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

inner tank for ze fishes

Browse source
This commit is contained in:
James B. Pollack 2016-03-30 13:44:40 -07:00
parent cfa22a694e
commit 9e01cbb4ef
2 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,7 @@
var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js'); var TANK_SCRIPT = Script.resolvePath('entityLocalFish.js');
FishTank = function(spawnPosition, spawnRotation) { FishTank = function(spawnPosition, spawnRotation) {
var fishTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, anemone, treasure, rocks; var fishTank, innerTank, tankBase, bubbleSystem, secondBubbleSystem, thirdBubbleSystem, anemone, treasure, rocks;
var CLEANUP = true; var CLEANUP = true;
var TANK_DIMENSIONS = { var TANK_DIMENSIONS = {
@ -22,11 +22,11 @@ FishTank = function(spawnPosition, spawnRotation) {
z: 2.1404 z: 2.1404
}; };
// var INNER_TANK_SCALE = 0.7; var INNER_TANK_SCALE = 0.7;
// var INNER_TANK_DIMENSIONS = Vec3.multiply(INNER_TANK_SCALE, TANK_DIMENSIONS); var INNER_TANK_DIMENSIONS = Vec3.multiply(INNER_TANK_SCALE, TANK_DIMENSIONS);
// INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.4; INNER_TANK_DIMENSIONS.y = INNER_TANK_DIMENSIONS.y - 0.4;
// var TANK_WIDTH = TANK_DIMENSIONS.z; var TANK_WIDTH = TANK_DIMENSIONS.z;
// var TANK_HEIGHT = TANK_DIMENSIONS.y; var TANK_HEIGHT = TANK_DIMENSIONS.y;
var DEBUG_COLOR = { var DEBUG_COLOR = {
red: 255, red: 255,
@ -111,7 +111,6 @@ FishTank = function(spawnPosition, spawnRotation) {
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,
visible: true, visible: true,
userData: JSON.stringify({ userData: JSON.stringify({
'hifiHomeKey': { 'hifiHomeKey': {
@ -310,6 +309,32 @@ FishTank = function(spawnPosition, spawnRotation) {
tankBase = Entities.addEntity(properties); tankBase = Entities.addEntity(properties);
} }
function createInnerTank() {
var properties = {
dimensions: INNER_TANK_DIMENSIONS,
name: 'hifi-home-fishtank-inner-tank',
type: 'Box',
visible: true,
color: {
red: 255,
green: 0,
blue: 255
},
position: TANK_POSITION,
rotation: Quat.fromPitchYawRollDegrees(spawnRotation.x, spawnRotation.y, spawnRotation.z),
color: DEBUG_COLOR,
collisionless: true,
script: TANK_SCRIPT,
visible: true,
userData: JSON.stringify({
'hifiHomeKey': {
'reset': true
}
}),
}
innerTank = Entities.addEntity(innerTank);
}
createFishTank(); createFishTank();
createBubbleSystems(); createBubbleSystems();

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

@ -66,7 +66,6 @@
showTidyingButton: function() { showTidyingButton: function() {
Entities.editEntity(_this.entityID, { Entities.editEntity(_this.entityID, {
textures: { textures: {
"Texture.001": "atp:/Tidyguy-6.fbx/Tidyguy-6.fbm/Head-Housing-Texture.png", "Texture.001": "atp:/Tidyguy-6.fbx/Tidyguy-6.fbm/Head-Housing-Texture.png",