From 6f31c36a3dbe5e61644ec39c4fcad0284d50e4f1 Mon Sep 17 00:00:00 2001
From: Alex Sakhartchouk <alexst@google.com>
Date: Fri, 3 Feb 2012 15:50:18 -0800
Subject: Fixes to simplify programmatic creation.

Change-Id: Ief2c794b0c50ce8016737628b9a7348574590039
---
 .../SceneGraph/src/com/android/testapp/TestAppRS.java            | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java')

diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java
index 2757398..08175f1 100644
--- a/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java
+++ b/tests/RenderScriptTests/SceneGraph/src/com/android/testapp/TestAppRS.java
@@ -189,7 +189,7 @@ public class TestAppRS {
         int numDraw = allDraw.size();
 
         if (mUseBlur) {
-            FullscreenBlur.addBlurPasses(mActiveScene, mRS);
+            FullscreenBlur.addBlurPasses(mActiveScene, mRS, mTouchHandler.getCamera());
         }
 
         RenderPass mainPass = new RenderPass();
@@ -197,14 +197,14 @@ public class TestAppRS {
         mainPass.setShouldClearColor(true);
         mainPass.setClearDepth(1.0f);
         mainPass.setShouldClearDepth(true);
-        mainPass.setCamera(mActiveScene.getCameras().get(1));
+        mainPass.setCamera(mTouchHandler.getCamera());
         for (int i = 0; i < numDraw; i ++) {
             mainPass.appendRenderable((Renderable)allDraw.get(i));
         }
         mActiveScene.appendRenderPass(mainPass);
 
         if (mUseBlur) {
-            FullscreenBlur.addCompositePass(mActiveScene, mRS);
+            FullscreenBlur.addCompositePass(mActiveScene, mRS, mTouchHandler.getCamera());
         }
     }
 
@@ -221,6 +221,7 @@ public class TestAppRS {
     public void prepareToRender(Scene s) {
         mSceneManager.setActiveScene(s);
         mActiveScene = s;
+        mTouchHandler.init(mActiveScene);
         addShadersToScene();
         RenderState plastic = new RenderState(mGenericV, mPlasticF, null, null);
         RenderState diffuse = new RenderState(mGenericV, mDiffuseF, null, null);
@@ -255,8 +256,6 @@ public class TestAppRS {
             plane.setVisible(!mUseBlur);
         }
 
-        mTouchHandler.init(mActiveScene);
-
         long start = System.currentTimeMillis();
         mActiveScene.initRS(mRS, mRes, mSceneManager);
         long end = System.currentTimeMillis();
-- 
cgit v1.1