Update for API changes

RavEngine · Jun 22, 2024 · 7cad458 · 7cad458
1 parent aa6d389
commit 7cad458
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 84 deletions.
diff --git a/RavEngine b/RavEngine
diff --git a/Samples/Rendering/main.cpp b/Samples/Rendering/main.cpp
@@ -174,11 +174,14 @@ struct Level : public RavEngine::World {
         };
 
         auto asteroidUpdateMat = New<ParticleUpdateMaterialInstance>(New<AsteroidUpdateMaterial>());
-        auto asteroidRenderMat = New<PBRMeshParticleRenderMaterialInstance>(New<PBRMeshParticleRenderMaterial>());
+        auto asteroidRenderMat = New<PBRMeshParticleRenderMaterialInstance>(New<PBRMeshParticleRenderMaterial>(),asteroidMeshCol, sizeof(AsteroidParticleData), offsetof(AsteroidParticleData,pos));
 
         auto asteroidEmitterEntity = Instantiate<GameObject>();
         auto& emitter = asteroidEmitterEntity.EmplaceComponent<ParticleEmitter>(1024, sizeof(AsteroidParticleData), asteroidUpdateMat, asteroidRenderMat);
 
+        emitter.Play();
+        emitter.SetEmissionRate(500);
+
         SetupInputs();
 
         constexpr auto MoveParticleSystem = [](const ParticleEmitter& emitter, Transform& t) {

diff --git a/Samples/Rendering/shaders/AsteroidUpdate.csh b/Samples/Rendering/shaders/AsteroidUpdate.csh
@@ -4,11 +4,16 @@ layout(push_constant, std430) uniform UniformBufferObject{
     float fpsScale;
 } ubo;
 
+const float kGraivty = 0.5 / 60;
 
 void update(inout ParticleData data, inout float newLife, uint particleID)
 {    
     newLife += ubo.fpsScale;
 
+    data.velocity.y -= kGraivty * ubo.fpsScale;
+
+    data.pos += data.velocity; 
+
     if (newLife > 300)
     {
         // destroy the particle

diff --git a/Samples/Rendering/shaders/FireParticleInit.csh b/Samples/Rendering/shaders/FireParticleInit.csh
@@ -1,24 +1,6 @@
-struct ParticleData{
-    vec3 pos;
-    vec2 scale;
-    uint animationFrame;
-};
-
-float rand(in vec2 ip) {
-    const float seed = 12345678;
-    uvec2 p = uvec2(floatBitsToUint(ip.x), floatBitsToUint(ip.y));
-    uint s = floatBitsToUint(seed);
-    s ^= (s ^ ((~p.x << s) + (~p.y << s)));
-
-    p ^= (p << 17U);
-    p ^= ((p ^ s) >> 13U);
-    p ^= (p << 5U);
-    p ^= ((s + (s&(p.x^p.y))) >> 3U);
-    
-    uint n = (p.x*s+p.y)+((p.x ^ p.y) << ~p.x ^ s) + ((p.x ^ p.y) << ~p.y ^ s);
-    return float(n*50323U) / float(0xFFFFFFFFU);
-}
+#include "sprite_particle_layout.glsl"
 
+#include "utility.glsl"
 
 ParticleData init(ParticleInitData initData)
 {  

diff --git a/Samples/Rendering/shaders/FireParticleUpdate.csh b/Samples/Rendering/shaders/FireParticleUpdate.csh
@@ -5,27 +5,9 @@ layout(push_constant, std430) uniform UniformBufferObject{
 } ubo;
 
 
-struct ParticleData{
-    vec3 pos;
-    vec2 scale;
-    uint animationFrame;
-};
-
-
-float rand(in vec2 ip) {
-    const float seed = 12345678;
-    uvec2 p = uvec2(floatBitsToUint(ip.x), floatBitsToUint(ip.y));
-    uint s = floatBitsToUint(seed);
-    s ^= (s ^ ((~p.x << s) + (~p.y << s)));
-
-    p ^= (p << 17U);
-    p ^= ((p ^ s) >> 13U);
-    p ^= (p << 5U);
-    p ^= ((s + (s&(p.x^p.y))) >> 3U);
-    
-    uint n = (p.x*s+p.y)+((p.x ^ p.y) << ~p.x ^ s) + ((p.x ^ p.y) << ~p.y ^ s);
-    return float(n*50323U) / float(0xFFFFFFFFU);
-}
+#include "sprite_particle_layout.glsl"
+
+#include "utility.glsl"
 
 const float maxLife = 20;
 

diff --git a/Samples/Rendering/shaders/SmokeParticleInitialize.csh b/Samples/Rendering/shaders/SmokeParticleInitialize.csh
@@ -1,25 +1,7 @@
 
-struct ParticleData{
-    vec3 pos;
-    vec2 scale;
-    uint animationFrame;
-};
-
-float rand(in vec2 ip) {
-    const float seed = 12345678;
-    uvec2 p = uvec2(floatBitsToUint(ip.x), floatBitsToUint(ip.y));
-    uint s = floatBitsToUint(seed);
-    s ^= (s ^ ((~p.x << s) + (~p.y << s)));
-
-    p ^= (p << 17U);
-    p ^= ((p ^ s) >> 13U);
-    p ^= (p << 5U);
-    p ^= ((s + (s&(p.x^p.y))) >> 3U);
-    
-    uint n = (p.x*s+p.y)+((p.x ^ p.y) << ~p.x ^ s) + ((p.x ^ p.y) << ~p.y ^ s);
-    return float(n*50323U) / float(0xFFFFFFFFU);
-}
+#include "sprite_particle_layout.glsl"
 
+#include "utility.glsl"
 
 ParticleData init(ParticleInitData initData)
 {  

diff --git a/Samples/Rendering/shaders/SmokeParticleUpdate.csh b/Samples/Rendering/shaders/SmokeParticleUpdate.csh
@@ -6,27 +6,9 @@ layout(push_constant, std430) uniform UniformBufferObject{
 } ubo;
 
 
-struct ParticleData{
-    vec3 pos;
-    vec2 scale;
-    uint animationFrame;
-};
-
-
-float rand(in vec2 ip) {
-    const float seed = 12345678;
-    uvec2 p = uvec2(floatBitsToUint(ip.x), floatBitsToUint(ip.y));
-    uint s = floatBitsToUint(seed);
-    s ^= (s ^ ((~p.x << s) + (~p.y << s)));
-
-    p ^= (p << 17U);
-    p ^= ((p ^ s) >> 13U);
-    p ^= (p << 5U);
-    p ^= ((s + (s&(p.x^p.y))) >> 3U);
-    
-    uint n = (p.x*s+p.y)+((p.x ^ p.y) << ~p.x ^ s) + ((p.x ^ p.y) << ~p.y ^ s);
-    return float(n*50323U) / float(0xFFFFFFFFU);
-}
+#include "sprite_particle_layout.glsl"
+
+#include "utility.glsl"
 
 const float maxLife = 200;
 

diff --git a/Samples/Rendering/shaders/sprite_particle_layout.glsl b/Samples/Rendering/shaders/sprite_particle_layout.glsl
@@ -0,0 +1,5 @@
+struct ParticleData{
+    vec3 pos;
+    vec2 scale;
+    uint animationFrame;
+};