registerLocator(string,string) is deprecated, replaced them by registerLocator(string,class) in these jmetest classes.

git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@9394 75d07b2b-3a1a-0410-a2c5-0572b91ccdca

engine/src/test/jme3test/bullet/TestQ3.java

@@ -89,9 +89,9 @@ public class TestQ3 extends SimpleApplication implements ActionListener {
 
         // load the level from zip or http zip
         if (useHttp) {
-            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/quake3level.zip", HttpZipLocator.class.getName());
+            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/quake3level.zip", HttpZipLocator.class);
         } else {
-            assetManager.registerLocator("quake3level.zip", ZipLocator.class.getName());
+            assetManager.registerLocator("quake3level.zip", ZipLocator.class);
         }
 
         // create the geometry and attach it

engine/src/test/jme3test/helloworld/HelloCollision.java

@@ -83,7 +83,7 @@ public class HelloCollision extends SimpleApplication
     setUpLight();
 
     // We load the scene from the zip file and adjust its size.
-    assetManager.registerLocator("town.zip", ZipLocator.class.getName());
+    assetManager.registerLocator("town.zip", ZipLocator.class);
     sceneModel = assetManager.loadModel("main.scene");
     sceneModel.setLocalScale(2f);
 

engine/src/test/jme3test/post/TestFog.java

@@ -80,9 +80,9 @@ public class TestFog extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         if (useHttp) {
-            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class.getName());
+            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class);
         } else {
-            assetManager.registerLocator("wildhouse.zip", ZipLocator.class.getName());
+            assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }
         Spatial scene = assetManager.loadModel("main.scene");
 

engine/src/test/jme3test/post/TestMultiplesFilters.java

@@ -77,9 +77,9 @@ public class TestMultiplesFilters extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         if (useHttp) {
-            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class.getName());
+            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class);
         } else {
-            assetManager.registerLocator("wildhouse.zip", ZipLocator.class.getName());
+            assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }
         Spatial scene = assetManager.loadModel("main.scene");
 

engine/src/test/jme3test/scene/TestSceneLoading.java

@@ -75,9 +75,9 @@ public class TestSceneLoading extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         if (useHttp) {
-            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class.getName());
+            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class);
         } else {
-            assetManager.registerLocator("wildhouse.zip", ZipLocator.class.getName());
+            assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }
         Spatial scene = assetManager.loadModel("main.scene");
 

engine/src/test/jme3test/tools/TestOctree.java

