Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-06 03:10:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

re enable things

Browse source
This commit is contained in:
James B. Pollack 2016-03-27 18:23:35 -07:00
parent d74114ff55
commit ca4931e6ce
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -43,7 +43,7 @@
Script.include(fishTankPath); Script.include(fishTankPath);
Script.include(tiltMazePath); Script.include(tiltMazePath);
Script.include(whiteboardPath); Script.include(whiteboardPath);
// Script.include(plantPath); Script.include(plantPath);
Script.include(cuckooClockPath); Script.include(cuckooClockPath);
Script.include(pingPongGunPath); Script.include(pingPongGunPath);
Script.include(transformerPath); Script.include(transformerPath);
@ -120,9 +120,6 @@
}, },
createDynamicEntities: function() { createDynamicEntities: function() {
return;
print("EBL CREATE DYNAMIC ENTITIES");
var fishTank = new FishTank({ var fishTank = new FishTank({
x: 1098.9254, x: 1098.9254,
y: 460.5814, y: 460.5814,
@ -149,15 +146,15 @@
z: 0 z: 0
}); });
// var myPlant = new Plant({ var myPlant = new Plant({
// x: 1099.8785, x: 1099.8785,
// y: 460.3115, y: 460.3115,
// z: -84.7736 z: -84.7736
// }, { }, {
// x: 0, x: 0,
// y: 0, y: 0,
// z: 0 z: 0
// }); });
var pingPongGun = new HomePingPongGun({ var pingPongGun = new HomePingPongGun({
x: 1101.2123, x: 1101.2123,
@ -186,7 +183,7 @@
createKineticEntities: function() { createKineticEntities: function() {
return;
var blocks = new Blocks({ var blocks = new Blocks({
x: 1097.1383, x: 1097.1383,
y: 460.3790, y: 460.3790,
@ -282,7 +279,7 @@
z: 0, z: 0,
} }
var rotationAsQuat = Quat.fromPitchYawRollDegrees(dollRotation.x,dollRotation.y,dollRotation.z); var rotationAsQuat = Quat.fromPitchYawRollDegrees(dollRotation.x, dollRotation.y, dollRotation.z);
var dolls = [ var dolls = [
TRANSFORMER_URL_ARTEMIS, TRANSFORMER_URL_ARTEMIS,
@ -294,14 +291,14 @@
var dollLateralSeparation = 1.0; var dollLateralSeparation = 1.0;
dolls.forEach(function(doll, index) { dolls.forEach(function(doll, index) {
var separation = index * dollLateralSeparation; var separation = index * dollLateralSeparation;
print('separation: ' + separation) print('separation: ' + separation)
var left = Quat.getRight(rotationAsQuat); var left = Quat.getRight(rotationAsQuat);
var distanceToLeft = Vec3.multiply(separation,left); var distanceToLeft = Vec3.multiply(separation, left);
var dollPosition = Vec3.sum(firstDollPosition,distanceToLeft) var dollPosition = Vec3.sum(firstDollPosition, distanceToLeft)
var transformer = new TransformerDoll(doll, dollPosition, dollRotation); var transformer = new TransformerDoll(doll, dollPosition, dollRotation);
}); });
}, },