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

hmm

Browse source
This commit is contained in:
James B. Pollack 2016-03-18 14:52:34 -07:00
parent 0aab01d774
commit acba6817f2
4 changed files with 37 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
unpublishedScripts/DomainContent/Home/fishTank/tank.js
View file

@ -46,13 +46,16 @@
var UPPER_CORNER_FORWARD_OFFSET = -TANK_DIMENSIONS.x;
var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
var upperCorner, lowerCorner;
function FishTank() {
_this = this;
}
function startUpdate() {
upperCorner = getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET);
lowerCorner = getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET);
//when the baton is claimed;
// print('trying to claim the object' + _entityID)
iOwn = true;
@ -137,6 +140,7 @@
preload: function(entityID) {
// print("preload");
this.entityID = entityID;
_entityID = entityID;
this.initialize(entityID);
@ -409,7 +413,6 @@
}
if (_this.userData['hifi-home-fishtank'].fishLoaded === false) {
//no fish in the user data
_this.tankLocked = true;
@ -418,9 +421,7 @@
var data = {
fishLoaded: true,
bubbleSystem: _this.userData['hifi-home-fishtank'].bubbleSystem,
bubbleSound: _this.userData['hifi-home-fishtank'].bubbleSound,
innerContainer: _this.userData['hifi-home-fishtank'].innerContainer,
}
setEntityCustomData(FISHTANK_USERDATA_KEY, _this.entityID, data);
_this.userData['hifi-home-fishtank'].fishLoaded = true;
@ -497,6 +498,7 @@
z: 0
};
var othersCounted = 0;
for (var j = 0; j < fish.length; j++) {
if (i != j) {
@ -604,8 +606,17 @@
var center = _this.currentProperties.position;
upperCorner = getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET);
lowerCorner = getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET);
var lowerCorner = {
x: center.x - (_this.currentProperties.dimensions.z / 2),
y: center.y,
z: center.z - (_this.currentProperties.dimensions.z / 2)
};
var upperCorner = {
x: center.x + (_this.currentProperties.dimensions.z / 2),
y: center.y + _this.currentProperties.dimensions.y,
z: center.z + (_this.currentProperties.dimensions.z / 2)
};
var fish = [];

17
unpublishedScripts/DomainContent/Home/fishTank/wrapper.js
View file

@ -124,12 +124,7 @@ FishTank = function(spawnPosition, spawnRotation) {
color: DEBUG_COLOR,
collisionless: true,
script: TANK_SCRIPT,
visible: true,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
visible: true
}
if (spawnRotation !== undefined) {
@ -427,18 +422,24 @@ FishTank = function(spawnPosition, spawnRotation) {
createTankBase();
createTreasureChest();
var customKey = 'hifi-home-fishtank';
var customKey = 'hifi-home-fishtank';
var data = {
fishLoaded: false,
bubbleSystem: bubbleSystem,
// bubbleSound: bubbleSound,
innerContainer: innerContainer,
}
var resetKey = 'hifiHomeKey';
var resetData = {
'reset': true
};
Script.setTimeout(function() {
setEntityCustomData(customKey, fishTank, data);
setEntityCustomData(resetKey, fishTank, resetData);
}, 2000)

1
unpublishedScripts/DomainContent/Home/pingPongGun/pingPongGun.js
View file

@ -114,6 +114,7 @@
dynamic: true,
rotation: gunProperties.rotation,
position: this.getGunTipPosition(gunProperties),
gravity:PING_PONG_GUN_GRAVITY,
velocity: forwardVec,
lifetime: 10,
userData: JSON.stringify({

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

@ -34,7 +34,7 @@
Script.include(kineticPath);
Script.include(utilsPath);
// Script.include(fishTankPath);
Script.include(fishTankPath);
Script.include(tiltMazePath);
Script.include(whiteboardPath);
Script.include(plantPath);
@ -113,15 +113,15 @@
createDynamicEntities: function() {
// var fishTank = new FishTank({
// x: 1098.9254,
// y: 460.5814,
// z: -79.1103
// }, {
// x: 0,
// y: 152,
// z: 0
// });
var fishTank = new FishTank({
x: 1098.9254,
y: 460.5814,
z: -79.1103
}, {
x: 0,
y: 152,
z: 0
});
var tiltMaze = new TiltMaze({
x: 1105.5768,