1 files changed, 55 insertions, 27 deletions

diff --git a/src/com/android/phasebeam/phasebeam.rs b/src/com/android/phasebeam/phasebeam.rs
index ccbf60a..9f8ac26 100644
--- a/src/com/android/phasebeam/phasebeam.rs
+++ b/src/com/android/phasebeam/phasebeam.rs
@@ -22,6 +22,7 @@ static int numVertColors;
 typedef struct __attribute__((packed, aligned(4))) Particle {
     float3 position;
     float offsetX;
+    float3 adjust;
 } Particle_t;
 
 typedef struct VpConsts {
@@ -34,6 +35,8 @@ typedef struct VertexColor_s {
     float3 position;
     float offsetX;
     float4 color;
+    float4 realColor;
+    float3 adjust;
 } VertexColor;
 
 VertexColor* vertexColors;
@@ -43,6 +46,8 @@ rs_mesh dotMesh;
 rs_mesh beamMesh;
 rs_mesh gBackgroundMesh;
 
+float3 adjust = { -1.0, 1.0, 1.0 };
+float3 oldAdjust = { -1.0, 1.0, 1.0 };
 float densityDPI;
 float xOffset = 0.5;
 
@@ -56,6 +61,11 @@ static float halfScreenHeight;
 static float newOffset = 0.5;
 static float oldOffset = 0.5;
 
+static const float zxParticleSpeed = 0.0000780;
+static const float zxBeamSpeed = 0.00005;
+static const float yzParticleSpeed = 0.00011;
+static const float yzBeamSpeed = 0.000080;
+
 void positionParticles() {
     screenWidth = rsgGetWidth();
     screenHeight = rsgGetHeight();
@@ -85,6 +95,7 @@ void positionParticles() {
         }
         particle->position.z = z;
         particle->offsetX = 0;
+        particle->adjust = adjust;
 
         particle++;
     }
@@ -102,19 +113,34 @@ void positionParticles() {
 
         beamParticles->position.z = z;
         beamParticles->offsetX = 0;
+        beamParticles->adjust = adjust;
         beamParticles++;
     }
 }
 
 int root() {
+    float speedbump;
 
     newOffset = xOffset*2;
+    speedbump = newOffset != oldOffset ? 0.25 : 1.0;
     rsgClearColor(0.0f, 0.f, 0.f,1.0f);
 
-    if(newOffset != oldOffset) {
+    if(newOffset != oldOffset
+            || oldAdjust.x != adjust.x
+            || oldAdjust.y != adjust.y
+            || oldAdjust.z != adjust.z) {
         VertexColor* vert = vertexColors;
+        bool useAdjust = adjust.x >= 0;
         for(int i=0; i<numVertColors; i++) {
             vert->offsetX = -xOffset/2.0;
+            vert->realColor = vert->color;
+            if (useAdjust) {
+                float grey = 0.3 * vert->color.x + 0.59 * vert->color.y + 0.11 * vert->color.z;
+                vert->realColor.x = grey;
+                vert->realColor.y = grey;
+                vert->realColor.z = grey;
+            }
+            vert->adjust = adjust;
             vert++;
         }
     }
@@ -127,36 +153,38 @@ int root() {
     Particle_t* beam = beamParticles;
     Particle_t* particle = dotParticles;
 
-    for(int i=0; i<numDotParticles; i++) {
+    for (int i=0; i<numBeamParticles; i++) {
+        if(beam->position.x/beam->position.z > 0.5) {
+            beam->position.x = -1.0;
+        }
+        if(beam->position.y > 1.15) {
+            beam->position.y = -1.15;
+            beam->position.x = rsRand(-1.25f, 1.25f);
+        } else {
+            beam->position.y += yzBeamSpeed * beam->position.z * speedbump;
+        }
+        beam->position.x += zxBeamSpeed * beam->position.z * speedbump;
+        beam->offsetX = newOffset;
+        beam->adjust = adjust;
+        beam++;
+    }
 
-        if(newOffset==oldOffset) {
-            if(beam->position.x/beam->position.z > 0.5) {
-                beam->position.x = -1.0;
-            }
-            if(particle->position.x/particle->position.z > 0.5) {
-                particle->position.x = -1.0;
-            }
+    for(int i=0; i<numDotParticles; i++) {
+        if(particle->position.x/particle->position.z > 0.5) {
+            particle->position.x = -1.0;
+        }
 
-            if(beam->position.y > 1.05) {
-                beam->position.y = -1.05;
-                beam->position.x = rsRand(-1.25f, 1.25f);
-            } else {
-                beam->position.y = beam->position.y + 0.000160*beam->position.z;
-            }
-            if(particle->position.y > 1.25) {
-                particle->position.y = -1.25;
-                particle->position.x = rsRand(0.0f, 3.0f);
+        if(particle->position.y > 1.25) {
+            particle->position.y = -1.25;
+            particle->position.x = rsRand(0.0f, 3.0f);
 
-            } else {
-                particle->position.y = particle->position.y + 0.00022*particle->position.z;
-            }
+        } else {
+            particle->position.y += yzParticleSpeed * particle->position.z * speedbump;
         }
 
-        beam->position.x = beam->position.x + 0.0001*beam->position.z;
-        beam->offsetX = newOffset;
-        beam++;
         particle->offsetX = newOffset;
-        particle->position.x = particle->position.x + 0.0001560*beam->position.z;
+        particle->position.x += zxParticleSpeed * particle->position.z * speedbump;
+        particle->adjust = adjust;
         particle++;
     }
 
@@ -170,7 +198,7 @@ int root() {
     rsgDrawMesh(dotMesh);
 
     oldOffset = newOffset;
+    oldAdjust = adjust;
 
-    return 66;
-
+    return 66 * speedbump;
 }