From cac80a6e1324cb0679977a61533edfe3f7f9cf6b Mon Sep 17 00:00:00 2001
From: Romain Guy <romainguy@android.com>
Date: Tue, 18 Aug 2009 11:39:17 -0700
Subject: [PATCH] Tweak the galaxy

---
 .../java/Galaxy/res/drawable-hdpi/flares.png  | Bin 657 -> 413 bytes
 libs/rs/java/Galaxy/res/raw/galaxy.c          |  27 ++++++-----
 .../src/com/android/galaxy/rs/GalaxyRS.java   |  22 +++++----
 libs/rs/rsScriptC_Lib.cpp                     |  42 ++++++++++++++++++
 4 files changed, 67 insertions(+), 24 deletions(-)

diff --git a/libs/rs/java/Galaxy/res/drawable-hdpi/flares.png b/libs/rs/java/Galaxy/res/drawable-hdpi/flares.png
index e1c70108cf8d3218ece9c24fbfe23a463d414f21..3a5c970fc2b9f94b599faad431de44bf0928c61e 100644
GIT binary patch
delta 385
zcmV-{0e=3G1)T#SiBL{Q4GJ0x0000DNk~Le0000G0000G2nGNE03Y-JVUZyxe*r&9
zL_t(|+N6_9OT$1Eg)>P@Ykd|)iw^{~f}pq-{15(XS6#V~LP2~K7fP{eOBG|rbLATi
zH6q1<j|67s+;bn}y!S5pUOt*|ISEAnS$_#Q$R-tt#k80cZ{kU$;(a{LaRG}~6)R$m
ze~Ug6ebE)eyhsoTRu{yEXy9N5e>VdzUL*1x(#i`gi&Y}m#evupi8vQ$;!gC$jkvdz
zN;sLq_M(^-`{G1w;$R2cE$WcsY7le4F3yv)2^@)CQ4wX)6vvz?lU^-U+w7OH>JZo}
z=*%`XiV-mZ7aSDzzGx<r+`bDAGV*yPPpj}%fq)h6f%7S?^+BLVg<lw&S5t9;U`Fd&
z?Ac&F!e{OtZYfTMmYMh=du>`df-c`5lUU`_6907s`b4&2>X45A?JZc(*AYl^56LcH
f68-COeF!iBU6pMy=aw~!00000NkvXXu0mjfJBp#&

delta 631
zcmV--0*L*c1Ca$GiBL{Q4GJ0x0000DNk~Le0000W0000G2nGNE0Cxa=S&<<pe*!Z}
zL_t(|+N70DPZLoThC9p{z^MWOL?|dA5+L{$<AMYd7VQ0}`~X-HjmCr(3osgjT4+e2
z0cx>o>kRK{o-ubZLrb{HlW9A1&w0;#&YgO39OrJZy1?Um1j)KlFk4;+0=$gC9z?lY
ztabvd+EH;V{$<>c+K9haWIF)^f8ve!B&sP+WVvI)LUCU-*xRItxDx>u_^uceuf#`j
z*g=nNUym3O1wLE#b#YFNOE*rIfRN;qVphBpU&QY=R`-hu@sJpK+^CWG2O@qZZAla0
zlXOlzX9m{AzBnaNGey7yL>Fk?GcixRU9ls|q9Tgo#99)h1R53#Vokgjf88jy-}l4;
zcDl-Yv3*e76N}=lc#H!xJipBxG;yUCID?c}I8T5Tg#6|AM{GLAg@z;A68F(_6R?Df
z$$Bc5#aD_6nX#6D5xxvk?G&2}1n(yK85Ykl-BpImt^rni2$)WplP45X5_iby1q?$M
z4>d_tb}CF(g#>*h>!%g9e~f`l8&u!9-+IObTu?<B^?zu|OR>sk8=?)aCFh;+ivnuw
z%VY6(+;Ufu;vxz)_u_ya#{{VJuvxUlH2a)_Z3ghv*%NWC(3TK!A873q_e<=r;_L;q
z9EhDik_JO&0^T#RX89&Tj#7?b&Pft7Gdr~P1@}JVUL6jTVzXXEO}=v+hY@pz<=3qq
zk`D2C00HL|cgaa8CWV`TtoM1y%OuaMxZdGEpPiC%1o+M#Oa6`O|Hru!U;z7&!0?_l
Rhw1<T002ovPDHLkV1o5`6zl*1

diff --git a/libs/rs/java/Galaxy/res/raw/galaxy.c b/libs/rs/java/Galaxy/res/raw/galaxy.c
index 857571242de09..59c31a1a0901a 100644
--- a/libs/rs/java/Galaxy/res/raw/galaxy.c
+++ b/libs/rs/java/Galaxy/res/raw/galaxy.c
@@ -30,7 +30,7 @@
 
 #define PARTICLES_TEXTURES_COUNT 2
 
-#define ELLIPSE_RATIO 0.86f
+#define ELLIPSE_RATIO 0.892f
 #define ELLIPSE_TWIST 0.02333333333f
 
 void drawSpace(int width, int height) {
@@ -47,15 +47,18 @@ void drawSpace(int width, int height) {
 }
 
 void drawLights(int width, int height) {
-    float x = (width - 512.0f) / 2.0f;
-    float y = (height - 512.0f) / 2.0f;
+    float x = (width - 512.0f) * 0.5f;
+    float y = (height - 512.0f) * 0.5f;
+    
+    // increase the size of the texture by 5% on each side
+    x -= 512.0f * 0.05f;
 
     bindProgramFragment(NAMED_PFBackground);
     bindTexture(NAMED_PFBackground, 0, NAMED_TLight1);
-    drawQuad(x + 512.0f, y         , 0.0f,
-             x         , y         , 0.0f,
-             x         , y + 512.0f, 0.0f,
-             x + 512.0f, y + 512.0f, 0.0f);
+    drawQuad(x + 512.0f * 1.1f, y         , 0.0f,
+             x                , y         , 0.0f,
+             x                , y + 512.0f, 0.0f,
+             x + 512.0f * 1.1f, y + 512.0f, 0.0f);
 }
 
 void drawParticle(float *particle, int index, float *particleBuffer, int bufferIndex,
@@ -67,11 +70,11 @@ void drawParticle(float *particle, int index, float *particleBuffer, int bufferI
     float r = particle[index + PARTICLE_STRUCT_RADIUS];
 
     float a = angle + speed;
-    float x = distance * sinf(a);
-    float y = distance * cosf(a) * ELLIPSE_RATIO;
+    float x = distance * sinf_fast(a);
+    float y = distance * cosf_fast(a) * ELLIPSE_RATIO;
     float z = distance * ELLIPSE_TWIST;
-    float s = cosf(z);
-    float t = sinf(z);
+    float s = cosf_fast(z);
+    float t = sinf_fast(z);
 
     float sX = t * x + s * y + w;
     float sY = s * x - t * y + h;
@@ -87,7 +90,7 @@ void drawParticle(float *particle, int index, float *particleBuffer, int bufferI
 
     // upper middle vertex of the particle's triangle
     bufferIndex += PARTICLE_BUFFER_COMPONENTS_COUNT;
-    particleBuffer[bufferIndex + 1] = sX;     // X
+    particleBuffer[bufferIndex + 1] = sX;         // X
     particleBuffer[bufferIndex + 2] = sY - r;     // Y
 
     particle[index + PARTICLE_STRUCT_ANGLE] = a;
diff --git a/libs/rs/java/Galaxy/src/com/android/galaxy/rs/GalaxyRS.java b/libs/rs/java/Galaxy/src/com/android/galaxy/rs/GalaxyRS.java
index 1b9e34998a73a..717100dc97071 100644
--- a/libs/rs/java/Galaxy/src/com/android/galaxy/rs/GalaxyRS.java
+++ b/libs/rs/java/Galaxy/src/com/android/galaxy/rs/GalaxyRS.java
@@ -49,7 +49,6 @@ class GalaxyRS {
     private static final int RSID_STATE = 0;
 
     private static final int TEXTURES_COUNT = 3;
-    private static final int PARTICLES_TEXTURES_COUNT = 2;
     private static final int RSID_TEXTURE_SPACE = 0;
     private static final int RSID_TEXTURE_LIGHT1 = 1;
     private static final int RSID_TEXTURE_FLARES = 2;
@@ -216,13 +215,15 @@ class GalaxyRS {
 
     @SuppressWarnings({"PointlessArithmeticExpression"})
     private void createParticle(float[] particles, int index, int bufferIndex) {
-        float d = abs(randomGauss()) * GALAXY_RADIUS / 2.0f;
+        float d = abs(randomGauss()) * GALAXY_RADIUS / 2.0f + random(-4.0f, 4.0f);
+        float z = randomGauss() * 0.5f * 0.8f * ((GALAXY_RADIUS - d) / (float) GALAXY_RADIUS);
+        z += 1.0f;
 
         particles[index + PARTICLE_STRUCT_ANGLE] = random(0.0f, (float) (Math.PI * 2.0));
         particles[index + PARTICLE_STRUCT_DISTANCE] = d;
         particles[index + PARTICLE_STRUCT_SPEED] = random(0.0015f, 0.0025f) *
-                (0.5f + (0.5f * (float) GALAXY_RADIUS / d));
-        particles[index + PARTICLE_STRUCT_RADIUS] = random(1.0f, 2.1f);
+                (0.5f + (0.5f * (float) GALAXY_RADIUS / d)) * 0.7f;
+        particles[index + PARTICLE_STRUCT_RADIUS] = z * random(1.2f, 2.1f);
 
         int red, green, blue;
         if (d < GALAXY_RADIUS / 3.0f) {
@@ -234,27 +235,24 @@ class GalaxyRS {
             green = 180;
             blue = (int) constrain(140 + (d / (float) GALAXY_RADIUS) * 115, 140, 255);
         }
-
-        final int color = 0xFF000000 | red | green << 8 | blue << 16;
-        final int sprite = random(PARTICLES_TEXTURES_COUNT);        
-        final float u1 = sprite / (float) PARTICLES_TEXTURES_COUNT;
-        final float u2 = (sprite + 1) / (float) PARTICLES_TEXTURES_COUNT;
+        
+        final int color = red | green << 8 | blue << 16 | 0xff000000;
 
         final float[] floatData = mFloatData5;
         final Allocation buffer = mParticlesBuffer;
         
         floatData[0] = Float.intBitsToFloat(color);
-        floatData[3] = u1;
+        floatData[3] = 0.0f;
         floatData[4] = 1.0f;
         buffer.subData1D(bufferIndex, 1, floatData);
 
         bufferIndex++;
-        floatData[3] = u2;
+        floatData[3] = 1.0f;
         floatData[4] = 1.0f;
         buffer.subData1D(bufferIndex, 1, floatData);
 
         bufferIndex++;
-        floatData[3] = u1 + (u2 - u1) / 2.0f;
+        floatData[3] = 0.5f;
         floatData[4] = 0.0f;
         buffer.subData1D(bufferIndex, 1, floatData);
     }
diff --git a/libs/rs/rsScriptC_Lib.cpp b/libs/rs/rsScriptC_Lib.cpp
index 0ecdf9a06998a..5f8ee2a9ec807 100644
--- a/libs/rs/rsScriptC_Lib.cpp
+++ b/libs/rs/rsScriptC_Lib.cpp
@@ -170,6 +170,44 @@ static void SC_storeMatrix(uint32_t bank, uint32_t offset, const rsc_Matrix *m)
 #define DEG_TO_RAD PI / 180.0f
 #define RAD_TO_DEG 180.0f / PI
 
+static float SC_sinf_fast(float x)
+{
+    const float A =   1.0f / (2.0f * M_PI);
+    const float B = -16.0f;
+    const float C =   8.0f;
+    
+    // scale angle for easy argument reduction
+    x *= A;
+    
+    if (fabsf(x) >= 0.5f) {
+        // argument reduction
+        x = x - ceilf(x + 0.5f) + 1.0f;
+    }
+    
+    const float y = B * x * fabsf(x) + C * x;
+    return 0.2215f * (y * fabsf(y) - y) + y;
+}
+
+static float SC_cosf_fast(float x)
+{
+    x += float(M_PI / 2);
+
+    const float A =   1.0f / (2.0f * M_PI);
+    const float B = -16.0f;
+    const float C =   8.0f;
+    
+    // scale angle for easy argument reduction
+    x *= A;
+    
+    if (fabsf(x) >= 0.5f) {
+        // argument reduction
+        x = x - ceilf(x + 0.5f) + 1.0f;
+    }
+    
+    const float y = B * x * fabsf(x) + C * x;
+    return 0.2215f * (y * fabsf(y) - y) + y;
+}
+
 static float SC_randf(float max)
 {
     float r = (float)rand();
@@ -846,6 +884,10 @@ ScriptCState::SymbolTable_t ScriptCState::gSyms[] = {
         "int", "(int)" },
     { "absf", (void *)&fabs,
         "float", "(float)" },
+    { "sinf_fast", (void *)&SC_sinf_fast,
+        "float", "(float)" },
+    { "cosf_fast", (void *)&SC_cosf_fast,
+        "float", "(float)" },
     { "sinf", (void *)&sinf,
         "float", "(float)" },
     { "cosf", (void *)&cosf,