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

Reverted Changes and fixed it the way it was done in CapsuleCollissionShape (See Commit f836b26)

Browse Source 
"SphereCollisionShape: warn about scaling only if its not identity"
This commit is contained in:
MeFisto94 2016-01-26 15:53:53 +01:00
parent 5064552905
commit e776967c23
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java
View File

@ -82,7 +82,9 @@ public class SphereCollisionShape extends CollisionShape {
*/ */
@Override @Override
public void setScale(Vector3f scale) { public void setScale(Vector3f scale) {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "SphereCollisionShape cannot be scaled"); if (!scale.equals(Vector3f.UNIT_XYZ)) {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "SphereCollisionShape cannot be scaled");
}
} }
protected void createShape() { protected void createShape() {
@ -91,7 +93,7 @@ public class SphereCollisionShape extends CollisionShape {
// new SphereShape(radius); // new SphereShape(radius);
// objectId.setLocalScaling(Converter.convert(getScale())); // objectId.setLocalScaling(Converter.convert(getScale()));
// objectId.setMargin(margin); // objectId.setMargin(margin);
super.setScale(scale); // Set the scale to 1 setScale(scale); // Set the scale to 1
setMargin(margin); setMargin(margin);
} }