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

Merge pull request #10093 from huffman/fix/tutorial-lighter-intersection

Browse source 
Fix the tutorial lighter using properties inside intersection results
This commit is contained in:
Ryan Huffman 2017-04-03 09:31:10 -07:00 committed by GitHub
commit 29b966ee04
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tutorial/lighter/butaneLighter.js
View file

@ -154,9 +154,12 @@
direction: Quat.inverse(Quat.getFront(flameProperties.rotation)) direction: Quat.inverse(Quat.getFront(flameProperties.rotation))
} }
var intersection = Entities.findRayIntersection(pickRay, true, [], [_this.entityID, _this.lighterParticleEntity]); var intersection = Entities.findRayIntersection(pickRay, true, [], [_this.entityID, _this.lighterParticleEntity]);
if (intersection.intersects && intersection.distance <= FLAME_LENGTH && intersection.properties.script !== '') { if (intersection.intersects && intersection.distance <= FLAME_LENGTH) {
Entities.callEntityMethod(intersection.properties.id, 'onLit', [_this.triggerValue]); var properties = Entities.getEntityProperties(intersection.entityID, 'script');
debugPrint('Light it up! found: ' + intersection.properties.id); if (properties.script !== '') {
Entities.callEntityMethod(intersection.entityID, 'onLit', [_this.triggerValue]);
debugPrint('Light it up! found: ' + intersection.entityID);
}
} }
}, },
releaseEquip: function(entityID, args) { releaseEquip: function(entityID, args) {