namechange URCHIN --> ANEMONE

This commit is contained in:
Andrew Meadows 2016-03-14 17:07:35 -07:00
parent e38c08ebd9
commit d18f988cba

View file

@ -1,12 +1,12 @@
// //
// createTank.js // createTank.js
// //
// //
// created by James b. Pollack @imgntn on 3/9/2016 // created by James b. Pollack @imgntn on 3/9/2016
// Copyright 2016 High Fidelity, Inc. // Copyright 2016 High Fidelity, Inc.
// //
// Adds a fish tank and base, decorations, particle bubble systems, and a bubble sound. Attaches a script that does fish swimming. // Adds a fish tank and base, decorations, particle bubble systems, and a bubble sound. Attaches a script that does fish swimming.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
// //
@ -76,14 +76,14 @@ var BUBBLE_SOUND_URL = "http://hifi-content.s3.amazonaws.com/DomainContent/Home/
var bubbleSound = SoundCache.getSound(BUBBLE_SOUND_URL); var bubbleSound = SoundCache.getSound(BUBBLE_SOUND_URL);
var URCHIN_FORWARD_OFFSET = TANK_DIMENSIONS.x - 0.35; var ANEMONE_FORWARD_OFFSET = TANK_DIMENSIONS.x - 0.35;
var URCHIN_LATERAL_OFFSET = -0.05; var ANEMONE_LATERAL_OFFSET = -0.05;
var URCHIN_VERTICAL_OFFSET = -0.12; var ANEMONE_VERTICAL_OFFSET = -0.12;
var URCHIN_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx'; var ANEMONE_MODEL_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx';
var URCHIN_ANIMATION_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx'; var ANEMONE_ANIMATION_URL = 'http://hifi-content.s3.amazonaws.com/DomainContent/Home/fishTank/anemone.fbx';
var URCHIN_DIMENSIONS = { var ANEMONE_DIMENSIONS = {
x: 0.4, x: 0.4,
y: 0.4, y: 0.4,
z: 0.4 z: 0.4
@ -311,12 +311,12 @@ function createRocks() {
} }
function createUrchin() { function createUrchin() {
var finalPosition = getOffsetFromTankCenter(URCHIN_VERTICAL_OFFSET, URCHIN_FORWARD_OFFSET, URCHIN_LATERAL_OFFSET); var finalPosition = getOffsetFromTankCenter(ANEMONE_VERTICAL_OFFSET, ANEMONE_FORWARD_OFFSET, ANEMONE_LATERAL_OFFSET);
var properties = { var properties = {
name: 'hifi-home-fishtank-urchin', name: 'hifi-home-fishtank-urchin',
type: 'Model', type: 'Model',
animationURL: URCHIN_ANIMATION_URL, animationURL: ANEMONE_ANIMATION_URL,
animationIsPlaying: true, animationIsPlaying: true,
animationFPS: 15, animationFPS: 15,
animationSettings: JSON.stringify({ animationSettings: JSON.stringify({
@ -326,11 +326,11 @@ function createUrchin() {
startAutomatically: true startAutomatically: true
}), }),
parentID: fishTank, parentID: fishTank,
modelURL: URCHIN_MODEL_URL, modelURL: ANEMONE_MODEL_URL,
position: finalPosition, position: finalPosition,
shapeType: 'Sphere', shapeType: 'Sphere',
rotation: Quat.fromPitchYawRollDegrees(0, 90, 0), rotation: Quat.fromPitchYawRollDegrees(0, 90, 0),
dimensions: URCHIN_DIMENSIONS dimensions: ANEMONE_DIMENSIONS
} }
urchin = Entities.addEntity(properties); urchin = Entities.addEntity(properties);
@ -467,4 +467,4 @@ function getEntityCustomData(customKey, id, defaultValue) {
} else { } else {
return defaultValue; return defaultValue;
} }
} }