From 18f6419bfe5f2ee11a43713770d17888fd61ed69 Mon Sep 17 00:00:00 2001 From: Alex Sakhartchouk Date: Wed, 14 Dec 2011 17:10:04 -0800 Subject: Adding default scene to assets. Change-Id: Iec48cb53cd5c2902aa64dd02d23724f607f9114c --- tests/RenderScriptTests/SceneGraph/assets/blue.jpg | Bin 0 -> 12773 bytes .../SceneGraph/assets/carbonfiber.jpg | Bin 0 -> 17021 bytes .../RenderScriptTests/SceneGraph/assets/green.jpg | Bin 0 -> 12368 bytes tests/RenderScriptTests/SceneGraph/assets/grey.jpg | Bin 0 -> 10744 bytes .../RenderScriptTests/SceneGraph/assets/orange.jpg | Bin 0 -> 11574 bytes .../SceneGraph/assets/orientation_test.a3d | Bin 0 -> 346140 bytes .../SceneGraph/assets/orientation_test.dae | 1102 ++++++++++++++++++++ .../RenderScriptTests/SceneGraph/assets/paint.jpg | Bin 0 -> 11350 bytes tests/RenderScriptTests/SceneGraph/assets/red.jpg | Bin 0 -> 11975 bytes .../src/com/android/scenegraph/Scene.java | 1 + .../src/com/android/scenegraph/TestAppRS.java | 66 +- 11 files changed, 1137 insertions(+), 32 deletions(-) create mode 100644 tests/RenderScriptTests/SceneGraph/assets/blue.jpg create mode 100644 tests/RenderScriptTests/SceneGraph/assets/carbonfiber.jpg create mode 100644 tests/RenderScriptTests/SceneGraph/assets/green.jpg create mode 100644 tests/RenderScriptTests/SceneGraph/assets/grey.jpg create mode 100644 tests/RenderScriptTests/SceneGraph/assets/orange.jpg create mode 100644 tests/RenderScriptTests/SceneGraph/assets/orientation_test.a3d create mode 100644 tests/RenderScriptTests/SceneGraph/assets/orientation_test.dae create mode 100644 tests/RenderScriptTests/SceneGraph/assets/paint.jpg create mode 100644 tests/RenderScriptTests/SceneGraph/assets/red.jpg (limited to 'tests/RenderScriptTests/SceneGraph') diff --git a/tests/RenderScriptTests/SceneGraph/assets/blue.jpg b/tests/RenderScriptTests/SceneGraph/assets/blue.jpg new file mode 100644 index 000000000000..494e77a199e1 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/blue.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/carbonfiber.jpg b/tests/RenderScriptTests/SceneGraph/assets/carbonfiber.jpg new file mode 100644 index 000000000000..2fcecb0be1f5 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/carbonfiber.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/green.jpg b/tests/RenderScriptTests/SceneGraph/assets/green.jpg new file mode 100644 index 000000000000..a86a754fe2e3 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/green.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/grey.jpg b/tests/RenderScriptTests/SceneGraph/assets/grey.jpg new file mode 100644 index 000000000000..5870b1af055e Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/grey.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/orange.jpg b/tests/RenderScriptTests/SceneGraph/assets/orange.jpg new file mode 100644 index 000000000000..7dbe942af1a8 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/orange.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/orientation_test.a3d b/tests/RenderScriptTests/SceneGraph/assets/orientation_test.a3d new file mode 100644 index 000000000000..07318ae11249 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/orientation_test.a3d differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/orientation_test.dae b/tests/RenderScriptTests/SceneGraph/assets/orientation_test.dae new file mode 100644 index 000000000000..7eef443fa0e2 --- /dev/null +++ b/tests/RenderScriptTests/SceneGraph/assets/orientation_test.dae @@ -0,0 +1,1102 @@ + + + + + alexst + OpenCOLLADA2010 + ColladaMaya export options: bakeTransforms=0;relativePaths=0;copyTextures=0;exportTriangles=1;exportCgfxFileReferences=0; isSampling=0;curveConstrainSampling=0;removeStaticCurves=1;exportPolygonMeshes=1;exportLights=1; exportCameras=1;exportJointsAndSkin=1;exportAnimations=0;exportInvisibleNodes=0;exportDefaultCameras=0; exportTexCoords=1;exportNormals=1;exportNormalsPerVertex=1;exportVertexColors=0;exportVertexColorsPerVertex=0; exportTexTangents=0;exportTangents=0;exportReferencedMaterials=1;exportMaterialsOnly=0; exportXRefs=1;dereferenceXRefs=1;exportCameraAsLookat=0;cameraXFov=0;cameraYFov=1;doublePrecision=0 + file:///Volumes/Android/art/orientation_test.mb + + 2011-09-30T15:31:38 + 2011-09-30T15:31:38 + + Y_UP + + + + + + + 37.8493 + 1.5 + 1 + 400 + + + + + + 0 + 0 + 0 + 0 + 3.599993 + 1 + cameraShape1 + 2.399995 + + + + + + + + 37.8493 + 1.5 + 1 + 1000 + + + + + + 0 + 0 + 0 + 0 + 3.599993 + 1 + CameraDistShape + 2.399995 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + file23 + + + + + file23-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file25 + + + + + file25-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file24 + + + + + file24-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file24 + + + + + file24-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file23 + + + + + file23-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file28 + + + + + file28-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file29 + + + + + file29-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + + file22 + + + + + file22-surface + + + + + + 0 0 0 1 + + + 0 0 0 1 + + + + + + NONE + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + + + + + + 0 0 0 1 + + + 1 + + + + + + + + + file:///Volumes/Android/Sanity/SceneGraph/assets/blue.jpg + + + kFile + 0 + file29 + + + + + file:///Volumes/Android/Sanity/SceneGraph/assets/carbonfiber.jpg + + + kFile + 0 + file25 + + + + + file:///Volumes/Android/Sanity/SceneGraph/assets/green.jpg + + + kFile + 0 + file28 + + + + + file:///Volumes/Android/Sanity/SceneGraph/assets/grey.jpg + + + kFile + 0 + file22 + + + + + file:///Volumes/Android/Sanity/SceneGraph/assets/orange.jpg + + + kFile + 0 + file24 + + + + + file:///Volumes/Android/Sanity/SceneGraph/assets/red.jpg + + + kFile + 0 + file23 + + + + + + + + 24.5791 14.1321 31.4654 + 0 0 1 0 + 0 1 0 42 + 1 0 0 -16.2 + 1 1 1 + + + + camera1 + + + + + 0.0209301 3.68542 2.06912 + 0 1 0 43.2561 + 1 0 0 -20 + 1 1 1 + + 0 0 45 + 1 1 1 + + + + CameraDist + + + + + + CameraAim + + + + + -9.69237 0 7.70498 + 1 1 1 + + + + + + + + + + + + pSphere4 + + + + + 13.0966 0 5.76254 + 1 1 1 + + + + + + + + + + + + pSphere1 + + + + + 21.7661 0 -13.6375 + 1 1 1 + + + + + + + + + + + + pSphere2 + + + + + -13.862 0 -13.6154 + 1 1 1 + + + + + + + + + + + + pSphere3 + + + + + 31.0862 0 18.5992 + 1 1 1 + + + + + + + + + + + + pSphere5 + + + + + 0 0 0 + 1 1 1 + + + + + + + + + + + + pCube1 + + + + + 0 0 0 + 0 0 1 -162.693 + 0 1 0 21.3345 + 1 0 0 -100.567 + 1 1 1 + + -13.862 0 -13.6154 + 1 1 1 + + + + + + + + + + + + pSphere6 + + + + + -9.69237 0 7.70498 + 1 1 1 + + + + + + + + + + + + pSphere7 + + + + + 21.7661 0 -13.6375 + 1 1 1 + + + + + + + + + + + + pSphere8 + + + + + 13.0966 0 5.76254 + 1 1 1 + + + + + + + + + + + + pSphere9 + + + + + + group1 + + + + + 0 0 0 + 0 0 1 45.4017 + 0 1 0 79.393 + 1 0 0 5.10889 + 1 1 1 + + 31.0862 0 18.5992 + 1 1 1 + + + + + + + + + + + + pSphere10 + + + + + 13.0966 0 5.76254 + 1 1 1 + + + + + + + + + + + + pSphere11 + + + + + 7.4784 16.3496 7.36882 + 0 0 1 17.3073 + 0 1 0 158.666 + 1 0 0 79.4335 + 1 1 1 + + + + + + + + + + + + pSphere12 + + + + + -9.69237 0 7.70498 + 1 1 1 + + + + + + + + + + + + pSphere13 + + + + + 11.3635 -4.3926 2.21012 + 0 0 1 17.3073 + 0 1 0 158.666 + 1 0 0 79.4335 + 1 1 1 + + + + + + + + + + + + pSphere14 + + + + + 21.7661 0 -13.6375 + 1 1 1 + + + + + + + + + + + + pSphere15 + + + + + -9.5945 -8.92317 -5.74901 + 0 0 1 17.3073 + 0 1 0 158.666 + 1 0 0 79.4335 + 1 1 1 + + + + + + + + + + + + pSphere16 + + + + + -13.862 0 -13.6154 + 1 1 1 + + + + + + + + + + + + pSphere17 + + + + + -24.2135 6.497 -5.58935 + 0 0 1 17.3073 + 0 1 0 158.666 + 1 0 0 79.4335 + 1 1 1 + + + + + + + + + + + + pSphere18 + + + + + + group2 + + + + + 0 0 0 + 1 1 1 + + + + + + + + + + + + pCube2 + + + + + 15 0 0 + 1 1 1 + + + + + + + + + + + + pCube3 + + + + + 0 15 0 + 1 1 1 + + + + + + + + + + + + pCube4 + + + + + 0 0 15 + 1 1 1 + + + + + + + + + + + + pCube5 + + + + + + + + + diff --git a/tests/RenderScriptTests/SceneGraph/assets/paint.jpg b/tests/RenderScriptTests/SceneGraph/assets/paint.jpg new file mode 100644 index 000000000000..0791045b5c18 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/paint.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/assets/red.jpg b/tests/RenderScriptTests/SceneGraph/assets/red.jpg new file mode 100644 index 000000000000..320a2a6ad187 Binary files /dev/null and b/tests/RenderScriptTests/SceneGraph/assets/red.jpg differ diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Scene.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Scene.java index cb1ad8b13193..a308f436cc65 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Scene.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/Scene.java @@ -206,6 +206,7 @@ public class Scene extends SceneGraphBase { public void initRS(RenderScriptGL rs, Resources res, SceneManager sceneManager) { mRS = rs; + mRes = res; long start = System.currentTimeMillis(); mTransformRSData = mRootTransforms.getRSData(rs); long end = System.currentTimeMillis(); diff --git a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppRS.java b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppRS.java index cebfcf4ef861..ed9b7bf3e9b1 100644 --- a/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppRS.java +++ b/tests/RenderScriptTests/SceneGraph/src/com/android/scenegraph/TestAppRS.java @@ -48,7 +48,8 @@ public class TestAppRS { private static String TAG = "TestAppRS"; private final int STATE_LAST_FOCUS = 1; private final boolean mLoadFromSD = true; - private static String mSDCardPath = "sdcard/scenegraph/"; + private static String mSDFilePath = "sdcard/scenegraph/"; + private static String mFilePath = ""; int mWidth; int mHeight; @@ -100,7 +101,7 @@ public class TestAppRS { mTouchHandler = new TouchHandler(); mSceneManager = new SceneManager(); - // Initializes all the RS specific scenegraph elements + // Initializes all the RS specific scenegraph elements mSceneManager.initRS(mRS, mRes, mWidth, mHeight); // Shows the loading screen with some text @@ -112,7 +113,7 @@ public class TestAppRS { initRS(); // Load a scene to render - mSceneManager.loadModel(mSDCardPath + modelName, mLoadedCallback); + mSceneManager.loadModel(mFilePath + modelName, mLoadedCallback); } // When a new model file is selected from the UI, this function gets called to init everything @@ -140,7 +141,7 @@ public class TestAppRS { ScriptField_FShaderParams_s mFsConst; private ProgramVertex mPV_Paint; ScriptField_VShaderParams_s mVsConst; - + private Allocation mDefaultCube; private Allocation mAllocPV; private Allocation mEnvCube; @@ -186,55 +187,54 @@ public class TestAppRS { Allocation tempEnv; Allocation tempDiff; - InputStream openStream(String name) { + Allocation loadCubemap(String name) { InputStream is = null; try { if (!mLoadFromSD) { is = mRes.getAssets().open(name); } else { - File f = new File(mSDCardPath + name); + File f = new File(mSDFilePath + name); is = new BufferedInputStream(new FileInputStream(f)); } } catch (IOException e) { - Log.e("PAINTSHADERS", " Message: " + e.getMessage()); + Log.e("ImageLoaderTask", " Message: " + e.getMessage()); + return null; + } + + Bitmap b = BitmapFactory.decodeStream(is); + try { + is.close(); + } catch (IOException e) { + Log.e("ImageLoaderTask", " Message: " + e.getMessage()); } - return is; + + return Allocation.createCubemapFromBitmap(mRS, + b, + MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE, + Allocation.USAGE_GRAPHICS_TEXTURE); } protected Boolean doInBackground(String... names) { long start = System.currentTimeMillis(); - InputStream is = openStream("cube_env.png"); - if (is == null) { - return new Boolean(false); - } - Bitmap b = BitmapFactory.decodeStream(is); - tempEnv = Allocation.createCubemapFromBitmap(mRS, - b, - MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE, - Allocation.USAGE_GRAPHICS_TEXTURE); - - is = openStream("cube_spec.png"); - if (is == null) { - return new Boolean(false); - } + tempEnv = loadCubemap("cube_env.png"); + tempDiff = loadCubemap("cube_spec.png"); - b = BitmapFactory.decodeStream(is); - tempDiff = Allocation.createCubemapFromBitmap(mRS, - b, - MipmapControl.MIPMAP_ON_SYNC_TO_TEXTURE, - Allocation.USAGE_GRAPHICS_TEXTURE); long end = System.currentTimeMillis(); Log.v("TIMER", "Image load time: " + (end - start)); return new Boolean(true); } protected void onPostExecute(Boolean result) { - mEnvCube = tempEnv; - mDiffCube = tempDiff; + if (tempEnv != null) { + mEnvCube = tempEnv; + mPF_Paint.bindTexture(mEnvCube, 1); + } - mPF_Paint.bindTexture(mEnvCube, 1); - mPF_Aluminum.bindTexture(mDiffCube, 1); + if (tempDiff != null) { + mDiffCube = tempDiff; + mPF_Aluminum.bindTexture(mDiffCube, 1); + } } } @@ -433,13 +433,15 @@ public class TestAppRS { FullscreenBlur.createRenderTargets(mRS, mWidth, mHeight); initPaintShaders(); - new ImageLoaderTask().execute(); Bitmap b = BitmapFactory.decodeResource(mRes, R.drawable.defaultcube); mDefaultCube = Allocation.createCubemapFromBitmap(mRS, b); mPF_Paint.bindTexture(mDefaultCube, 1); mPF_Aluminum.bindTexture(mDefaultCube, 1); + // Reflection maps from SD card + new ImageLoaderTask().execute(); + ScriptC_render renderLoop = mSceneManager.getRenderLoop(); renderLoop.bind_vConst(mVsConst); renderLoop.bind_fConst(mFsConst); -- cgit v1.2.3-59-g8ed1b