merge from upstream

assignment-client/src/AssignmentAction.h

@@ -37,17 +37,9 @@ public:
 private:
     QUuid _id;
     EntityActionType _type;
-    // QReadWriteLock _lock;
-
     QByteArray _data;
 
 protected:
-
-    // bool tryLockForRead() { return _lock.tryLockForRead(); }
-    // void lockForWrite() { _lock.lockForWrite(); }
-    // bool tryLockForWrite() { return _lock.tryLockForWrite(); }
-    // void unlock() { _lock.unlock(); }
-
     virtual glm::vec3 getPosition() { assert(false); return glm::vec3(0.0f); }
     virtual void setPosition(glm::vec3 position) { assert(false); }
     virtual glm::quat getRotation() { assert(false); return glm::quat(); }

assignment-client/src/audio/AudioMixer.cpp

@@ -852,9 +852,11 @@ void AudioMixer::run() {
 
         // since we're a while loop we need to help Qt's event processing
         QCoreApplication::processEvents();
-        QCoreApplication::sendPostedEvents(this, 0);
 
         if (_isFinished) {
+            // at this point the audio-mixer is done
+            // check if we have a deferred delete event to process (which we should once finished)
+            QCoreApplication::sendPostedEvents(this, QEvent::DeferredDelete);
             break;
         }
 

libraries/entities-renderer/src/RenderableTextEntityItem.cpp

@@ -16,6 +16,9 @@
 #include <DeferredLightingEffect.h>
 #include <GeometryCache.h>
 #include <PerfStat.h>
+#include <Transform.h>
+
+
 
 #include "RenderableTextEntityItem.h"
 #include "GLMHelpers.h"
@@ -37,14 +40,22 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
     transformToTopLeft.postTranslate(glm::vec3(-0.5f, 0.5f, 0.0f)); // Go to the top left
     transformToTopLeft.setScale(1.0f); // Use a scale of one so that the text is not deformed
     
+    // Render background
+    glm::vec3 minCorner = glm::vec3(0.0f, -dimensions.y, SLIGHTLY_BEHIND);
+    glm::vec3 maxCorner = glm::vec3(dimensions.x, 0.0f, SLIGHTLY_BEHIND);
+    
+    
     // Batch render calls
     Q_ASSERT(args->_batch);
     gpu::Batch& batch = *args->_batch;
     batch.setModelTransform(transformToTopLeft);
     
-    // Render background
-    glm::vec3 minCorner = glm::vec3(0.0f, -dimensions.y, SLIGHTLY_BEHIND);
-    glm::vec3 maxCorner = glm::vec3(dimensions.x, 0.0f, SLIGHTLY_BEHIND);
+    //rotate about vertical to face the camera
+    if (getFaceCamera()) {
+        transformToTopLeft.postRotate(args->_viewFrustum->getOrientation());
+        batch.setModelTransform(transformToTopLeft);
+    }
+    
     DependencyManager::get<DeferredLightingEffect>()->renderQuad(batch, minCorner, maxCorner, backgroundColor);
     
     float scale = _lineHeight / _textRenderer->getFontSize();
@@ -55,6 +66,7 @@ void RenderableTextEntityItem::render(RenderArgs* args) {
     glm::vec2 bounds = glm::vec2(dimensions.x - 2.0f * leftMargin,
                                  dimensions.y - 2.0f * topMargin);
     _textRenderer->draw(batch, leftMargin / scale, -topMargin / scale, _text, textColor, bounds / scale);
+    
 }
 
 

libraries/entities/src/EntityItem.h

@@ -313,7 +313,7 @@ public:
 
     const QString& getUserData() const { return _userData; }
     void setUserData(const QString& value) { _userData = value; }
-
+    
     QUuid getSimulatorID() const { return _simulatorID; }
     void setSimulatorID(const QUuid& value);
     void updateSimulatorID(const QUuid& value);

libraries/entities/src/EntityItemProperties.cpp

@@ -98,6 +98,7 @@ CONSTRUCT_PROPERTY(backgroundMode, BACKGROUND_MODE_INHERIT),
 CONSTRUCT_PROPERTY(sourceUrl, ""),
 CONSTRUCT_PROPERTY(lineWidth, LineEntityItem::DEFAULT_LINE_WIDTH),
 CONSTRUCT_PROPERTY(linePoints, QVector<glm::vec3>()),
+CONSTRUCT_PROPERTY(faceCamera, TextEntityItem::DEFAULT_FACE_CAMERA),
 CONSTRUCT_PROPERTY(actionData, QByteArray()),
 
 _id(UNKNOWN_ENTITY_ID),
@@ -348,6 +349,7 @@ EntityPropertyFlags EntityItemProperties::getChangedProperties() const {
     CHECK_PROPERTY_CHANGE(PROP_LINE_POINTS, linePoints);
     CHECK_PROPERTY_CHANGE(PROP_HREF, href);
     CHECK_PROPERTY_CHANGE(PROP_DESCRIPTION, description);
+    CHECK_PROPERTY_CHANGE(PROP_FACE_CAMERA, faceCamera);
     CHECK_PROPERTY_CHANGE(PROP_ACTION_DATA, actionData);
 
     changedProperties += _stage.getChangedProperties();
@@ -444,6 +446,7 @@ QScriptValue EntityItemProperties::copyToScriptValue(QScriptEngine* engine, bool
     COPY_PROPERTY_TO_QSCRIPTVALUE(linePoints);
     COPY_PROPERTY_TO_QSCRIPTVALUE(href);
     COPY_PROPERTY_TO_QSCRIPTVALUE(description);
+    COPY_PROPERTY_TO_QSCRIPTVALUE(faceCamera);
     COPY_PROPERTY_TO_QSCRIPTVALUE(actionData);
 
     // Sitting properties support
@@ -556,9 +559,9 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     COPY_PROPERTY_FROM_QSCRIPTVALUE(linePoints, qVectorVec3, setLinePoints);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(href, QString, setHref);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(description, QString, setDescription);
+    COPY_PROPERTY_FROM_QSCRIPTVALUE(faceCamera, bool, setFaceCamera);
     COPY_PROPERTY_FROM_QSCRIPTVALUE(actionData, QByteArray, setActionData);
 
-
     if (!honorReadOnly) {
         // this is used by the json reader to set things that we don't want javascript to able to affect.
         COPY_PROPERTY_FROM_QSCRIPTVALUE_GETTER(created, QDateTime, setCreated, [this]() {
@@ -725,6 +728,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
             APPEND_ENTITY_PROPERTY(PROP_HREF, properties.getHref());
             APPEND_ENTITY_PROPERTY(PROP_DESCRIPTION, properties.getDescription());
             
+            
             if (properties.getType() == EntityTypes::Web) {
                 APPEND_ENTITY_PROPERTY(PROP_SOURCE_URL, properties.getSourceUrl());
             }
@@ -734,6 +738,7 @@ bool EntityItemProperties::encodeEntityEditPacket(PacketType command, EntityItem
                 APPEND_ENTITY_PROPERTY(PROP_LINE_HEIGHT, properties.getLineHeight());
                 APPEND_ENTITY_PROPERTY(PROP_TEXT_COLOR, properties.getTextColor());
                 APPEND_ENTITY_PROPERTY(PROP_BACKGROUND_COLOR, properties.getBackgroundColor());
+                APPEND_ENTITY_PROPERTY(PROP_FACE_CAMERA, properties.getFaceCamera());
             }
             
             if (properties.getType() == EntityTypes::Model) {
@@ -978,6 +983,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_HREF, QString, setHref);
     READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_DESCRIPTION, QString, setDescription);
     
+    
     if (properties.getType() == EntityTypes::Web) {
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_SOURCE_URL, QString, setSourceUrl);
     }
@@ -987,6 +993,7 @@ bool EntityItemProperties::decodeEntityEditPacket(const unsigned char* data, int
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_LINE_HEIGHT, float, setLineHeight);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_TEXT_COLOR, xColor, setTextColor);
         READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_BACKGROUND_COLOR, xColor, setBackgroundColor);
+        READ_ENTITY_PROPERTY_TO_PROPERTIES(PROP_FACE_CAMERA, bool, setFaceCamera);
     }
     
     if (properties.getType() == EntityTypes::Model) {
@@ -1165,7 +1172,7 @@ void EntityItemProperties::markAllChanged() {
 
     _hrefChanged = true;
     _descriptionChanged = true;
-
+    _faceCameraChanged = true;
     _actionDataChanged = true;
 }
 

libraries/entities/src/EntityItemProperties.h

@@ -150,6 +150,7 @@ public:
     DEFINE_PROPERTY_REF(LINE_POINTS, LinePoints, linePoints, QVector<glm::vec3>);
     DEFINE_PROPERTY_REF(PROP_HREF, Href, href, QString);
     DEFINE_PROPERTY_REF(PROP_DESCRIPTION, Description, description, QString);
+    DEFINE_PROPERTY(PROP_FACE_CAMERA, FaceCamera, faceCamera, bool);
     DEFINE_PROPERTY_REF(PROP_ACTION_DATA, ActionData, actionData, QByteArray);
 
     static QString getBackgroundModeString(BackgroundMode mode);

libraries/entities/src/EntityItemPropertiesDefaults.h

@@ -66,6 +66,7 @@ const float ENTITY_ITEM_DEFAULT_FRICTION = 0.5f;
 
 const bool ENTITY_ITEM_DEFAULT_IGNORE_FOR_COLLISIONS = false;
 const bool ENTITY_ITEM_DEFAULT_COLLISIONS_WILL_MOVE = false;
+const bool ENTITY_ITEM_DEFAULT_BILLBOARDED = false;
 
 const float ENTITY_ITEM_DEFAULT_CUTOFF = PI / 2;
 

libraries/entities/src/EntityPropertyFlags.h

@@ -121,7 +121,7 @@ enum EntityPropertyList {
     // used by hyperlinks
     PROP_HREF,
     PROP_DESCRIPTION,
-
+    PROP_FACE_CAMERA,
     PROP_ACTION_DATA,
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////

libraries/entities/src/TextEntityItem.cpp

@@ -27,6 +27,7 @@ const QString TextEntityItem::DEFAULT_TEXT("");
 const float TextEntityItem::DEFAULT_LINE_HEIGHT = 0.1f;
 const xColor TextEntityItem::DEFAULT_TEXT_COLOR = { 255, 255, 255 };
 const xColor TextEntityItem::DEFAULT_BACKGROUND_COLOR = { 0, 0, 0};
+const bool TextEntityItem::DEFAULT_FACE_CAMERA = false;
 
 EntityItemPointer TextEntityItem::factory(const EntityItemID& entityID, const EntityItemProperties& properties) {
     return EntityItemPointer(new TextEntityItem(entityID, properties));
@@ -54,6 +55,7 @@ EntityItemProperties TextEntityItem::getProperties() const {
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(lineHeight, getLineHeight);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(textColor, getTextColorX);
     COPY_ENTITY_PROPERTY_TO_PROPERTIES(backgroundColor, getBackgroundColorX);
+    COPY_ENTITY_PROPERTY_TO_PROPERTIES(faceCamera, getFaceCamera);
     return properties;
 }
 
@@ -65,6 +67,7 @@ bool TextEntityItem::setProperties(const EntityItemProperties& properties) {
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(lineHeight, setLineHeight);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(textColor, setTextColor);
     SET_ENTITY_PROPERTY_FROM_PROPERTIES(backgroundColor, setBackgroundColor);
+    SET_ENTITY_PROPERTY_FROM_PROPERTIES(faceCamera, setFaceCamera);
 
     if (somethingChanged) {
         bool wantDebug = false;
@@ -91,7 +94,8 @@ int TextEntityItem::readEntitySubclassDataFromBuffer(const unsigned char* data,
     READ_ENTITY_PROPERTY(PROP_LINE_HEIGHT, float, setLineHeight);
     READ_ENTITY_PROPERTY(PROP_TEXT_COLOR, rgbColor, setTextColor);
     READ_ENTITY_PROPERTY(PROP_BACKGROUND_COLOR, rgbColor, setBackgroundColor);
-
+    READ_ENTITY_PROPERTY(PROP_FACE_CAMERA, bool, setFaceCamera);
+    
     return bytesRead;
 }
 
@@ -103,6 +107,7 @@ EntityPropertyFlags TextEntityItem::getEntityProperties(EncodeBitstreamParams& p
     requestedProperties += PROP_LINE_HEIGHT;
     requestedProperties += PROP_TEXT_COLOR;
     requestedProperties += PROP_BACKGROUND_COLOR;
+    requestedProperties += PROP_FACE_CAMERA;
     return requestedProperties;
 }
 
@@ -120,6 +125,8 @@ void TextEntityItem::appendSubclassData(OctreePacketData* packetData, EncodeBits
     APPEND_ENTITY_PROPERTY(PROP_LINE_HEIGHT, getLineHeight());
     APPEND_ENTITY_PROPERTY(PROP_TEXT_COLOR, getTextColor());
     APPEND_ENTITY_PROPERTY(PROP_BACKGROUND_COLOR, getBackgroundColor());
+    APPEND_ENTITY_PROPERTY(PROP_FACE_CAMERA, getFaceCamera());
+    
 }
 
 

libraries/entities/src/TextEntityItem.h

@@ -79,12 +79,17 @@ public:
             _backgroundColor[GREEN_INDEX] = value.green;
             _backgroundColor[BLUE_INDEX] = value.blue;
     }
+    
+    static const bool DEFAULT_FACE_CAMERA;
+    bool getFaceCamera() const { return _faceCamera; }
+    void setFaceCamera(bool value) { _faceCamera = value; }
 
 protected:
     QString _text;
     float _lineHeight;
     rgbColor _textColor;
     rgbColor _backgroundColor;
+    bool _faceCamera;
 };
 
 #endif // hifi_TextEntityItem_h

libraries/networking/src/PacketHeaders.cpp

@@ -73,7 +73,7 @@ PacketVersion versionForPacketType(PacketType packetType) {
         case PacketTypeEntityAdd:
         case PacketTypeEntityEdit:
         case PacketTypeEntityData:
-            return VERSION_ENTITIES_LINE_POINTS;
+            return VERSION_ENTITIES_FACE_CAMERA;
         case PacketTypeEntityErase:
             return 2;
         case PacketTypeAudioStreamStats:

libraries/networking/src/PacketHeaders.h

@@ -183,5 +183,6 @@ const PacketVersion VERSION_ENTITIES_HAVE_FRICTION = 26;
 const PacketVersion VERSION_NO_ENTITY_ID_SWAP = 27;
 const PacketVersion VERSION_ENTITIES_PARTICLE_FIX = 28;
 const PacketVersion VERSION_ENTITIES_LINE_POINTS = 29;
+const PacketVersion VERSION_ENTITIES_FACE_CAMERA = 30;
 
 #endif // hifi_PacketHeaders_h

libraries/shared/src/SettingInterface.cpp

@@ -43,7 +43,7 @@ namespace Setting {
         // set the associated application properties
         applicationInfo.beginGroup("INFO");
         QCoreApplication::setApplicationName(applicationInfo.value("name").toString());
-        QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
+        // QCoreApplication::setOrganizationName(applicationInfo.value("organizationName").toString());
         QCoreApplication::setOrganizationDomain(applicationInfo.value("organizationDomain").toString());
         
         // Let's set up the settings Private instance on its own thread