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

Update stopwatch to use relative paths to models + sounds

Browse source
This commit is contained in:
Ryan Huffman 2017-02-08 14:27:06 -08:00
parent 40bd7d9475
commit 58e3351b25
7 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
unpublishedScripts/marketplace/stopwatch/models/Stopwatch-min-hand.fbx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/stopwatch/models/Stopwatch-sec-hand.fbx Normal file
View file

Binary file not shown.

BIN
unpublishedScripts/marketplace/stopwatch/models/Stopwatch.fbx Normal file
View file

Binary file not shown.

0
unpublishedScripts/marketplace/stopwatch/chime.wav → unpublishedScripts/marketplace/stopwatch/sounds/chime.wav
View file

0
unpublishedScripts/marketplace/stopwatch/tick.wav → unpublishedScripts/marketplace/stopwatch/sounds/tick.wav
View file

6
unpublishedScripts/marketplace/stopwatch/spawnStopwatch.js
View file

@ -18,7 +18,7 @@ var stopwatchID = Entities.addEntity({
type: "Model",
name: "stopwatch/base",
position: positionToSpawn,
modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch.fbx",
modelURL: Script.resolvePath("models/Stopwatch.fbx"),
dimensions: Vec3.multiply(scale, {"x":4.129462242126465,"y":1.058512806892395,"z":5.773681640625}),
rotation: Quat.multiply(MyAvatar.orientation, Quat.fromPitchYawRollDegrees(90, 0, 0))
});
@ -30,7 +30,7 @@ var secondHandID = Entities.addEntity({
localPosition: Vec3.multiply(scale, {"x":-0.004985813982784748,"y":0.39391064643859863,"z":0.8312804698944092}),
dimensions: Vec3.multiply(scale, {"x":0.14095762372016907,"y":0.02546107769012451,"z":1.6077008247375488}),
registrationPoint: {"x":0.5,"y":0.5,"z":1},
modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch-sec-hand.fbx",
modelURL: Script.resolvePath("models/Stopwatch-sec-hand.fbx"),
});
var minuteHandID = Entities.addEntity({
@ -40,7 +40,7 @@ var minuteHandID = Entities.addEntity({
localPosition: Vec3.multiply(scale, {"x":-0.0023056098725646734,"y":0.3308190703392029,"z":0.21810021996498108}),
dimensions: Vec3.multiply(scale, {"x":0.045471154153347015,"y":0.015412690117955208,"z":0.22930574417114258}),
registrationPoint: {"x":0.5,"y":0.5,"z":1},
modelURL: "http://hifi-content.s3.amazonaws.com/alan/dev/Stopwatch-min-hand.fbx",
modelURL: Script.resolvePath("models/Stopwatch-min-hand.fbx"),
});
Entities.editEntity(stopwatchID, {

4
unpublishedScripts/marketplace/stopwatch/stopwatchServer.js
View file

@ -17,11 +17,11 @@
self.secondHandID = null;
self.minuteHandID = null;
self.tickSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/huffman/tick.wav");
self.tickSound = SoundCache.getSound(Script.resolvePath("sounds/tick.wav"));
self.tickInjector = null;
self.tickIntervalID = null;
self.chimeSound = SoundCache.getSound("https://hifi-public.s3.amazonaws.com/huffman/chime.wav");
self.chimeSound = SoundCache.getSound(Script.resolvePath("sounds/chime.wav"));
self.preload = function(entityID) {
print("Preloading stopwatch: ", entityID);