diff options
Diffstat (limited to 'libs/rs/java')
18 files changed, 78 insertions, 93 deletions
diff --git a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java index 0afff34..53fb646 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainRS.java @@ -57,7 +57,7 @@ public class FountainRS { return; } int rate = (int)(pressure * pressure * 500.f); - if(rate > 500) { + if (rate > 500) { rate = 500; } if (rate > 0) { diff --git a/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java index 987bebe..50a9707 100644 --- a/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java +++ b/libs/rs/java/Fountain/src/com/android/fountain/FountainView.java @@ -62,7 +62,7 @@ public class FountainView extends RSSurfaceView { @Override protected void onDetachedFromWindow() { - if(mRS != null) { + if (mRS != null) { mRS = null; destroyRenderScript(); } diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java b/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java index 16f404f..c617759 100644 --- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java +++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/ImageProcessingActivity.java @@ -141,7 +141,7 @@ public class ImageProcessingActivity extends Activity float coeff2 = - 1.0f / (2.0f * sigma * sigma); float normalizeFactor = 0.0f; float floatR = 0.0f; - for(r = -radius; r <= radius; r ++) { + for (r = -radius; r <= radius; r ++) { floatR = (float)r; gaussian[r + radius] = coeff1 * (float)Math.pow(e, floatR * floatR * coeff2); normalizeFactor += gaussian[r + radius]; @@ -149,7 +149,7 @@ public class ImageProcessingActivity extends Activity //Now we need to normalize the weights because all our coefficients need to add up to one normalizeFactor = 1.0f / normalizeFactor; - for(r = -radius; r <= radius; r ++) { + for (r = -radius; r <= radius; r ++) { floatR = (float)r; gaussian[r + radius] *= normalizeFactor; } @@ -159,22 +159,22 @@ public class ImageProcessingActivity extends Activity float blurredPixelB = 0.0f; float blurredPixelA = 0.0f; - for(h = 0; h < height; h ++) { - for(w = 0; w < width; w ++) { + for (h = 0; h < height; h ++) { + for (w = 0; w < width; w ++) { blurredPixelR = 0.0f; blurredPixelG = 0.0f; blurredPixelB = 0.0f; blurredPixelA = 0.0f; - for(r = -radius; r <= radius; r ++) { + for (r = -radius; r <= radius; r ++) { // Stepping left and right away from the pixel int validW = w + r; // Clamp to zero and width max() isn't exposed for ints yet - if(validW < 0) { + if (validW < 0) { validW = 0; } - if(validW > width - 1) { + if (validW > width - 1) { validW = width - 1; } @@ -202,20 +202,20 @@ public class ImageProcessingActivity extends Activity } } - for(h = 0; h < height; h ++) { - for(w = 0; w < width; w ++) { + for (h = 0; h < height; h ++) { + for (w = 0; w < width; w ++) { blurredPixelR = 0.0f; blurredPixelG = 0.0f; blurredPixelB = 0.0f; blurredPixelA = 0.0f; - for(r = -radius; r <= radius; r ++) { + for (r = -radius; r <= radius; r ++) { int validH = h + r; // Clamp to zero and width - if(validH < 0) { + if (validH < 0) { validH = 0; } - if(validH > height - 1) { + if (validH > height - 1) { validH = height - 1; } @@ -252,36 +252,30 @@ public class ImageProcessingActivity extends Activity public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { if (fromUser) { - if(seekBar == mRadiusSeekBar) { + if (seekBar == mRadiusSeekBar) { float fRadius = progress / 100.0f; fRadius *= (float)(MAX_RADIUS); mRadius = (int)fRadius; mScript.set_radius(mRadius); - } - else if(seekBar == mInBlackSeekBar) { + } else if (seekBar == mInBlackSeekBar) { mInBlack = (float)progress; mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite); - } - else if(seekBar == mOutBlackSeekBar) { + } else if (seekBar == mOutBlackSeekBar) { mOutBlack = (float)progress; mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite); - } - else if(seekBar == mInWhiteSeekBar) { + } else if (seekBar == mInWhiteSeekBar) { mInWhite = (float)progress + 127.0f; mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite); - } - else if(seekBar == mOutWhiteSeekBar) { + } else if (seekBar == mOutWhiteSeekBar) { mOutWhite = (float)progress + 127.0f; mScriptVBlur.invoke_setLevels(mInBlack, mOutBlack, mInWhite, mOutWhite); - } - else if(seekBar == mGammaSeekBar) { + } else if (seekBar == mGammaSeekBar) { mGamma = (float)progress/100.0f; mGamma = Math.max(mGamma, 0.1f); mGamma = 1.0f / mGamma; mScriptVBlur.invoke_setGamma(mGamma); - } - else if(seekBar == mSaturationSeekBar) { + } else if (seekBar == mSaturationSeekBar) { mSaturation = (float)progress / 50.0f; mScriptVBlur.invoke_setSaturation(mSaturation); } diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs index cfffac8..652ffd7 100644 --- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs +++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/horizontal_blur.rs @@ -11,13 +11,13 @@ void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32 const float *gPtr = fs->gaussian; if ((x > fs->radius) && (x < (fs->width - fs->radius))) { const float4 *i = input + (x - fs->radius); - for(int r = -fs->radius; r <= fs->radius; r ++) { + for (int r = -fs->radius; r <= fs->radius; r ++) { blurredPixel += i->xyz * gPtr[0]; gPtr++; i++; } } else { - for(int r = -fs->radius; r <= fs->radius; r ++) { + for (int r = -fs->radius; r <= fs->radius; r ++) { // Stepping left and right away from the pixel int validW = rsClamp(x + r, (uint)0, (uint)(fs->width - 1)); blurredPixel += input[validW].xyz * gPtr[0]; diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs index d05ed6f..698540b 100644 --- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs +++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/threshold.rs @@ -48,7 +48,7 @@ static void computeGaussianWeights() { float normalizeFactor = 0.0f; float floatR = 0.0f; int r; - for(r = -radius; r <= radius; r ++) { + for (r = -radius; r <= radius; r ++) { floatR = (float)r; gaussian[r + radius] = coeff1 * pow(e, floatR * floatR * coeff2); normalizeFactor += gaussian[r + radius]; @@ -56,7 +56,7 @@ static void computeGaussianWeights() { //Now we need to normalize the weights because all our coefficients need to add up to one normalizeFactor = 1.0f / normalizeFactor; - for(r = -radius; r <= radius; r ++) { + for (r = -radius; r <= radius; r ++) { floatR = (float)r; gaussian[r + radius] *= normalizeFactor; } @@ -68,8 +68,8 @@ static void copyInput() { rsSetObject(&ain,rsGetAllocation(InPixel)); uint32_t dimx = rsAllocationGetDimX(ain); uint32_t dimy = rsAllocationGetDimY(ain); - for(uint32_t y = 0; y < dimy; y++) { - for(uint32_t x = 0; x < dimx; x++) { + for (uint32_t y = 0; y < dimy; y++) { + for (uint32_t x = 0; x < dimx; x++) { ScratchPixel1[x + y * dimx] = convert_float4(InPixel[x + y * dimx]); } } diff --git a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs index d901d2a..fe43354 100644 --- a/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs +++ b/libs/rs/java/ImageProcessing/src/com/android/rs/image/vertical_blur.rs @@ -66,13 +66,13 @@ void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32 const float *gPtr = fs->gaussian; if ((y > fs->radius) && (y < (fs->height - fs->radius))) { const float4 *i = input + ((y - fs->radius) * fs->width); - for(int r = -fs->radius; r <= fs->radius; r ++) { + for (int r = -fs->radius; r <= fs->radius; r ++) { blurredPixel += i->xyz * gPtr[0]; gPtr++; i += fs->width; } } else { - for(int r = -fs->radius; r <= fs->radius; r ++) { + for (int r = -fs->radius; r <= fs->radius; r ++) { int validH = rsClamp(y + r, (uint)0, (uint)(fs->height - 1)); const float4 *i = input + validH * fs->width; blurredPixel += i->xyz * gPtr[0]; diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java index 1531d09..954ec96 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphRS.java @@ -71,15 +71,15 @@ public class SceneGraphRS { public void touchEvent(int x, int y) { int dx = mLastX - x; - if(Math.abs(dx) > 50 || Math.abs(dx) < 3) { + if (Math.abs(dx) > 50 || Math.abs(dx) < 3) { dx = 0; } mRotation -= dx; - if(mRotation > 360) { + if (mRotation > 360) { mRotation -= 360; } - if(mRotation < 0) { + if (mRotation < 0) { mRotation += 360; } @@ -186,10 +186,9 @@ public class SceneGraphRS { FileA3D model = FileA3D.createFromResource(mRS, mRes, R.raw.robot); FileA3D.IndexEntry entry = model.getIndexEntry(0); - if(entry == null || entry.getClassID() != FileA3D.ClassID.MESH) { + if (entry == null || entry.getClassID() != FileA3D.ClassID.MESH) { Log.e("rs", "could not load model"); - } - else { + } else { mMesh = (Mesh)entry.getObject(); mScript.set_gTestMesh(mMesh); } diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java index 9457fd7..1cabba1 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SceneGraphView.java @@ -64,7 +64,7 @@ public class SceneGraphView extends RSSurfaceView { @Override protected void onDetachedFromWindow() { - if(mRS != null) { + if (mRS != null) { mRS = null; destroyRenderScript(); } diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SgTransform.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SgTransform.java index 8351f42..f5484e2 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SgTransform.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SgTransform.java @@ -70,7 +70,7 @@ public class SgTransform { void initData() { int numElements = mTransformData.transforms.length; mTransformData.transformTypes = new int[numElements]; - for(int i = 0; i < numElements; i ++) { + for (int i = 0; i < numElements; i ++) { mTransformData.transforms[i] = new Float4(0, 0, 0, 0); mTransformData.transformTypes[i] = TransformType.NONE.mID; } @@ -87,11 +87,11 @@ public class SgTransform { } public ScriptField_SgTransform.Item getData() { - if(mChildren.size() != 0) { + if (mChildren.size() != 0) { mChildField = new ScriptField_SgTransform(mRS, mChildren.size()); mTransformData.children = mChildField.getAllocation(); - for(int i = 0; i < mChildren.size(); i ++) { + for (int i = 0; i < mChildren.size(); i ++) { SgTransform child = (SgTransform)mChildren.get(i); mChildField.set(child.getData(), i, false); } diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java index edf40e9..29c3728 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelRS.java @@ -67,15 +67,15 @@ public class SimpleModelRS { public void touchEvent(int x, int y) { int dx = mLastX - x; - if(Math.abs(dx) > 50 || Math.abs(dx) < 3) { + if (Math.abs(dx) > 50 || Math.abs(dx) < 3) { dx = 0; } mRotation -= dx; - if(mRotation > 360) { + if (mRotation > 360) { mRotation -= 360; } - if(mRotation < 0) { + if (mRotation < 0) { mRotation += 360; } @@ -148,10 +148,9 @@ public class SimpleModelRS { FileA3D model = FileA3D.createFromResource(mRS, mRes, R.raw.robot); FileA3D.IndexEntry entry = model.getIndexEntry(0); - if(entry == null || entry.getClassID() != FileA3D.ClassID.MESH) { + if (entry == null || entry.getClassID() != FileA3D.ClassID.MESH) { Log.e("rs", "could not load model"); - } - else { + } else { mMesh = (Mesh)entry.getObject(); mScript.set_gTestMesh(mMesh); } diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java index 4253085..875c4bd 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/SimpleModelView.java @@ -64,7 +64,7 @@ public class SimpleModelView extends RSSurfaceView { @Override protected void onDetachedFromWindow() { - if(mRS != null) { + if (mRS != null) { mRS = null; destroyRenderScript(); } diff --git a/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs b/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs index e7c04de..3c235d7 100644 --- a/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs +++ b/libs/rs/java/ModelViewer/src/com/android/modelviewer/transform.rs @@ -28,7 +28,7 @@ typedef struct { void appendTransformation(int type, float4 data, rs_matrix4x4 *mat) { rs_matrix4x4 temp; - switch(type) { + switch (type) { case TRANSFORM_TRANSLATE: rsMatrixLoadTranslate(&temp, data.x, data.y, data.z); break; @@ -60,15 +60,15 @@ void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32 //rsDebug("Transform is dirty", data->isDirty); // Refresh matrices if dirty - if(data->isDirty) { + if (data->isDirty) { data->isDirty = 0; toChild.changed = 1; // Reset our local matrix rsMatrixLoadIdentity(localMat); - for(int i = 0; i < 16; i ++) { - if(data->transformTypes[i] == TRANSFORM_NONE) { + for (int i = 0; i < 16; i ++) { + if (data->transformTypes[i] == TRANSFORM_NONE) { break; } //rsDebug("Transform adding transformation", transformTypes[i]); @@ -78,20 +78,19 @@ void root(const void *v_in, void *v_out, const void *usrData, uint32_t x, uint32 //rsDebug("Transform checking parent", (int)0); - if(parent) { - if(parent->changed) { + if (parent) { + if (parent->changed) { toChild.changed = 1; rsMatrixLoad(globalMat, parent->mat); rsMatrixMultiply(globalMat, localMat); } - } - else { + } else { rsMatrixLoad(globalMat, localMat); } //rsDebug("Transform calling self with child ", (int)data->children.p); - if(data->children.p) { + if (data->children.p) { rsForEach(transformScript, data->children, data->children, (void*)&toChild); } } diff --git a/libs/rs/java/Samples/src/com/android/samples/RsListRS.java b/libs/rs/java/Samples/src/com/android/samples/RsListRS.java index ce9ab01..3aa20e8 100644 --- a/libs/rs/java/Samples/src/com/android/samples/RsListRS.java +++ b/libs/rs/java/Samples/src/com/android/samples/RsListRS.java @@ -109,7 +109,7 @@ public class RsListRS { int dx = mLastX - x; int dy = mLastY - y; - if(Math.abs(dy) <= 2) { + if (Math.abs(dy) <= 2) { dy = 0; } @@ -124,7 +124,7 @@ public class RsListRS { mScript = new ScriptC_rslist(mRS, mRes, R.raw.rslist); mListAllocs = new ScriptField_ListAllocs_s(mRS, DATA_LIST.length); - for(int i = 0; i < DATA_LIST.length; i ++) { + for (int i = 0; i < DATA_LIST.length; i ++) { ScriptField_ListAllocs_s.Item listElem = new ScriptField_ListAllocs_s.Item(); listElem.text = Allocation.createFromString(mRS, DATA_LIST[i]); mListAllocs.set(listElem, i, false); diff --git a/libs/rs/java/Samples/src/com/android/samples/RsListView.java b/libs/rs/java/Samples/src/com/android/samples/RsListView.java index cd66fbb..21b58b1 100644 --- a/libs/rs/java/Samples/src/com/android/samples/RsListView.java +++ b/libs/rs/java/Samples/src/com/android/samples/RsListView.java @@ -64,7 +64,7 @@ public class RsListView extends RSSurfaceView { @Override protected void onDetachedFromWindow() { - if(mRS != null) { + if (mRS != null) { mRS = null; destroyRenderScript(); } @@ -87,8 +87,7 @@ public class RsListView extends RSSurfaceView { if (act == ev.ACTION_DOWN) { mRender.onActionDown((int)ev.getX(), (int)ev.getY()); ret = true; - } - else if (act == ev.ACTION_MOVE) { + } else if (act == ev.ACTION_MOVE) { mRender.onActionMove((int)ev.getX(), (int)ev.getY()); ret = true; } diff --git a/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java b/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java index dd2daa7..f0b69d1 100644 --- a/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java +++ b/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesRS.java @@ -307,10 +307,9 @@ public class RsRenderStatesRS { FileA3D model = FileA3D.createFromResource(mRS, mRes, R.raw.torus); FileA3D.IndexEntry entry = model.getIndexEntry(0); - if(entry == null || entry.getClassID() != FileA3D.ClassID.MESH) { + if (entry == null || entry.getClassID() != FileA3D.ClassID.MESH) { Log.e("rs", "could not load model"); - } - else { + } else { mTorus = (Mesh)entry.getObject(); mScript.set_gTorusMesh(mTorus); } diff --git a/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesView.java b/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesView.java index c434c09..6893d20 100644 --- a/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesView.java +++ b/libs/rs/java/Samples/src/com/android/samples/RsRenderStatesView.java @@ -64,7 +64,7 @@ public class RsRenderStatesView extends RSSurfaceView { @Override protected void onDetachedFromWindow() { - if(mRS != null) { + if (mRS != null) { mRS = null; destroyRenderScript(); } diff --git a/libs/rs/java/Samples/src/com/android/samples/rslist.rs b/libs/rs/java/Samples/src/com/android/samples/rslist.rs index 01b37ab..f29276a 100644 --- a/libs/rs/java/Samples/src/com/android/samples/rslist.rs +++ b/libs/rs/java/Samples/src/com/android/samples/rslist.rs @@ -56,12 +56,12 @@ int root(int launchID) { int itemHeight = 80; int currentYPos = itemHeight + textPos; - for(int i = 0; i < allocSize; i ++) { - if(currentYPos - itemHeight > height) { + for (int i = 0; i < allocSize; i ++) { + if (currentYPos - itemHeight > height) { break; } - if(currentYPos > 0) { + if (currentYPos > 0) { rsgDrawRect(0, currentYPos - 1, width, currentYPos, 0); rsgDrawText(gList[i].text, 30, currentYPos - 32); } diff --git a/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs b/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs index 4f8eada..f26633d 100644 --- a/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs +++ b/libs/rs/java/Samples/src/com/android/samples/rsrenderstates.rs @@ -214,7 +214,7 @@ void displayBlendingSamples() { rsgBindProgramFragment(gProgFragmentColor); rsgBindProgramStore(gProgStoreBlendNone); - for(i = 0; i < 3; i ++) { + for (i = 0; i < 3; i ++) { float iPlusOne = (float)(i + 1); rsgProgramFragmentConstantColor(gProgFragmentColor, 0.1f*iPlusOne, 0.2f*iPlusOne, 0.3f*iPlusOne, 1); @@ -223,7 +223,7 @@ void displayBlendingSamples() { } rsgBindProgramStore(gProgStoreBlendAlpha); - for(i = 0; i < 3; i ++) { + for (i = 0; i < 3; i ++) { float iPlusOne = (float)(i + 1); rsgProgramFragmentConstantColor(gProgFragmentColor, 0.2f*iPlusOne, 0.3f*iPlusOne, 0.1f*iPlusOne, 0.5); @@ -232,7 +232,7 @@ void displayBlendingSamples() { } rsgBindProgramStore(gProgStoreBlendAdd); - for(i = 0; i < 3; i ++) { + for (i = 0; i < 3; i ++) { float iPlusOne = (float)(i + 1); rsgProgramFragmentConstantColor(gProgFragmentColor, 0.3f*iPlusOne, 0.1f*iPlusOne, 0.2f*iPlusOne, 0.5); @@ -342,7 +342,7 @@ void displayCullingSamples() { // Aplly a rotation to our mesh gTorusRotation += 50.0f * gDt; - if(gTorusRotation > 360.0f) { + if (gTorusRotation > 360.0f) { gTorusRotation -= 360.0f; } @@ -379,11 +379,11 @@ void setupCustomShaderLights() { float4 light1SpecCol = {0.5f, 0.5f, 0.9f, 1.0f}; gLight0Rotation += 50.0f * gDt; - if(gLight0Rotation > 360.0f) { + if (gLight0Rotation > 360.0f) { gLight0Rotation -= 360.0f; } gLight1Rotation -= 50.0f * gDt; - if(gLight1Rotation > 360.0f) { + if (gLight1Rotation > 360.0f) { gLight1Rotation -= 360.0f; } @@ -439,7 +439,7 @@ void displayCustomShaderSamples() { // Load model matrix // Aplly a rotation to our mesh gTorusRotation += 50.0f * gDt; - if(gTorusRotation > 360.0f) { + if (gTorusRotation > 360.0f) { gTorusRotation -= 360.0f; } @@ -475,7 +475,7 @@ void displayCustomShaderSamples2() { // Load model matrix // Aplly a rotation to our mesh gTorusRotation += 50.0f * gDt; - if(gTorusRotation > 360.0f) { + if (gTorusRotation > 360.0f) { gTorusRotation -= 360.0f; } @@ -558,19 +558,17 @@ void displayAnisoSample() { rsgBindTexture(gProgFragmentTexture, 0, gTexChecker); - if(gAnisoTime >= 5.0f) { + if (gAnisoTime >= 5.0f) { gAnisoTime = 0.0f; anisoMode ++; anisoMode = anisoMode % 3; } - if(anisoMode == 0) { + if (anisoMode == 0) { rsgBindSampler(gProgFragmentTexture, 0, gMipLinearAniso8); - } - else if(anisoMode == 1) { + } else if (anisoMode == 1) { rsgBindSampler(gProgFragmentTexture, 0, gMipLinearAniso15); - } - else { + } else { rsgBindSampler(gProgFragmentTexture, 0, gMipLinearWrap); } @@ -587,13 +585,11 @@ void displayAnisoSample() { rsgFontColor(1.0f, 1.0f, 1.0f, 1.0f); rsgBindFont(gFontMono); - if(anisoMode == 0) { + if (anisoMode == 0) { rsgDrawText("Anisotropic filtering 8", 10, 40); - } - else if(anisoMode == 1) { + } else if (anisoMode == 1) { rsgDrawText("Anisotropic filtering 15", 10, 40); - } - else { + } else { rsgDrawText("Miplinear filtering", 10, 40); } } @@ -605,7 +601,7 @@ int root(int launchID) { rsgClearColor(0.2f, 0.2f, 0.2f, 0.0f); rsgClearDepth(1.0f); - switch(gDisplayMode) { + switch (gDisplayMode) { case 0: displayFontSamples(); break; |