Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 948ee251 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 21660 into eclair 

* changes:
  Optimized Galaxy
parents e5a07e65 4f7136c6

graphics/java/android/renderscript/Element.java

+6 −0
Original line number Diff line number Diff line
@@ -246,6 +246,12 @@ public class Element extends BaseObj { 
            return this;

        }

        

        public Builder addFloatST() {

            add(DataType.FLOAT, DataKind.S, false, 32, null);

            add(DataType.FLOAT, DataKind.T, false, 32, null);

            return this;

        }



        public Builder addFloatRGB() {

            add(DataType.FLOAT, DataKind.RED, false, 32, null);

            add(DataType.FLOAT, DataKind.GREEN, false, 32, null);

libs/rs/java/Galaxy/res/drawable-hdpi/flares.png

−6.23 KiB (657 B)
Loading image diff...

libs/rs/java/Galaxy/res/drawable-hdpi/light1.png

+54.8 KiB (246 KiB)
Loading image diff...

libs/rs/java/Galaxy/res/drawable-hdpi/light2.png

deleted100644 → 0
−126 KiB
Loading image diff...

libs/rs/java/Galaxy/res/raw/galaxy.c

+34 −83
Original line number Diff line number Diff line
@@ -17,26 +17,16 @@ 
#pragma stateFragment(PFBackground)

#pragma stateFragmentStore(PFSBackground)



#define RSID_STATE 0

#define RSID_FRAME_COUNT 0

#define RSID_WIDTH 1

#define RSID_HEIGHT 2

#define RSID_PARTICLES_COUNT 3

#define RSID_GALAXY_RADIUS 4



#define RSID_PARTICLES 1



#define PARTICLE_STRUCT_FIELDS_COUNT 7

#define PARTICLE_STRUCT_FIELDS_COUNT 4

#define PARTICLE_STRUCT_ANGLE 0

#define PARTICLE_STRUCT_DISTANCE 1

#define PARTICLE_STRUCT_SPEED 2

#define PARTICLE_STRUCT_Z 3

#define PARTICLE_STRUCT_RADIUS 4

#define PARTICLE_STRUCT_U1 5

#define PARTICLE_STRUCT_U2 6

#define PARTICLE_STRUCT_RADIUS 3



#define RSID_PARTICLES_BUFFER 2

#define PARTICLE_BUFFER_COMPONENTS_COUNT 6

#define PARTICLE_BUFFER_COMPONENTS_COUNT 5



#define PARTICLES_TEXTURES_COUNT 2
@@ -57,121 +47,82 @@ void drawSpace(int width, int height) { 
}



void drawLights(int width, int height) {

    bindProgramFragment(NAMED_PFBackground);

    bindProgramFragmentStore(NAMED_PFSLights);



    float x = (width - 512.0f) / 2.0f;

    float y = (height - 512.0f) / 2.0f;



    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);



    bindTexture(NAMED_PFBackground, 0, NAMED_TLight2);

    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);

}



