Merge branch 'master' of https://github.com/highfidelity/hifi into remove_gl_transform

examples/pointer.js

@@ -0,0 +1,76 @@
+
+var lineEntityID = null;
+var lineIsRezzed = false;
+
+
+function nearLinePoint(targetPosition) {
+    var handPosition = MyAvatar.getRightPalmPosition();
+    var along = Vec3.subtract(targetPosition, handPosition);
+    along = Vec3.normalize(along);
+    along = Vec3.multiply(along, 0.4);
+    return Vec3.sum(handPosition, along);
+}
+
+
+function removeLine() {
+    if (lineIsRezzed) {
+        Entities.deleteEntity(lineEntityID);
+        lineEntityID = null;
+        lineIsRezzed = false;
+    }
+}
+
+
+function createOrUpdateLine(event) {
+    var pickRay = Camera.computePickRay(event.x, event.y);
+    var intersection = Entities.findRayIntersection(pickRay, true); // accurate picking
+
+    if (lineIsRezzed) {
+        Entities.editEntity(lineEntityID, {
+            position: nearLinePoint(intersection.intersection),
+            dimensions: Vec3.subtract(intersection.intersection, nearLinePoint(intersection.intersection)),
+            lifetime: 30 // renew lifetime
+    });
+
+    } else {
+        lineIsRezzed = true;
+        lineEntityID = Entities.addEntity({
+            type: "Line",
+            position: nearLinePoint(intersection.intersection),
+            dimensions: Vec3.subtract(intersection.intersection, nearLinePoint(intersection.intersection)),
+            color: { red: 255, green: 255, blue: 255 },
+            lifetime: 30 // if someone crashes while pointing, don't leave the line there forever.
+        });
+    }
+}
+
+
+function mousePressEvent(event) {
+    if (!event.isLeftButton) {
+        return;
+    }
+    if (lineIsRezzed) {
+        return;
+    }
+    createOrUpdateLine(event);
+    if (lineIsRezzed) {
+        Controller.mouseMoveEvent.connect(mouseMoveEvent);
+    }
+ }
+
+
+function mouseMoveEvent(event) {
+    createOrUpdateLine(event);
+}
+
+
+function mouseReleaseEvent() {
+    if (lineIsRezzed) {
+        Controller.mouseMoveEvent.disconnect(mouseMoveEvent);
+    }
+    removeLine();
+}
+
+
+Controller.mousePressEvent.connect(mousePressEvent);
+Controller.mouseReleaseEvent.connect(mouseReleaseEvent);

libraries/entities-renderer/src/EntityTreeRenderer.cpp

