Added simple test extended spine model, SlimeVR/SlimeVR-Server#31

This commit is contained in:
Eiren Rain committed 2021-08-20 17:05:15 +03:00
1 parent fed13e8fda
commit c8da0427f9
4 files changed
+81 -11

No files matched your search

@@ -16,6 +16,7 @@ import io.eiren.util.StringUtils;
import io.eiren.util.ann.ThreadSafe;
import io.eiren.vr.VRServer;
import io.eiren.vr.processor.HumanSkeletonWithLegs;
import io.eiren.vr.processor.HumanSkeletonWithWaist;
import io.eiren.vr.processor.HumanSkeleton;
public class SkeletonConfig extends EJBag {
@@ -67,6 +68,30 @@ public class SkeletonConfig extends EJBag {
}}, s(c(0, row, 1), 3, 1));
row++;
add(new JCheckBox("Extended spine model #1") {{
addItemListener(new ItemListener() {
@Override
public void itemStateChanged(ItemEvent e) {
if(e.getStateChange() == ItemEvent.SELECTED) {//checkbox has been selected
if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithWaist) {
HumanSkeletonWithWaist hswl = (HumanSkeletonWithWaist) newSkeleton;
hswl.setSkeletonConfigBoolean("Extended spine model 1", true);
}
} else {
if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithWaist) {
HumanSkeletonWithWaist hswl = (HumanSkeletonWithWaist) newSkeleton;
hswl.setSkeletonConfigBoolean("Extended spine model 1", false);
}
}
}
});
if(newSkeleton != null && newSkeleton instanceof HumanSkeletonWithWaist) {
HumanSkeletonWithWaist hswl = (HumanSkeletonWithWaist) newSkeleton;
setSelected(hswl.getSkeletonConfigBoolean("Extended spine model 1"));
}
}}, s(c(0, row, 1), 3, 1));
row++;
/*
add(new JCheckBox("Extended knee model") {{
addItemListener(new ItemListener() {
+1 -1
View File
@@ -7,7 +7,7 @@ import io.eiren.util.logging.LogManager;
public class Main {
public static String VERSION = "0.0.15";
public static String VERSION = "0.0.15 Test 1";
public static VRServer vrServer;
@@ -197,6 +197,7 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist {
}
}
@Override
public boolean getSkeletonConfigBoolean(String config) {
switch(config) {
case "Extended pelvis model":
@@ -204,9 +205,10 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist {
case "Extended knee model":
return extendedKneeModel;
}
return false;
return super.getSkeletonConfigBoolean(config);
}
@Override
public void setSkeletonConfigBoolean(String config, boolean newState) {
switch(config) {
case "Extended pelvis model":
@@ -216,6 +218,10 @@ public class HumanSkeletonWithLegs extends HumanSkeletonWithWaist {
case "Extended knee model":
extendedKneeModel = newState;
server.config.setProperty("body.model.extendedKnee", newState);
break;
default:
super.setSkeletonConfigBoolean(config, newState);
break;
}
}
@@ -35,6 +35,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton {
protected final TransformNode headNode = new TransformNode("Head", false);
protected final TransformNode neckNode = new TransformNode("Neck", false);
protected final TransformNode waistNode = new TransformNode("Waist", false);
protected final TransformNode chestWaistNode = new TransformNode("Chest-Waist", false);
protected final TransformNode chestNode = new TransformNode("Chest", false);
protected final TransformNode trackerWaistNode = new TransformNode("Waist-Tracker", false);
@@ -57,6 +58,10 @@ public class HumanSkeletonWithWaist extends HumanSkeleton {
* Distance from eyes to ear
*/
protected float headShift = HEAD_SHIFT_DEFAULT;
protected boolean extendedSpineModel1 = false;
protected float spineModel1AngleSlerp = 0.5f;
protected float spineModel1DistanceRatio = 0.5f;
public HumanSkeletonWithWaist(VRServer server, List<ComputedHumanPoseTracker> computedTrackers) {
List<Tracker> allTracekrs = server.getAllTrackers();
@@ -81,6 +86,7 @@ public class HumanSkeletonWithWaist extends HumanSkeleton {
chestDistance = server.config.getFloat("body.chestDistance", chestDistance);
waistDistance = server.config.getFloat("body.waistDistance", waistDistance);
trackerWaistDistance = server.config.getFloat("body.trackerWaistDistance", trackerWaistDistance);
extendedSpineModel1 = server.config.getBoolean("body.model.extendedSpine1", extendedSpineModel1);
// Build skeleton
hmdNode.attachChild(headNode);
headNode.localTransform.setTranslation(0, 0, headShift);
@@ -91,11 +97,14 @@ public class HumanSkeletonWithWaist extends HumanSkeleton {
neckNode.attachChild(chestNode);
chestNode.localTransform.setTranslation(0, -chestDistance, 0);
chestNode.attachChild(waistNode);
waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0);
chestWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * spineModel1DistanceRatio : 0, 0);
chestNode.attachChild(chestWaistNode);
chestNode.attachChild(trackerWaistNode);
trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0);
chestWaistNode.attachChild(waistNode);
waistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance - chestDistance), 0);
chestWaistNode.attachChild(trackerWaistNode);
trackerWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance + trackerWaistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance + trackerWaistDistance - chestDistance), 0);
configMap.put("Head", headShift);
configMap.put("Neck", neckLength);
@@ -159,20 +168,43 @@ public class HumanSkeletonWithWaist extends HumanSkeleton {
case "Waist":
waistDistance = newLength;
server.config.setProperty("body.waistDistance", waistDistance);
waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0);
trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0);
chestWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * spineModel1DistanceRatio : 0, 0);
waistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance - chestDistance), 0);
trackerWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance + trackerWaistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance + trackerWaistDistance - chestDistance), 0);
break;
case "Chest":
chestDistance = newLength;
server.config.setProperty("body.chestDistance", chestDistance);
chestNode.localTransform.setTranslation(0, -chestDistance, 0);
waistNode.localTransform.setTranslation(0, -(waistDistance - chestDistance), 0);
trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0);
chestWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * spineModel1DistanceRatio : 0, 0);
waistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance - chestDistance), 0);
trackerWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance + trackerWaistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance + trackerWaistDistance - chestDistance), 0);
break;
case "Virtual waist":
trackerWaistDistance = newLength;
server.config.setProperty("body.trackerWaistDistance", trackerWaistDistance);
trackerWaistNode.localTransform.setTranslation(0, -(waistDistance + trackerWaistDistance - chestDistance), 0);
chestWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * spineModel1DistanceRatio : 0, 0);
trackerWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance + trackerWaistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance + trackerWaistDistance - chestDistance), 0);
break;
}
}
public boolean getSkeletonConfigBoolean(String config) {
switch(config) {
case "Extended spine model 1":
return extendedSpineModel1;
}
return false;
}
public void setSkeletonConfigBoolean(String config, boolean newState) {
switch(config) {
case "Extended spine model 1":
extendedSpineModel1 = newState;
server.config.setProperty("body.model.extendedSpine1", newState);
chestWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * spineModel1DistanceRatio : 0, 0);
waistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance - chestDistance), 0);
trackerWaistNode.localTransform.setTranslation(0, extendedSpineModel1 ? -(waistDistance + trackerWaistDistance - chestDistance) * (1 - spineModel1DistanceRatio) : -(waistDistance + trackerWaistDistance - chestDistance), 0);
break;
}
}
@@ -207,6 +239,13 @@ public class HumanSkeletonWithWaist extends HumanSkeleton {
chestNode.localTransform.setRotation(qBuf);
waistNode.localTransform.setRotation(qBuf);
}
chestWaistNode.localTransform.setRotation(chestNode.localTransform.getRotation());
if(extendedSpineModel1) {
// Average chest-waist node between chest and waist
chestWaistNode.localTransform.getRotation().slerp(waistNode.localTransform.getRotation(), spineModel1AngleSlerp);
}
}
protected void updateComputedTrackers() {