Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 21:43:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

add tank assets to reset

Browse source
This commit is contained in:
James B. Pollack 2016-03-21 12:10:39 -07:00
parent dece01179e
commit a6cd1e8335
2 changed files with 62 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -680,7 +680,12 @@
red: 0, red: 0,
green: 255, green: 255,
blue: 255 blue: 255
},
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
} }
}),
}) })
); );
@ -746,7 +751,7 @@
var inverseQ = Quat.inverse(Q); var inverseQ = Quat.inverse(Q);
var finalPosition = Vec3.multiplyQbyV(inverseQ, tPosition); var finalPosition = Vec3.multiplyQbyV(inverseQ, tPosition);
var finalVelocity = Vec3.multiplyQbyV(inverseQ,tVelocity); var finalVelocity = Vec3.multiplyQbyV(inverseQ, tVelocity);
return { return {
position: finalPosition, position: finalPosition,

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

@ -117,11 +117,16 @@ FishTank = function(spawnPosition, spawnRotation) {
modelURL: TANK_MODEL_URL, modelURL: TANK_MODEL_URL,
dimensions: TANK_DIMENSIONS, dimensions: TANK_DIMENSIONS,
position: TANK_POSITION, position: TANK_POSITION,
rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x,spawnRotation.y,spawnRotation.z), rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
color: DEBUG_COLOR, color: DEBUG_COLOR,
collisionless: true, collisionless: true,
script: TANK_SCRIPT, script: TANK_SCRIPT,
visible: true visible: true,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
fishTank = Entities.addEntity(tankProperties); fishTank = Entities.addEntity(tankProperties);
@ -172,7 +177,12 @@ FishTank = function(spawnPosition, spawnRotation) {
"alphaStart": 0.3, "alphaStart": 0.3,
"alphaFinish": 0, "alphaFinish": 0,
"emitterShouldTrail": 0, "emitterShouldTrail": 0,
"textures": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/bubble-white.png" "textures": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/bubble-white.png",
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
}; };
bubbleProperties.type = "ParticleEffect"; bubbleProperties.type = "ParticleEffect";
@ -239,7 +249,12 @@ FishTank = function(spawnPosition, spawnRotation) {
position: tankProperties.position, position: tankProperties.position,
visible: false, visible: false,
collisionless: true, collisionless: true,
dynamic: false dynamic: false,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
}; };
innerContainer = Entities.addEntity(containerProps); innerContainer = Entities.addEntity(containerProps);
@ -265,7 +280,12 @@ FishTank = function(spawnPosition, spawnRotation) {
}, },
collisionless: true, collisionless: true,
position: getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET), position: getOffsetFromTankCenter(LOWER_CORNER_VERTICAL_OFFSET, LOWER_CORNER_FORWARD_OFFSET, LOWER_CORNER_LATERAL_OFFSET),
visible: false visible: false,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
var upperProps = { var upperProps = {
@ -284,7 +304,12 @@ FishTank = function(spawnPosition, spawnRotation) {
}, },
collisionless: true, collisionless: true,
position: getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET), position: getOffsetFromTankCenter(UPPER_CORNER_VERTICAL_OFFSET, UPPER_CORNER_FORWARD_OFFSET, UPPER_CORNER_LATERAL_OFFSET),
visible: false visible: false,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
lowerCorner = Entities.addEntity(lowerProps); lowerCorner = Entities.addEntity(lowerProps);
@ -301,7 +326,12 @@ FishTank = function(spawnPosition, spawnRotation) {
parentID: fishTank, parentID: fishTank,
modelURL: ROCK_MODEL_URL, modelURL: ROCK_MODEL_URL,
position: finalPosition, position: finalPosition,
dimensions: ROCK_DIMENSIONS dimensions: ROCK_DIMENSIONS,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
rocks = Entities.addEntity(properties); rocks = Entities.addEntity(properties);
@ -327,7 +357,12 @@ FishTank = function(spawnPosition, spawnRotation) {
position: finalPosition, position: finalPosition,
shapeType: 'Sphere', shapeType: 'Sphere',
rotation: Quat.fromPitchYawRollDegrees(0, 90, 0), rotation: Quat.fromPitchYawRollDegrees(0, 90, 0),
dimensions: ANEMONE_DIMENSIONS dimensions: ANEMONE_DIMENSIONS,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
anemone = Entities.addEntity(properties); anemone = Entities.addEntity(properties);
@ -344,7 +379,12 @@ FishTank = function(spawnPosition, spawnRotation) {
modelURL: TREASURE_MODEL_URL, modelURL: TREASURE_MODEL_URL,
position: finalPosition, position: finalPosition,
dimensions: TREASURE_DIMENSIONS, dimensions: TREASURE_DIMENSIONS,
rotation: Quat.fromPitchYawRollDegrees(10, -45, 10) rotation: Quat.fromPitchYawRollDegrees(10, -45, 10),
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
treasure = Entities.addEntity(properties); treasure = Entities.addEntity(properties);
@ -363,7 +403,12 @@ FishTank = function(spawnPosition, spawnRotation) {
y: TANK_POSITION.y - BASE_VERTICAL_OFFSET, y: TANK_POSITION.y - BASE_VERTICAL_OFFSET,
z: TANK_POSITION.z z: TANK_POSITION.z
}, },
dimensions: TANK_BASE_DIMENSIONS dimensions: TANK_BASE_DIMENSIONS,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
} }
tankBase = Entities.addEntity(properties); tankBase = Entities.addEntity(properties);