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

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Sveske Juice 2024-02-03 16:26:05 -08:00
parent 85cb42fd63 7800d171e7
commit 5f00412d5e
5 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Prefabs/CameraRig.prefab
View File

@ -187,8 +187,8 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Wave: 0 Wave: 0
difficulty: 1 difficulty: 1
difficultyIncreasePerWave: 0.25 difficultyIncreasePerWave: 1
difficultyMultiplyDecreasePerWave: 0.1 difficultyMultiplyDecreasePerWave: 0.05
WaveTime: 20 WaveTime: 20
enemyDifficulties: [] enemyDifficulties: []
SpawnRadius: 22.6 SpawnRadius: 22.6

2
Assets/Scenes/Bloody Mary.unity
View File

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

6
Assets/Scripts/BloodComputeShader.cs
View File

@ -260,10 +260,14 @@ public class BloodComputeShader : MonoBehaviour
// Test for race conditions // Test for race conditions
// yield return new WaitForSeconds(1.0f); // yield return new WaitForSeconds(1.0f);
bloodCompute.SetFloat("particleVel", power); bloodCompute.SetFloat("particleVel", power/4.0f);
bloodCompute.SetVector("particleInitPos", loc); bloodCompute.SetVector("particleInitPos", loc);
bloodCompute.SetInt("particlesToInitialize", found); bloodCompute.SetInt("particlesToInitialize", found);
Vector3 pow = Random.insideUnitSphere * power;
pow.z = Mathf.Abs(pow.z);
bloodCompute.SetVector("initialVelocity",pow);
ComputeHelper.Dispatch(bloodCompute, amount, 1, 1, InitDustKernel); ComputeHelper.Dispatch(bloodCompute, amount, 1, 1, InitDustKernel);
activeParticles += found; activeParticles += found;

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

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

4
Assets/Scripts/Upgrader.cs
View File

@ -108,6 +108,8 @@ public class Upgrader : MonoBehaviour
// Update is called once per frame // Update is called once per frame
void Update() void Update()
{ {
bool upgrade = canUpgrade();
if (canUpgrade()) if (canUpgrade())
{ {
@ -205,7 +207,7 @@ public class Upgrader : MonoBehaviour
Player1Cursor.localPosition = Player1Input.look.normalized * (125 - 12); Player1Cursor.localPosition = Player1Input.look.normalized * (125 - 12);
Player2Cursor.localPosition = Player2Input.look.normalized * (125 - 12); Player2Cursor.localPosition = Player2Input.look.normalized * (125 - 12);
prevCouldUpgrade = canUpgrade(); prevCouldUpgrade = upgrade;
} }
/// Increases mop radius by 10% /// Increases mop radius by 10%