From f248bf4e2d9017b7b4bdea62811adca630691122 Mon Sep 17 00:00:00 2001 From: austin Date: Sun, 5 Nov 2023 17:24:04 -0500 Subject: [PATCH] debug display fix --- assets/Data/foliage.json | 4 ++-- .../java/electrosphere/entity/types/tree/ProceduralTree.java | 1 - src/main/java/electrosphere/renderer/RenderingEngine.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/assets/Data/foliage.json b/assets/Data/foliage.json index ead21524..06e5fcfd 100644 --- a/assets/Data/foliage.json +++ b/assets/Data/foliage.json @@ -73,9 +73,9 @@ "physicsCutoff": 3, "physicsBody": { "type" : "CYLINDER", - "dimension1" : 1, + "dimension1" : 0.5, "dimension2" : 3, - "dimension3" : 1, + "dimension3" : 0.5, "offsetX" : 0, "offsetY" : 1.5, "offsetZ" : 0 diff --git a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java index e68b5220..e23c247e 100644 --- a/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java +++ b/src/main/java/electrosphere/entity/types/tree/ProceduralTree.java @@ -122,7 +122,6 @@ public class ProceduralTree { trunkChild.putData(EntityDataStrings.PHYSICS_COLLISION_BODY_OFFSET, new Vector3f(0,treeModel.getPhysicsBody().getOffsetY(),0)); trunkChild.putData(EntityDataStrings.PHYSICS_MODEL_TEMPLATE, treeModel.getPhysicsBody()); trunkChild.putData(EntityDataStrings.PHYSICS_COLLIDABLE, collidable); - trunkChild.putData(EntityDataStrings.PHYSICS_MASS, TREE_MASS); Globals.clientSceneWrapper.getCollisionEngine().registerCollisionObject(rigidBody, collidable); diff --git a/src/main/java/electrosphere/renderer/RenderingEngine.java b/src/main/java/electrosphere/renderer/RenderingEngine.java index 08860fcb..15c00ddf 100644 --- a/src/main/java/electrosphere/renderer/RenderingEngine.java +++ b/src/main/java/electrosphere/renderer/RenderingEngine.java @@ -942,7 +942,7 @@ public class RenderingEngine { modelTransformMatrix.translate(cameraModifiedPosition); modelTransformMatrix.rotate(EntityUtils.getRotation(physicsEntity)); // modelTransformMatrix.translate(template.getOffsetX(),template.getOffsetY(),template.getOffsetZ()); //center sphere - modelTransformMatrix.scale(template.getDimension1(),template.getDimension2(),template.getDimension3()); + modelTransformMatrix.scale(template.getDimension1(),template.getDimension2() * 0.5,template.getDimension3()); physicsGraphicsModel.modelMatrix = modelTransformMatrix; physicsGraphicsModel.draw(renderPipelineState); }