瀏覽代碼

Merge pull request #402 from MeFisto94/Issue373

Fixes #373 - Faulty Loggings of a SphereCollissionShape when using na…
Kirill Vainer 9 年之前
父節點
當前提交
c39788d4fa
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java

+ 4 - 2
jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/SphereCollisionShape.java

@@ -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);
-        setScale(scale);
+        setScale(scale); // Set the scale to 1
         setMargin(margin);
         setMargin(margin);
     }
     }