From 1df8a89b3ee3d02569a04317f3e579abb55e27df Mon Sep 17 00:00:00 2001 From: austin Date: Fri, 26 Jul 2024 23:20:44 -0400 Subject: [PATCH] small data fix --- assets/Data/creatures/elf.json | 4 ++-- assets/Data/creatures/human.json | 4 ++-- docs/src/progress/currenttarget.md | 2 +- src/main/java/electrosphere/renderer/actor/Actor.java | 4 +++- 4 files changed, 8 insertions(+), 6 deletions(-) diff --git a/assets/Data/creatures/elf.json b/assets/Data/creatures/elf.json index 419c2828..24eac0d4 100644 --- a/assets/Data/creatures/elf.json +++ b/assets/Data/creatures/elf.json @@ -202,7 +202,7 @@ { "followsView" : false, "followsBone" : true, - "parentBone" : "myTorsoBone", + "parentBone" : "Bone", "allowedMarginYaw" : 0.2 } ] @@ -213,7 +213,7 @@ { "followsView" : false, "followsBone" : true, - "parentBone" : "myTorsoBone", + "parentBone" : "Bone", "allowedMarginYaw" : 0.2 } ] diff --git a/assets/Data/creatures/human.json b/assets/Data/creatures/human.json index afe0cf04..2b0db6b4 100644 --- a/assets/Data/creatures/human.json +++ b/assets/Data/creatures/human.json @@ -220,7 +220,7 @@ { "followsView" : false, "followsBone" : true, - "parentBone" : "myTorsoBone", + "parentBone" : "Bone", "allowedMarginYaw" : 0.2 } ] @@ -231,7 +231,7 @@ { "followsView" : false, "followsBone" : true, - "parentBone" : "myTorsoBone", + "parentBone" : "Bone", "allowedMarginYaw" : 0.2 } ] diff --git a/docs/src/progress/currenttarget.md b/docs/src/progress/currenttarget.md index 8507bcef..2b53bbc2 100644 --- a/docs/src/progress/currenttarget.md +++ b/docs/src/progress/currenttarget.md @@ -10,4 +10,4 @@ fix rendering pipelines (black when looking at character from angle with item, shadows are not darker color, etc) + bug fixes - fix client-attached models drawing on previous frame + fix client-attached models to viewmodel drawing on previous frame diff --git a/src/main/java/electrosphere/renderer/actor/Actor.java b/src/main/java/electrosphere/renderer/actor/Actor.java index 87120ffb..e96d0b6a 100644 --- a/src/main/java/electrosphere/renderer/actor/Actor.java +++ b/src/main/java/electrosphere/renderer/actor/Actor.java @@ -309,7 +309,9 @@ public class Actor { Quaterniond rotation = new Quaterniond(axisAngle); rVal.set(rotation); } else { - throw new IllegalArgumentException("Trying to get rotation of bone that does not exist on model!"); + String message = "Trying to get rotation of bone that does not exist on model!\n" + + "boneName: " + boneName; + throw new IllegalArgumentException(message); } } if(!Double.isFinite(rVal.x)){