Merge branch 'MeFisto94-wip/issue1290'

Author: stephengold

jme3-core/build.gradle

@@ -10,11 +10,16 @@ sourceSets {
         java {
             srcDir 'src/test/java'
         }
+
+        System.setProperty "java.awt.headless", "true"
     }
 }
 
 dependencies {
     testImplementation project(':jme3-testdata')
+    testImplementation project(':jme3-testdata')
+    testImplementation project(':jme3-desktop')
+    testRuntime project(':jme3-plugins')
 }
 
 task updateVersionPropertiesFile {
@@ -40,4 +45,4 @@ task updateVersionPropertiesFile {
     }
 }
 
-processResources.dependsOn updateVersionPropertiesFile
+processResources.dependsOn updateVersionPropertiesFile

jme3-core/src/test/java/com/jme3/asset/TestLocators.java

@@ -0,0 +1,68 @@
+package com.jme3.asset;
+
+import com.jme3.asset.plugins.ClasspathLocator;
+import com.jme3.asset.plugins.HttpZipLocator;
+import com.jme3.asset.plugins.UrlLocator;
+import com.jme3.asset.plugins.ZipLocator;
+import com.jme3.audio.plugins.WAVLoader;
+import com.jme3.system.JmeSystem;
+import com.jme3.texture.plugins.AWTLoader;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class TestLocators {
+
+    @Test
+    public void testAbsoluteLocators() {
+        AssetManager am = JmeSystem.newAssetManager(TestLocators.class.getResource("/com/jme3/asset/Desktop.cfg"));
+        am.registerLocator("/",  ClasspathLocator.class);
+        am.registerLoader(WAVLoader.class, "wav");
+        am.registerLoader(AWTLoader.class, "jpg");
+
+        Assert.assertNotNull(am.loadAudio("Sound/Effects/Gun.wav"));
+        Assert.assertNotNull(am.loadTexture("Textures/Terrain/Pond/Pond.jpg"));
+    }
+
+    /**
+     * Demonstrates loading a file from a custom {@link AssetLoader}
+     */
+    @Test
+    public void testCustomLoader() {
+        AssetManager am = new DesktopAssetManager(true);
+        am.registerLocator("/", ClasspathLocator.class);
+        am.registerLoader(TextLoader.class, "fnt");
+        String result = (String)am.loadAsset("Interface/Fonts/Console.fnt");
+        Assert.assertTrue(result.startsWith("info face=\"Lucida Console\" size=11 bold=0 italic=0 charset=\"\" unicode=1" +
+                " stretchH=100 smooth=1 aa=1 padding=0,0,0,0 spacing=1,1 outline=0"));
+    }
+
+    @Test
+    public void testManyLocators() {
+        AssetManager am = new DesktopAssetManager(true);
+        am.registerLocator(
+                "https://github.com/jMonkeyEngine/wiki/raw/master/docs/modules/tutorials/assets/images/beginner/",
+                UrlLocator.class);
+
+        am.registerLocator("../jme3-examples/town.zip", ZipLocator.class);
+        am.registerLocator(
+                "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/jmonkeyengine/wildhouse.zip",
+                HttpZipLocator.class);
+        am.registerLocator("/", ClasspathLocator.class);
+
+        // Try loading from jme3-core resources using the ClasspathLocator.
+        Assert.assertNotNull("Failed to load from classpath",
+                am.locateAsset(new AssetKey<>("Interface/Fonts/Default.fnt")));
+
+        // Try loading from the "town.zip" file using the ZipLocator.
+        Assert.assertNotNull("Failed to load from town.zip file",
+                am.locateAsset(new ModelKey("casaamarela.jpg")));
+
+        // Try loading from the Google Code Archive website using the HttpZipLocator.
+        Assert.assertNotNull("Failed to load from wildhouse.zip on googleapis.com",
+                am.locateAsset(new ModelKey("glasstile2.png")));
+
+        // Try loading from the GitHub website using the UrlLocator.
+        Assert.assertNotNull("Failed to load from HTTP",
+                am.locateAsset(new TextureKey("beginner-physics.png")));
+    }
+}

jme3-examples/src/main/java/jme3test/asset/TextLoader.java renamed to jme3-core/src/test/java/com/jme3/asset/TextLoader.java

@@ -1,26 +1,23 @@
-package jme3test.asset;
-
-import com.jme3.asset.AssetInfo;
-import com.jme3.asset.AssetLoader;
-import java.io.IOException;
-import java.util.Scanner;
-
-/**
- * An example implementation of {@link AssetLoader} to load text
- * files as strings.
- */
-public class TextLoader implements AssetLoader {
-    @Override
-    public Object load(AssetInfo assetInfo) throws IOException {
-        Scanner scan = new Scanner(assetInfo.openStream());
-        StringBuilder sb = new StringBuilder();
-        try {
-            while (scan.hasNextLine()) {
-                sb.append(scan.nextLine()).append('\n');
-            }
-        } finally {
-            scan.close();
-        }
-        return sb.toString();
-    }
-}
+package com.jme3.asset;
+
+import java.util.Scanner;
+
+/**
+ * An example implementation of {@link AssetLoader} to load text
+ * files as strings.
+ */
+public class TextLoader implements AssetLoader {
+    @Override
+    public Object load(AssetInfo assetInfo) {
+        Scanner scan = new Scanner(assetInfo.openStream());
+        StringBuilder sb = new StringBuilder();
+        try {
+            while (scan.hasNextLine()) {
+                sb.append(scan.nextLine()).append('\n');
+            }
+        } finally {
+            scan.close();
+        }
+        return sb.toString();
+    }
+}

