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

Merge pull request #402 from MeFisto94/Issue373

Browse Source 
Fixes #373 - Faulty Loggings of a SphereCollissionShape when using na…
This commit is contained in:
Kirill Vainer 2016-01-26 19:52:59 -05:00
commit c39788d4fa
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
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() {
@ -91,7 +93,7 @@ public class SphereCollisionShape extends CollisionShape {
// new SphereShape(radius);
// objectId.setLocalScaling(Converter.convert(getScale()));
// objectId.setMargin(margin);
setScale(scale);
setScale(scale); // Set the scale to 1
setMargin(margin);
}