diff --git a/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java b/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java index 6bce59d798..fbb4e8a922 100644 --- a/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java +++ b/jme3-examples/src/main/java/jme3test/animation/TestCinematic.java @@ -221,7 +221,7 @@ private void createCameraMotion() { private void createScene() { - model = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + model = assetManager.loadModel("Models/Oto/Oto.j3o"); model.center(); model.setShadowMode(ShadowMode.CastAndReceive); rootNode.attachChild(model); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestBoneRagdoll.java b/jme3-examples/src/main/java/jme3test/bullet/TestBoneRagdoll.java index 538ec8b31c..6de101e01f 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestBoneRagdoll.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestBoneRagdoll.java @@ -170,7 +170,7 @@ public void simpleInitApp() { PhysicsTestHelper.createPhysicsTestWorld(rootNode, assetManager, physicsSpace); - model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml"); + model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.j3o"); rootNode.attachChild(model); composer = model.getControl(AnimComposer.class); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java b/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java index ce21b1f15b..9d42359b64 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestFancyCar.java @@ -121,7 +121,7 @@ private void buildPlayer() { final float mass = 400; // Load model and get chassis Geometry - carNode = (Node) assetManager.loadModel("Models/Ferrari/Car.scene"); + carNode = (Node) assetManager.loadModel("Models/Ferrari/Car_Scene.j3o"); carNode.setShadowMode(ShadowMode.Cast); Geometry chassis = findGeom(carNode, "Car"); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java b/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java index 3127ec4a68..e264d2bdd8 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestHoveringTank.java @@ -138,7 +138,7 @@ public void simpleInitApp() { } private void buildPlayer() { - spaceCraft = assetManager.loadModel("Models/HoverTank/Tank2.mesh.xml"); + spaceCraft = assetManager.loadModel("Models/HoverTank/Tank2.j3o"); CollisionShape colShape = CollisionShapeFactory.createDynamicMeshShape(spaceCraft); spaceCraft.setShadowMode(ShadowMode.CastAndReceive); spaceCraft.setLocalTranslation(startLocation); @@ -164,7 +164,7 @@ public void makeMissile() { Quaternion rot = spaceCraft.getWorldRotation(); Vector3f dir = rot.getRotationColumn(2); - Spatial missile = assetManager.loadModel("Models/SpaceCraft/Rocket.mesh.xml"); + Spatial missile = assetManager.loadModel("Models/SpaceCraft/Rocket.j3o"); missile.scale(0.5f); missile.rotate(0, FastMath.PI, 0); missile.updateGeometricState(); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java index f0f4d7807d..f3ba2ca370 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsCharacter.java @@ -109,7 +109,7 @@ public void simpleInitApp() { physicsCharacter = new CharacterControl(new CapsuleCollisionShape(0.5f, 1.8f), .1f); physicsCharacter.setPhysicsLocation(new Vector3f(0, 1, 0)); Node characterNode = new Node("character node"); - Spatial model = assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml"); + Spatial model = assetManager.loadModel("Models/Sinbad/Sinbad.j3o"); model.scale(0.25f); characterNode.addControl(physicsCharacter); getPhysicsSpace().add(physicsCharacter); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsRayCast.java b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsRayCast.java index 9d3a77350e..e4453782bc 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsRayCast.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestPhysicsRayCast.java @@ -30,7 +30,7 @@ public void simpleInitApp() { stateManager.attach(bulletAppState); initCrossHair(); - Spatial s = assetManager.loadModel("Models/Elephant/Elephant.mesh.xml"); + Spatial s = assetManager.loadModel("Models/Elephant/Elephant.j3o"); s.setLocalScale(0.1f); CollisionShape collisionShape = CollisionShapeFactory.createMeshShape(s); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestRagdollCharacter.java b/jme3-examples/src/main/java/jme3test/bullet/TestRagdollCharacter.java index b457e3b15b..06037c6cc6 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestRagdollCharacter.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestRagdollCharacter.java @@ -160,8 +160,8 @@ public void simpleInitApp() { physicsSpace); initWall(2f, 1f, 1f); - model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml"); - rootNode.attachChild(model); + model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.j3o"); + rootNode.attachChild(model); model.lookAt(new Vector3f(0f, 0f, -1f), Vector3f.UNIT_Y); model.setLocalTranslation(4f, 0f, -7f); diff --git a/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java b/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java index 61f08d25f2..15cf0b4c92 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java +++ b/jme3-examples/src/main/java/jme3test/bullet/TestWalkingChar.java @@ -294,7 +294,7 @@ private void createTerrain() { private void createCharacter() { CapsuleCollisionShape capsule = new CapsuleCollisionShape(3f, 4f); character = new CharacterControl(capsule, 0.01f); - model = (Node) assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + model = (Node) assetManager.loadModel("Models/Oto/Oto.j3o"); model.addControl(character); character.setPhysicsLocation(new Vector3f(-140, 40, -10)); rootNode.attachChild(model); diff --git a/jme3-examples/src/main/java/jme3test/bullet/shape/TestGimpactShape.java b/jme3-examples/src/main/java/jme3test/bullet/shape/TestGimpactShape.java index f564790411..610ed9eafe 100644 --- a/jme3-examples/src/main/java/jme3test/bullet/shape/TestGimpactShape.java +++ b/jme3-examples/src/main/java/jme3test/bullet/shape/TestGimpactShape.java @@ -262,19 +262,19 @@ private void dropTest2(Vector3f offset) { } private void dropPot(Vector3f offset) { - drop(offset.add(-12, 7, 15), "Models/Teapot/Teapot.mesh.xml", 1.0f, 2); + drop(offset.add(-12, 7, 15), "Models/Teapot/Teapot.j3o", 1.0f, 2); } private void dropSword(Vector3f offset) { - drop(offset.add(-10, 5, 3), "Models/Sinbad/Sword.mesh.xml", 1.0f, 2); + drop(offset.add(-10, 5, 3), "Models/Sinbad/Sword.j3o", 1.0f, 2); } private void dropSign(Vector3f offset) { - drop(offset.add(9, 15, 5), "Models/Sign Post/Sign Post.mesh.xml", 1.0f, 1); + drop(offset.add(9, 15, 5), "Models/Sign Post/Sign Post.j3o", 1.0f, 1); } private void dropRocket(Vector3f offset) { - RigidBodyControl c = drop(offset.add(26, 4, 7), "Models/SpaceCraft/Rocket.mesh.xml", 4.0f, 3); + RigidBodyControl c = drop(offset.add(26, 4, 7), "Models/SpaceCraft/Rocket.j3o", 4.0f, 3); c.setAngularDamping(0.5f); c.setLinearDamping(0.5f); } diff --git a/jme3-examples/src/main/java/jme3test/collision/TestMousePick.java b/jme3-examples/src/main/java/jme3test/collision/TestMousePick.java index 00f25e59ef..94a0aeca53 100644 --- a/jme3-examples/src/main/java/jme3test/collision/TestMousePick.java +++ b/jme3-examples/src/main/java/jme3test/collision/TestMousePick.java @@ -119,7 +119,7 @@ private void setupScene() { shootables.attachChild(torus); // load a character from jme3-testdata - Spatial golem = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial golem = assetManager.loadModel("Models/Oto/Oto.j3o"); golem.scale(0.5f); golem.setLocalTranslation(-1.0f, -1.5f, -0.6f); shootables.attachChild(golem); diff --git a/jme3-examples/src/main/java/jme3test/collision/TestRayCasting.java b/jme3-examples/src/main/java/jme3test/collision/TestRayCasting.java index e3c1ba136b..47f9669778 100644 --- a/jme3-examples/src/main/java/jme3test/collision/TestRayCasting.java +++ b/jme3-examples/src/main/java/jme3test/collision/TestRayCasting.java @@ -71,7 +71,7 @@ public void simpleInitApp() { q.updateBound(); // Geometry teapot = new Geometry("MyGeom", q); - teapot = assetManager.loadModel("Models/Teapot/Teapot.mesh.xml"); + teapot = assetManager.loadModel("Models/Teapot/Teapot.j3o"); // teapot.scale(2f, 2f, 2f); // teapot.move(2f, 2f, -.5f); teapot.rotate(FastMath.HALF_PI, FastMath.HALF_PI, FastMath.HALF_PI); diff --git a/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java b/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java index 6d20ea1fc2..fcced40d04 100644 --- a/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java +++ b/jme3-examples/src/main/java/jme3test/collision/TestTriangleCollision.java @@ -70,7 +70,7 @@ public void simpleInitApp() { rootNode.attachChild(geom1); // load a character from jme3-testdata - golem = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + golem = assetManager.loadModel("Models/Oto/Oto.j3o"); golem.scale(0.5f); golem.setLocalTranslation(-1.0f, -1.5f, -0.6f); diff --git a/jme3-examples/src/main/java/jme3test/effect/TestEverything.java b/jme3-examples/src/main/java/jme3test/effect/TestEverything.java index bb5ab62a1a..7737c039d9 100644 --- a/jme3-examples/src/main/java/jme3test/effect/TestEverything.java +++ b/jme3-examples/src/main/java/jme3test/effect/TestEverything.java @@ -152,7 +152,7 @@ public void setupFloor(){ // } public void setupRobotGuy(){ - Node model = (Node) assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Node model = (Node) assetManager.loadModel("Models/Oto/Oto.j3o"); Material mat = assetManager.loadMaterial("Models/Oto/Oto.j3m"); model.getChild(0).setMaterial(mat); // model.setAnimation("Walk"); @@ -163,7 +163,7 @@ public void setupRobotGuy(){ } public void setupSignpost(){ - Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.mesh.xml"); + Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.j3o"); Material mat = assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"); signpost.setMaterial(mat); signpost.rotate(0, FastMath.HALF_PI, 0); diff --git a/jme3-examples/src/main/java/jme3test/export/TestAssetLinkNode.java b/jme3-examples/src/main/java/jme3test/export/TestAssetLinkNode.java index 42e291da25..5535cf9bb2 100644 --- a/jme3-examples/src/main/java/jme3test/export/TestAssetLinkNode.java +++ b/jme3-examples/src/main/java/jme3test/export/TestAssetLinkNode.java @@ -67,7 +67,7 @@ public static void main(String[] args){ @Override public void simpleInitApp() { AssetLinkNode loaderNode=new AssetLinkNode(); - loaderNode.addLinkedChild(new ModelKey("Models/MonkeyHead/MonkeyHead.mesh.xml")); + loaderNode.addLinkedChild(new ModelKey("Models/MonkeyHead/MonkeyHead.j3o")); //load/attach the children (happens automatically on load) // loaderNode.attachLinkedChildren(assetManager); // rootNode.attachChild(loaderNode); diff --git a/jme3-examples/src/main/java/jme3test/export/TestOgreConvert.java b/jme3-examples/src/main/java/jme3test/export/TestOgreConvert.java index 2c1449f5d5..f7784c468e 100644 --- a/jme3-examples/src/main/java/jme3test/export/TestOgreConvert.java +++ b/jme3-examples/src/main/java/jme3test/export/TestOgreConvert.java @@ -51,8 +51,12 @@ * plays an animation, and displays debugging information about its skinning * and material parameters. * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + * * @author capdevon */ +@Deprecated public class TestOgreConvert extends SimpleApplication { public static void main(String[] args) { diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java index 5af191916d..f227bd217e 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloAnimation.java @@ -71,7 +71,7 @@ public void simpleInitApp() { rootNode.addLight(dl); /* Load a model that contains animation */ - Node player = (Node) assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Node player = (Node) assetManager.loadModel("Models/Oto/Oto.j3o"); player.setLocalScale(0.5f); rootNode.attachChild(player); diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloAssets.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloAssets.java index d062ed8e98..2e682783ae 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloAssets.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloAssets.java @@ -78,7 +78,7 @@ public void simpleInitApp() { guiNode.attachChild(helloText); /* Load a Ninja model (OgreXML + material + texture from test_data) */ - Spatial ninja = assetManager.loadModel("Models/Ninja/Ninja.mesh.xml"); + Spatial ninja = assetManager.loadModel("Models/Ninja/Ninja.j3o"); ninja.scale(0.05f, 0.05f, 0.05f); ninja.rotate(0.0f, -3.0f, 0.0f); ninja.setLocalTranslation(0.0f, -5.0f, -2.0f); diff --git a/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java b/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java index 90e187a9a9..cf31eef824 100644 --- a/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java +++ b/jme3-examples/src/main/java/jme3test/helloworld/HelloPicking.java @@ -169,7 +169,7 @@ private void initCrossHairs() { private Spatial makeCharacter() { // load a character from jme3-testdata - Spatial golem = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial golem = assetManager.loadModel("Models/Oto/Oto.j3o"); golem.scale(0.5f); golem.setLocalTranslation(-1.0f, -1.5f, -0.6f); diff --git a/jme3-examples/src/main/java/jme3test/light/TestIssue2209.java b/jme3-examples/src/main/java/jme3test/light/TestIssue2209.java index 4b0699de88..dc62d18f87 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestIssue2209.java +++ b/jme3-examples/src/main/java/jme3test/light/TestIssue2209.java @@ -81,7 +81,7 @@ public void simpleInitApp() { dlsr.setLight(dl); viewPort.addProcessor(dlsr); - Node player = (Node) assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Node player = (Node) assetManager.loadModel("Models/Oto/Oto.j3o"); player.setShadowMode(RenderQueue.ShadowMode.Cast); rootNode.attachChild(player); } diff --git a/jme3-examples/src/main/java/jme3test/light/TestManyLights.java b/jme3-examples/src/main/java/jme3test/light/TestManyLights.java index 644344b023..c8cafb5ba1 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestManyLights.java +++ b/jme3-examples/src/main/java/jme3test/light/TestManyLights.java @@ -46,7 +46,7 @@ public static void main(String[] args){ public void simpleInitApp() { flyCam.setMoveSpeed(10); - Node scene = (Node) assetManager.loadModel("Scenes/ManyLights/Main.scene"); + Node scene = (Node) assetManager.loadModel("Scenes/ManyLights/Main.j3o"); rootNode.attachChild(scene); // guiNode.setCullHint(CullHint.Always); } diff --git a/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java b/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java index ca9365cb88..c3baebd369 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java +++ b/jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java @@ -77,10 +77,10 @@ public void simpleInitApp() { flyCam.setMoveSpeed(10); - Node scene = (Node) assetManager.loadModel("Scenes/ManyLights/Main.scene"); + Node scene = (Node) assetManager.loadModel("Scenes/ManyLights/Main.j3o"); rootNode.attachChild(scene); Node n = (Node) rootNode.getChild(0); - final LightList lightList = n.getWorldLightList(); + final LightList lightList = n.getLocalLightList(); final Geometry g = (Geometry) n.getChild("Grid-geom-1"); g.getMaterial().setColor("Ambient", new ColorRGBA(0.2f, 0.2f, 0.2f, 1f)); diff --git a/jme3-examples/src/main/java/jme3test/light/TestShadowBug.java b/jme3-examples/src/main/java/jme3test/light/TestShadowBug.java index acf2d6df13..13303b0f75 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestShadowBug.java +++ b/jme3-examples/src/main/java/jme3test/light/TestShadowBug.java @@ -69,7 +69,7 @@ public void simpleInitApp() { characters.setShadowMode(ShadowMode.Cast); rootNode.attachChild(characters); - Spatial golem = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial golem = assetManager.loadModel("Models/Oto/Oto.j3o"); golem.scale(0.5f); golem.setLocalTranslation(200.0f, -6f, 200f); golem.setShadowMode(ShadowMode.CastAndReceive); diff --git a/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java b/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java index ed53b0de35..5aee773204 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java +++ b/jme3-examples/src/main/java/jme3test/light/TestSpotLight.java @@ -112,7 +112,7 @@ public void setupFloor(){ public void setupSignpost(){ - Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.mesh.xml"); + Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.j3o"); Material mat = assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"); // mat.setBoolean("VertexLighting", true); signpost.setMaterial(mat); diff --git a/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java b/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java index 11dd519ef3..3b4ff5ad4d 100644 --- a/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java +++ b/jme3-examples/src/main/java/jme3test/light/TestSpotLightShadows.java @@ -158,7 +158,7 @@ public void setupFloor() { } public void setupSignpost() { - Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.mesh.xml"); + Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.j3o"); Material mat = assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"); // mat.setBoolean("VertexLighting", true); signpost.setMaterial(mat); diff --git a/jme3-examples/src/main/java/jme3test/material/TestBumpModel.java b/jme3-examples/src/main/java/jme3test/material/TestBumpModel.java index 645dd074f5..5dd9cbe71e 100644 --- a/jme3-examples/src/main/java/jme3test/material/TestBumpModel.java +++ b/jme3-examples/src/main/java/jme3test/material/TestBumpModel.java @@ -57,7 +57,7 @@ public static void main(String[] args){ @Override public void simpleInitApp() { - Spatial signpost = assetManager.loadAsset(new OgreMeshKey("Models/Sign Post/Sign Post.mesh.xml")); + Spatial signpost = assetManager.loadAsset(new OgreMeshKey("Models/Sign Post/Sign Post.j3o")); signpost.setMaterial(assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m")); MikktspaceTangentGenerator.generate(signpost); rootNode.attachChild(signpost); diff --git a/jme3-examples/src/main/java/jme3test/material/TestParallax.java b/jme3-examples/src/main/java/jme3test/material/TestParallax.java index 3715806f6d..e2d07e0bde 100644 --- a/jme3-examples/src/main/java/jme3test/material/TestParallax.java +++ b/jme3-examples/src/main/java/jme3test/material/TestParallax.java @@ -84,7 +84,7 @@ public void setupFloor() { } public void setupSignpost() { - Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.mesh.xml"); + Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.j3o"); Material matSp = assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"); MikktspaceTangentGenerator.generate(signpost); signpost.setMaterial(matSp); diff --git a/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java b/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java index 038066c68b..4ec3379d5c 100644 --- a/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java +++ b/jme3-examples/src/main/java/jme3test/material/TestParallaxPBR.java @@ -88,7 +88,7 @@ public void setupFloor() { } public void setupSignpost() { - Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.mesh.xml"); + Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.j3o"); Material mat = assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"); MikktspaceTangentGenerator.generate(signpost); signpost.setMaterial(mat); diff --git a/jme3-examples/src/main/java/jme3test/model/TestHoverTank.java b/jme3-examples/src/main/java/jme3test/model/TestHoverTank.java index 648f7390df..0aa0794059 100644 --- a/jme3-examples/src/main/java/jme3test/model/TestHoverTank.java +++ b/jme3-examples/src/main/java/jme3test/model/TestHoverTank.java @@ -57,7 +57,7 @@ public static void main(String[] args) { @Override public void simpleInitApp() { - Node tank = (Node) assetManager.loadModel("Models/HoverTank/Tank2.mesh.xml"); + Node tank = (Node) assetManager.loadModel("Models/HoverTank/Tank2.j3o"); flyCam.setEnabled(false); ChaseCamera chaseCam = new ChaseCamera(cam, tank, inputManager); diff --git a/jme3-examples/src/main/java/jme3test/model/TestMonkeyHead.java b/jme3-examples/src/main/java/jme3test/model/TestMonkeyHead.java index f97a71b3c0..893d2fd015 100644 --- a/jme3-examples/src/main/java/jme3test/model/TestMonkeyHead.java +++ b/jme3-examples/src/main/java/jme3test/model/TestMonkeyHead.java @@ -57,7 +57,7 @@ public static void main(String[] args){ public void simpleInitApp() { viewPort.setBackgroundColor(ColorRGBA.DarkGray); - Spatial bumpy = assetManager.loadModel("Models/MonkeyHead/MonkeyHead.mesh.xml"); + Spatial bumpy = assetManager.loadModel("Models/MonkeyHead/MonkeyHead.j3o"); rootNode.attachChild(bumpy); lightMdl = new Geometry("Light", new Sphere(10, 10, 0.1f)); diff --git a/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java b/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java index c3bc78f479..bae1c6f616 100644 --- a/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java +++ b/jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java @@ -41,6 +41,14 @@ import com.jme3.scene.Spatial; import com.jme3.scene.shape.Sphere; +/** + * Example demonstrating Ogre model loading. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + * + */ +@Deprecated public class TestOgreLoading extends SimpleApplication { private float angle1; diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestAnimMigration.java b/jme3-examples/src/main/java/jme3test/model/anim/TestAnimMigration.java index 18b09edbf2..75549374f2 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestAnimMigration.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestAnimMigration.java @@ -76,9 +76,9 @@ public void simpleInitApp() { rootNode.addLight(new AmbientLight(ColorRGBA.DarkGray)); Spatial model = assetManager.loadModel("Models/Jaime/Jaime.j3o"); - // Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml").scale(0.2f).move(0, 1, 0); - //Spatial model = assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml"); - //Spatial model = assetManager.loadModel("Models/Elephant/Elephant.mesh.xml").scale(0.02f); + // Spatial model = assetManager.loadModel("Models/Oto/Oto.j3o").scale(0.2f).move(0, 1, 0); + //Spatial model = assetManager.loadModel("Models/Sinbad/Sinbad.j3o"); + //Spatial model = assetManager.loadModel("Models/Elephant/Elephant.j3o").scale(0.02f); AnimMigrationUtils.migrate(model); diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestHWSkinning.java b/jme3-examples/src/main/java/jme3test/model/anim/TestHWSkinning.java index bf882bf1a1..f5aac0b2fa 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestHWSkinning.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestHWSkinning.java @@ -98,7 +98,7 @@ public void simpleInitApp() { } private Spatial loadModel(int i) { - Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial model = assetManager.loadModel("Models/Oto/Oto.j3o"); model.setLocalScale(0.1f); AnimComposer composer = model.getControl(AnimComposer.class); diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestIssue1395.java b/jme3-examples/src/main/java/jme3test/model/anim/TestIssue1395.java index f0e8bd3a6b..801eebe5e1 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestIssue1395.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestIssue1395.java @@ -69,7 +69,7 @@ public void simpleInitApp() { dl.setColor(new ColorRGBA(1f, 1f, 1f, 1f)); rootNode.addLight(dl); - Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial model = assetManager.loadModel("Models/Oto/Oto.j3o"); rootNode.attachChild(model); model.center(); diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestModelExportingCloning.java b/jme3-examples/src/main/java/jme3test/model/anim/TestModelExportingCloning.java index 7795753b9d..6a20a980be 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestModelExportingCloning.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestModelExportingCloning.java @@ -58,7 +58,7 @@ public void simpleInitApp() { AnimComposer composer; - Spatial originalModel = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial originalModel = assetManager.loadModel("Models/Oto/Oto.j3o"); composer = originalModel.getControl(AnimComposer.class); composer.setCurrentAction("Walk"); composer.setGlobalSpeed(1.5f); diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java b/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java index fbd9524d80..2402552991 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java @@ -53,6 +53,13 @@ import com.jme3.scene.Spatial; import com.jme3.scene.shape.Box; +/** + * Example demonstrating Ogre model animation. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + */ +@Deprecated public class TestOgreAnim extends SimpleApplication implements ActionListener { private AnimComposer animComposer; diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestOgreComplexAnim.java b/jme3-examples/src/main/java/jme3test/model/anim/TestOgreComplexAnim.java index aac2c1f970..4c7487b590 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestOgreComplexAnim.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestOgreComplexAnim.java @@ -47,6 +47,13 @@ import com.jme3.scene.Node; import com.jme3.scene.debug.custom.ArmatureDebugger; +/** + * Example demonstrating complex Ogre model animations with armature masks and advanced blending. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + */ +@Deprecated public class TestOgreComplexAnim extends SimpleApplication { private SkinningControl skinningControl; diff --git a/jme3-examples/src/main/java/jme3test/model/anim/TestSkeletonControlRefresh.java b/jme3-examples/src/main/java/jme3test/model/anim/TestSkeletonControlRefresh.java index 3761858166..f51511dcd2 100644 --- a/jme3-examples/src/main/java/jme3test/model/anim/TestSkeletonControlRefresh.java +++ b/jme3-examples/src/main/java/jme3test/model/anim/TestSkeletonControlRefresh.java @@ -90,7 +90,7 @@ public void simpleInitApp() { for (int i = 0; i < SIZE; i++) { for (int j = 0; j < SIZE; j++) { - Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial model = assetManager.loadModel("Models/Oto/Oto.j3o"); //setting a different material model.setMaterial(m.clone()); model.setLocalScale(0.1f); diff --git a/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java b/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java index 208af7b682..c35efa37c3 100644 --- a/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java +++ b/jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java @@ -113,7 +113,7 @@ public static void main(String[] args) throws IOException, InterruptedException{ ObjectStore store = new ObjectStore(client); ServerAccess access = store.getExposedObject("access", ServerAccess.class, true); - boolean result = access.attachChild("Models/Oto/Oto.mesh.xml"); + boolean result = access.attachChild("Models/Oto/Oto.j3o"); System.out.println(result); } } diff --git a/jme3-examples/src/main/java/jme3test/post/TestCartoonEdge.java b/jme3-examples/src/main/java/jme3test/post/TestCartoonEdge.java index ff6ab497f3..5d0b077e9d 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestCartoonEdge.java +++ b/jme3-examples/src/main/java/jme3test/post/TestCartoonEdge.java @@ -103,7 +103,7 @@ public void setupLighting(){ } public void setupModel(){ - Spatial model = assetManager.loadModel("Models/MonkeyHead/MonkeyHead.mesh.xml"); + Spatial model = assetManager.loadModel("Models/MonkeyHead/MonkeyHead.j3o"); makeToonish(model); model.rotate(0, FastMath.PI, 0); // signpost.setLocalTranslation(12, 3.5f, 30); diff --git a/jme3-examples/src/main/java/jme3test/post/TestIssue1798.java b/jme3-examples/src/main/java/jme3test/post/TestIssue1798.java index 79605f29a8..ca7168fe5d 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestIssue1798.java +++ b/jme3-examples/src/main/java/jme3test/post/TestIssue1798.java @@ -128,7 +128,7 @@ private void setupLighting() { } private void setupModel() { - Spatial model = assetManager.loadModel("Models/MonkeyHead/MonkeyHead.mesh.xml"); + Spatial model = assetManager.loadModel("Models/MonkeyHead/MonkeyHead.j3o"); makeToonish(model); rootNode.attachChild(model); } diff --git a/jme3-examples/src/main/java/jme3test/post/TestLightScattering.java b/jme3-examples/src/main/java/jme3test/post/TestLightScattering.java index 83e0d464e8..03d03c72d3 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestLightScattering.java +++ b/jme3-examples/src/main/java/jme3test/post/TestLightScattering.java @@ -65,7 +65,7 @@ public void simpleInitApp() { //cam.setFrustumFar(1000); flyCam.setMoveSpeed(10); Material mat = assetManager.loadMaterial("Textures/Terrain/Rocky/Rocky.j3m"); - Spatial scene = assetManager.loadModel("Models/Terrain/Terrain.mesh.xml"); + Spatial scene = assetManager.loadModel("Models/Terrain/Terrain.j3o"); MikktspaceTangentGenerator.generate(((Geometry) ((Node) scene).getChild(0)).getMesh()); scene.setMaterial(mat); scene.setShadowMode(ShadowMode.CastAndReceive); diff --git a/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java b/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java index a46b14655c..7920065748 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java +++ b/jme3-examples/src/main/java/jme3test/post/TestPostFilters.java @@ -120,7 +120,7 @@ public void setupFloor() { } public void setupSignpost() { - Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.mesh.xml"); + Spatial signpost = assetManager.loadModel("Models/Sign Post/Sign Post.j3o"); Material mat = assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"); signpost.setMaterial(mat); signpost.rotate(0, FastMath.HALF_PI, 0); diff --git a/jme3-examples/src/main/java/jme3test/post/TestSSAO2.java b/jme3-examples/src/main/java/jme3test/post/TestSSAO2.java index 34fe62e27c..406ad65fb0 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestSSAO2.java +++ b/jme3-examples/src/main/java/jme3test/post/TestSSAO2.java @@ -68,7 +68,7 @@ public void simpleInitApp() { floor.setMaterial(mat); rootNode.attachChild(floor); - Node teapotNode = (Node) assetManager.loadModel("Models/Teapot/Teapot.mesh.xml"); + Node teapotNode = (Node) assetManager.loadModel("Models/Teapot/Teapot.j3o"); Geometry teapot = (Geometry) teapotNode.getChild(0); teapot.setMaterial(mat); // Sphere sph = new Sphere(16, 16, 4); diff --git a/jme3-examples/src/main/java/jme3test/post/TestSoftBloom.java b/jme3-examples/src/main/java/jme3test/post/TestSoftBloom.java index e277e8f943..ca367c51e2 100644 --- a/jme3-examples/src/main/java/jme3test/post/TestSoftBloom.java +++ b/jme3-examples/src/main/java/jme3test/post/TestSoftBloom.java @@ -120,7 +120,7 @@ public void simpleInitApp() { tankMat.setFloat("EmissivePower", emissionPower); tankMat.setFloat("EmissiveIntensity", 50); tankMat.setFloat("Metallic", .5f); - Spatial tank = assetManager.loadModel("Models/HoverTank/Tank2.mesh.xml"); + Spatial tank = assetManager.loadModel("Models/HoverTank/Tank2.j3o"); tank.setLocalTranslation(-10, 5, -10); tank.setMaterial(tankMat); rootNode.attachChild(tank); diff --git a/jme3-examples/src/main/java/jme3test/scene/TestUserData.java b/jme3-examples/src/main/java/jme3test/scene/TestUserData.java index b482f1906e..45f41bb6be 100644 --- a/jme3-examples/src/main/java/jme3test/scene/TestUserData.java +++ b/jme3-examples/src/main/java/jme3test/scene/TestUserData.java @@ -45,7 +45,7 @@ public static void main(String[] args) { @Override public void simpleInitApp() { - Node scene = (Node) assetManager.loadModel("Scenes/DotScene/DotScene.scene"); + Node scene = (Node) assetManager.loadModel("Scenes/DotScene/DotScene.j3o"); System.out.println("Scene: " + scene); Spatial testNode = scene.getChild("TestNode"); diff --git a/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java b/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java index 717ed6d8f6..af0c720cc1 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestBatchLod.java @@ -56,7 +56,7 @@ public void simpleInitApp() { dl.setDirection(new Vector3f(-1, -1, -1).normalizeLocal()); rootNode.addLight(dl); - Node teapotNode = (Node) assetManager.loadModel("Models/Teapot/Teapot.mesh.xml"); + Node teapotNode = (Node) assetManager.loadModel("Models/Teapot/Teapot.j3o"); Geometry teapot = (Geometry) teapotNode.getChild(0); Material mat = new Material(assetManager, "Common/MatDefs/Light/Lighting.j3md"); diff --git a/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java b/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java index 6c7e3d965d..61885fb92d 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestLodGeneration.java @@ -85,7 +85,7 @@ public void simpleInitApp() { rootNode.addLight(al); // --- Model Loading and Setup --- - // model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml"); + // model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.j3o"); Node model = (Node) assetManager.loadModel("Models/Jaime/Jaime.j3o"); BoundingBox b = ((BoundingBox) model.getWorldBound()); model.setLocalScale(1.2f / (b.getYExtent() * 2)); diff --git a/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java b/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java index a02616680f..ec539ad12a 100644 --- a/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java +++ b/jme3-examples/src/main/java/jme3test/stress/TestLodStress.java @@ -56,7 +56,7 @@ public void simpleInitApp() { dl.setDirection(new Vector3f(-1,-1,-1).normalizeLocal()); rootNode.addLight(dl); - Node teapotNode = (Node) assetManager.loadModel("Models/Teapot/Teapot.mesh.xml"); + Node teapotNode = (Node) assetManager.loadModel("Models/Teapot/Teapot.j3o"); Geometry teapot = (Geometry) teapotNode.getChild(0); // Sphere sph = new Sphere(16, 16, 4); diff --git a/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java b/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java index 2c54a5bdc9..52fd0df5e4 100644 --- a/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java +++ b/jme3-examples/src/main/java/jme3test/tools/TestSaveGame.java @@ -60,7 +60,7 @@ public void simpleInitApp() { myPlayer.setUserData("points", 0); // Attach the model to the Node. - Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial model = assetManager.loadModel("Models/Oto/Oto.j3o"); myPlayer.attachChild(model); // Before saving the game, detach the model since it doesn't need to be saved. diff --git a/jme3-examples/src/main/java/jme3test/tools/TestTextureAtlas.java b/jme3-examples/src/main/java/jme3test/tools/TestTextureAtlas.java index 5c3d6c98cb..6d18854fe6 100644 --- a/jme3-examples/src/main/java/jme3test/tools/TestTextureAtlas.java +++ b/jme3-examples/src/main/java/jme3test/tools/TestTextureAtlas.java @@ -53,15 +53,15 @@ public static void main(String[] args) { public void simpleInitApp() { flyCam.setMoveSpeed(50); Node scene = new Node("Scene"); - Spatial obj1 = assetManager.loadModel("Models/Ferrari/Car.scene"); + Spatial obj1 = assetManager.loadModel("Models/Ferrari/Car_Scene.j3o"); obj1.setLocalTranslation(-4, 0, 0); - Spatial obj2 = assetManager.loadModel("Models/Oto/Oto.mesh.xml"); + Spatial obj2 = assetManager.loadModel("Models/Oto/Oto.j3o"); obj2.setLocalTranslation(-2, 0, 0); - Spatial obj3 = assetManager.loadModel("Models/Ninja/Ninja.mesh.xml"); + Spatial obj3 = assetManager.loadModel("Models/Ninja/Ninja.j3o"); obj3.setLocalTranslation(-0, 0, 0); - Spatial obj4 = assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml"); + Spatial obj4 = assetManager.loadModel("Models/Sinbad/Sinbad.j3o"); obj4.setLocalTranslation(2, 0, 0); - Spatial obj5 = assetManager.loadModel("Models/Tree/Tree.mesh.j3o"); + Spatial obj5 = assetManager.loadModel("Models/Tree/Tree.j3o"); obj5.setLocalTranslation(4, 0, 0); scene.attachChild(obj1); scene.attachChild(obj2); diff --git a/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java b/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java index 5bc6604a91..492fa63802 100644 --- a/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java +++ b/jme3-examples/src/main/java/jme3test/water/TestSimpleWater.java @@ -81,7 +81,7 @@ public void simpleInitApp() { //create water quad //waterPlane = waterProcessor.createWaterGeometry(100, 100); - waterPlane = assetManager.loadModel("Models/WaterTest/WaterTest.mesh.xml"); + waterPlane = assetManager.loadModel("Models/WaterTest/WaterTest.j3o"); waterPlane.setMaterial(waterProcessor.getMaterial()); waterPlane.setLocalScale(40); waterPlane.setLocalTranslation(-5, 0, 5); diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java index 5c0b33ed63..1734cd295a 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java @@ -53,6 +53,13 @@ import java.util.logging.Level; import java.util.logging.Logger; +/** + * Loads Ogre3D material files. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + */ +@Deprecated public class MaterialLoader implements AssetLoader { private static final Logger logger = Logger.getLogger(MaterialLoader.class.getName()); diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java index 3d198fd857..5627fb47e5 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java @@ -46,7 +46,11 @@ /** * Utility class used by OgreLoader to load poses and mesh animations. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. */ +@Deprecated public class MeshAnimationLoader { // public static void loadMeshAnimations(Node animationsNode, List poseList, OgreMesh sharedgeom, List submeshes, Map animations){ diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java index 337b0527fd..567236291c 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java @@ -60,7 +60,11 @@ /** * Loads Ogre3D mesh.xml files. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. */ +@Deprecated public class MeshLoader extends DefaultHandler implements AssetLoader { private static final Logger logger = Logger.getLogger(MeshLoader.class.getName()); diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/OgreMeshKey.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/OgreMeshKey.java index d0458899b2..4b8d3274fa 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/OgreMeshKey.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/OgreMeshKey.java @@ -40,8 +40,12 @@ * are retrieved, instead of loading the material file as the same * name as the model (the default). * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + * * @author Kirill Vainer */ +@Deprecated public class OgreMeshKey extends ModelKey { private MaterialList materialList; diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneLoader.java index 8bd469d3aa..d20960ae56 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneLoader.java @@ -64,6 +64,13 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; +/** + * Loads Ogre3D .scene files. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + */ +@Deprecated public class SceneLoader extends DefaultHandler implements AssetLoader { private static final int DEFAULT_CAM_WIDTH = 640; diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMaterialLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMaterialLoader.java index 63c2fcdf74..9f77cb0b46 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMaterialLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMaterialLoader.java @@ -57,8 +57,11 @@ * used by the SceneLoader doesn't support reading bottom XML nodes * before reading the top nodes. * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. * @author Kirill Vainer */ +@Deprecated class SceneMaterialLoader extends DefaultHandler { private static final Logger logger = Logger.getLogger(SceneMaterialLoader.class.getName()); diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMeshLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMeshLoader.java index 5ea589d249..ea22b5efa3 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMeshLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMeshLoader.java @@ -8,6 +8,13 @@ import com.jme3.asset.AssetKey; import com.jme3.scene.Spatial; +/** + * Caching mesh loader for Ogre scene files. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + */ +@Deprecated public class SceneMeshLoader extends MeshLoader{ private Map cache=new HashMap<>(); @Override diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SkeletonLoader.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SkeletonLoader.java index 7fee37edfb..634b318470 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SkeletonLoader.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SkeletonLoader.java @@ -48,6 +48,13 @@ import java.util.*; import java.util.logging.Logger; +/** + * Loads Ogre3D skeleton.xml files. + * + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. + * Consider using glTF. + */ +@Deprecated public class SkeletonLoader extends DefaultHandler implements AssetLoader { private static final Logger logger = Logger.getLogger(SceneLoader.class.getName()); diff --git a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/package-info.java b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/package-info.java index 4331630743..72d5650210 100644 --- a/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/package-info.java +++ b/jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/package-info.java @@ -30,6 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /** - * import 3-D models in formats defined by the OGRE 3-D engine + * @deprecated as of jMonkeyEngine 3.10, for removal in a future version. */ +@Deprecated package com.jme3.scene.plugins.ogre; diff --git a/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestCartoonEdge.java b/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestCartoonEdge.java index 3f40859c18..bfe050b106 100644 --- a/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestCartoonEdge.java +++ b/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestCartoonEdge.java @@ -106,7 +106,7 @@ private void setupLighting(Node rootNode) { } private void setupModel(SimpleApplication app, Node rootNode) { - Spatial model = app.getAssetManager().loadModel("Models/MonkeyHead/MonkeyHead.mesh.xml"); + Spatial model = app.getAssetManager().loadModel("Models/MonkeyHead/MonkeyHead.j3o"); makeToonish(app, model); model.rotate(0, FastMath.PI, 0); rootNode.attachChild(model); diff --git a/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestLightScattering.java b/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestLightScattering.java index 5353226f90..b9fd7dce02 100644 --- a/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestLightScattering.java +++ b/jme3-screenshot-tests/src/test/java/org/jmonkeyengine/screenshottests/post/TestLightScattering.java @@ -76,7 +76,7 @@ protected void initialize(Application app) { simpleApplication.getCamera().setRotation(new Quaternion(0.010414706f, 0.9874893f, 0.13880467f, -0.07409228f)); Material mat = simpleApplication.getAssetManager().loadMaterial("Textures/Terrain/Rocky/Rocky.j3m"); - Spatial scene = simpleApplication.getAssetManager().loadModel("Models/Terrain/Terrain.mesh.xml"); + Spatial scene = simpleApplication.getAssetManager().loadModel("Models/Terrain/Terrain.j3o"); MikktspaceTangentGenerator.generate(((Geometry) ((Node) scene).getChild(0)).getMesh()); scene.setMaterial(mat); scene.setShadowMode(ShadowMode.CastAndReceive); diff --git a/jme3-testdata/src/main/resources/Models/Elephant/Elephant.j3o b/jme3-testdata/src/main/resources/Models/Elephant/Elephant.j3o new file mode 100644 index 0000000000..5257fe842b Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Elephant/Elephant.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Ferrari/Car.j3o b/jme3-testdata/src/main/resources/Models/Ferrari/Car.j3o new file mode 100644 index 0000000000..7e9f8c6b09 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Ferrari/Car.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Ferrari/Car_Scene.j3o b/jme3-testdata/src/main/resources/Models/Ferrari/Car_Scene.j3o new file mode 100644 index 0000000000..5c81c04e74 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Ferrari/Car_Scene.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/HoverTank/Tank2.j3o b/jme3-testdata/src/main/resources/Models/HoverTank/Tank2.j3o new file mode 100644 index 0000000000..ab994cf587 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/HoverTank/Tank2.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/MonkeyHead/MonkeyHead.j3o b/jme3-testdata/src/main/resources/Models/MonkeyHead/MonkeyHead.j3o new file mode 100644 index 0000000000..2ad682cef0 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/MonkeyHead/MonkeyHead.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Ninja/Ninja.j3o b/jme3-testdata/src/main/resources/Models/Ninja/Ninja.j3o new file mode 100644 index 0000000000..f8d1deea5e Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Ninja/Ninja.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Oto/Oto.j3o b/jme3-testdata/src/main/resources/Models/Oto/Oto.j3o new file mode 100644 index 0000000000..bcd1605bc1 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Oto/Oto.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3o b/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3o new file mode 100644 index 0000000000..4c68529823 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Sign Post/Sign Post.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Sinbad/Sinbad.j3o b/jme3-testdata/src/main/resources/Models/Sinbad/Sinbad.j3o new file mode 100644 index 0000000000..456db94aa7 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Sinbad/Sinbad.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Sinbad/Sword.j3o b/jme3-testdata/src/main/resources/Models/Sinbad/Sword.j3o new file mode 100644 index 0000000000..f539a9dc4f Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Sinbad/Sword.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/SpaceCraft/Rocket.j3o b/jme3-testdata/src/main/resources/Models/SpaceCraft/Rocket.j3o new file mode 100644 index 0000000000..62c7312274 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/SpaceCraft/Rocket.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Teapot/Teapot.j3o b/jme3-testdata/src/main/resources/Models/Teapot/Teapot.j3o new file mode 100644 index 0000000000..9823bf2ace Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Teapot/Teapot.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Terrain/Terrain.j3o b/jme3-testdata/src/main/resources/Models/Terrain/Terrain.j3o new file mode 100644 index 0000000000..0638feb5b0 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Terrain/Terrain.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/Tree/Tree.j3o b/jme3-testdata/src/main/resources/Models/Tree/Tree.j3o new file mode 100644 index 0000000000..b86c46d026 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/Tree/Tree.j3o differ diff --git a/jme3-testdata/src/main/resources/Models/WaterTest/WaterTest.j3o b/jme3-testdata/src/main/resources/Models/WaterTest/WaterTest.j3o new file mode 100644 index 0000000000..e21ecafe96 Binary files /dev/null and b/jme3-testdata/src/main/resources/Models/WaterTest/WaterTest.j3o differ diff --git a/jme3-testdata/src/main/resources/Scenes/DotScene/DotScene.j3o b/jme3-testdata/src/main/resources/Scenes/DotScene/DotScene.j3o new file mode 100644 index 0000000000..b87f39fa6f Binary files /dev/null and b/jme3-testdata/src/main/resources/Scenes/DotScene/DotScene.j3o differ diff --git a/jme3-testdata/src/main/resources/Scenes/ManyLights/Grid.j3o b/jme3-testdata/src/main/resources/Scenes/ManyLights/Grid.j3o new file mode 100644 index 0000000000..be060c7155 Binary files /dev/null and b/jme3-testdata/src/main/resources/Scenes/ManyLights/Grid.j3o differ diff --git a/jme3-testdata/src/main/resources/Scenes/ManyLights/Main.j3o b/jme3-testdata/src/main/resources/Scenes/ManyLights/Main.j3o new file mode 100644 index 0000000000..15e79dd15b Binary files /dev/null and b/jme3-testdata/src/main/resources/Scenes/ManyLights/Main.j3o differ