Added copyright header, expanded tabs to spaces

This commit is contained in:
Patterntrick 2017-03-28 18:22:22 -07:00 committed by GitHub
parent bc33e45d0e
commit 8ff4eb0a96

View file

@ -1,3 +1,13 @@
//
// xylophoneRezzer.js
//
// Created by Patrick Gosch on 03/28/2017
// Copyright 2017 High Fidelity, Inc.
//
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
var soundFiles = ["C2.wav", "D2.wav", "E2.wav", "F2.wav", "G2.wav", "A2.wav", "B2.wav", "C3.wav"];
var keyModelURL = Script.resolvePath("xyloKey_2_a_e.fbx");
var keyScriptURL = Script.resolvePath("xylophoneKey.js");
@ -13,27 +23,26 @@ var xyloFrameID = Entities.addEntity( {
modelURL: Script.resolvePath("xylophoneFrameWithWave.fbx"),
position: xyloFramePos,
rotation: Quat.fromVec3Radians({x:0, y:Math.PI, z:0}),
shapeType: "static-mesh",
shapeType: "static-mesh"
});
center.y += (0.45); //key Y offset from frame
var keyPos;
var keyRot;
for (i=1, len=soundFiles.length; i<=len; i++) {
var keyPos, keyRot, ud, td, keyID;
for (var i = 1; i <= soundFiles.length; i++) {
keyRot = Quat.fromVec3Radians({x:0, y:(0.9 - (i*0.2)), z:0});
keyPos = Vec3.sum(center, Vec3.multiplyQbyV(keyRot, fwd));
var ud = {
ud = {
soundFile: soundFiles[i-1]
};
var td = {
td = {
"file4": Script.resolvePath("xylotex_bar" + i + ".png"),
"file5": TEXBLACK
};
var keyID = Entities.addEntity( {
keyID = Entities.addEntity( {
name: ("XyloKey" + i),
type: "Model",
modelURL: keyModelURL,
@ -45,7 +54,7 @@ for (i=1, len=soundFiles.length; i<=len; i++) {
userData: JSON.stringify(ud),
parentID: xyloFrameID,
} );
};
}
//if rezzed on/above something, wait until after model has loaded so you can read its dimensions then move object on to that surface.
var pickRay = {origin: center, direction: {x:0, y:-1, z:0}};
@ -80,11 +89,11 @@ function rezMallets() {
};
malletProps.position = Vec3.sum(xyloFramePos, {x: 0.1, y: 0.55, z: 0});
malletProps.rotation = Quat.fromVec3Radians({x:0, y:Math.PI - 0.1, z:0}),
malletProps.rotation = Quat.fromVec3Radians({x:0, y:Math.PI - 0.1, z:0});
Entities.addEntity(malletProps);
malletProps.position = Vec3.sum(xyloFramePos, {x: -0.1, y: 0.55, z: 0});
malletProps.rotation = Quat.fromVec3Radians({x:0, y:Math.PI + 0.1, z:0}),
malletProps.rotation = Quat.fromVec3Radians({x:0, y:Math.PI + 0.1, z:0});
Entities.addEntity(malletProps);
Script.stop();
};
}