Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 03:17:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Updated master script to make jslint happy

Browse source
This commit is contained in:
ericrius1 2015-09-23 16:21:36 -07:00
parent a1dccc2a92
commit d0b5d62bb7
1 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
examples/toys/masterResetEntity.js
View file

@ -360,7 +360,7 @@ function createBasketBall(position) {
linearDamping: 0.0, linearDamping: 0.0,
velocity: { velocity: {
x: 0, x: 0,
y: -.01, y: -0.01,
z: 0 z: 0
}, },
collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav" collisionSoundURL: "http://s3.amazonaws.com/hifi-public/sounds/basketball/basketball.wav"
@ -397,7 +397,7 @@ function createDoll(position) {
}, },
velocity: { velocity: {
x: 0, x: 0,
y: -.1, y: -0.1,
z: 0 z: 0
}, },
collisionsWillMove: true collisionsWillMove: true
@ -450,8 +450,10 @@ function createSprayCan(position) {
} }
function createBlocks(position) { function createBlocks(position) {
var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/" var baseURL = HIFI_PUBLIC_BUCKET + "models/content/planky/";
var modelURLs = ['planky_blue.fbx', 'planky_green.fbx', 'planky_natural.fbx', "planky_red.fbx", "planky_yellow.fbx"]; var NUM_BLOCKS_PER_COLOR = 4;
var i, j;
var blockTypes = [{ var blockTypes = [{
url: "planky_blue.fbx", url: "planky_blue.fbx",
dimensions: { dimensions: {
@ -487,16 +489,13 @@ function createBlocks(position) {
y: 0.05, y: 0.05,
z: 0.25 z: 0.25
} }
}, }];
var modelURL, entity;
]; for (i = 0; i < blockTypes.length; i++) {
var NUM_BLOCKS_PER_COLOR = 4;
for (var i = 0; i < blockTypes.length; i++) {
for (j = 0; j < NUM_BLOCKS_PER_COLOR; j++) { for (j = 0; j < NUM_BLOCKS_PER_COLOR; j++) {
var modelURL = baseURL + blockTypes[i].url; modelURL = baseURL + blockTypes[i].url;
var entity = Entities.addEntity({ entity = Entities.addEntity({
type: "Model", type: "Model",
modelURL: modelURL, modelURL: modelURL,
position: Vec3.sum(position, { position: Vec3.sum(position, {
@ -515,7 +514,7 @@ function createBlocks(position) {
}, },
velocity: { velocity: {
x: 0, x: 0,
y: -.01, y: -0.01,
z: 0 z: 0
} }
}); });