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

merged

Browse source
This commit is contained in:
ericrius1 2016-03-21 10:22:18 -07:00
commit a0d9c24365
3 changed files with 44 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -372,13 +372,13 @@
var sinceLastUpdate = 0; var sinceLastUpdate = 0;
var LOWER_CORNER_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.3; var LOWER_CORNER_VERTICAL_OFFSET = (-TANK_DIMENSIONS.y / 2) + 0.3;
var LOWER_CORNER_FORWARD_OFFSET = TANK_DIMENSIONS.x; var LOWER_CORNER_FORWARD_OFFSET = TANK_DIMENSIONS.x;
var LOWER_CORNER_LATERAL_OFFSET = -TANK_DIMENSIONS.z / 8; var LOWER_CORNER_LATERAL_OFFSET = -TANK_DIMENSIONS.z / 8;
var UPPER_CORNER_VERTICAL_OFFSET = (TANK_DIMENSIONS.y / 2)-0.3; var UPPER_CORNER_VERTICAL_OFFSET = (TANK_DIMENSIONS.y / 2) - 0.3;
var UPPER_CORNER_FORWARD_OFFSET = -TANK_DIMENSIONS.x; var UPPER_CORNER_FORWARD_OFFSET = -TANK_DIMENSIONS.x;
var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8; var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
// var FISH_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Fish-1.fbx"; // var FISH_MODEL_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/Fish-1.fbx";
@ -478,7 +478,8 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
lowerCorner = getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET); lowerCorner = getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET);
upperCorner = getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET); upperCorner = getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET);
// print('LOADFISH LOWER' + JSON.stringify(lowerCorner));
// print('LOADFISH UPPER' + JSON.stringify(upperCorner));
// First pre-load an array with properties on all the other fish so our per-fish loop // First pre-load an array with properties on all the other fish so our per-fish loop
// isn't doing it. // isn't doing it.
var flockProperties = []; var flockProperties = [];
@ -625,7 +626,7 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
function loadFish(howMany) { function loadFish(howMany) {
// print('LOADING FISH: ' + howMany) // print('LOADING FISH: ' + howMany)
_this.currentProperties = Entities.getEntityProperties(_this.entityID);
var center = _this.currentProperties.position; var center = _this.currentProperties.position;
lowerCorner = { lowerCorner = {
@ -639,6 +640,8 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
z: center.z + (_this.currentProperties.dimensions.z / 2) z: center.z + (_this.currentProperties.dimensions.z / 2)
}; };
print('LOADFISH LOWER' + JSON.stringify(lowerCorner));
print('LOADFISH UPPER' + JSON.stringify(upperCorner));
var fish = []; var fish = [];
for (var i = 0; i < howMany; i++) { for (var i = 0; i < howMany; i++) {
@ -735,5 +738,21 @@ var UPPER_CORNER_LATERAL_OFFSET = TANK_DIMENSIONS.z / 8;
} }
} }
function transformFishFromTankToWorldSpace(position, velocity) {
var Q = Entities.getEntityProperties(_this.entityID).rotation;
var tPosition = Vec3.multiplyQbyV(Q, position);
var tVelocity = Vec3.multiplyQbyV(Q, velocity);
var inverseQ = Quat.inverse(Q);
var finalPosition = Vec3.multiplyQbyV(inverseQ, tPosition);
var finalVelocity = Vec3.multiplyQbyV(inverseQ,tVelocity);
return {
position: finalPosition,
velocity: finalVelocity
};
}
return new FishTank(); return new FishTank();
}); });

5
unpublishedScripts/DomainContent/Home/pingPongGun/wrapper.js
View file

@ -28,6 +28,11 @@ _PingPongGun = function(spawnPosition, spawnRotation) {
y: 0.3875, y: 0.3875,
z: 0.9931 z: 0.9931
}, },
gravity:{
x:0,
y:-3,
z:0
},
rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z), rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
dynamic: true, dynamic: true,
collisionSoundURL: COLLISION_SOUND_URL, collisionSoundURL: COLLISION_SOUND_URL,

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

@ -118,6 +118,7 @@
createDynamicEntities: function() { createDynamicEntities: function() {
<<<<<<< HEAD
var fishTank = new FishTank({ var fishTank = new FishTank({
x: 1098.9254, x: 1098.9254,
@ -128,6 +129,17 @@
y: 152, y: 152,
z: 0 z: 0
}); });
=======
// var fishTank = new FishTank({
// x: 1098.9254,
// y: 460.5814,
// z: -79.1103
// }, {
// x: 0,
// y: 0,
// z: 0
// });
>>>>>>> james/homereset
var tiltMaze = new TiltMaze({ var tiltMaze = new TiltMaze({
x: 1105.5768, x: 1105.5768,