Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-23 15:34:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Bug fix for offset of animated parts of oculus touch controller display

Browse source 
Ensure position/rotations are updated with a consistent scale and
are animated correctly as the controller values change.
This commit is contained in:
Anthony J. Thibault 2017-09-28 18:03:22 -07:00 committed by Atlante45
parent 572986bfad
commit 7dfa80f666
1 changed files with 74 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

149
scripts/system/controllers/controllerDisplay.js
View file

@ -49,6 +49,7 @@ createControllerDisplay = function(config) {
partOverlays: {}, partOverlays: {},
parts: {}, parts: {},
mappingName: "mapping-display-" + Math.random(), mappingName: "mapping-display-" + Math.random(),
partValues: {},
setVisible: function(visible) { setVisible: function(visible) {
for (var i = 0; i < this.overlays.length; ++i) { for (var i = 0; i < this.overlays.length; ++i) {
@ -109,12 +110,53 @@ createControllerDisplay = function(config) {
for (var partName in controller.parts) { for (var partName in controller.parts) {
overlayID = this.overlays[i++]; overlayID = this.overlays[i++];
var part = controller.parts[partName]; var part = controller.parts[partName];
var partPosition = Vec3.multiply(sensorScaleFactor, Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition))); localPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition));
var partDimensions = Vec3.multiply(sensorScaleFactor, part.naturalDimensions); var localRotation;
var value = this.partValues[partName];
var offset, rotation;
if (value !== undefined) {
if (part.type === "linear") {
var axis = Vec3.multiplyQbyV(controller.rotation, part.axis);
offset = Vec3.multiply(part.maxTranslation * value, axis);
localPosition = Vec3.sum(localPosition, offset);
localRotation = undefined;
} else if (part.type === "joystick") {
rotation = Quat.fromPitchYawRollDegrees(value.y * part.xHalfAngle, 0, value.x * part.yHalfAngle);
if (part.originOffset) {
offset = Vec3.multiplyQbyV(rotation, part.originOffset);
offset = Vec3.subtract(part.originOffset, offset);
} else {
offset = { x: 0, y: 0, z: 0 };
}
localPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
localRotation = Quat.multiply(controller.rotation, rotation);
} else if (part.type === "rotational") {
value = clamp(value, part.minValue, part.maxValue);
var pct = (value - part.minValue) / part.maxValue;
var angle = pct * part.maxAngle;
rotation = Quat.angleAxis(angle, part.axis);
if (part.origin) {
offset = Vec3.multiplyQbyV(rotation, part.origin);
offset = Vec3.subtract(offset, part.origin);
} else {
offset = { x: 0, y: 0, z: 0 };
}
localPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
localRotation = Quat.multiply(controller.rotation, rotation);
}
}
if (localRotation !== undefined) {
Overlays.editOverlay(overlayID, { Overlays.editOverlay(overlayID, {
dimensions: partDimensions, dimensions: Vec3.multiply(sensorScaleFactor, part.naturalDimensions),
localPosition: partPosition localPosition: Vec3.multiply(sensorScaleFactor, localPosition),
localRotation: localRotation
}); });
} else {
Overlays.editOverlay(overlayID, {
dimensions: Vec3.multiply(sensorScaleFactor, part.naturalDimensions),
localPosition: Vec3.multiply(sensorScaleFactor, localPosition)
});
}
} }
} }
} }
@ -172,29 +214,13 @@ createControllerDisplay = function(config) {
if (part.type === "rotational") { if (part.type === "rotational") {
var input = resolveHardware(part.input); var input = resolveHardware(part.input);
print("Mapping to: ", part.input, input); print("Mapping to: ", part.input, input);
mapping.from([input]).peek().to(function(controller, overlayID, part) { mapping.from([input]).peek().to(function(partName) {
return function(value) { return function(value) {
value = clamp(value, part.minValue, part.maxValue); // insert the most recent controller value into controllerDisplay.partValues.
controllerDisplay.partValues[partName] = value;
var pct = (value - part.minValue) / part.maxValue; controllerDisplay.resize(MyAvatar.sensorToWorldScale);
var angle = pct * part.maxAngle;
var rotation = Quat.angleAxis(angle, part.axis);
var offset = { x: 0, y: 0, z: 0 };
if (part.origin) {
offset = Vec3.multiplyQbyV(rotation, part.origin);
offset = Vec3.subtract(offset, part.origin);
}
var partPosition = Vec3.sum(controller.position,
Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
Overlays.editOverlay(overlayID, {
localPosition: partPosition,
localRotation: Quat.multiply(controller.rotation, rotation)
});
}; };
}(controller, overlayID, part)); }(partName));
} else if (part.type === "touchpad") { } else if (part.type === "touchpad") {
var visibleInput = resolveHardware(part.visibleInput); var visibleInput = resolveHardware(part.visibleInput);
var xInput = resolveHardware(part.xInput); var xInput = resolveHardware(part.xInput);
@ -210,69 +236,38 @@ createControllerDisplay = function(config) {
mapping.from([yInput]).peek().invert().to(function(value) { mapping.from([yInput]).peek().invert().to(function(value) {
}); });
} else if (part.type === "joystick") { } else if (part.type === "joystick") {
(function(controller, overlayID, part) { (function(part, partName) {
var xInput = resolveHardware(part.xInput); var xInput = resolveHardware(part.xInput);
var yInput = resolveHardware(part.yInput); var yInput = resolveHardware(part.yInput);
var xvalue = 0;
var yvalue = 0;
function calculatePositionAndRotation(xValue, yValue) {
var rotation = Quat.fromPitchYawRollDegrees(yValue * part.xHalfAngle, 0, xValue * part.yHalfAngle);
var offset = { x: 0, y: 0, z: 0 };
if (part.originOffset) {
offset = Vec3.multiplyQbyV(rotation, part.originOffset);
offset = Vec3.subtract(part.originOffset, offset);
}
var partPosition = Vec3.sum(controller.position,
Vec3.multiplyQbyV(controller.rotation, Vec3.sum(offset, part.naturalPosition)));
var partRotation = Quat.multiply(controller.rotation, rotation);
return {
position: partPosition,
rotation: partRotation
};
}
mapping.from([xInput]).peek().to(function(value) { mapping.from([xInput]).peek().to(function(value) {
xvalue = value; // insert the most recent controller value into controllerDisplay.partValues.
var posRot = calculatePositionAndRotation(xvalue, yvalue); if (controllerDisplay.partValues[partName]) {
Overlays.editOverlay(overlayID, { controllerDisplay.partValues[partName].x = value;
localPosition: posRot.position, } else {
localRotation: posRot.rotation controllerDisplay.partValues[partName] = {x: value, y: 0};
}
controllerDisplay.resize(MyAvatar.sensorToWorldScale);
}); });
});
mapping.from([yInput]).peek().to(function(value) { mapping.from([yInput]).peek().to(function(value) {
yvalue = value; // insert the most recent controller value into controllerDisplay.partValues.
var posRot = calculatePositionAndRotation(xvalue, yvalue); if (controllerDisplay.partValues[partName]) {
Overlays.editOverlay(overlayID, { controllerDisplay.partValues[partName].y = value;
localPosition: posRot.position, } else {
localRotation: posRot.rotation controllerDisplay.partValues[partName] = {x: 0, y: value};
}
controllerDisplay.resize(MyAvatar.sensorToWorldScale);
}); });
}); })(part, partName);
})(controller, overlayID, part);
} else if (part.type === "linear") { } else if (part.type === "linear") {
(function(controller, overlayID, part) { (function(part, partName) {
var input = resolveHardware(part.input); var input = resolveHardware(part.input);
mapping.from([input]).peek().to(function(value) { mapping.from([input]).peek().to(function(value) {
var axis = Vec3.multiplyQbyV(controller.rotation, part.axis); // insert the most recent controller value into controllerDisplay.partValues.
var offset = Vec3.multiply(part.maxTranslation * value, axis); controllerDisplay.partValues[partName] = value;
controllerDisplay.resize(MyAvatar.sensorToWorldScale);
var partPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition));
var position = Vec3.sum(partPosition, offset);
Overlays.editOverlay(overlayID, {
localPosition: position
}); });
}); })(part, partName);
})(controller, overlayID, part);
} else if (part.type === "static") { } else if (part.type === "static") {
// do nothing // do nothing