Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-23 12:24:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

object typo

Browse source
This commit is contained in:
James B. Pollack 2016-03-27 14:32:08 -07:00
parent 816873204a
commit a8ec78ed2f
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
unpublishedScripts/DomainContent/Home/dressingRoom/transformer.js
View file

@ -76,7 +76,7 @@
rotation: rotatorProps.rotation, rotation: rotatorProps.rotation,
userData: JSON.stringify({ userData: JSON.stringify({
'grabbableKey': { 'grabbableKey': {
'grabbable:', false 'grabbable': false
}, },
'hifiHomeKey': { 'hifiHomeKey': {
'reset': true 'reset': true

9
unpublishedScripts/DomainContent/Home/fishTank/tank.js
View file

@ -431,7 +431,6 @@
var data = { var data = {
fishLoaded: true, fishLoaded: true,
innerContainer: _this.userData['hifi-home-fishtank'].innerContainer, innerContainer: _this.userData['hifi-home-fishtank'].innerContainer,
} }
setEntityCustomData(FISHTANK_USERDATA_KEY, _this.entityID, data); setEntityCustomData(FISHTANK_USERDATA_KEY, _this.entityID, data);
_this.userData['hifi-home-fishtank'].fishLoaded = true; _this.userData['hifi-home-fishtank'].fishLoaded = true;
@ -519,7 +518,7 @@
y: properties.position.y, y: properties.position.y,
z: properties.position.z z: properties.position.z
}; };
var othersCounted = 0; var othersCounted = 0;
for (var j = 0; j < fish.length; j++) { for (var j = 0; j < fish.length; j++) {
@ -588,8 +587,8 @@
var primePosition = tankXForm.xFormPoint(position); var primePosition = tankXForm.xFormPoint(position);
var primeVelocity = tankXForm.xFormVector(velocity); var primeVelocity = tankXForm.xFormVector(velocity);
// Orient in direction of velocity // Orient in direction of velocity
var rotation = Quat.rotationBetween(Vec3.UNIT_NEG_Z, primeVelocity); var rotation = Quat.rotationBetween(Vec3.UNIT_NEG_Z, primeVelocity);
var mixedRotation = Quat.mix(properties.rotation, rotation, VELOCITY_FOLLOW_RATE); var mixedRotation = Quat.mix(properties.rotation, rotation, VELOCITY_FOLLOW_RATE);
@ -626,7 +625,7 @@
Entities.editEntity(fish[i], { Entities.editEntity(fish[i], {
position: primePosition, position: primePosition,
velocity: primeVelocity, velocity: primeVelocity,
rotation: finalQuat rotation: finalQuat
}); });
} }
} }