Skip to content

Commit 9335e10

Browse files
NwosuTyriccardobl
andcommitted
Deprecate ogre loader
Co-authored-by: Riccardo Balbo <os@rblb.it>
1 parent 455f39f commit 9335e10

80 files changed

Lines changed: 133 additions & 63 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

jme3-examples/src/main/java/jme3test/animation/TestCinematic.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ private void createCameraMotion() {
221221

222222
private void createScene() {
223223

224-
model = assetManager.loadModel("Models/Oto/Oto.mesh.xml");
224+
model = assetManager.loadModel("Models/Oto/Oto.j3o");
225225
model.center();
226226
model.setShadowMode(ShadowMode.CastAndReceive);
227227
rootNode.attachChild(model);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ public void simpleInitApp() {
170170
PhysicsTestHelper.createPhysicsTestWorld(rootNode, assetManager,
171171
physicsSpace);
172172

173-
model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml");
173+
model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.j3o");
174174
rootNode.attachChild(model);
175175

176176
composer = model.getControl(AnimComposer.class);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ private void buildPlayer() {
121121
final float mass = 400;
122122

123123
// Load model and get chassis Geometry
124-
carNode = (Node) assetManager.loadModel("Models/Ferrari/Car.scene");
124+
carNode = (Node) assetManager.loadModel("Models/Ferrari/Car_Scene.j3o");
125125
carNode.setShadowMode(ShadowMode.Cast);
126126
Geometry chassis = findGeom(carNode, "Car");
127127

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ public void simpleInitApp() {
138138
}
139139

140140
private void buildPlayer() {
141-
spaceCraft = assetManager.loadModel("Models/HoverTank/Tank2.mesh.xml");
141+
spaceCraft = assetManager.loadModel("Models/HoverTank/Tank2.j3o");
142142
CollisionShape colShape = CollisionShapeFactory.createDynamicMeshShape(spaceCraft);
143143
spaceCraft.setShadowMode(ShadowMode.CastAndReceive);
144144
spaceCraft.setLocalTranslation(startLocation);
@@ -164,7 +164,7 @@ public void makeMissile() {
164164
Quaternion rot = spaceCraft.getWorldRotation();
165165
Vector3f dir = rot.getRotationColumn(2);
166166

167-
Spatial missile = assetManager.loadModel("Models/SpaceCraft/Rocket.mesh.xml");
167+
Spatial missile = assetManager.loadModel("Models/SpaceCraft/Rocket.j3o");
168168
missile.scale(0.5f);
169169
missile.rotate(0, FastMath.PI, 0);
170170
missile.updateGeometricState();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public void simpleInitApp() {
109109
physicsCharacter = new CharacterControl(new CapsuleCollisionShape(0.5f, 1.8f), .1f);
110110
physicsCharacter.setPhysicsLocation(new Vector3f(0, 1, 0));
111111
Node characterNode = new Node("character node");
112-
Spatial model = assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml");
112+
Spatial model = assetManager.loadModel("Models/Sinbad/Sinbad.j3o");
113113
model.scale(0.25f);
114114
characterNode.addControl(physicsCharacter);
115115
getPhysicsSpace().add(physicsCharacter);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void simpleInitApp() {
3030
stateManager.attach(bulletAppState);
3131
initCrossHair();
3232

33-
Spatial s = assetManager.loadModel("Models/Elephant/Elephant.mesh.xml");
33+
Spatial s = assetManager.loadModel("Models/Elephant/Elephant.j3o");
3434
s.setLocalScale(0.1f);
3535

3636
CollisionShape collisionShape = CollisionShapeFactory.createMeshShape(s);

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

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

163-
model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.mesh.xml");
164-
rootNode.attachChild(model);
163+
model = (Node) assetManager.loadModel("Models/Sinbad/Sinbad.j3o");
164+
rootNode.attachChild(model);
165165
model.lookAt(new Vector3f(0f, 0f, -1f), Vector3f.UNIT_Y);
166166
model.setLocalTranslation(4f, 0f, -7f);
167167

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ private void createTerrain() {
294294
private void createCharacter() {
295295
CapsuleCollisionShape capsule = new CapsuleCollisionShape(3f, 4f);
296296
character = new CharacterControl(capsule, 0.01f);
297-
model = (Node) assetManager.loadModel("Models/Oto/Oto.mesh.xml");
297+
model = (Node) assetManager.loadModel("Models/Oto/Oto.j3o");
298298
model.addControl(character);
299299
character.setPhysicsLocation(new Vector3f(-140, 40, -10));
300300
rootNode.attachChild(model);

jme3-examples/src/main/java/jme3test/bullet/shape/TestGimpactShape.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -262,19 +262,19 @@ private void dropTest2(Vector3f offset) {
262262
}
263263

264264
private void dropPot(Vector3f offset) {
265-
drop(offset.add(-12, 7, 15), "Models/Teapot/Teapot.mesh.xml", 1.0f, 2);
265+
drop(offset.add(-12, 7, 15), "Models/Teapot/Teapot.j3o", 1.0f, 2);
266266
}
267267

268268
private void dropSword(Vector3f offset) {
269-
drop(offset.add(-10, 5, 3), "Models/Sinbad/Sword.mesh.xml", 1.0f, 2);
269+
drop(offset.add(-10, 5, 3), "Models/Sinbad/Sword.j3o", 1.0f, 2);
270270
}
271271

272272
private void dropSign(Vector3f offset) {
273-
drop(offset.add(9, 15, 5), "Models/Sign Post/Sign Post.mesh.xml", 1.0f, 1);
273+
drop(offset.add(9, 15, 5), "Models/Sign Post/Sign Post.j3o", 1.0f, 1);
274274
}
275275

276276
private void dropRocket(Vector3f offset) {
277-
RigidBodyControl c = drop(offset.add(26, 4, 7), "Models/SpaceCraft/Rocket.mesh.xml", 4.0f, 3);
277+
RigidBodyControl c = drop(offset.add(26, 4, 7), "Models/SpaceCraft/Rocket.j3o", 4.0f, 3);
278278
c.setAngularDamping(0.5f);
279279
c.setLinearDamping(0.5f);
280280
}

jme3-examples/src/main/java/jme3test/collision/TestMousePick.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ private void setupScene() {
119119
shootables.attachChild(torus);
120120

121121
// load a character from jme3-testdata
122-
Spatial golem = assetManager.loadModel("Models/Oto/Oto.mesh.xml");
122+
Spatial golem = assetManager.loadModel("Models/Oto/Oto.j3o");
123123
golem.scale(0.5f);
124124
golem.setLocalTranslation(-1.0f, -1.5f, -0.6f);
125125
shootables.attachChild(golem);

0 commit comments

Comments
 (0)