From a7b12c280a203b9ab1f2109b48ce37c7d2ba568e Mon Sep 17 00:00:00 2001 From: austin Date: Mon, 12 Aug 2024 16:36:00 -0400 Subject: [PATCH] rescale player model --- assets/Data/creatures/human.json | 2 +- assets/Models/modelPretransforms.json | 2 +- docs/src/progress/currenttarget.md | 3 +-- .../entity/types/camera/CameraEntityUtils.java | 8 ++++---- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index 2b62465c..324eaf43 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -507,7 +507,7 @@ }, "modelPath" : "Models/creatures/person2/person2_1.glb", "viewModelData" : { - "heightFromOrigin" : 0.8, + "heightFromOrigin" : 1.3, "cameraViewDirOffsetY" : -0.3, "cameraViewDirOffsetZ" : 0.0, "firstPersonModelPath" : "Models/creatures/viewmodel.glb" diff --git a/assets/Models/modelPretransforms.json b/assets/Models/modelPretransforms.json index 2e34dc85..dcbd7ac9 100644 --- a/assets/Models/modelPretransforms.json +++ b/assets/Models/modelPretransforms.json @@ -71,7 +71,7 @@ "globalTransform": { "rotation" : [0,0,0,1], "offset" : [0.0, 0.0, 0.0], - "scale" : [0.6, 0.6, 0.6] + "scale" : [1.0, 1.0, 1.0] }, "meshes" : [ ] diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 559b37b1..a3d17f35 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -10,7 +10,6 @@ - Damage event accumulator each frame on server side Use accumulator to negate all damage if block box was hit I-frames - audio fx for everything + rearchitecture @@ -19,5 +18,5 @@ Hitboxes between server and client feel wayyyy off + bug fixes - + Walk animation does not interrupt on stopping walking diff --git a/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java b/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java index e8aa8b84..c8689f92 100644 --- a/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java +++ b/src/main/java/electrosphere/entity/types/camera/CameraEntityUtils.java @@ -27,7 +27,7 @@ public class CameraEntityUtils { rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_TYPE, EntityDataStrings.DATA_STRING_CAMERA_TYPE_BASIC); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_CENTER, center); rVal.putData(EntityDataStrings .DATA_STRING_CAMERA_EYE, eye); - rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 1.0f); + rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 2.0f); rVal.putData(EntityDataStrings.CAMERA_ORBIT_RADIAL_OFFSET, new Vector3f(0,1,0)); rVal.putData(EntityDataStrings.CAMERA_PITCH, 0.0f); rVal.putData(EntityDataStrings.CAMERA_YAW, 0.0f); @@ -39,7 +39,7 @@ public class CameraEntityUtils { rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_TYPE, EntityDataStrings.DATA_STRING_CAMERA_TYPE_ORBIT); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_CENTER, center); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_EYE, eye); - rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 1.0f); + rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 2.0f); rVal.putData(EntityDataStrings.CAMERA_ORBIT_RADIAL_OFFSET, new Vector3f(0,1,0)); rVal.putData(EntityDataStrings.CAMERA_PITCH, 0.0f); rVal.putData(EntityDataStrings.CAMERA_YAW, 0.0f); @@ -61,7 +61,7 @@ public class CameraEntityUtils { rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_TYPE, EntityDataStrings.DATA_STRING_CAMERA_TYPE_ORBIT); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_CENTER, center); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_EYE, eye); - rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 1.0f); + rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 2.0f); rVal.putData(EntityDataStrings.CAMERA_ORBIT_RADIAL_OFFSET, new Vector3f(0,1,0)); rVal.putData(EntityDataStrings.CAMERA_PITCH, 0.0f); rVal.putData(EntityDataStrings.CAMERA_YAW, 0.0f); @@ -81,7 +81,7 @@ public class CameraEntityUtils { rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_CENTER, center); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_EYE, eye); rVal.putData(EntityDataStrings.DATA_STRING_CAMERA_ORBIT_DISTANCE, 0.01f); - rVal.putData(EntityDataStrings.CAMERA_ORBIT_RADIAL_OFFSET, new Vector3f(0,0.8f,0)); + rVal.putData(EntityDataStrings.CAMERA_ORBIT_RADIAL_OFFSET, new Vector3f(0,1.3f,0)); rVal.putData(EntityDataStrings.CAMERA_PITCH, 0.0f); rVal.putData(EntityDataStrings.CAMERA_YAW, 0.0f); Globals.cameraHandler.setTrackPlayerEntity(true);