Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-24 12:04:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

change cuckoo and whiteboard positions

Browse source
This commit is contained in:
James B. Pollack 2016-05-11 10:33:06 -07:00
parent 46c6999dd4
commit 8cac61081d
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
unpublishedScripts/DomainContent/Home/cuckooClock/wrapper.js
View file

@ -9,7 +9,7 @@
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js" ) var MINUTE_HAND_CLOCK_SCRIPT_URL = Script.resolvePath("cuckooClockMinuteHandEntityScript.js")
var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx"; var CLOCK_BODY_URL = "atp:/cuckooClock/cuckoo2_BODY.fbx";
var CLOCK_BODY_COLLISION_HULL_URL = "atp:/cuckooClock/clockHull.obj"; var CLOCK_BODY_COLLISION_HULL_URL = "atp:/cuckooClock/clockHull.obj";
var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx"; var CLOCK_FACE_URL = "atp:/cuckooClock/cuckooClock2_FACE.fbx";
@ -38,11 +38,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
}, },
position: spawnPosition, position: spawnPosition,
rotation: clockRotation, rotation: clockRotation,
dimensions: { dimensions: Vec3.multiply(0.5, {
x: 0.8181, x: 0.8181,
y: 1.3662, y: 1.3662,
z: 0.8181 z: 0.8181
}, }),
userData: JSON.stringify({ userData: JSON.stringify({
hifiHomeKey: { hifiHomeKey: {
reset: true reset: true
@ -50,9 +50,9 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
}) })
}) })
var forwardOffset = -0.13 var forwardOffset = 0.5 * -0.13;
var upOffset = 0.255; var upOffset = 0.5 * 0.255;
var sideOffset = -0.03; var sideOffset = 0.5 * -0.03;
var clockFacePosition = spawnPosition; var clockFacePosition = spawnPosition;
clockFacePosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getFront(clockRotation), forwardOffset)); clockFacePosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getFront(clockRotation), forwardOffset));
clockFacePosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getUp(clockRotation), upOffset)); clockFacePosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getUp(clockRotation), upOffset));
@ -65,11 +65,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
name: "home_model_clockFace", name: "home_model_clockFace",
modelURL: CLOCK_FACE_URL, modelURL: CLOCK_FACE_URL,
position: clockFacePosition, position: clockFacePosition,
dimensions: { dimensions: Vec3.multiply(0.5, {
x: 0.2397, x: 0.2397,
y: 0.2402, y: 0.2402,
z: 0.0212 z: 0.0212
}, }),
userData: JSON.stringify({ userData: JSON.stringify({
hifiHomeKey: { hifiHomeKey: {
reset: true reset: true
@ -86,7 +86,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
var myDate = new Date() var myDate = new Date()
// HOUR HAND ************************* // HOUR HAND *************************
var clockHandForwardOffset = -0.017; var clockHandForwardOffset = (0.5 * -0.017);
var hourHandPosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getFront(clockRotation), clockHandForwardOffset)); var hourHandPosition = Vec3.sum(clockFacePosition, Vec3.multiply(Quat.getFront(clockRotation), clockHandForwardOffset));
@ -118,11 +118,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
rotation: worldClockHandRotation, rotation: worldClockHandRotation,
angularDamping: 0, angularDamping: 0,
angularVelocity: worldAngularVelocity, angularVelocity: worldAngularVelocity,
dimensions: { dimensions: Vec3.multiply(0.5, {
x: 0.0263, x: 0.0263,
y: 0.0982, y: 0.0982,
z: 0.0024 z: 0.0024
}, }),
userData: JSON.stringify({ userData: JSON.stringify({
hifiHomeKey: { hifiHomeKey: {
reset: true reset: true
@ -150,11 +150,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
modelURL: CLOCK_SECOND_HAND_URL, modelURL: CLOCK_SECOND_HAND_URL,
name: "home_model_clockSecondHand", name: "home_model_clockSecondHand",
position: hourHandPosition, position: hourHandPosition,
dimensions: { dimensions: Vec3.multiply(0.5, {
x: 0.0043, x: 0.0043,
y: 0.1117, y: 0.1117,
z: 0.0008 z: 0.0008
}, }),
color: { color: {
red: 200, red: 200,
green: 10, green: 10,
@ -202,14 +202,14 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
y: 0.05, y: 0.05,
z: 0.5 z: 0.5
}, },
rotation:worldClockHandRotation, rotation: worldClockHandRotation,
angularDamping: 0, angularDamping: 0,
angularVelocity: worldAngularVelocity, angularVelocity: worldAngularVelocity,
dimensions: { dimensions: Vec3.multiply(0.5, {
x: 0.0251, x: 0.0251,
y: 0.1179, y: 0.1179,
z: 0.0032 z: 0.0032
}, }),
script: MINUTE_HAND_CLOCK_SCRIPT_URL, script: MINUTE_HAND_CLOCK_SCRIPT_URL,
userData: JSON.stringify({ userData: JSON.stringify({
clockBody: clockBody, clockBody: clockBody,

24
unpublishedScripts/DomainContent/Home/reset.js
View file

@ -198,13 +198,13 @@
}); });
var whiteboard = new Whiteboard({ var whiteboard = new Whiteboard({
x: 1104, x: 1105.0955,
y: 460.5, y: 460.5000,
z: -77 z: -77.4409
}, { }, {
x: 0, x: -0.0013,
y: -133, y: -133.0056,
z: 0 z: -0.0013
}); });
var pingPongGun = new HomePingPongGun({ var pingPongGun = new HomePingPongGun({
@ -218,13 +218,13 @@
}); });
var cuckooClock = new MyCuckooClock({ var cuckooClock = new MyCuckooClock({
x: 1105.267, x: 1105.5237,
y: 461.44, y: 461.4826,
z: -81.9495 z: -81.7524
}, { }, {
x: 0, x: -0.0013,
y: -57, y: -57.0089,
z: 0 z: -0.0013
}); });
print('HOME after creating scripted entities') print('HOME after creating scripted entities')