@@ -82,7 +82,7 @@ public class TestOctree extends SimpleApplication implements SceneProcessor {
 
 //        mat2 = new Material(assetManager, "Common/MatDefs/Misc/ShowNormals.j3md");
 
-        assetManager.registerLocator("quake3level.zip", "com.jme3.asset.plugins.ZipLocator");
+        assetManager.registerLocator("quake3level.zip", com.jme3.asset.plugins.ZipLocator.class);
         MaterialList matList = (MaterialList) assetManager.loadAsset("Scene.material");
         OgreMeshKey key = new OgreMeshKey("main.meshxml", matList);
         Spatial scene = assetManager.loadModel(key);

engine/src/test/jme3test/water/TestPostWater.java

@@ -3,13 +3,10 @@ package jme3test.water;
 import com.jme3.app.SimpleApplication;
 import com.jme3.audio.AudioNode;
 import com.jme3.audio.LowPassFilter;
-import com.jme3.effect.ParticleEmitter;
-import com.jme3.effect.ParticleMesh;
 import com.jme3.input.controls.ActionListener;
 import com.jme3.input.controls.KeyTrigger;
 import com.jme3.light.DirectionalLight;
 import com.jme3.material.Material;
-import com.jme3.material.RenderState.BlendMode;
 import com.jme3.math.ColorRGBA;
 import com.jme3.math.FastMath;
 import com.jme3.math.Quaternion;
@@ -19,12 +16,9 @@ import com.jme3.post.filters.BloomFilter;
 import com.jme3.post.filters.DepthOfFieldFilter;
 import com.jme3.post.filters.LightScatteringFilter;
 import com.jme3.renderer.Camera;
-import com.jme3.renderer.queue.RenderQueue.Bucket;
 import com.jme3.renderer.queue.RenderQueue.ShadowMode;
-import com.jme3.scene.Geometry;
 import com.jme3.scene.Node;
 import com.jme3.scene.Spatial;
-import com.jme3.scene.shape.Box;
 import com.jme3.terrain.geomipmap.TerrainQuad;
 import com.jme3.terrain.heightmap.AbstractHeightMap;
 import com.jme3.terrain.heightmap.ImageBasedHeightMap;
@@ -41,26 +35,92 @@ import java.util.List;
  * @author normenhansen
  */
 public class TestPostWater extends SimpleApplication {
-
-    private Vector3f lightDir = new Vector3f(-4.9236743f, -1.27054665f, 5.896916f);
-    private WaterFilter water;
-    TerrainQuad terrain;
-    Material matRock;
-    AudioNode waves;
-    LowPassFilter underWaterAudioFilter = new LowPassFilter(0.5f, 0.1f);
-    LowPassFilter underWaterReverbFilter = new LowPassFilter(0.5f, 0.1f);
-    LowPassFilter aboveWaterAudioFilter = new LowPassFilter(1, 1);
-
-    public static void main(String[] args) {
-        TestPostWater app = new TestPostWater();
-        app.start();
+  // water effect
+
+  private Vector3f lightDir = new Vector3f(-4.9236743f, -1.27054665f, 5.896916f);
+  private WaterFilter water;
+  // terrain
+  TerrainQuad terrain;
+  Material matRock;
+  // sound effects
+  AudioNode waveSound;
+  //emulate tides, slightly varying the height of the water plane
+  private float time = 0.0f;
+  private float waterHeight = 0.0f;
+  private float initialWaterHeight = 0.8f;
+  private boolean wasUnderWater = true;
+
+  public static void main(String[] args) {
+    TestPostWater app = new TestPostWater();
+    app.start();
+  }
+
+  @Override
+  public void simpleInitApp() {
+    /* no statistics display */
+    setDisplayFps(false);
+    setDisplayStatView(false);
+    /* main scene is what is reflected in the water: terrain, sun, sky */
+    Node mainScene = new Node("Main Scene");
+    rootNode.attachChild(mainScene);
+    /* terrain */
+    createTerrain(mainScene);
+    /* sun light */
+    DirectionalLight sun = new DirectionalLight();
+    sun.setDirection(lightDir);
+    sun.setColor(ColorRGBA.White.clone().multLocal(1.7f));
+    mainScene.addLight(sun);
+    /* camera */
+    flyCam.setMoveSpeed(50);
+    cam.setLocation(new Vector3f(-327.21957f, 61.6459f, 126.884346f));
+    cam.setRotation(new Quaternion(0.052168474f, 0.9443102f, -0.18395276f, 0.2678024f));
+    cam.setRotation(new Quaternion().fromAngles(new float[]{FastMath.PI * 0.06f, FastMath.PI * 0.65f, 0}));
+    cam.setFrustumFar(4000);
+    /*sky*/
+    Spatial sky = SkyFactory.createSky(assetManager, "Scenes/Beach/FullskiesSunset0068.dds", false);
+    sky.setLocalScale(350);
+    mainScene.attachChild(sky);
+
+    /* environmental effects */
+    FilterPostProcessor fpp = new FilterPostProcessor(assetManager);
+    viewPort.addProcessor(fpp);
+    /* glow */
+    BloomFilter bloom = new BloomFilter();
+    bloom.setExposurePower(55);
+    bloom.setBloomIntensity(1.0f);
+    fpp.addFilter(bloom);
+    /* sun light beams */
+    LightScatteringFilter lsf = new LightScatteringFilter(lightDir.mult(-300));
+    lsf.setLightDensity(1.0f);
+    fpp.addFilter(lsf);
+    /* blur */
+    DepthOfFieldFilter dof = new DepthOfFieldFilter();
+    dof.setFocusDistance(0);
+    dof.setFocusRange(100);
+    fpp.addFilter(dof);
+    /* water */
+    water = new WaterFilter(rootNode, lightDir);
+    water.setWaveScale(0.003f);
+    water.setMaxAmplitude(2f);
+    water.setFoamExistence(new Vector3f(1f, 4, 0.5f));
+    water.setFoamTexture((Texture2D) assetManager.loadTexture("Common/MatDefs/Water/Textures/foam2.jpg"));
+    //water.setNormalScale(0.5f);
+    //water.setRefractionConstant(0.25f);
+    water.setRefractionStrength(0.2f);
+    //water.setFoamHardness(0.6f);
+    water.setWaterHeight(initialWaterHeight);
+    wasUnderWater = cam.getLocation().y > waterHeight;
+    fpp.addFilter(water);
+    /* sound */
+    waveSound = new AudioNode(assetManager, "Sound/Environment/Ocean Waves.ogg", false);
+    waveSound.setLooping(true);
+    waveSound.setReverbEnabled(true);
+    if (!wasUnderWater) {
+      waveSound.setDryFilter(new LowPassFilter(0.5f, 0.1f));
+    } else {
+      waveSound.setDryFilter(new LowPassFilter(1f, 1f));
     }
-
-    @Override
-    public void simpleInitApp() {
-
-      setDisplayFps(false);
-      setDisplayStatView(false);
+    waveSound.playInstance();
 
         Node mainScene = new Node("Main Scene");
         rootNode.attachChild(mainScene);
@@ -145,154 +205,77 @@ public class TestPostWater extends SimpleApplication {
         }else{
             waves.setDryFilter(aboveWaterAudioFilter);            
         }
-        audioRenderer.playSource(waves);
-        //  
-        viewPort.addProcessor(fpp);
-
-        inputManager.addListener(new ActionListener() {
-
-            public void onAction(String name, boolean isPressed, float tpf) {
-                if (isPressed) {
-                    if (name.equals("foam1")) {
-                        water.setFoamTexture((Texture2D) assetManager.loadTexture("Common/MatDefs/Water/Textures/foam.jpg"));
-                    }
-                    if (name.equals("foam2")) {
-                        water.setFoamTexture((Texture2D) assetManager.loadTexture("Common/MatDefs/Water/Textures/foam2.jpg"));
-                    }
-                    if (name.equals("foam3")) {
-                        water.setFoamTexture((Texture2D) assetManager.loadTexture("Common/MatDefs/Water/Textures/foam3.jpg"));
-                    }
-                }
-            }
-        }, "foam1", "foam2", "foam3");
-        inputManager.addMapping("foam1", new KeyTrigger(keyInput.KEY_1));
-        inputManager.addMapping("foam2", new KeyTrigger(keyInput.KEY_2));
-        inputManager.addMapping("foam3", new KeyTrigger(keyInput.KEY_3));
-//        createBox();
-      //  createFire();
+      }
+    }, "foam1", "foam2", "foam3");
+    inputManager.addMapping("foam1", new KeyTrigger(keyInput.KEY_1));
+    inputManager.addMapping("foam2", new KeyTrigger(keyInput.KEY_2));
+    inputManager.addMapping("foam3", new KeyTrigger(keyInput.KEY_3));
+  }
+
+  private void createTerrain(Node rootNode) {
+    matRock = new Material(assetManager, "Common/MatDefs/Terrain/TerrainLighting.j3md");
+    matRock.setBoolean("useTriPlanarMapping", false);
+    matRock.setBoolean("WardIso", true);
+    matRock.setTexture("AlphaMap", assetManager.loadTexture("Textures/Terrain/splat/alphamap.png"));
+    Texture heightMapImage = assetManager.loadTexture("Textures/Terrain/splat/mountains512.png");
+    Texture grass = assetManager.loadTexture("Textures/Terrain/splat/grass.jpg");
+    grass.setWrap(WrapMode.Repeat);
+    matRock.setTexture("DiffuseMap", grass);
+    matRock.setFloat("DiffuseMap_0_scale", 64);
+    Texture dirt = assetManager.loadTexture("Textures/Terrain/splat/dirt.jpg");
+    dirt.setWrap(WrapMode.Repeat);
+    matRock.setTexture("DiffuseMap_1", dirt);
+    matRock.setFloat("DiffuseMap_1_scale", 16);
+    Texture rock = assetManager.loadTexture("Textures/Terrain/splat/road.jpg");
+    rock.setWrap(WrapMode.Repeat);
+    matRock.setTexture("DiffuseMap_2", rock);
+    matRock.setFloat("DiffuseMap_2_scale", 128);
+    Texture normalMap0 = assetManager.loadTexture("Textures/Terrain/splat/grass_normal.jpg");
+    normalMap0.setWrap(WrapMode.Repeat);
+    Texture normalMap1 = assetManager.loadTexture("Textures/Terrain/splat/dirt_normal.png");
+    normalMap1.setWrap(WrapMode.Repeat);
+    Texture normalMap2 = assetManager.loadTexture("Textures/Terrain/splat/road_normal.png");
+    normalMap2.setWrap(WrapMode.Repeat);
+    matRock.setTexture("NormalMap", normalMap0);
+    matRock.setTexture("NormalMap_1", normalMap2);
+    matRock.setTexture("NormalMap_2", normalMap2);
+
+    AbstractHeightMap heightmap = null;
+    try {
+      heightmap = new ImageBasedHeightMap(heightMapImage.getImage(), 0.25f);
+      heightmap.load();
+    } catch (Exception e) {
     }
-    Geometry box;
-
-    private void createBox() {
-        //creating a transluscent box
-        box = new Geometry("box", new Box(new Vector3f(0, 0, 0), 50, 50, 50));
-        Material mat = new Material(assetManager, "Common/MatDefs/Misc/Unshaded.j3md");
-        mat.setColor("Color", new ColorRGBA(1.0f, 0, 0, 0.3f));
-        mat.getAdditionalRenderState().setBlendMode(BlendMode.Alpha);
-        //mat.getAdditionalRenderState().setDepthWrite(false);
-        //mat.getAdditionalRenderState().setDepthTest(false);
-        box.setMaterial(mat);
-        box.setQueueBucket(Bucket.Translucent);
-
-
-        //creating a post view port
-//        ViewPort post=renderManager.createPostView("transpPost", cam);
-//        post.setClearFlags(false, true, true);
-
-
-        box.setLocalTranslation(-600, 0, 300);
-
-        //attaching the box to the post viewport
-        //Don't forget to updateGeometricState() the box in the simpleUpdate
-        //  post.attachScene(box);
-
-        rootNode.attachChild(box);
+    terrain = new TerrainQuad("terrain", 65, 513, heightmap.getHeightMap());
+    List<Camera> cameras = new ArrayList<Camera>();
+    cameras.add(getCamera());
+    terrain.setMaterial(matRock);
+    terrain.setLocalScale(new Vector3f(5, 5, 5));
+    terrain.setLocalTranslation(new Vector3f(0, -30, 0));
+    terrain.setLocked(false); // unlock it so we can edit the height
+    terrain.setShadowMode(ShadowMode.Receive);
+    rootNode.attachChild(terrain);
+
+  }
+  
+  @Override
+  public void simpleUpdate(float tpf) {
+    super.simpleUpdate(tpf);
+    time += tpf;
+    waterHeight = (float) Math.cos(((time * 0.6f) % FastMath.TWO_PI)) * 1.5f;
+    water.setWaterHeight(initialWaterHeight + waterHeight);
+    if (water.isUnderWater() && !wasUnderWater) {
+      // just went under water
+      waveSound.setDryFilter(new LowPassFilter(0.5f, 0.1f));
+      wasUnderWater = true;
+      System.out.println("went under");
     }
-
-    private void createFire() {
-        /** Uses Texture from jme3-test-data library! */
-        ParticleEmitter fire = new ParticleEmitter("Emitter", ParticleMesh.Type.Triangle, 30);
-        Material mat_red = new Material(assetManager, "Common/MatDefs/Misc/Particle.j3md");
-        mat_red.setTexture("Texture", assetManager.loadTexture("Effects/Explosion/flame.png"));
-
-        fire.setMaterial(mat_red);
-        fire.setImagesX(2);
-        fire.setImagesY(2); // 2x2 texture animation
-        fire.setEndColor(new ColorRGBA(1f, 0f, 0f, 1f));   // red
-        fire.setStartColor(new ColorRGBA(1f, 1f, 0f, 0.5f)); // yellow
-        fire.getParticleInfluencer().setInitialVelocity(new Vector3f(0, 2, 0));
-        fire.setStartSize(10f);
-        fire.setEndSize(1f);
-        fire.setGravity(0, 0, 0);
-        fire.setLowLife(0.5f);
-        fire.setHighLife(1.5f);
-        fire.getParticleInfluencer().setVelocityVariation(0.3f);
-        fire.setLocalTranslation(-350, 40, 430);
-
-        fire.setQueueBucket(Bucket.Transparent);
-        rootNode.attachChild(fire);
-    }
-
-    private void createTerrain(Node rootNode) {
-        matRock = new Material(assetManager, "Common/MatDefs/Terrain/TerrainLighting.j3md");
-        matRock.setBoolean("useTriPlanarMapping", false);
-        matRock.setBoolean("WardIso", true);
-        matRock.setTexture("AlphaMap", assetManager.loadTexture("Textures/Terrain/splat/alphamap.png"));
-        Texture heightMapImage = assetManager.loadTexture("Textures/Terrain/splat/mountains512.png");
-        Texture grass = assetManager.loadTexture("Textures/Terrain/splat/grass.jpg");
-        grass.setWrap(WrapMode.Repeat);
-        matRock.setTexture("DiffuseMap", grass);
-        matRock.setFloat("DiffuseMap_0_scale", 64);
-        Texture dirt = assetManager.loadTexture("Textures/Terrain/splat/dirt.jpg");
-        dirt.setWrap(WrapMode.Repeat);
-        matRock.setTexture("DiffuseMap_1", dirt);
-        matRock.setFloat("DiffuseMap_1_scale", 16);
-        Texture rock = assetManager.loadTexture("Textures/Terrain/splat/road.jpg");
-        rock.setWrap(WrapMode.Repeat);
-        matRock.setTexture("DiffuseMap_2", rock);
-        matRock.setFloat("DiffuseMap_2_scale", 128);
-        Texture normalMap0 = assetManager.loadTexture("Textures/Terrain/splat/grass_normal.jpg");
-        normalMap0.setWrap(WrapMode.Repeat);
-        Texture normalMap1 = assetManager.loadTexture("Textures/Terrain/splat/dirt_normal.png");
-        normalMap1.setWrap(WrapMode.Repeat);
-        Texture normalMap2 = assetManager.loadTexture("Textures/Terrain/splat/road_normal.png");
-        normalMap2.setWrap(WrapMode.Repeat);
-        matRock.setTexture("NormalMap", normalMap0);
-        matRock.setTexture("NormalMap_1", normalMap2);
-        matRock.setTexture("NormalMap_2", normalMap2);
-
-        AbstractHeightMap heightmap = null;
-        try {
-            heightmap = new ImageBasedHeightMap(heightMapImage.getImage(), 0.25f);
-            heightmap.load();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-        terrain = new TerrainQuad("terrain", 65, 513, heightmap.getHeightMap());
-        List<Camera> cameras = new ArrayList<Camera>();
-        cameras.add(getCamera());
-        terrain.setMaterial(matRock);
-        terrain.setLocalScale(new Vector3f(5, 5, 5));
-        terrain.setLocalTranslation(new Vector3f(0, -30, 0));
-        terrain.setLocked(false); // unlock it so we can edit the height
-
-        terrain.setShadowMode(ShadowMode.Receive);
-        rootNode.attachChild(terrain);
-
-    }
-    //This part is to emulate tides, slightly varrying the height of the water plane
-    private float time = 0.0f;
-    private float waterHeight = 0.0f;
-    private float initialWaterHeight = 0.8f;
-private boolean uw=false;
-    @Override
-    public void simpleUpdate(float tpf) {
-        super.simpleUpdate(tpf);
-        //     box.updateGeometricState();
-        time += tpf;
-        waterHeight = (float) Math.cos(((time * 0.6f) % FastMath.TWO_PI)) * 1.5f;
-        water.setWaterHeight(initialWaterHeight + waterHeight);
-        if(water.isUnderWater() && !uw){
-           
-            waves.setDryFilter(new LowPassFilter(0.5f, 0.1f));
-            uw=true;
-        }
-        if(!water.isUnderWater() && uw){
-            uw=false;
-             //waves.setReverbEnabled(false);
-             waves.setDryFilter(new LowPassFilter(1, 1f));
-             //waves.setDryFilter(new LowPassFilter(1,1f));
-             
-        }     
+    if (!water.isUnderWater() && wasUnderWater) {
+      // just came out of the water
+      wasUnderWater = false;
+      waveSound.setReverbEnabled(false);
+      waveSound.setDryFilter(new LowPassFilter(1, 1f));
+      System.out.println("came up");
     }
+  }
 }

engine/src/test/jme3test/water/TestPostWaterLake.java

@@ -72,9 +72,9 @@ public class TestPostWaterLake extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         if (useHttp) {
-            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class.getName());
+            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class);
         } else {
-            assetManager.registerLocator("wildhouse.zip", ZipLocator.class.getName());
+            assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }
         Spatial scene = assetManager.loadModel("main.scene");
         rootNode.attachChild(scene);

engine/src/test/jme3test/water/TestSceneWater.java

@@ -76,9 +76,9 @@ public class TestSceneWater extends SimpleApplication {
         // create the geometry and attach it
         // load the level from zip or http zip
         if (useHttp) {
-            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class.getName());
+            assetManager.registerLocator("http://jmonkeyengine.googlecode.com/files/wildhouse.zip", HttpZipLocator.class);
         } else {
-            assetManager.registerLocator("wildhouse.zip", ZipLocator.class.getName());
+            assetManager.registerLocator("wildhouse.zip", ZipLocator.class);
         }
         Spatial scene = assetManager.loadModel("main.scene");