@@ -1111,6 +1111,9 @@ void EntityTreeRenderer::changingEntityID(const EntityItemID& oldEntityID, const
 
 void EntityTreeRenderer::playEntityCollisionSound(const QUuid& myNodeID, EntityTree* entityTree, const EntityItemID& id, const Collision& collision) {
     EntityItem* entity = entityTree->findEntityByEntityItemID(id);
+    if (!entity) {
+        return;
+    }
     QUuid simulatorID = entity->getSimulatorID();
     if (simulatorID.isNull() || (simulatorID != myNodeID)) {
         return; // Only one injector per simulation, please.
@@ -1124,20 +1127,24 @@ void EntityTreeRenderer::playEntityCollisionSound(const QUuid& myNodeID, EntityT
     const float linearVelocity = glm::length(collision.penetration) * COLLISION_PENTRATION_TO_VELOCITY;
     const float energy = mass * linearVelocity * linearVelocity / 2.0f;
     const glm::vec3 position = collision.contactPoint;
-    const float COLLISION_ENERGY_AT_FULL_VOLUME = 1.0f;
+    const float COLLISION_ENERGY_AT_FULL_VOLUME = 0.5f;
     const float COLLISION_MINIMUM_VOLUME = 0.001f;
     const float energyFactorOfFull = fmin(1.0f, energy / COLLISION_ENERGY_AT_FULL_VOLUME);
     if (energyFactorOfFull < COLLISION_MINIMUM_VOLUME) {
         return;
     }
 
-    SharedSoundPointer sound = DependencyManager::get<SoundCache>().data()->getSound(QUrl(collisionSoundURL));
-    if (!sound->isReady()) {
+    auto soundCache = DependencyManager::get<SoundCache>();
+    if (soundCache.isNull()) {
+        return;
+    }
+    SharedSoundPointer sound = soundCache.data()->getSound(QUrl(collisionSoundURL));
+    if (sound.isNull() || !sound->isReady()) {
         return;
     }
 
     // This is a hack. Quiet sound aren't really heard at all, so we compress everything to the range [1-c, 1], if we play it all.
-    const float COLLISION_SOUND_COMPRESSION_RANGE = 0.95f;
+    const float COLLISION_SOUND_COMPRESSION_RANGE = 0.7f;
     float volume = energyFactorOfFull;
     volume = (volume * COLLISION_SOUND_COMPRESSION_RANGE) + (1.0f - COLLISION_SOUND_COMPRESSION_RANGE);
     
@@ -1148,6 +1155,7 @@ void EntityTreeRenderer::playEntityCollisionSound(const QUuid& myNodeID, EntityT
     options.volume = volume;
     AudioInjector* injector = new AudioInjector(sound.data(), options);
     injector->setLocalAudioInterface(_localAudioInterface);
+    injector->triggerDeleteAfterFinish();
     QThread* injectorThread = new QThread();
     injectorThread->setObjectName("Audio Injector Thread");
     injector->moveToThread(injectorThread);
@@ -1168,7 +1176,7 @@ void EntityTreeRenderer::entityCollisionWithEntity(const EntityItemID& idA, cons
     }
     // Don't respond to small continuous contacts. It causes deadlocks when locking the entityTree.
     // Note that any entity script is likely to Entities.getEntityProperties(), which locks the tree.
-    const float COLLISION_MINUMUM_PENETRATION = 0.001;
+    const float COLLISION_MINUMUM_PENETRATION = 0.005;
     if ((collision.type != CONTACT_EVENT_TYPE_START) && (glm::length(collision.penetration) < COLLISION_MINUMUM_PENETRATION)) {
         return;
     }

libraries/script-engine/src/ScriptCache.cpp

@@ -12,6 +12,7 @@
 #include <QCoreApplication>
 #include <QEventLoop>
 #include <QNetworkAccessManager>
+#include <QNetworkConfiguration>
 #include <QNetworkReply>
 #include <QObject>
 
@@ -35,7 +36,7 @@ QString ScriptCache::getScript(const QUrl& url, ScriptUser* scriptUser, bool& is
         isPending = true;
         bool alreadyWaiting = _scriptUsers.contains(url);
         _scriptUsers.insert(url, scriptUser);
-        
+
         if (alreadyWaiting) {
             qCDebug(scriptengine) << "Already downloading script at:" << url.toString();
         } else {
@@ -43,7 +44,7 @@ QString ScriptCache::getScript(const QUrl& url, ScriptUser* scriptUser, bool& is
             QNetworkRequest networkRequest = QNetworkRequest(url);
             networkRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT);
 
-            qCDebug(scriptengine) << "Downloading script at:" << url.toString();
+            qCDebug(scriptengine) << "Downloading script at" << url.toString();
             QNetworkReply* reply = networkAccessManager.get(networkRequest);
             connect(reply, &QNetworkReply::finished, this, &ScriptCache::scriptDownloaded);
         }
@@ -56,7 +57,7 @@ void ScriptCache::scriptDownloaded() {
     QUrl url = reply->url();
     QList<ScriptUser*> scriptUsers = _scriptUsers.values(url);
     _scriptUsers.remove(url);
-    
+
     if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute) == 200) {
         _scriptCache[url] = reply->readAll();
         qCDebug(scriptengine) << "Done downloading script at:" << url.toString();
@@ -65,7 +66,9 @@ void ScriptCache::scriptDownloaded() {
             user->scriptContentsAvailable(url, _scriptCache[url]);
         }
     } else {
-        qCDebug(scriptengine) << "ERROR Loading file:" << reply->url().toString();
+        qCWarning(scriptengine) << "Error loading script from URL " << reply->url().toString()
+            << "- HTTP status code is" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt()
+            << "and error from QNetworkReply is" << reply->errorString();
         foreach(ScriptUser* user, scriptUsers) {
             user->errorInLoadingScript(url);
         }
@@ -73,4 +76,4 @@ void ScriptCache::scriptDownloaded() {
     reply->deleteLater();
 }
 
-    
+