Skip to content

Commit 3c80146

Browse files
committed
Final Review Check Fix
Removed Fake Documentation URL Link Switch TestOgreConvert mesh loaded back to ogreModel Fixed 3 Scenes still using Deprecated Ogre Models
1 parent 8cec4a9 commit 3c80146

14 files changed

Lines changed: 20 additions & 29 deletions

File tree

jme3-examples/src/main/java/jme3test/export/TestAssetLinkNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ public static void main(String[] args){
6767
@Override
6868
public void simpleInitApp() {
6969
AssetLinkNode loaderNode=new AssetLinkNode();
70-
loaderNode.addLinkedChild(new ModelKey("Models/MonkeyHead/MonkeyHead.mesh.xml"));
70+
loaderNode.addLinkedChild(new ModelKey("Models/MonkeyHead/MonkeyHead.j3o"));
7171
//load/attach the children (happens automatically on load)
7272
// loaderNode.attachLinkedChildren(assetManager);
7373
// rootNode.attachChild(loaderNode);

jme3-examples/src/main/java/jme3test/export/TestOgreConvert.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,8 @@ public void simpleInitApp() {
7878
setupLights();
7979

8080
bmp = createLabelText(10, 20, "<placeholder>");
81-
82-
// Load the Ogre model (Oto.mesh.xml) from the assets
8381
Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml");
84-
// Save the loaded model to jME3's binary format and then reload it.
85-
// This tests the binary serialization/deserialization process.
82+
8683
spCopy = BinaryExporter.saveAndLoad(assetManager, model);
8784
spCopy.setName("Oto-Copy");
8885
rootNode.attachChild(spCopy);

jme3-examples/src/main/java/jme3test/material/TestBumpModel.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ public static void main(String[] args){
5757

5858
@Override
5959
public void simpleInitApp() {
60-
Spatial signpost = assetManager.loadAsset(new OgreMeshKey("Models/Sign Post/Sign Post.mesh.xml"));
60+
Spatial signpost = assetManager.loadAsset(new OgreMeshKey("Models/Sign Post/Sign Post.j3o"));
6161
signpost.setMaterial(assetManager.loadMaterial("Models/Sign Post/Sign Post.j3m"));
6262
MikktspaceTangentGenerator.generate(signpost);
6363
rootNode.attachChild(signpost);

jme3-examples/src/main/java/jme3test/network/TestRemoteCall.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
/*
23
* Copyright (c) 2009-2020 jMonkeyEngine
34
* All rights reserved.
@@ -113,7 +114,7 @@ public static void main(String[] args) throws IOException, InterruptedException{
113114

114115
ObjectStore store = new ObjectStore(client);
115116
ServerAccess access = store.getExposedObject("access", ServerAccess.class, true);
116-
boolean result = access.attachChild("Models/Oto/Oto.mesh.xml");
117+
boolean result = access.attachChild("Models/Oto/Oto.j3o");
117118
System.out.println(result);
118119
}
119120
}

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MaterialLoader.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,9 @@
5656
/**
5757
* Loads Ogre3D material files.
5858
*
59-
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
60-
* The Ogre model format is deprecated. Consider migrating to glTF (.glb/.gltf)
59+
* * @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
60+
* The Ogre model format is deprecated. Consider migrating to (.glb/.gltf/.j3o) etc
6161
* or other modern model formats for better performance, broader tool support, and future compatibility.
62-
* See <a href="https://jmonkeyengine.org/docs/3.6/manual/upgrading_to_glTF/">glTF migration guide</a>.
6362
*/
6463
@Deprecated
6564
public class MaterialLoader implements AssetLoader {

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshAnimationLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,8 @@
4848
* Utility class used by OgreLoader to load poses and mesh animations.
4949
*
5050
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
51-
* The Ogre model format is deprecated. Consider migrating to glTF (.glb/.gltf)
51+
* The Ogre model format is deprecated. Consider migrating to (.glb/.gltf/.j3o) etc
5252
* or other modern model formats for better performance, broader tool support, and future compatibility.
53-
* See <a href="https://jmonkeyengine.org/docs/3.6/manual/upgrading_to_glTF/">glTF migration guide</a>.
5453
*/
5554
@Deprecated
5655
public class MeshAnimationLoader {

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/MeshLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,8 @@
6262
* Loads Ogre3D mesh.xml files.
6363
*
6464
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
65-
* The Ogre model format is deprecated. Consider migrating to glTF (.glb/.gltf)
65+
* The Ogre model format is deprecated. Consider migrating to (.glb/.gltf/.j3o) etc
6666
* or other modern model formats for better performance, broader tool support, and future compatibility.
67-
* See <a href="https://jmonkeyengine.org/docs/3.6/manual/upgrading_to_glTF/">glTF migration guide</a>.
6867
*/
6968
@Deprecated
7069
public class MeshLoader extends DefaultHandler implements AssetLoader {

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/OgreMeshKey.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,13 @@
4040
* are retrieved, instead of loading the material file as the same
4141
* name as the model (the default).
4242
*
43+
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
44+
* The Ogre model format is deprecated. Consider migrating to (.glb/.gltf/.j3o) etc
45+
* or other modern model formats for better performance, broader tool support, and future compatibility.
46+
*
4347
* @author Kirill Vainer
4448
*/
49+
@Deprecated
4550
public class OgreMeshKey extends ModelKey {
4651

4752
private MaterialList materialList;

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneLoader.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,8 @@
6868
* Loads Ogre3D .scene files.
6969
*
7070
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
71-
* The Ogre model format is deprecated. Consider migrating to glTF (.glb/.gltf)
71+
* The Ogre model format is deprecated. Consider migrating to (.glb/.gltf/.j3o) etc
7272
* or other modern model formats for better performance, broader tool support, and future compatibility.
73-
* See <a href="https://jmonkeyengine.org/docs/3.6/manual/upgrading_to_glTF/">glTF migration guide</a>.
7473
*/
7574
@Deprecated
7675
public class SceneLoader extends DefaultHandler implements AssetLoader {

jme3-plugins/src/ogre/java/com/jme3/scene/plugins/ogre/SceneMaterialLoader.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@
5858
* before reading the top nodes.
5959
*
6060
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
61-
* The Ogre model format is deprecated. Consider migrating to glTF (.glb/.gltf)
61+
* The Ogre model format is deprecated. Consider migrating to (.glb/.gltf/.j3o) etc
6262
* or other modern model formats for better performance, broader tool support, and future compatibility.
63-
* See <a href="https://jmonkeyengine.org/docs/3.6/manual/upgrading_to_glTF/">glTF migration guide</a>.
64-
*
6563
* @author Kirill Vainer
6664
*/
6765
@Deprecated

0 commit comments

Comments
 (0)