Sveskejuice/fgm24
Sveskejuice
/
fgm24
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Sveskejuice:4f12551e8f9cf82ef1db895105bf0cd558c0b1e8
Branches Tags
Sveskejuice:main
Sveskejuice:Netcode
Sveskejuice:BloodWIthLotsOfDirections
..
compare: Sveskejuice:fc295808e91ff97d54cf9d4b5e7912f058c846a6
Branches Tags
Sveskejuice:main
Sveskejuice:Netcode
Sveskejuice:BloodWIthLotsOfDirections

No commits in common. "4f12551e8f9cf82ef1db895105bf0cd558c0b1e8" and "fc295808e91ff97d54cf9d4b5e7912f058c846a6" have entirely different histories.
4f12551e8f ... fc295808e9

3 changed files with 6 additions and 5 deletions
Show Stats Expand all files Collapse all files

2
Assets/Scenes/Bloody Mary.unity
View File

@ -1300,7 +1300,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
numParticles: 1000000
bloodCompute: {fileID: 7200000, guid: 99867deda8cf464cd87542adcc3c08f2, type: 3}
mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
mesh: {fileID: 6466198060863859617, guid: 803eb7ed90ad4b9388c2563597bd6db2, type: 3}
instancedMaterial: {fileID: 2100000, guid: 0d09c46ae354e8c49b2688cc4325b256, type: 2}
size: 0.05
scoreMult: 1

2
Assets/Scripts/BloodComputeShader.cs
View File

@ -264,8 +264,6 @@ public class BloodComputeShader : MonoBehaviour
bloodCompute.SetVector("particleInitPos", loc);
bloodCompute.SetInt("particlesToInitialize", found);
bloodCompute.SetVector("initialVelocity",Random.insideUnitCircle * power);
ComputeHelper.Dispatch(bloodCompute, amount, 1, 1, InitDustKernel);
activeParticles += found;

7
Assets/Scripts/ComputeShaders/BloodCompute.compute
View File

@ -15,8 +15,11 @@ RWStructuredBuffer<uint> freeParticles;
uint numParticles;
uint particlesToInitialize;
float3 particleInitPos;
float3 initialVelocity;
float deltaTime;
// float3 attractPos;
// float3 xAxis;
// float attractRadius;
// float attractForce;
float3 mop1Pos;
float3 mop2Pos;
@ -81,7 +84,7 @@ void InitDust (uint3 id : SV_DispatchThreadID)
randState = hash(randState);
nvel.xy *= scaleToRange01(randState);
particles[i].velocity = initialVelocity + nvel;
particles[i].velocity = nvel;
particles[i].position = particleInitPos;
particles[i].position.z = 0.01;