diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 8cdc796..510fd97 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,7 +2,9 @@ - + + + @@ -67,30 +69,19 @@ - - - - - - - - - - - - + - + - + @@ -114,10 +105,10 @@ - + - + @@ -179,16 +170,16 @@ - @@ -216,8 +207,8 @@ - + @@ -337,7 +328,7 @@ - + @@ -414,12 +405,10 @@ - - - - - + + @@ -586,16 +582,16 @@ - - + + - + @@ -623,6 +619,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -726,13 +785,6 @@ - - - - - - - @@ -775,13 +827,6 @@ - - - - - - - @@ -793,7 +838,26 @@ - + + + + + + + + + + + + + + + + + + + + diff --git a/data/fireworks.png b/data/fireworks.png index c0aa4e2..f178534 100644 Binary files a/data/fireworks.png and b/data/fireworks.png differ diff --git a/src/com/persesgames/jogl/TestJogl.java b/src/com/persesgames/jogl/TestJogl.java index 6f66559..a97dab0 100644 --- a/src/com/persesgames/jogl/TestJogl.java +++ b/src/com/persesgames/jogl/TestJogl.java @@ -26,7 +26,7 @@ public class TestJogl { GLWindow glWindow = GLWindow.create(caps); - glWindow.setTitle("jogl-triangle"); + glWindow.setTitle("jogl-compute-shaders-fireworks"); glWindow.setSize(800, 800); diff --git a/src/com/persesgames/jogl/explosion/explosionCleanUp.comp b/src/com/persesgames/jogl/explosion/explosionCleanUp.comp index 44c2b07..e88db0e 100644 --- a/src/com/persesgames/jogl/explosion/explosionCleanUp.comp +++ b/src/com/persesgames/jogl/explosion/explosionCleanUp.comp @@ -19,7 +19,7 @@ void main() { if (gid < last && last > 0) { if (e[gid].color.a == 0.0) { - uint old = atomicCounterDecrement(lastCounter) - 1; + uint old = atomicCounterDecrement(lastCounter); e[gid].positionVelocity = e[old].positionVelocity; e[gid].color = e[old].color;