diff options
Diffstat (limited to 'tests/RenderScriptTests/SceneGraph/src/com/android/testapp')
4 files changed, 17 insertions, 2 deletions
diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/SimpleAppView.java b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/SimpleAppView.java index 053e545..2112181 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/SimpleAppView.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/SimpleAppView.java @@ -41,6 +41,7 @@ public class SimpleAppView extends RSSurfaceView { if (mRS == null) { RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); sc.setDepth(16, 24); + sc.setSamples(1, 2, 1); mRS = createRenderScriptGL(sc); mRS.setSurface(holder, w, h); mRender = new SimpleAppRS(); diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java index f159e85..3aa80f4 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java @@ -65,6 +65,7 @@ public class TestAppRS { // Shaders private FragmentShader mPaintF; private FragmentShader mLightsF; + private FragmentShader mLightsDiffF; private FragmentShader mAluminumF; private FragmentShader mPlasticF; private FragmentShader mDiffuseF; @@ -173,6 +174,11 @@ public class TestAppRS { fb.setShader(mRes, R.raw.plastic_lights); mLightsF = fb.create(); + fb = new FragmentShader.Builder(mRS); + fb.setObjectConst(lightParams.getAllocation().getType()); + fb.setShader(mRes, R.raw.diffuse_lights); + mLightsDiffF = fb.create(); + FullscreenBlur.initShaders(mRes, mRS); } @@ -203,6 +209,7 @@ public class TestAppRS { private void addShadersToScene() { mActiveScene.appendShader(mPaintF); mActiveScene.appendShader(mLightsF); + mActiveScene.appendShader(mLightsDiffF); mActiveScene.appendShader(mAluminumF); mActiveScene.appendShader(mPlasticF); mActiveScene.appendShader(mDiffuseF); @@ -219,8 +226,12 @@ public class TestAppRS { RenderState paint = new RenderState(mGenericV, mPaintF, null, null); RenderState aluminum = new RenderState(mGenericV, mAluminumF, null, null); RenderState lights = new RenderState(mGenericV, mLightsF, null, null); + RenderState diff_lights = new RenderState(mGenericV, mLightsDiffF, null, null); + RenderState diff_lights_no_cull = new RenderState(mGenericV, mLightsDiffF, null, + ProgramRaster.CULL_NONE(mRS)); RenderState glassTransp = new RenderState(mGenericV, mPaintF, ProgramStore.BLEND_ALPHA_DEPTH_TEST(mRS), null); + RenderState texState = new RenderState(mGenericV, mTextureF, null, null); initRenderPasses(); @@ -239,10 +250,12 @@ public class TestAppRS { mActiveScene.assignRenderStateToMaterial(glassTransp, "^GlassLight"); mActiveScene.assignRenderStateToMaterial(lights, "^LightBlinn"); + mActiveScene.assignRenderStateToMaterial(diff_lights, "^LightLambert"); + mActiveScene.assignRenderStateToMaterial(diff_lights_no_cull, "^LightLambertNoCull"); + mActiveScene.assignRenderStateToMaterial(texState, "^TextureOnly"); Renderable plane = (Renderable)mActiveScene.getRenderableByName("pPlaneShape1"); if (plane != null) { - RenderState texState = new RenderState(mGenericV, mTextureF, null, null); plane.setRenderState(texState); plane.setVisible(!mUseBlur); } diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppView.java b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppView.java index 687f35b..33ca1b8 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppView.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppView.java @@ -59,6 +59,7 @@ public class TestAppView extends RSSurfaceView { if (mRS == null) { RenderScriptGL.SurfaceConfig sc = new RenderScriptGL.SurfaceConfig(); sc.setDepth(16, 24); + sc.setSamples(1, 2, 1); mRS = createRenderScriptGL(sc); mRS.setSurface(holder, w, h); mRender = new TestAppRS(); diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TouchHandler.java b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TouchHandler.java index e272cc5..d0f9797 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TouchHandler.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TouchHandler.java @@ -43,7 +43,7 @@ public class TouchHandler { public void init(Scene scene) { // Some initial values for camera position mRotateXValue = -20; - mRotateYValue = 45; + mRotateYValue = 0; mDistValue = new Float3(0, 0, 45); mPosValue = new Float3(0, 4, 0); |