From: Kazuhiko Kobayashi <chototsu_moushinp@yahoo.co.jp>
Date: Wed, 5 Dec 2012 10:16:32 +0000 (+0900)
Subject: Add cube map support.
X-Git-Tag: v0.8.0~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1ccc62c09a336641905309551ab8536b17c67bef;p=mikumikustudio%2FMikuMikuStudio.git

Add cube map support.
---

diff --git a/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java b/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
index a2a3a9f22..e99ab13fa 100644
--- a/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
+++ b/engine/src/android/com/jme3/renderer/android/OGLESShaderRenderer.java
@@ -1985,24 +1985,24 @@ public final class OGLESShaderRenderer implements Renderer {
         Image image = tex.getImage();
         if (image.isUpdateNeeded()) {
 //            logger.warning("setTexture: isUpdateNeeded");
-            Bitmap bmp = (Bitmap)image.getEfficentData();
-            if (bmp != null)
-            {
-            // Check if the bitmap got recycled, can happen after wakeup/restart
-            if ( bmp.isRecycled() )
-            {
-            // We need to reload the bitmap
-            DesktopAssetManager assetManager;
-            try {
-                assetManager = (DesktopAssetManager)((AndroidHarness)JmeSystem.getActivity()).getJmeApplication().getAssetManager();
-            } catch(ClassCastException ex) {
-                Application app = JmeSystem.getApplication();
-                assetManager = (DesktopAssetManager) app.getAssetManager();
-            }
-            assetManager.deleteFromCache((TextureKey)tex.getKey());
-            Texture textureReloaded = assetManager.loadTexture((TextureKey)tex.getKey());
-            image.setEfficentData( textureReloaded.getImage().getEfficentData());
-            }
+            if (image.getEfficentData() instanceof Bitmap) {
+                Bitmap bmp = (Bitmap) image.getEfficentData();
+                if (bmp != null) {
+                    // Check if the bitmap got recycled, can happen after wakeup/restart
+                    if (bmp.isRecycled()) {
+                        // We need to reload the bitmap
+                        DesktopAssetManager assetManager;
+                        try {
+                            assetManager = (DesktopAssetManager) ((AndroidHarness) JmeSystem.getActivity()).getJmeApplication().getAssetManager();
+                        } catch (ClassCastException ex) {
+                            Application app = JmeSystem.getApplication();
+                            assetManager = (DesktopAssetManager) app.getAssetManager();
+                        }
+                        assetManager.deleteFromCache((TextureKey) tex.getKey());
+                        Texture textureReloaded = assetManager.loadTexture((TextureKey) tex.getKey());
+                        image.setEfficentData(textureReloaded.getImage().getEfficentData());
+                    }
+                }
             }
             updateTexImageData(image, tex.getType(), tex.getMinFilter().usesMipMapLevels());
             setupTextureParams(tex);
@@ -2026,11 +2026,11 @@ public final class OGLESShaderRenderer implements Renderer {
 //             glEnable(type);
 //        }
 
-            if (context.boundTextureUnit != unit) {
-                if (verboseLogging) {
-                    logger.info("GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + " + unit + ")");
-                }
+        if (context.boundTextureUnit != unit) {
+            if (verboseLogging) {
+                logger.info("GLES20.glActiveTexture(GLES20.GL_TEXTURE0 + " + unit + ")");
             }
+        }
         if (textures[unit] != image) {
 
             if (verboseLogging) {