sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fix ConeCollisionShape

Browse Source 
git-svn-id: https://jmonkeyengine.googlecode.com/svn/trunk@10009 75d07b2b-3a1a-0410-a2c5-0572b91ccdca
This commit is contained in:
nor..67 2012-11-26 17:11:17 +00:00
parent 85059fd8a0
commit 1a4b918451
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engine/src/bullet/com/jme3/bullet/collision/shapes/ConeCollisionShape.java
View File

@ -55,14 +55,14 @@ public class ConeCollisionShape extends CollisionShape {
public ConeCollisionShape(float radius, float height, int axis) {
this.radius = radius;
this.height = radius;
this.height = height;
this.axis = axis;
createShape();
}
public ConeCollisionShape(float radius, float height) {
this.radius = radius;
this.height = radius;
this.height = height;
this.axis = PhysicsSpace.AXIS_Y;
createShape();
}
@ -76,15 +76,15 @@ public class ConeCollisionShape extends CollisionShape {
OutputCapsule capsule = ex.getCapsule(this);
capsule.write(radius, "radius", 0.5f);
capsule.write(height, "height", 0.5f);
capsule.write(axis, "axis", 0.5f);
capsule.write(axis, "axis", PhysicsSpace.AXIS_Y);
}
public void read(JmeImporter im) throws IOException {
super.read(im);
InputCapsule capsule = im.getCapsule(this);
radius = capsule.readFloat("radius", 0.5f);
radius = capsule.readFloat("height", 0.5f);
radius = capsule.readFloat("axis", 0.5f);
height = capsule.readFloat("height", 0.5f);
axis = capsule.readInt("axis", PhysicsSpace.AXIS_Y);
createShape();
}

6
engine/src/jbullet/com/jme3/bullet/collision/shapes/ConeCollisionShape.java
View File

@ -106,15 +106,15 @@ public class ConeCollisionShape extends CollisionShape {
OutputCapsule capsule = ex.getCapsule(this);
capsule.write(radius, "radius", 0.5f);
capsule.write(height, "height", 0.5f);
capsule.write(axis, "axis", 0.5f);
capsule.write(axis, "axis", PhysicsSpace.AXIS_Y);
}
public void read(JmeImporter im) throws IOException {
super.read(im);
InputCapsule capsule = im.getCapsule(this);
radius = capsule.readFloat("radius", 0.5f);
radius = capsule.readFloat("height", 0.5f);
radius = capsule.readFloat("axis", 0.5f);
height = capsule.readFloat("height", 0.5f);
axis = capsule.readInt("axis", PhysicsSpace.AXIS_Y);
createShape();
}