Skip to content

Commit a661d32

Browse files
committed
Merge branch 'Ogre-Deprecation-J3o-Format' of https://github.com/NwosuTy/jmonkeyengine into Ogre-Deprecation-J3o-Format
2 parents 9999e3a + 9335e10 commit a661d32

15 files changed

Lines changed: 21 additions & 42 deletions

jme3-examples/src/main/java/jme3test/bullet/TestRagdollCharacter.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,7 @@ public void simpleInitApp() {
161161
initWall(2f, 1f, 1f);
162162

163163
model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.j3o");
164-
rootNode.attachChild(model);
165-
164+
rootNode.attachChild(model);
166165
model.lookAt(new Vector3f(0f, 0f, -1f), Vector3f.UNIT_Y);
167166
model.setLocalTranslation(4f, 0f, -7f);
168167

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,7 @@
5252
* and material parameters.
5353
*
5454
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
55-
* The Ogre model format is deprecated. Consider using glTF (.glb/.gltf/.j3o) or other modern formats instead.
56-
* This test is maintained for backward compatibility during the transition period.
55+
* Consider using glTF.
5756
*
5857
* @author capdevon
5958
*/
@@ -76,12 +75,13 @@ public static void main(String[] args) {
7675
public void simpleInitApp() {
7776
configureCamera();
7877
setupLights();
79-
80-
// Save the loaded model to jME3's binary format and then reload it.
81-
// This tests the binary serialization/deserialization process.
78+
8279
bmp = createLabelText(10, 20, "<placeholder>");
83-
Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml");
8480

81+
// Load the Ogre model (Oto.mesh.xml) from the assets
82+
Spatial model = assetManager.loadModel("Models/Oto/Oto.mesh.xml");
83+
// Save the loaded model to jME3's binary format and then reload it.
84+
// This tests the binary serialization/deserialization process.
8585
spCopy = BinaryExporter.saveAndLoad(assetManager, model);
8686
spCopy.setName("Oto-Copy");
8787
rootNode.attachChild(spCopy);

jme3-examples/src/main/java/jme3test/light/TestManyLightsSingle.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,6 @@ public void simpleInitApp() {
8080
Node scene = (Node) assetManager.loadModel("Scenes/ManyLights/Main.j3o");
8181
rootNode.attachChild(scene);
8282
Node n = (Node) rootNode.getChild(0);
83-
8483
final LightList lightList = n.getLocalLightList();
8584
final Geometry g = (Geometry) n.getChild("Grid-geom-1");
8685

@@ -99,8 +98,7 @@ public void simpleInitApp() {
9998
final Node cubeNodes = new Node();
10099
n.attachChild(cubeNodes);
101100
int nb = 0;
102-
for (Light light : lightList)
103-
{
101+
for (Light light : lightList) {
104102
nb++;
105103
PointLight p = (PointLight) light;
106104
if (nb > 60) {

jme3-examples/src/main/java/jme3test/model/TestOgreLoading.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
* Example demonstrating Ogre model loading.
4646
*
4747
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
48-
* The Ogre model format is deprecated. Consider using glTF (.glb/.gltf/.j3o) or other modern formats instead.
49-
* See TestGltfLoading for a modern alternative.
48+
* Consider using glTF.
49+
*
5050
*/
5151
@Deprecated
5252
public class TestOgreLoading extends SimpleApplication {

jme3-examples/src/main/java/jme3test/model/anim/TestOgreAnim.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
* Example demonstrating Ogre model animation.
5858
*
5959
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
60-
* The Ogre model format is deprecated. Consider using glTF (.glb/.gltf/.j3o) or other modern formats instead.
60+
* Consider using glTF.
6161
*/
6262
@Deprecated
6363
public class TestOgreAnim extends SimpleApplication implements ActionListener {

jme3-examples/src/main/java/jme3test/model/anim/TestOgreComplexAnim.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
* Example demonstrating complex Ogre model animations with armature masks and advanced blending.
5252
*
5353
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
54-
* The Ogre model format is deprecated. Consider using glTF (.glb/.gltf/.j3o) or other modern formats instead.
54+
* Consider using glTF.
5555
*/
5656
@Deprecated
5757
public class TestOgreComplexAnim extends SimpleApplication {

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,9 +56,8 @@
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 (.glb/.gltf/.j3o) etc
61-
* or other modern model formats for better performance, broader tool support, and future compatibility.
59+
* @deprecated as of jMonkeyEngine 3.10, for removal in a future version.
60+
* Consider using glTF.
6261
*/
6362
@Deprecated
6463
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,8 +48,7 @@
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 (.glb/.gltf/.j3o) etc
52-
* or other modern model formats for better performance, broader tool support, and future compatibility.
51+
* Consider using glTF.
5352
*/
5453
@Deprecated
5554
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,8 +62,7 @@
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 (.glb/.gltf/.j3o) etc
66-
* or other modern model formats for better performance, broader tool support, and future compatibility.
65+
* Consider using glTF.
6766
*/
6867
@Deprecated
6968
public class MeshLoader extends DefaultHandler implements AssetLoader {

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@
4141
* name as the model (the default).
4242
*
4343
* @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.
44+
* Consider using glTF.
4645
*
4746
* @author Kirill Vainer
4847
*/

0 commit comments

Comments
 (0)