Modify normal map to use png instead of dds to enable running on Android

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10514 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
12 years ago · 107b3f2b88
parent e26c86c794
commit 107b3f2b88
2 changed files with 18 additions and 18 deletions
--- a/engine/src/core-effects/Common/MatDefs/Water/Textures/water_normalmap.png
+++ b/engine/src/core-effects/Common/MatDefs/Water/Textures/water_normalmap.png
--- a/engine/src/core-effects/com/jme3/water/SimpleWaterProcessor.java
+++ b/engine/src/core-effects/com/jme3/water/SimpleWaterProcessor.java
@ -268,7 +268,7 @@ public class SimpleWaterProcessor implements SceneProcessor {
    }

    protected void loadTextures(AssetManager manager) {
-        normalTexture = (Texture2D) manager.loadTexture("Common/MatDefs/Water/Textures/water_normalmap.dds");
+        normalTexture = (Texture2D) manager.loadTexture("Common/MatDefs/Water/Textures/water_normalmap.png");
        dudvTexture = (Texture2D) manager.loadTexture("Common/MatDefs/Water/Textures/dudv_map.jpg");
        normalTexture.setWrap(WrapMode.Repeat);
        dudvTexture.setWrap(WrapMode.Repeat);