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

Merge pull request #512 from riccardobl/pr200616

Browse Source 
Removed warning if scale=1,1,1 in CylinderCollisionShape
This commit is contained in:
empirephoenix 2016-06-21 15:32:13 +02:00 committed by GitHub
commit e4840e2e9f
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jme3-bullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
View File

@ -86,7 +86,9 @@ public class CylinderCollisionShape extends CollisionShape {
*/
@Override
public void setScale(Vector3f scale) {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
if (!scale.equals(Vector3f.UNIT_XYZ)) {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
}
}
public void write(JmeExporter ex) throws IOException {

4
jme3-jbullet/src/main/java/com/jme3/bullet/collision/shapes/CylinderCollisionShape.java
View File

@ -90,7 +90,9 @@ public class CylinderCollisionShape extends CollisionShape {
*/
@Override
public void setScale(Vector3f scale) {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
if (!scale.equals(Vector3f.UNIT_XYZ)) {
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
}
}
public void write(JmeExporter ex) throws IOException {