diff --git a/jme3-examples/src/main/java/jme3test/model/TestGltfLoading.java b/jme3-examples/src/main/java/jme3test/model/TestGltfLoading.java index 3373638fa..d3d0da624 100644 --- a/jme3-examples/src/main/java/jme3test/model/TestGltfLoading.java +++ b/jme3-examples/src/main/java/jme3test/model/TestGltfLoading.java @@ -34,6 +34,7 @@ package jme3test.model; import com.jme3.animation.*; import com.jme3.app.ChaseCameraAppState; import com.jme3.app.SimpleApplication; +import com.jme3.asset.plugins.FileLocator; import com.jme3.input.KeyInput; import com.jme3.input.controls.ActionListener; import com.jme3.input.controls.KeyTrigger; @@ -76,6 +77,9 @@ public class TestGltfLoading extends SimpleApplication { SkeletonDebugAppState skeletonDebugAppState = new SkeletonDebugAppState(); getStateManager().attach(skeletonDebugAppState); + String folder = System.getProperty("user.home"); + assetManager.registerLocator(folder, FileLocator.class); + // cam.setLocation(new Vector3f(4.0339394f, 2.645184f, 6.4627485f)); // cam.setRotation(new Quaternion(-0.013950467f, 0.98604023f, -0.119502485f, -0.11510504f)); cam.setFrustumPerspective(45f, (float) cam.getWidth() / cam.getHeight(), 0.1f, 100f); diff --git a/jme3-testdata/src/main/resources/Models/Tank/Tank_AO.png b/jme3-testdata/src/main/resources/Models/Tank/Tank_AO.png deleted file mode 100644 index 9191ee1bd..000000000 Binary files a/jme3-testdata/src/main/resources/Models/Tank/Tank_AO.png and /dev/null differ diff --git a/jme3-testdata/src/main/resources/Models/Tank/Tank_Metallic.png b/jme3-testdata/src/main/resources/Models/Tank/Tank_Metallic.png deleted file mode 100644 index afe233143..000000000 Binary files a/jme3-testdata/src/main/resources/Models/Tank/Tank_Metallic.png and /dev/null differ diff --git a/jme3-testdata/src/main/resources/Models/Tank/Tank_Occ_Rough_Metal.png b/jme3-testdata/src/main/resources/Models/Tank/Tank_Occ_Rough_Metal.png new file mode 100644 index 000000000..9a6cf378f Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Tank/Tank_Occ_Rough_Metal.png differ diff --git a/jme3-testdata/src/main/resources/Models/Tank/Tank_Roughness.png b/jme3-testdata/src/main/resources/Models/Tank/Tank_Roughness.png deleted file mode 100644 index 41f6c0a73..000000000 Binary files a/jme3-testdata/src/main/resources/Models/Tank/Tank_Roughness.png and /dev/null differ diff --git a/jme3-testdata/src/main/resources/Models/Tank/tank.j3m b/jme3-testdata/src/main/resources/Models/Tank/tank.j3m index e9fbe66b3..3cd8ac428 100644 --- a/jme3-testdata/src/main/resources/Models/Tank/tank.j3m +++ b/jme3-testdata/src/main/resources/Models/Tank/tank.j3m @@ -1,12 +1,11 @@ Material Tank : Common/MatDefs/Light/PBRLighting.j3md { MaterialParameters { - MetallicMap : Flip Models/Tank/Tank_Metallic.png - RoughnessMap : Flip Models/Tank/Tank_Roughness.png + MetallicRoughnessMap : Flip Models/Tank/Tank_Occ_Rough_Metal.png NormalMap : Flip Models/Tank/Tank_Normal.png BaseColorMap : Flip Models/Tank/Tank_Base_Color.png EmissiveMap : Flip Models/Tank/Tank_Emissive.png - LightMap: Flip Models/Tank/Tank_AO.png + LightMap: Flip Models/Tank/Tank_Occ_Rough_Metal.png LightMapAsAOMap: true; EmissiveIntensity : 2.0