Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

clock rotation in progress

Browse source
This commit is contained in:
ericrius1 2016-03-22 16:30:20 -07:00
parent 899d6e7c88
commit 9ce14a28ed
3 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
unpublishedScripts/DomainContent/Home/cuckooClock/cuckooClockMinuteHandEntityScript.js
View file

@ -92,6 +92,7 @@
},
unload: function() {
baton.unload();
if (connected === true) {
connected = false;
Script.update.disconnect(_this.update);

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

@ -50,7 +50,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
var clockFaceOffset = {
x: -0.0345,
y: 0.2587,
z: 0.1255
z: 0.3255
};
var clockFacePosition = Vec3.sum(spawnPosition, clockFaceOffset);
clockFace = Entities.addEntity({
@ -132,11 +132,11 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
modelURL: CLOCK_SECOND_HAND_URL,
name: "hifi-home_model_clockSecondHand",
position: Vec3.sum(clockFacePosition, clockHandOffset),
// dimensions: {
// x: 0.00263,
// y: 0.0982,
// z: 0.0024
// },
dimensions: {
x: 0.0043,
y: 0.1117,
z: 0.0008
},
color: {
red: 200,
green: 10,
@ -147,7 +147,7 @@ MyCuckooClock = function(spawnPosition, spawnRotation) {
y: 0.05,
z: 0.5
},
// rotation: Quat.fromPitchYawRollDegrees(0, 0, secondRollDegrees),
rotation: Quat.fromPitchYawRollDegrees(0, 0, secondRollDegrees),
angularDamping: 0,
angularVelocity: {
x: 0,

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

@ -89,14 +89,14 @@
_this.showTidyingButton();
_this.playTidyingSound();
_this.findAndDeleteHomeEntities();
// _this.findAndDeleteHomeEntities();
Script.setTimeout(function() {
_this.showTidyButton();
_this.tidying = false;
}, 2500);
Script.setTimeout(function() {
_this.createKineticEntities();
// _this.createKineticEntities();
_this.createDynamicEntities();
}, 750)
@ -118,61 +118,61 @@
createDynamicEntities: function() {
var fishTank = new FishTank({
x: 1098.9254,
y: 460.5814,
z: -79.1103
}, {
x: 0,
y: 0,
z: 0
});
// var fishTank = new FishTank({
// x: 1098.9254,
// y: 460.5814,
// z: -79.1103
// }, {
// x: 0,
// y: 0,
// z: 0
// });
var tiltMaze = new TiltMaze({
x: 1105.5768,
y: 460.3298,
z: -80.4891
});
// var tiltMaze = new TiltMaze({
// x: 1105.5768,
// y: 460.3298,
// z: -80.4891
// });
var whiteboard = new Whiteboard({
x: 1104,
y: 460.5,
z: -77
}, {
x: 0,
y: -133,
z: 0
});
// var whiteboard = new Whiteboard({
// x: 1104,
// y: 460.5,
// z: -77
// }, {
// x: 0,
// y: -133,
// z: 0
// });
var myPlant = new Plant({
x: 1099.8785,
y: 460.3115,
z: -84.7736
}, {
x: 0,
y: 0,
z: 0
});
// var myPlant = new Plant({
// x: 1099.8785,
// y: 460.3115,
// z: -84.7736
// }, {
// x: 0,
// y: 0,
// z: 0
// });
var pingPongGun = new _PingPongGun({
x: 1101.2123,
y: 460.2328,
z: -65.8513
}, {
x: 97.3683,
y: 179.0293,
z: 89.9698
});
// var pingPongGun = new _PingPongGun({
// x: 1101.2123,
// y: 460.2328,
// z: -65.8513
// }, {
// x: 97.3683,
// y: 179.0293,
// z: 89.9698
// });
//v2.0
// var musicBox = new MusicBox();
//var cuckooClock = new MyCuckooClock(center);
var cuckooClock = new MyCuckooClock({
x: 1105.172,
x: 1105.267,
y: 461.44,
z: -81.86
z: -81.9495
}, {
x: 0,
y: 0,
y: -57,
z: 0
});
// var doppelganger = new Doppelganger();
@ -264,7 +264,7 @@
print('JBP after deleting home entities')
},
unload: function() {
this.findAndDeleteHomeEntities();
// this.findAndDeleteHomeEntities();
}
}