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

CR feedback

Browse source
This commit is contained in:
ZappoMan 2014-11-03 15:42:40 -08:00
parent 2dae78b82c
commit 60182a78cb
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
examples/entityScripts/playSoundOnEnterOrLeave.js
View file

@ -15,11 +15,11 @@
var bird = new Sound("http://s3.amazonaws.com/hifi-public/sounds/Animals/bushtit_1.raw"); var bird = new Sound("http://s3.amazonaws.com/hifi-public/sounds/Animals/bushtit_1.raw");
function playSound(entityID) { function playSound(entityID) {
var options = new AudioInjectionOptions(); var options = new AudioInjectionOptions();
var position = MyAvatar.position; var position = MyAvatar.position;
options.position = position; options.position = position;
options.volume = 0.5; options.volume = 0.5;
Audio.playSound(bird, options); Audio.playSound(bird, options);
}; };
this.enterEntity = function(entityID) { this.enterEntity = function(entityID) {

2
interface/src/entities/EntityTreeRenderer.cpp
View file

@ -76,7 +76,7 @@ void EntityTreeRenderer::init() {
// make sure our "last avatar position" is something other than our current position, so that on our // make sure our "last avatar position" is something other than our current position, so that on our
// first chance, we'll check for enter/leave entity events. // first chance, we'll check for enter/leave entity events.
glm::vec3 avatarPosition = Application::getInstance()->getAvatar()->getPosition(); glm::vec3 avatarPosition = Application::getInstance()->getAvatar()->getPosition();
_lastAvatarPosition = avatarPosition + glm::vec3(1.f,1.f,1.f); _lastAvatarPosition = avatarPosition + glm::vec3(1.f, 1.f, 1.f);
} }
QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) { QScriptValue EntityTreeRenderer::loadEntityScript(const EntityItemID& entityItemID) {