jme3-core/src/test/java/com/jme3/test/PreventCoreIssueRegressions.java

@@ -0,0 +1,133 @@
+/*
+ * Copyright (c) 2019-2021 jMonkeyEngine
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * * Redistributions of source code must retain the above copyright
+ *   notice, this list of conditions and the following disclaimer.
+ *
+ * * Redistributions in binary form must reproduce the above copyright
+ *   notice, this list of conditions and the following disclaimer in the
+ *   documentation and/or other materials provided with the distribution.
+ *
+ * * Neither the name of 'jMonkeyEngine' nor the names of its contributors
+ *   may be used to endorse or promote products derived from this software
+ *   without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+package com.jme3.test;
+
+import com.jme3.anim.AnimComposer;
+import com.jme3.anim.Joint;
+import com.jme3.anim.SkinningControl;
+import com.jme3.app.LegacyApplication;
+import com.jme3.app.SimpleApplication;
+import com.jme3.app.state.AppState;
+import com.jme3.app.state.ScreenshotAppState;
+import com.jme3.asset.AssetManager;
+import com.jme3.asset.DesktopAssetManager;
+import com.jme3.input.InputManager;
+import com.jme3.input.dummy.DummyKeyInput;
+import com.jme3.input.dummy.DummyMouseInput;
+import com.jme3.math.Vector3f;
+import com.jme3.renderer.Camera;
+import com.jme3.renderer.RenderManager;
+import com.jme3.renderer.ViewPort;
+import com.jme3.scene.Node;
+import com.jme3.system.JmeSystem;
+import com.jme3.system.NullRenderer;
+import org.junit.Assert;
+import org.junit.Test;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * The Test Suite to prevent regressions from previously fixed Core issues
+ * @author Stephen Gold <[email protected]>
+ */
+public class PreventCoreIssueRegressions {
+
+    /**
+     * Test case for JME issue #1421: ScreenshotAppState never cleans up.
+     */
+    @Test
+    public void testIssue1421() throws NoSuchFieldException, IllegalAccessException {
+        ScreenshotAppState screenshotAppState = new ScreenshotAppState("./", "screen_shot");
+
+        SimpleApplication app = new SimpleApplication(new AppState[]{}) {
+            // Dummy application because SimpleApp is abstract
+            @Override
+            public void simpleInitApp() { }
+        };
+
+        app.setAssetManager(new DesktopAssetManager(true));
+        Field f1 = LegacyApplication.class.getDeclaredField("inputManager");
+        f1.setAccessible(true);
+        f1.set(app, new InputManager(new DummyMouseInput(), new DummyKeyInput(), null, null));
+
+        Field f2 = LegacyApplication.class.getDeclaredField("renderManager");
+        f2.setAccessible(true);
+        f2.set(app, new RenderManager(new NullRenderer()));
+
+        app.getRenderManager().createPostView("null", new Camera(1, 1));
+
+        Assert.assertTrue(app.getStateManager().attach(screenshotAppState));
+        app.getStateManager().update(0f); // Causes SAS#initialize to be called
+
+        // Confirm that the SceneProcessor is attached.
+        List<ViewPort> vps = app.getRenderManager().getPostViews();
+        Assert.assertEquals(1, vps.size());
+        Assert.assertEquals(1, vps.get(0).getProcessors().size());
+        Assert.assertTrue(app.getInputManager().hasMapping("ScreenShot")); // Confirm that KEY_SYSRQ is mapped.
+        Assert.assertTrue(app.getStateManager().detach(screenshotAppState));
+
+        app.getStateManager().update(0f); // Causes SAS#cleanup to be called
+
+        // Check whether the SceneProcessor is still attached.
+        Assert.assertEquals(0, vps.get(0).getProcessors().size());
+        Assert.assertFalse(app.getInputManager().hasMapping("ScreenShot")); // Confirm that KEY_SYSRQ is unmapped.
+    }
+
+    /**
+     * Test case for JME issue #1138: Elephant's legUp animation sets Joint translation to NaN.
+     */
+    @Test
+    public void testIssue1138() {
+        AssetManager am = JmeSystem.newAssetManager(PreventCoreIssueRegressions.class.getResource("/com/jme3/asset/Desktop.cfg"));
+        Node cgModel = (Node)am.loadModel("Models/Elephant/Elephant.mesh.xml");
+        cgModel.rotate(0f, -1f, 0f);
+        cgModel.scale(0.04f);
+
+        AnimComposer composer = cgModel.getControl(AnimComposer.class);
+        composer.setCurrentAction("legUp");
+        SkinningControl sControl = cgModel.getControl(SkinningControl.class);
+
+        for (Joint joint : sControl.getArmature().getJointList()) {
+            Assert.assertTrue("Invalid translation for joint " + joint.getName(),
+                    Vector3f.isValidVector(joint.getLocalTranslation()));
+        }
+
+        cgModel.updateLogicalState(1.0f);
+        cgModel.updateGeometricState();
+
+        for (Joint joint : sControl.getArmature().getJointList()) {
+            Assert.assertTrue("Invalid translation for joint " + joint.getName(),
+                    Vector3f.isValidVector(joint.getLocalTranslation()));
+        }
+    }
+}