Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 17:17:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Tweak tutorial and controllers

Browse source
This commit is contained in:
Ryan Huffman 2016-09-09 11:38:14 -07:00
parent 170502e8a1
commit 7bbf9bebec
2 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tutorial/tutorial.js
View file

@ -356,7 +356,7 @@ stepNearGrab.prototype = {
function checkCollides() { function checkCollides() {
var dist = Vec3.distance(basketPosition, Entities.getEntityProperties(this.boxID, 'position').position); var dist = Vec3.distance(basketPosition, Entities.getEntityProperties(this.boxID, 'position').position);
print(this.tag, "CHECKING...", dist); print(this.tag, "CHECKING...", dist);
if (dist < 0.1) { if (dist < 0.15) {
Script.clearInterval(this.checkCollidesTimer); Script.clearInterval(this.checkCollidesTimer);
this.checkCollidesTimer = null; this.checkCollidesTimer = null;
this.soundInjector = Audio.playSound(successSound, { this.soundInjector = Audio.playSound(successSound, {
@ -622,7 +622,7 @@ stepTurnAround.prototype = {
var angleDegrees = ((angle / Math.PI) * 180); var angleDegrees = ((angle / Math.PI) * 180);
print("CHECK"); print("CHECK");
if (!hasTurnedAround) { if (!hasTurnedAround) {
if (Math.abs(angleDegrees) > 100) { if (Math.abs(angleDegrees) > 140) {
hasTurnedAround = true; hasTurnedAround = true;
print("half way there..."); print("half way there...");
} }

28
tutorial/viveHandsv2.js
View file

@ -468,7 +468,7 @@ var VIVE_CONTROLLER_CONFIGURATION = {
defaultTextureURL: "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive_trackpad.fbx/Touchpad.fbm/touchpad-teleport.jpg", defaultTextureURL: "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive_trackpad.fbx/Touchpad.fbm/touchpad-teleport.jpg",
}, },
arrows: { arrows: {
defaultTextureURL: "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive_trackpad.fbx/Touchpad.fbm/touchpad-look-arrows.jpg", defaultTextureURL: "https://hifi-public.s3.amazonaws.com/huffman/controllers/vive_trackpad.fbx/Touchpad.fbm/touchpad-look-arrows-active.jpg",
} }
} }
}, },
@ -621,17 +621,17 @@ function setupController(config) {
print("Setting layer...", partName, layerName); print("Setting layer...", partName, layerName);
if (partName in this.parts) { if (partName in this.parts) {
var part = this.parts[partName]; var part = this.parts[partName];
print("FOnd", JSON.stringify(part)); //print("FOnd", JSON.stringify(part));
if (layerName in part.textureLayers) { if (layerName in part.textureLayers) {
print("got it", layerName); //print("got it", layerName);
var layer = part.textureLayers[layerName]; var layer = part.textureLayers[layerName];
var textures = {}; var textures = {};
if (layer.defaultTextureURL) { if (layer.defaultTextureURL) {
print("default texture"); //print("default texture");
textures[part.textureName] = layer.defaultTextureURL; textures[part.textureName] = layer.defaultTextureURL;
} }
for (var i = 0; i < this.partOverlays[partName].length; ++i) { for (var i = 0; i < this.partOverlays[partName].length; ++i) {
print("updating", JSON.stringify(textures)); //print("updating", JSON.stringify(textures));
Overlays.editOverlay(this.partOverlays[partName][i], { Overlays.editOverlay(this.partOverlays[partName][i], {
textures: textures textures: textures
}); });
@ -748,8 +748,8 @@ function setupController(config) {
var partPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition)); var partPosition = Vec3.sum(controller.position, Vec3.multiplyQbyV(controller.rotation, part.naturalPosition));
var innerRotation = controller.rotation var innerRotation = controller.rotation
Vec3.print("controller", controller.position); //Vec3.print("controller", controller.position);
Vec3.print("part", partPosition); //Vec3.print("part", partPosition);
controllerDisplay.parts[partName] = controller.parts[partName]; controllerDisplay.parts[partName] = controller.parts[partName];
@ -775,14 +775,14 @@ function setupController(config) {
var pct = (value - part.minValue) / part.maxValue; var pct = (value - part.minValue) / part.maxValue;
var angle = pct * part.maxAngle; var angle = pct * part.maxAngle;
var rotation = Quat.angleAxis(angle, part.axis); var rotation = Quat.angleAxis(angle, part.axis);
print(value, pct, angle); //print(value, pct, angle);
var offset = { x: 0, y: 0, z: 0 }; var offset = { x: 0, y: 0, z: 0 };
if (part.origin) { if (part.origin) {
//print(rotation.x, rotation.y, rotation.z, rotation.w); //print(rotation.x, rotation.y, rotation.z, rotation.w);
var offset = Vec3.multiplyQbyV(rotation, part.origin); var offset = Vec3.multiplyQbyV(rotation, part.origin);
offset = Vec3.subtract(offset, part.origin); offset = Vec3.subtract(offset, part.origin);
Vec3.print('offset', offset); //Vec3.print('offset', offset);
//partPosition = Vec3.sum(partPosition, offset); //partPosition = Vec3.sum(partPosition, offset);
} }
@ -799,7 +799,7 @@ function setupController(config) {
function resolveHardware(path) { function resolveHardware(path) {
var parts = path.split("."); var parts = path.split(".");
function resolveInner(base, path, i) { function resolveInner(base, path, i) {
print(path[i]); //print(path[i]);
if (i >= path.length) { if (i >= path.length) {
return base; return base;
} }
@ -812,16 +812,14 @@ function setupController(config) {
var xinput = resolveHardware(part.xInput); var xinput = resolveHardware(part.xInput);
var yinput = resolveHardware(part.yInput); var yinput = resolveHardware(part.yInput);
print("visible:", visibleInput);
mapping.from([visibleInput]).peek().to(function(value) { mapping.from([visibleInput]).peek().to(function(value) {
print("visible", value); //print("visible", value);
}); });
mapping.from([xinput]).peek().to(function(value) { mapping.from([xinput]).peek().to(function(value) {
print("X", value); //print("X", value);
}); });
mapping.from([yinput]).peek().invert().to(function(value) { mapping.from([yinput]).peek().invert().to(function(value) {
print("Y", value); //print("Y", value);
}); });
if (part.defaultTextureURL) { if (part.defaultTextureURL) {
var textures = {}; var textures = {};