void drawParticle(int index, int bufferIndex, int width, int height, int radius) {

    float *particle = loadArrayF(RSID_PARTICLES, index);



    float distance = particle[PARTICLE_STRUCT_DISTANCE];

    float angle = particle[PARTICLE_STRUCT_ANGLE];

    float speed = particle[PARTICLE_STRUCT_SPEED];

    float r = particle[PARTICLE_STRUCT_RADIUS];



    int red;

    int green;

    int blue;



    if (distance < radius / 3.0f) {

        red = 220 + (distance / (float) radius) * 35;

        green = 220;

        blue = 220;

    } else {

        red = 180;

        green = 180;

        blue = clamp(140 + (distance / (float) radius) * 115, 140, 255);

    }

void drawParticle(float *particle, int index, float *particleBuffer, int bufferIndex,

        float w, float h) {



    int color = 0xFF000000 | red | green << 8 | blue << 16;

    float distance = particle[index + PARTICLE_STRUCT_DISTANCE];

    float angle = particle[index + PARTICLE_STRUCT_ANGLE];

    float speed = particle[index + PARTICLE_STRUCT_SPEED];

    float r = particle[index + PARTICLE_STRUCT_RADIUS];



    float a = angle + speed * (0.5f + (0.5f * radius / distance));

    float a = angle + speed;

    float x = distance * sinf(a);

    float y = distance * cosf(a) * ELLIPSE_RATIO;

    float z = distance * ELLIPSE_TWIST;

    float s = cosf(z);

    float t = sinf(z);



    float sX = t * x + s * y + width / 2.0f;

    float sY = s * x - t * y + height / 2.0f;

    float sZ = particle[PARTICLE_STRUCT_Z];



    float u1 = particle[PARTICLE_STRUCT_U1];

    float u2 = particle[PARTICLE_STRUCT_U2];

    float sX = t * x + s * y + w;

    float sY = s * x - t * y + h;



    // lower left vertex of the particle's triangle

    storeI32(RSID_PARTICLES_BUFFER, bufferIndex, color);        // ABGR



    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 1, sX - r);     // X

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 2, sY + r);     // Y

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 3, sZ);         // Z



    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 4, u1);         // S

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 5, 1.0f);       // T

    particleBuffer[bufferIndex + 1] = sX - r;     // X

    particleBuffer[bufferIndex + 2] = sY + r;     // Y



    // lower right vertex of the particle's triangle

    bufferIndex += PARTICLE_BUFFER_COMPONENTS_COUNT;

    storeI32(RSID_PARTICLES_BUFFER, bufferIndex, color);



    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 1, sX + r);

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 2, sY + r);

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 3, sZ);



    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 4, u2);

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 5, 1.0f);

    particleBuffer[bufferIndex + 1] = sX + r;     // X

    particleBuffer[bufferIndex + 2] = sY + r;     // Y



    // upper middle vertex of the particle's triangle

    bufferIndex += PARTICLE_BUFFER_COMPONENTS_COUNT;

    storeI32(RSID_PARTICLES_BUFFER, bufferIndex, color);

    particleBuffer[bufferIndex + 1] = sX;     // X

    particleBuffer[bufferIndex + 2] = sY - r;     // Y



    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 1, sX);

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 2, sY - r);

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 3, sZ);



    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 4, u1 + (u2 - u1) / 2.0f);

    storeF(RSID_PARTICLES_BUFFER, bufferIndex + 5, 0.0f);



    particle[PARTICLE_STRUCT_ANGLE] = a;

    particle[index + PARTICLE_STRUCT_ANGLE] = a;

}



void drawParticles(int width, int height) {

    bindProgramFragment(NAMED_PFLighting);

    bindProgramFragmentStore(NAMED_PFSLights);    

    bindTexture(NAMED_PFLighting, 0, NAMED_TFlares);



    int radius = loadI32(RSID_STATE, RSID_GALAXY_RADIUS);

    int particlesCount = loadI32(RSID_STATE, RSID_PARTICLES_COUNT);

    int radius = State_galaxyRadius;

    int particlesCount = State_particlesCount;

    int count = particlesCount * PARTICLE_STRUCT_FIELDS_COUNT;



    float *particle = loadArrayF(RSID_PARTICLES, 0);

    float *particleBuffer = loadArrayF(RSID_PARTICLES_BUFFER, 0);



    float w = width * 0.5f;

    float h = height * 0.5f;



    int i = 0;

    int bufferIndex = 0;

    for ( ; i < count; i += PARTICLE_STRUCT_FIELDS_COUNT) {

        drawParticle(i, bufferIndex, width, height, radius);

        drawParticle(particle, i, particleBuffer, bufferIndex, w, h);

        // each particle is a triangle (3 vertices) of 6 properties (ABGR, X, Y, Z, S, T)

        bufferIndex += 3 * PARTICLE_BUFFER_COMPONENTS_COUNT;

    }



    uploadToBufferObject(NAMED_BParticles);

    drawSimpleMeshRange(NAMED_MParticles, 0, particlesCount * 3);

    uploadToBufferObject(NAMED_ParticlesBuffer);

    drawSimpleMeshRange(NAMED_ParticlesMesh, 0, particlesCount * 3);

}



int main(int index) {

    int width = loadI32(RSID_STATE, RSID_WIDTH);

    int height = loadI32(RSID_STATE, RSID_HEIGHT);

    int width = State_width;

    int height = State_height;



    drawSpace(width, height);

    drawParticles(width, height);