Skip to content

Commit 5d2c89f

Browse files
authored
Merge pull request #599 from stephengold/v3.1
CapsuleCollisionShape: warn about scaling only if it's not identity
2 parents aae6170 + ac8eb4d commit 5d2c89f

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,9 @@ public int getAxis() {
8686
*/
8787
@Override
8888
public void setScale(Vector3f scale) {
89-
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
89+
if (!scale.equals(Vector3f.UNIT_XYZ)) {
90+
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
91+
}
9092
}
9193

9294
public void write(JmeExporter ex) throws IOException {

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,9 +90,11 @@ public int getAxis() {
9090
*/
9191
@Override
9292
public void setScale(Vector3f scale) {
93-
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
93+
if (!scale.equals(Vector3f.UNIT_XYZ)) {
94+
Logger.getLogger(this.getClass().getName()).log(Level.WARNING, "CylinderCollisionShape cannot be scaled");
95+
}
9496
}
95-
97+
9698
public void write(JmeExporter ex) throws IOException {
9799
super.write(ex);
98100
OutputCapsule capsule = ex.getCapsule(this);

0 commit comments

Comments
 (0)