Make robot.png a raw resource.

After all, it's being used as a raw resource.

diff --git a/samples/ApiDemos/res/drawable/robot.png b/samples/ApiDemos/res/raw/robot.png
old mode 100755 (executable)
new mode 100644 (file)
similarity index 100%
rename from samples/ApiDemos/res/drawable/robot.png
rename to samples/ApiDemos/res/raw/robot.png

diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/StaticTriangleRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/StaticTriangleRenderer.java
index c492e3f..c7e7e64 100644 (file)
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/StaticTriangleRenderer.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/StaticTriangleRenderer.java
@@ -101,7 +101,7 @@ public class StaticTriangleRenderer implements GLSurfaceView.Renderer{
                 GL_REPLACE);
 
         InputStream is = mContext.getResources()
-                .openRawResource(R.drawable.robot);
+                .openRawResource(R.raw.robot);
         Bitmap bitmap;
         try {
             bitmap = BitmapFactory.decodeStream(is);

diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleRenderer.java
index e5299b3..ede6ef5 100644 (file)
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleRenderer.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/TriangleRenderer.java
@@ -90,7 +90,7 @@ public class TriangleRenderer implements GLSurfaceView.Renderer{
                 GL10.GL_REPLACE);
 
         InputStream is = mContext.getResources()
-                .openRawResource(R.drawable.robot);
+                .openRawResource(R.raw.robot);
         Bitmap bitmap;
         try {
             bitmap = BitmapFactory.decodeStream(is);

diff --git a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
index 223300a..7485741 100644 (file)
--- a/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
+++ b/samples/ApiDemos/src/com/example/android/apis/graphics/spritetext/SpriteTextRenderer.java
@@ -35,6 +35,7 @@ import android.opengl.GLSurfaceView;
 import android.opengl.GLU;
 import android.opengl.GLUtils;
 import android.os.SystemClock;
+import android.util.Log;
 
 import com.example.android.apis.R;
 
@@ -96,7 +97,7 @@ public class SpriteTextRenderer implements GLSurfaceView.Renderer{
                 GL10.GL_REPLACE);
 
         InputStream is = mContext.getResources()
-                .openRawResource(R.drawable.robot);
+                .openRawResource(R.raw.robot);
         Bitmap bitmap;
         try {
             bitmap = BitmapFactory.decodeStream(is);
@@ -172,6 +173,15 @@ public class SpriteTextRenderer implements GLSurfaceView.Renderer{
         gl.glTexParameterx(GL10.GL_TEXTURE_2D, GL10.GL_TEXTURE_WRAP_T,
                 GL10.GL_REPEAT);
 
+        {
+            long time = SystemClock.uptimeMillis();
+            if (mLastTime != 0) {
+                long delta = time - mLastTime;
+                Log.w("time", Long.toString(delta));
+            }
+            mLastTime = time;
+        }
+
         long time = SystemClock.uptimeMillis() % 4000L;
         float angle = 0.090f * ((int) time);
 
@@ -266,6 +276,7 @@ public class SpriteTextRenderer implements GLSurfaceView.Renderer{
     private Projector mProjector;
     private NumericSprite mNumericSprite;
     private float[] mScratch = new float[8];
+    private long mLastTime;
 }
 
 class Triangle {