Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

temp fix for doll, moved cat

Browse source
This commit is contained in:
ericrius1 2015-12-01 10:09:29 -08:00
parent d80bfc0af6
commit a3f8c52aa3
3 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
examples/toybox/doll/doll.js
View file

@ -36,14 +36,10 @@
Entities.editEntity(this.entityID, { Entities.editEntity(this.entityID, {
animation: { animation: {
url: "https://hifi-public.s3.amazonaws.com/models/Bboys/zombie_scream.fbx", url: "https://hifi-public.s3.amazonaws.com/models/Bboys/zombie_scream.fbx",
currentFrame: 0 running: true
} }
}); });
Entities.editEntity(_this.entityID, {
animationIsPlaying: true
});
var position = Entities.getEntityProperties(this.entityID, "position").position; var position = Entities.getEntityProperties(this.entityID, "position").position;
this.audioInjector = Audio.playSound(this.screamSounds[randInt(0, this.screamSounds.length)], { this.audioInjector = Audio.playSound(this.screamSounds[randInt(0, this.screamSounds.length)], {
position: position, position: position,
@ -67,8 +63,10 @@
this.audioInjector.stop(); this.audioInjector.stop();
Entities.editEntity(this.entityID, { Entities.editEntity(this.entityID, {
animation: { animation: {
url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx", // Providing actual model fbx for animation used to work, now contorts doll into a weird ball
currentFrame: 0 // See bug:
// url: "http://hifi-public.s3.amazonaws.com/models/Bboys/bboy2/bboy2.fbx",
running: false,
} }
}); });
@ -82,4 +80,4 @@
}; };
// entity scripts always need to return a newly constructed object of our type // entity scripts always need to return a newly constructed object of our type
return new Doll(); return new Doll();
}); });

7
unpublishedScripts/hiddenEntityReset.js
View file

@ -125,11 +125,12 @@
createLights(); createLights();
createCat({ createCat({
x: 551.09, x: 551.0,
y: 494.98, y: 495.3,
z: 503.49 z: 503.3
}); });
createSprayCan({ createSprayCan({
x: 549.7, x: 549.7,
y: 495.6, y: 495.6,

6
unpublishedScripts/masterReset.js
View file

@ -102,9 +102,9 @@ MasterReset = function() {
createCat({ createCat({
x: 551.09, x: 551.0,
y: 494.98, y: 495.3,
z: 503.49 z: 503.3
}); });