Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-04 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

second bubble system, quieter noise

Browse source
This commit is contained in:
James B. Pollack 2016-03-07 10:19:21 -08:00
parent 2740391c3b
commit 5f9b64444c
1 changed files with 72 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

76
unpublishedScripts/DomainContent/Home/fishTank/createFishTank.js
View file

@ -1,4 +1,4 @@
var fishTank, bubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, urchin, rocks; var fishTank, bubbleSystem, secondBubbleSystem, innerContainer, bubbleInjector, lowerCorner, upperCorner, urchin, rocks;
var CLEANUP = true; var CLEANUP = true;
var TANK_DIMENSIONS = { var TANK_DIMENSIONS = {
@ -103,7 +103,7 @@ function createBubbleSystem() {
}, },
"emitDimensions": { "emitDimensions": {
"x": -0.2, "x": -0.2,
"y": 1.6000000000000002, "y": TANK_DIMENSIONS.y,
"z": 0 "z": 0
}, },
"polarStart": 0, "polarStart": 0,
@ -147,6 +147,71 @@ function createBubbleSystem() {
createBubbleSound(finalOffset); createBubbleSound(finalOffset);
} }
function createSecondBubbleSystem() {
var tankProperties = Entities.getEntityProperties(fishTank);
var bubbleProperties = {
"name": 'hifi-home-fishtank-bubbles',
"color": {},
"isEmitting": 1,
"maxParticles": 1880,
"lifespan": 1.6,
"emitRate": 10,
"emitSpeed": 0.025,
"speedSpread": 0.025,
"emitOrientation": {
"x": 0,
"y": 0.5,
"z": 0.5,
"w": 0
},
"emitDimensions": {
"x": -0.4,
"y": TANK_DIMENSIONS.y,
"z": 0
},
"polarStart": 0,
"polarFinish": 0,
"azimuthStart": 0.2,
"azimuthFinish": 0.1,
"emitAcceleration": {
"x": 0,
"y": 0.4,
"z": 0
},
"accelerationSpread": {
"x": 0.1,
"y": 0.1,
"z": 0.1
},
"particleRadius": 0.02,
"radiusSpread": 0,
"radiusStart": 0.043,
"radiusFinish": 0.02,
"colorSpread": {},
"colorStart": {},
"colorFinish": {},
"alpha": 0.2,
"alphaSpread": 0,
"alphaStart": 0.3,
"alphaFinish": 0,
"emitterShouldTrail": 0,
"textures": "http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/bubble-white.png"
};
bubbleProperties.type = "ParticleEffect";
bubbleProperties.parentID = fishTank;
bubbleProperties.dimensions = BUBBLE_SYSTEM_DIMENSIONS;
var finalOffset = getOffsetFromTankCenter(BUBBLE_SYSTEM_VERTICAL_OFFSET, BUBBLE_SYSTEM_FORWARD_OFFSET, BUBBLE_SYSTEM_LATERAL_OFFSET - 0.076);
bubbleProperties.position = finalOffset;
secondBubbleSystem = Entities.addEntity(bubbleProperties);
}
function getOffsetFromTankCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET) { function getOffsetFromTankCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET) {
@ -169,7 +234,7 @@ function getOffsetFromTankCenter(VERTICAL_OFFSET, FORWARD_OFFSET, LATERAL_OFFSET
function createBubbleSound(position) { function createBubbleSound(position) {
var audioProperties = { var audioProperties = {
volume: 1, volume: 0.05,
position: position, position: position,
loop: true loop: true
}; };
@ -288,9 +353,11 @@ createInnerContainer();
createBubbleSystem(); createBubbleSystem();
createSecondBubbleSystem();
createEntitiesAtCorners(); createEntitiesAtCorners();
createBubbleSound();
createUrchin(); createUrchin();
@ -327,6 +394,7 @@ Script.setTimeout(function() {
function cleanup() { function cleanup() {
Entities.deleteEntity(fishTank); Entities.deleteEntity(fishTank);
Entities.deleteEntity(bubbleSystem); Entities.deleteEntity(bubbleSystem);
Entities.deleteEntity(secondBubbleSystem);
Entities.deleteEntity(innerContainer); Entities.deleteEntity(innerContainer);
Entities.deleteEntity(lowerCorner); Entities.deleteEntity(lowerCorner);
Entities.deleteEntity(upperCorner); Entities.deleteEntity(upperCorner);