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

assignment-client/src/Agent.cpp

@@ -64,6 +64,7 @@ Agent::Agent(ReceivedMessage& message) :
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
     DependencyManager::set<ResourceManager>();
+    DependencyManager::set<PluginManager>();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -833,6 +834,8 @@ void Agent::aboutToFinish() {
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
+    DependencyManager::destroy<PluginManager>();
+
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();
 

assignment-client/src/audio/AudioMixer.cpp

@@ -65,7 +65,8 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
 
     // hash the available codecs (on the mixer)
     _availableCodecs.clear(); // Make sure struct is clean
-    auto codecPlugins = PluginManager::getInstance()->getCodecPlugins();
+    auto pluginManager = DependencyManager::set<PluginManager>();
+    auto codecPlugins = pluginManager->getCodecPlugins();
     std::for_each(codecPlugins.cbegin(), codecPlugins.cend(),
         [&](const CodecPluginPointer& codec) {
             _availableCodecs[codec->getName()] = codec;
@@ -106,6 +107,10 @@ AudioMixer::AudioMixer(ReceivedMessage& message) :
     connect(nodeList.data(), &NodeList::nodeKilled, this, &AudioMixer::handleNodeKilled);
 }
 
+void AudioMixer::aboutToFinish() {
+    DependencyManager::destroy<PluginManager>();
+}
+
 void AudioMixer::queueAudioPacket(QSharedPointer<ReceivedMessage> message, SharedNodePointer node) {
     if (message->getType() == PacketType::SilentAudioFrame) {
         _numSilentPackets++;

assignment-client/src/audio/AudioMixer.h

@@ -58,6 +58,9 @@ public:
                to.getPublicSocket() != from.getPublicSocket() &&
                to.getLocalSocket() != from.getLocalSocket();
     }
+
+    virtual void aboutToFinish() override;
+    
 public slots:
     void run() override;
     void sendStatsPacket() override;

assignment-client/src/scripts/EntityScriptServer.cpp

@@ -58,6 +58,7 @@ EntityScriptServer::EntityScriptServer(ReceivedMessage& message) : ThreadedAssig
     DependencyManager::get<EntityScriptingInterface>()->setPacketSender(&_entityEditSender);
 
     DependencyManager::set<ResourceManager>();
+    DependencyManager::set<PluginManager>();
 
     DependencyManager::registerInheritance<SpatialParentFinder, AssignmentParentFinder>();
 
@@ -572,6 +573,8 @@ void EntityScriptServer::aboutToFinish() {
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
+    DependencyManager::destroy<PluginManager>();
+
     // cleanup the AudioInjectorManager (and any still running injectors)
     DependencyManager::destroy<AudioInjectorManager>();
     DependencyManager::destroy<ScriptEngines>();

interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml

@@ -135,6 +135,8 @@ Item {
 
                 placeholderText: qsTr("Password")
                 echoMode: TextInput.Password
+
+                Keys.onReturnPressed: linkAccountBody.login()
             }
     }
 

interface/resources/qml/LoginDialog/LinkAccountBody.qml

@@ -177,6 +177,8 @@ Item {
                 root.text = "";
                 root.isPassword = true;
             }
+
+            Keys.onReturnPressed: linkAccountBody.login()
         }
 
         CheckBox {

interface/resources/qml/LoginDialog/SignUpBody.qml

@@ -164,6 +164,8 @@ Item {
                 root.text = "";
                 root.isPassword = focus
             }
+
+            Keys.onReturnPressed: signupBody.signup()
         }
 
         Row {

interface/resources/qml/dialogs/preferences/SpinnerSliderPreference.qml

@@ -56,8 +56,8 @@ Preference {
             id: slider
             value: preference.value
             width: 100
-            minimumValue: MyAvatar.getDomainMinScale()
+            minimumValue: preference.min
-            maximumValue: MyAvatar.getDomainMaxScale()
+            maximumValue: preference.max
             stepSize: preference.step
             onValueChanged: {
                 spinner.realValue = value
@@ -74,8 +74,8 @@ Preference {
             id: spinner
             decimals: preference.decimals
             realValue: preference.value
-            minimumValue: MyAvatar.getDomainMinScale()
+            minimumValue: preference.min
-            maximumValue: MyAvatar.getDomainMaxScale()
+            maximumValue: preference.max
             width: 100
             onValueChanged: {
                 slider.value = realValue;

interface/resources/qml/hifi/commerce/checkout/Checkout.qml

@@ -92,9 +92,9 @@ Rectangle {
 
         onBuyResult: {
             if (result.status !== 'success') {
-                failureErrorText.text = result.message;
+                failureErrorText.text = result.data.message;
                 root.activeView = "checkoutFailure";
-                UserActivityLogger.commercePurchaseFailure(root.itemId, root.itemAuthor, root.itemPrice, !root.alreadyOwned, result.message);
+                UserActivityLogger.commercePurchaseFailure(root.itemId, root.itemAuthor, root.itemPrice, !root.alreadyOwned, result.data.message);
             } else {
                 root.certificateId = result.data.certificate_id;
                 root.itemHref = result.data.download_url;

interface/src/Application.cpp

@@ -269,9 +269,6 @@ public:
         }
         _renderContext->doneCurrent();
 
-        // Deleting the object with automatically shutdown the thread
-        connect(qApp, &QCoreApplication::aboutToQuit, this, &QObject::deleteLater);
-
         // Transfer to a new thread
         moveToNewNamedThread(this, "RenderThread", [this](QThread* renderThread) {
             hifi::qt::addBlockingForbiddenThread("Render", renderThread);
@@ -814,6 +811,7 @@ bool setupEssentials(int& argc, char** argv, bool runningMarkerExisted) {
     }
 
     // Tell the plugin manager about our statically linked plugins
+    DependencyManager::set<PluginManager>();
     auto pluginManager = PluginManager::getInstance();
     pluginManager->setInputPluginProvider([] { return getInputPlugins(); });
     pluginManager->setDisplayPluginProvider([] { return getDisplayPlugins(); });
@@ -1378,6 +1376,10 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     initializeRenderEngine();
     qCDebug(interfaceapp, "Initialized Render Engine.");
 
+    // Overlays need to exist before we set the ContextOverlayInterface dependency
+    _overlays.init(); // do this before scripts load
+    DependencyManager::set<ContextOverlayInterface>();
+
     // Initialize the user interface and menu system
     // Needs to happen AFTER the render engine initialization to access its configuration
     initializeUi();
@@ -1514,10 +1516,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
     // allow you to move an entity around in your hand
     _entityEditSender.setPacketsPerSecond(3000); // super high!!
 
-    // Overlays need to exist before we set the ContextOverlayInterface dependency
-    _overlays.init(); // do this before scripts load
-    DependencyManager::set<ContextOverlayInterface>();
-
     // Make sure we don't time out during slow operations at startup
     updateHeartbeat();
 
@@ -2555,25 +2553,28 @@ Application::~Application() {
     _octreeProcessor.terminate();
     _entityEditSender.terminate();
 
+    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
+        steamClient->shutdown();
+    }
+    DependencyManager::destroy<PluginManager>();
+
+    DependencyManager::destroy<CompositorHelper>(); // must be destroyed before the FramebufferCache
+
     DependencyManager::destroy<AvatarManager>();
     DependencyManager::destroy<AnimationCache>();
     DependencyManager::destroy<FramebufferCache>();
     DependencyManager::destroy<TextureCache>();
     DependencyManager::destroy<ModelCache>();
-    DependencyManager::destroy<GeometryCache>();
     DependencyManager::destroy<ScriptCache>();
     DependencyManager::destroy<SoundCache>();
     DependencyManager::destroy<OctreeStatsProvider>();
+    DependencyManager::destroy<GeometryCache>();
 
     DependencyManager::get<ResourceManager>()->cleanup();
 
     // remove the NodeList from the DependencyManager
     DependencyManager::destroy<NodeList>();
 
-    if (auto steamClient = PluginManager::getInstance()->getSteamClientPlugin()) {
-        steamClient->shutdown();
-    }
-
 #if 0
     ConnexionClient::getInstance().destroy();
 #endif
@@ -2593,6 +2594,8 @@ Application::~Application() {
 
     // Can't log to file passed this point, FileLogger about to be deleted
     qInstallMessageHandler(LogHandler::verboseMessageHandler);
+    
+    _renderEventHandler->deleteLater();
 }
 
 void Application::initializeGL() {
@@ -2719,7 +2722,7 @@ void Application::initializeDisplayPlugins() {
     setDisplayPlugin(defaultDisplayPlugin);
 
     // Now set the desired plugin if it's not the same as the default plugin
-    if (targetDisplayPlugin != defaultDisplayPlugin) {
+    if (!targetDisplayPlugin && (targetDisplayPlugin != defaultDisplayPlugin)) {
         setDisplayPlugin(targetDisplayPlugin);
     }
 
@@ -2893,6 +2896,7 @@ void Application::initializeUi() {
     auto compositorHelper = DependencyManager::get<CompositorHelper>();
     connect(compositorHelper.data(), &CompositorHelper::allowMouseCaptureChanged, this, [=] {
         if (isHMDMode()) {
+            auto compositorHelper = DependencyManager::get<CompositorHelper>(); // don't capture outer smartpointer
             showCursor(compositorHelper->getAllowMouseCapture() ?
                        Cursor::Manager::lookupIcon(_preferredCursor.get()) :
                        Cursor::Icon::SYSTEM);

interface/src/Application_render.cpp

@@ -139,7 +139,10 @@ void Application::paintGL() {
     frame->frameIndex = _renderFrameCount;
     frame->framebuffer = finalFramebuffer;
     frame->framebufferRecycler = [](const gpu::FramebufferPointer& framebuffer) {
-        DependencyManager::get<FramebufferCache>()->releaseFramebuffer(framebuffer);
+        auto frameBufferCache = DependencyManager::get<FramebufferCache>();
+        if (frameBufferCache) {
+            frameBufferCache->releaseFramebuffer(framebuffer);
+        }
     };
     // deliver final scene rendering commands to the display plugin
     {

interface/src/ui/PreferencesDialog.cpp

@@ -227,6 +227,8 @@ void setupPreferences() {
         auto getter = [=]()->float { return myAvatar->getTargetScale(); };
         auto setter = [=](float value) { myAvatar->setTargetScale(value); };
         auto preference = new SpinnerSliderPreference(AVATAR_TUNING, "Avatar Scale", getter, setter);
+        preference->setMin(0.25);
+        preference->setMax(4);
         preference->setStep(0.05f);
         preference->setDecimals(2);
         preferences->addPreference(preference);
@@ -303,17 +305,21 @@ void setupPreferences() {
     {
         auto getter = [=]()->float { return myAvatar->getPitchSpeed(); };
         auto setter = [=](float value) { myAvatar->setPitchSpeed(value); };
-        auto preference = new SpinnerPreference(AVATAR_CAMERA, "Pitch speed (degrees/second)", getter, setter);
+        auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "Y input:", getter, setter);
         preference->setMin(1.0f);
         preference->setMax(360.0f);
+        preference->setStep(1);
+        preference->setDecimals(1);
         preferences->addPreference(preference);
     }
     {
         auto getter = [=]()->float { return myAvatar->getYawSpeed(); };
         auto setter = [=](float value) { myAvatar->setYawSpeed(value); };
-        auto preference = new SpinnerPreference(AVATAR_CAMERA, "Yaw speed (degrees/second)", getter, setter);
+        auto preference = new SpinnerSliderPreference(AVATAR_CAMERA, "X input:", getter, setter);
         preference->setMin(1.0f);
         preference->setMax(360.0f);
+        preference->setStep(1);
+        preference->setDecimals(1);
         preferences->addPreference(preference);
     }
 

libraries/entities/src/EntityScriptingInterface.cpp

@@ -1269,6 +1269,8 @@ bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& poin
     EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
     if (!entity) {
         qCDebug(entities) << "EntityScriptingInterface::setPoints no entity with ID" << entityID;
+        // There is no entity
+        return false;
     }
 
     EntityTypes::EntityType entityType = entity->getType();

libraries/entities/src/EntityTree.cpp

@@ -2521,6 +2521,13 @@ bool EntityTree::readFromMap(QVariantMap& map) {
             }
         }
 
+        // Zero out the spread values that were fixed in version ParticleEntityFix so they behave the same as before
+        if (contentVersion < (int)EntityVersion::ParticleEntityFix) {
+            properties.setRadiusSpread(0.0f);
+            properties.setAlphaSpread(0.0f);
+            properties.setColorSpread({0, 0, 0});
+        }
+
         EntityItemPointer entity = addEntity(entityItemID, properties);
         if (!entity) {
             qCDebug(entities) << "adding Entity failed:" << entityItemID << properties.getType();

libraries/gpu-gl-common/src/gpu/gl/GLBackendPipeline.cpp

@@ -203,10 +203,11 @@ void GLBackend::releaseResourceTexture(uint32_t slot) {
 }
 
 void GLBackend::resetResourceStage() {
-    for (uint32_t i = 0; i < _resource._buffers.size(); i++) {
+    uint32_t i;
+    for (i = 0; i < _resource._buffers.size(); i++) {
         releaseResourceBuffer(i);
     }
-    for (uint32_t i = 0; i < _resource._textures.size(); i++) {
+    for (i = 0; i < _resource._textures.size(); i++) {
         releaseResourceTexture(i);
     }
 }

libraries/gpu-gl-common/src/gpu/gl/GLTexture.cpp

@@ -59,7 +59,11 @@ const size_t GLVariableAllocationSupport::MAX_BUFFER_SIZE = MAX_TRANSFER_SIZE;
 GLenum GLTexture::getGLTextureType(const Texture& texture) {
     switch (texture.getType()) {
     case Texture::TEX_2D:
+        if (!texture.isArray()) {
             return GL_TEXTURE_2D;
+        } else {
+            return GL_TEXTURE_2D_ARRAY;
+        }
         break;
 
     case Texture::TEX_CUBE:
@@ -77,6 +81,7 @@ GLenum GLTexture::getGLTextureType(const Texture& texture) {
 uint8_t GLTexture::getFaceCount(GLenum target) {
     switch (target) {
         case GL_TEXTURE_2D:
+        case GL_TEXTURE_2D_ARRAY:
             return TEXTURE_2D_NUM_FACES;
         case GL_TEXTURE_CUBE_MAP:
             return TEXTURE_CUBE_NUM_FACES;
@@ -86,17 +91,22 @@ uint8_t GLTexture::getFaceCount(GLenum target) {
     }
 }
 const std::vector<GLenum>& GLTexture::getFaceTargets(GLenum target) {
-    static std::vector<GLenum> cubeFaceTargets {
+    static const std::vector<GLenum> cubeFaceTargets {
         GL_TEXTURE_CUBE_MAP_POSITIVE_X, GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
         GL_TEXTURE_CUBE_MAP_POSITIVE_Y, GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
         GL_TEXTURE_CUBE_MAP_POSITIVE_Z, GL_TEXTURE_CUBE_MAP_NEGATIVE_Z
     };
-    static std::vector<GLenum> faceTargets {
+    static const std::vector<GLenum> faceTargets {
         GL_TEXTURE_2D
     };
+    static const std::vector<GLenum> arrayFaceTargets{ 
+        GL_TEXTURE_2D_ARRAY 
+    };
     switch (target) {
     case GL_TEXTURE_2D:
         return faceTargets;
+    case GL_TEXTURE_2D_ARRAY:
+        return arrayFaceTargets;
     case GL_TEXTURE_CUBE_MAP:
         return cubeFaceTargets;
     default:

libraries/gpu-gl/src/gpu/gl41/GL41BackendOutput.cpp

@@ -64,7 +64,12 @@ public:
                     }
 
                     if (gltexture) {
+                        if (gltexture->_target == GL_TEXTURE_2D) {
                             glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, gltexture->_texture, 0);
+                        } else {
+                            glFramebufferTextureLayer(GL_FRAMEBUFFER, colorAttachments[unit], gltexture->_texture, 0,
+                                                      b._subresource);
+                        }
                         _colorBuffers.push_back(colorAttachments[unit]);
                     } else {
                         glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, 0, 0);
@@ -91,7 +96,12 @@ public:
             }
 
             if (gltexture) {
+                if (gltexture->_target == GL_TEXTURE_2D) {
                     glFramebufferTexture2D(GL_FRAMEBUFFER, attachement, GL_TEXTURE_2D, gltexture->_texture, 0);
+                } else {
+                    glFramebufferTextureLayer(GL_FRAMEBUFFER, attachement, gltexture->_texture, 0,
+                                              _gpuObject.getDepthStencilBufferSubresource());
+                }
             } else {
                 glFramebufferTexture2D(GL_FRAMEBUFFER, attachement, GL_TEXTURE_2D, 0, 0);
             }

libraries/gpu-gl/src/gpu/gl41/GL41BackendTexture.cpp

@@ -182,7 +182,7 @@ void GL41Texture::syncSampler() const {
     glTexParameteri(_target, GL_TEXTURE_MAG_FILTER, fm.magFilter);
 
     if (sampler.doComparison()) {
-        glTexParameteri(_target, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE_ARB);
+        glTexParameteri(_target, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
         glTexParameteri(_target, GL_TEXTURE_COMPARE_FUNC, COMPARISON_TO_GL[sampler.getComparisonFunction()]);
     } else {
         glTexParameteri(_target, GL_TEXTURE_COMPARE_MODE, GL_NONE);
@@ -197,7 +197,7 @@ void GL41Texture::syncSampler() const {
     glTexParameterf(_target, GL_TEXTURE_MIN_LOD, (float)sampler.getMinMip());
     glTexParameterf(_target, GL_TEXTURE_MAX_LOD, (sampler.getMaxMip() == Sampler::MAX_MIP_LEVEL ? 1000.f : sampler.getMaxMip()));
 
-    glTexParameterf(_target, GL_TEXTURE_MAX_ANISOTROPY_EXT, sampler.getMaxAnisotropy());
+    glTexParameterf(_target, GL_TEXTURE_MAX_ANISOTROPY, sampler.getMaxAnisotropy());
 }
 
 using GL41FixedAllocationTexture = GL41Backend::GL41FixedAllocationTexture;
@@ -215,12 +215,19 @@ GL41FixedAllocationTexture::~GL41FixedAllocationTexture() {
 void GL41FixedAllocationTexture::allocateStorage() const {
     const GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuObject.getTexelFormat());
     const auto numMips = _gpuObject.getNumMips();
+    const auto numSlices = _gpuObject.getNumSlices();
 
     // glTextureStorage2D(_id, mips, texelFormat.internalFormat, dimensions.x, dimensions.y);
     for (GLint level = 0; level < numMips; level++) {
         Vec3u dimensions = _gpuObject.evalMipDimensions(level);
         for (GLenum target : getFaceTargets(_target)) {
-            glTexImage2D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, 0, texelFormat.format, texelFormat.type, nullptr);
+            if (!_gpuObject.isArray()) {
+                glTexImage2D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, 0, texelFormat.format,
+                             texelFormat.type, nullptr);
+            } else {
+                glTexImage3D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, numSlices, 0,
+                             texelFormat.format, texelFormat.type, nullptr);
+            }
         }
     }
 

libraries/gpu-gl/src/gpu/gl45/GL45BackendOutput.cpp

@@ -60,7 +60,11 @@ public:
                     }
 
                     if (gltexture) {
+                        if (gltexture->_target == GL_TEXTURE_2D) {
                             glNamedFramebufferTexture(_id, colorAttachments[unit], gltexture->_texture, 0);
+                        } else {
+                            glNamedFramebufferTextureLayer(_id, colorAttachments[unit], gltexture->_texture, 0, b._subresource);
+                        }
                         _colorBuffers.push_back(colorAttachments[unit]);
                     } else {
                         glNamedFramebufferTexture(_id, colorAttachments[unit], 0, 0);
@@ -87,14 +91,18 @@ public:
             }
 
             if (gltexture) {
+                if (gltexture->_target == GL_TEXTURE_2D) {
                     glNamedFramebufferTexture(_id, attachement, gltexture->_texture, 0);
+                } else {
+                    glNamedFramebufferTextureLayer(_id, attachement, gltexture->_texture, 0,
+                                                   _gpuObject.getDepthStencilBufferSubresource());
+                }
             } else {
                 glNamedFramebufferTexture(_id, attachement, 0, 0);
             }
             _depthStamp = _gpuObject.getDepthStamp();
         }
 
-
         // Last but not least, define where we draw
         if (!_colorBuffers.empty()) {
             glNamedFramebufferDrawBuffers(_id, (GLsizei)_colorBuffers.size(), _colorBuffers.data());

libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp

@@ -152,7 +152,7 @@ public:
             glSamplerParameteri(result, GL_TEXTURE_MIN_FILTER, fm.minFilter);
             glSamplerParameteri(result, GL_TEXTURE_MAG_FILTER, fm.magFilter);
             if (sampler.doComparison()) {
-                glSamplerParameteri(result, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE_ARB);
+                glSamplerParameteri(result, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
                 glSamplerParameteri(result, GL_TEXTURE_COMPARE_FUNC, COMPARISON_TO_GL[sampler.getComparisonFunction()]);
             } else {
                 glSamplerParameteri(result, GL_TEXTURE_COMPARE_MODE, GL_NONE);
@@ -341,7 +341,7 @@ void GL45Texture::syncSampler() const {
     glTextureParameteri(_id, GL_TEXTURE_MAG_FILTER, fm.magFilter);
 
     if (sampler.doComparison()) {
-        glTextureParameteri(_id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE_ARB);
+        glTextureParameteri(_id, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_REF_TO_TEXTURE);
         glTextureParameteri(_id, GL_TEXTURE_COMPARE_FUNC, COMPARISON_TO_GL[sampler.getComparisonFunction()]);
     } else {
         glTextureParameteri(_id, GL_TEXTURE_COMPARE_MODE, GL_NONE);
@@ -374,8 +374,13 @@ void GL45FixedAllocationTexture::allocateStorage() const {
     const GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuObject.getTexelFormat());
     const auto dimensions = _gpuObject.getDimensions();
     const auto mips = _gpuObject.getNumMips();
+    const auto numSlices = _gpuObject.getNumSlices();
 
+    if (!_gpuObject.isArray()) {
         glTextureStorage2D(_id, mips, texelFormat.internalFormat, dimensions.x, dimensions.y);
+    } else {
+        glTextureStorage3D(_id, mips, texelFormat.internalFormat, dimensions.x, dimensions.y, numSlices);
+    }
 
     glTextureParameteri(_id, GL_TEXTURE_BASE_LEVEL, 0);
     glTextureParameteri(_id, GL_TEXTURE_MAX_LEVEL, mips - 1);

libraries/gpu-gles/src/gpu/gles/GLESBackendOutput.cpp

@@ -64,7 +64,12 @@ public:
                     }
 
                     if (gltexture) {
+                        if (gltexture->_target == GL_TEXTURE_2D) {
                             glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, gltexture->_texture, 0);
+                        } else {
+                            glFramebufferTextureLayer(GL_FRAMEBUFFER, colorAttachments[unit], gltexture->_texture, 0,
+                                                      b._subresource);
+                        }
                         _colorBuffers.push_back(colorAttachments[unit]);
                     } else {
                         glFramebufferTexture2D(GL_FRAMEBUFFER, colorAttachments[unit], GL_TEXTURE_2D, 0, 0);
@@ -91,7 +96,12 @@ public:
             }
 
             if (gltexture) {
+                if (gltexture->_target == GL_TEXTURE_2D) {
                     glFramebufferTexture2D(GL_FRAMEBUFFER, attachement, GL_TEXTURE_2D, gltexture->_texture, 0);
+                } else {
+                    glFramebufferTextureLayer(GL_FRAMEBUFFER, attachement, gltexture->_texture, 0,
+                                              _gpuObject.getDepthStencilBufferSubresource());
+                }
             } else {
                 glFramebufferTexture2D(GL_FRAMEBUFFER, attachement, GL_TEXTURE_2D, 0, 0);
             }

libraries/gpu-gles/src/gpu/gles/GLESBackendTexture.cpp

@@ -268,16 +268,27 @@ GLsizei getCompressedImageSize(int width, int height, GLenum internalFormat) {
 void GLESFixedAllocationTexture::allocateStorage() const {
     const GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuObject.getTexelFormat());
     const auto numMips = _gpuObject.getNumMips();
+    const auto numSlices = _gpuObject.getNumSlices();
 
     // glTextureStorage2D(_id, mips, texelFormat.internalFormat, dimensions.x, dimensions.y);
     for (GLint level = 0; level < numMips; level++) {
         Vec3u dimensions = _gpuObject.evalMipDimensions(level);
         for (GLenum target : getFaceTargets(_target)) {
             if (texelFormat.isCompressed()) {
-                glCompressedTexImage2D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, 0,
+                auto size = getCompressedImageSize(dimensions.x, dimensions.y, texelFormat.internalFormat);
-                                       getCompressedImageSize(dimensions.x, dimensions.y, texelFormat.internalFormat), nullptr);
+                if (!_gpuObject.isArray()) {
+                    glCompressedTexImage2D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, 0, size, nullptr);
                 } else {
-                glTexImage2D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, 0, texelFormat.format, texelFormat.type, nullptr);
+                    glCompressedTexImage3D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, numSlices, 0, size * numSlices, nullptr);
+                }
+            } else {
+                if (!_gpuObject.isArray()) {
+                    glTexImage2D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, 0, texelFormat.format,
+                                texelFormat.type, nullptr);
+                } else {
+                    glTexImage3D(target, level, texelFormat.internalFormat, dimensions.x, dimensions.y, numSlices, 0,
+                                texelFormat.format, texelFormat.type, nullptr);
+                }
             }
         }
     }

libraries/gpu/src/gpu/Frame.cpp

@@ -21,10 +21,7 @@ Frame::~Frame() {
         framebuffer.reset();
     }
 
-    assert(bufferUpdates.empty());
+    bufferUpdates.clear();
-    if (!bufferUpdates.empty()) {
-        qFatal("Buffer sync error... frame destroyed without buffer updates being applied");
-    }
 }
 
 void Frame::finish() {

libraries/gpu/src/gpu/Texture.cpp

@@ -184,6 +184,10 @@ TexturePointer Texture::createRenderBuffer(const Element& texelFormat, uint16 wi
     return create(TextureUsageType::RENDERBUFFER, TEX_2D, texelFormat, width, height, 1, 1, 0, numMips, sampler);
 }
 
+TexturePointer Texture::createRenderBufferArray(const Element& texelFormat, uint16 width, uint16 height, uint16 numSlices, uint16 numMips, const Sampler& sampler) {
+    return create(TextureUsageType::RENDERBUFFER, TEX_2D, texelFormat, width, height, 1, 1, numSlices, numMips, sampler);
+}
+
 TexturePointer Texture::create1D(const Element& texelFormat, uint16 width, uint16 numMips, const Sampler& sampler) {
     return create(TextureUsageType::RESOURCE, TEX_1D, texelFormat, width, 1, 1, 1, 0, numMips, sampler);
 }
@@ -192,6 +196,10 @@ TexturePointer Texture::create2D(const Element& texelFormat, uint16 width, uint1
     return create(TextureUsageType::RESOURCE, TEX_2D, texelFormat, width, height, 1, 1, 0, numMips, sampler);
 }
 
+TexturePointer Texture::create2DArray(const Element& texelFormat, uint16 width, uint16 height, uint16 numSlices, uint16 numMips, const Sampler& sampler) {
+    return create(TextureUsageType::STRICT_RESOURCE, TEX_2D, texelFormat, width, height, 1, 1, numSlices, numMips, sampler);
+}
+
 TexturePointer Texture::createStrict(const Element& texelFormat, uint16 width, uint16 height, uint16 numMips, const Sampler& sampler) {
     return create(TextureUsageType::STRICT_RESOURCE, TEX_2D, texelFormat, width, height, 1, 1, 0, numMips, sampler);
 }

libraries/gpu/src/gpu/Texture.h

@@ -374,9 +374,11 @@ public:
     static const uint16 SINGLE_MIP = 1;
     static TexturePointer create1D(const Element& texelFormat, uint16 width, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
     static TexturePointer create2D(const Element& texelFormat, uint16 width, uint16 height, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
+    static TexturePointer create2DArray(const Element& texelFormat, uint16 width, uint16 height, uint16 numSlices, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
     static TexturePointer create3D(const Element& texelFormat, uint16 width, uint16 height, uint16 depth, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
     static TexturePointer createCube(const Element& texelFormat, uint16 width, uint16 numMips = 1, const Sampler& sampler = Sampler());
     static TexturePointer createRenderBuffer(const Element& texelFormat, uint16 width, uint16 height, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
+    static TexturePointer createRenderBufferArray(const Element& texelFormat, uint16 width, uint16 height, uint16 numSlices, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
     static TexturePointer createStrict(const Element& texelFormat, uint16 width, uint16 height, uint16 numMips = SINGLE_MIP, const Sampler& sampler = Sampler());
     static TexturePointer createExternal(const ExternalRecycler& recycler, const Sampler& sampler = Sampler());
 

libraries/gpu/src/gpu/Texture_ktx.cpp

@@ -515,7 +515,7 @@ TexturePointer Texture::build(const ktx::KTXDescriptor& descriptor) {
         header.getPixelHeight(),
         header.getPixelDepth(),
         1, // num Samples
-        header.getNumberOfSlices(),
+        header.isArray() ? header.getNumberOfSlices() : 0,
         header.getNumberOfLevels(),
         samplerDesc);
     texture->setUsage(gpuktxKeyValue._usage);

libraries/ktx/src/ktx/KTX.h

@@ -163,6 +163,7 @@ namespace ktx {
         uint32_t getPixelDepth() const { return (pixelDepth ? pixelDepth : 1); }
         uint32_t getNumberOfSlices() const { return (numberOfArrayElements ? numberOfArrayElements : 1); }
         uint32_t getNumberOfLevels() const { return (numberOfMipmapLevels ? numberOfMipmapLevels : 1); }
+        bool isArray() const { return numberOfArrayElements > 0; }
         bool isCompressed() const { return glFormat == COMPRESSED_FORMAT; }
 
         uint32_t evalMaxDimension() const;

libraries/networking/src/ResourceManager.cpp

@@ -39,8 +39,13 @@ ResourceManager::ResourceManager(bool atpSupportEnabled) : _atpSupportEnabled(at
 }
 
 ResourceManager::~ResourceManager() {
+    if (_thread.isRunning()) {
+        _thread.quit();
+        static const auto MAX_RESOURCE_MANAGER_THREAD_QUITTING_TIME = MSECS_PER_SECOND / 2;
+        if (!_thread.wait(MAX_RESOURCE_MANAGER_THREAD_QUITTING_TIME)) {
             _thread.terminate();
-    _thread.wait();
+        }
+    }
 }
 
 void ResourceManager::setUrlPrefixOverride(const QString& prefix, const QString& replacement) {

libraries/networking/src/udt/Connection.cpp

@@ -239,7 +239,7 @@ void Connection::sync() {
             sendACK();
         }
         
-        if (_lossList.getLength() > 0) {
+        if (_congestionControl->shouldNAK() && _lossList.getLength() > 0) {
             // check if we need to re-transmit a loss list
             // we do this if it has been longer than the current nakInterval since we last sent
             auto now = p_high_resolution_clock::now();
@@ -272,9 +272,12 @@ void Connection::sendACK(bool wasCausedBySyncTimeout) {
     SequenceNumber nextACKNumber = nextACK();
     Q_ASSERT_X(nextACKNumber >= _lastSentACK, "Connection::sendACK", "Sending lower ACK, something is wrong");
 
-    if (nextACKNumber == _lastSentACK) {
+    // if our congestion control doesn't want to send an ACK for every packet received
-        // We already sent this ACK, but check if we should re-send it.
+    // check if we already sent this ACK
-        if (nextACKNumber < _lastReceivedAcknowledgedACK) {
+    if (_congestionControl->_ackInterval > 1 && nextACKNumber == _lastSentACK) {
+
+        // if we use ACK2s, check if the receiving side already confirmed receipt of this ACK
+        if (_congestionControl->shouldACK2() && nextACKNumber < _lastReceivedAcknowledgedACK) {
             // we already got an ACK2 for this ACK we would be sending, don't bother
             return;
         }
@@ -287,11 +290,11 @@ void Connection::sendACK(bool wasCausedBySyncTimeout) {
         }
     }
     // we have received new packets since the last sent ACK
+    // or our congestion control dictates that we always send ACKs
     
     // update the last sent ACK
     _lastSentACK = nextACKNumber;
 
-
     _ackPacket->reset(); // We need to reset it every time.
     
     // pack in the ACK sub-sequence number
@@ -449,6 +452,7 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
     // mark our last receive time as now (to push the potential expiry farther)
     _lastReceiveTime = p_high_resolution_clock::now();
 
+    if (_congestionControl->shouldProbe()) {
         // check if this is a packet pair we should estimate bandwidth from, or just a regular packet
         if (((uint32_t) sequenceNumber & 0xF) == 0) {
             _receiveWindow.onProbePair1Arrival();
@@ -460,8 +464,9 @@ bool Connection::processReceivedSequenceNumber(SequenceNumber sequenceNumber, in
                 // reset our control probe tail marker so the next probe that comes with data can be used
                 _receivedControlProbeTail = false;
             }
-        
         }
+    }
+
     _receiveWindow.onPacketArrival();
     
     // If this is not the next sequence number, report loss

libraries/plugins/src/plugins/PluginManager.cpp

@@ -40,9 +40,8 @@ void PluginManager::setInputPluginSettingsPersister(const InputPluginSettingsPer
     _inputSettingsPersister = persister;
 }
 
-PluginManager* PluginManager::getInstance() {
+PluginManagerPointer PluginManager::getInstance() {
-    static PluginManager _manager;
+    return DependencyManager::get<PluginManager>();
-    return &_manager;
 }
 
 QString getPluginNameFromMetaData(QJsonObject object) {
@@ -136,9 +135,6 @@ const LoaderList& getLoadedPlugins() {
     return loadedPlugins;
 }
 
-PluginManager::PluginManager() {
-}
-
 const CodecPluginList& PluginManager::getCodecPlugins() {
     static CodecPluginList codecPlugins;
     static std::once_flag once;

libraries/plugins/src/plugins/PluginManager.h

@@ -9,12 +9,19 @@
 
 #include <QObject>
 
+#include <DependencyManager.h>
+
 #include "Forward.h"
 
-class PluginManager : public QObject {
+
+class PluginManager;
+using PluginManagerPointer = QSharedPointer<PluginManager>;
+
+class PluginManager : public QObject, public Dependency {
+    SINGLETON_DEPENDENCY
+
 public:
-    static PluginManager* getInstance();
+    static PluginManagerPointer getInstance();
-    PluginManager();
 
     const DisplayPluginList& getDisplayPlugins();
     const InputPluginList& getInputPlugins();
@@ -39,6 +46,8 @@ public:
     void setInputPluginSettingsPersister(const InputPluginSettingsPersister& persister);
     
 private:
+    PluginManager() = default;
+
     DisplayPluginProvider _displayPluginProvider { []()->DisplayPluginList { return {}; } };
     InputPluginProvider _inputPluginProvider { []()->InputPluginList { return {}; } };
     CodecPluginProvider _codecPluginProvider { []()->CodecPluginList { return {}; } };

libraries/render-utils/src/DebugDeferredBuffer.cpp

@@ -60,7 +60,8 @@ enum TextureSlot {
 enum ParamSlot {
     CameraCorrection = 0,
     DeferredFrameTransform,
-    ShadowTransform
+    ShadowTransform,
+    DebugParametersBuffer
 };
 
 static const std::string DEFAULT_ALBEDO_SHADER {
@@ -139,12 +140,11 @@ static const std::string DEFAULT_LIGHTING_SHADER {
     " }"
 };
 
-static const std::string DEFAULT_SHADOW_SHADER{
+static const std::string DEFAULT_SHADOW_DEPTH_SHADER{
-    "uniform sampler2DShadow shadowMap;"
     "vec4 getFragmentColor() {"
     "    for (int i = 255; i >= 0; --i) {"
     "        float depth = i / 255.0;"
-    "        if (texture(shadowMap, vec3(uv, depth)) > 0.5) {"
+    "        if (texture(shadowMaps, vec4(uv, parameters._shadowCascadeIndex, depth)) > 0.5) {"
     "            return vec4(vec3(depth), 1.0);"
     "        }"
     "    }"
@@ -323,7 +323,7 @@ std::string DebugDeferredBuffer::getShaderSourceCode(Mode mode, std::string cust
         case ShadowCascade1Mode:
         case ShadowCascade2Mode:
         case ShadowCascade3Mode:
-            return DEFAULT_SHADOW_SHADER;
+            return DEFAULT_SHADOW_DEPTH_SHADER;
         case ShadowCascadeIndicesMode:
             return DEFAULT_SHADOW_CASCADE_SHADER;
         case LinearDepthMode:
@@ -396,6 +396,7 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str
         slotBindings.insert(gpu::Shader::Binding("cameraCorrectionBuffer", CameraCorrection));
         slotBindings.insert(gpu::Shader::Binding("deferredFrameTransformBuffer", DeferredFrameTransform));
         slotBindings.insert(gpu::Shader::Binding("shadowTransformBuffer", ShadowTransform));
+        slotBindings.insert(gpu::Shader::Binding("parametersBuffer", DebugParametersBuffer));
 
         slotBindings.insert(gpu::Shader::Binding("albedoMap", Albedo));
         slotBindings.insert(gpu::Shader::Binding("normalMap", Normal));
@@ -403,7 +404,7 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str
         slotBindings.insert(gpu::Shader::Binding("depthMap", Depth));
         slotBindings.insert(gpu::Shader::Binding("obscuranceMap", AmbientOcclusion));
         slotBindings.insert(gpu::Shader::Binding("lightingMap", Lighting));
-        slotBindings.insert(gpu::Shader::Binding("shadowMap", Shadow));
+        slotBindings.insert(gpu::Shader::Binding("shadowMaps", Shadow));
         slotBindings.insert(gpu::Shader::Binding("linearDepthMap", LinearDepth));
         slotBindings.insert(gpu::Shader::Binding("halfLinearDepthMap", HalfLinearDepth));
         slotBindings.insert(gpu::Shader::Binding("halfNormalMap", HalfNormal));
@@ -432,8 +433,11 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str
 }
 
 void DebugDeferredBuffer::configure(const Config& config) {
+    auto& parameters = _parameters.edit();
+
     _mode = (Mode)config.mode;
     _size = config.size;
+    parameters._shadowCascadeIndex = glm::clamp(_mode - Mode::ShadowCascade0Mode, 0, (int)SHADOW_CASCADE_MAX_COUNT - 1);
 }
 
 void DebugDeferredBuffer::run(const RenderContextPointer& renderContext, const Inputs& inputs) {
@@ -483,14 +487,15 @@ void DebugDeferredBuffer::run(const RenderContextPointer& renderContext, const I
             batch.setResourceTexture(Velocity, velocityFramebuffer->getVelocityTexture());
         }
 
+        batch.setUniformBuffer(DebugParametersBuffer, _parameters);
+
         auto lightStage = renderContext->_scene->getStage<LightStage>();
         assert(lightStage);
         assert(lightStage->getNumLights() > 0);
         auto lightAndShadow = lightStage->getCurrentKeyLightAndShadow();
         const auto& globalShadow = lightAndShadow.second;
         if (globalShadow) {
-            const auto cascadeIndex = glm::clamp(_mode - Mode::ShadowCascade0Mode, 0, (int)globalShadow->getCascadeCount() - 1);
+            batch.setResourceTexture(Shadow, globalShadow->map);
-            batch.setResourceTexture(Shadow, globalShadow->getCascade(cascadeIndex).map);
             batch.setUniformBuffer(ShadowTransform, globalShadow->getBuffer());
             batch.setUniformBuffer(DeferredFrameTransform, frameTransform->getFrameTransformBuffer());
         }

libraries/render-utils/src/DebugDeferredBuffer.h

@@ -39,7 +39,12 @@ signals:
 
 class DebugDeferredBuffer {
 public:
-    using Inputs = render::VaryingSet6<DeferredFramebufferPointer, LinearDepthFramebufferPointer, SurfaceGeometryFramebufferPointer, AmbientOcclusionFramebufferPointer, VelocityFramebufferPointer, DeferredFrameTransformPointer>;
+    using Inputs = render::VaryingSet6<DeferredFramebufferPointer,
+                                       LinearDepthFramebufferPointer,
+                                       SurfaceGeometryFramebufferPointer,
+                                       AmbientOcclusionFramebufferPointer,
+                                       VelocityFramebufferPointer,
+                                       DeferredFrameTransformPointer>;
     using Config = DebugDeferredBufferConfig;
     using JobModel = render::Job::ModelI<DebugDeferredBuffer, Inputs, Config>;
 
@@ -52,7 +57,8 @@ public:
 protected:
     friend class DebugDeferredBufferConfig;
 
-    enum Mode : uint8_t {
+    enum Mode : uint8_t
+    {
         // Use Mode suffix to avoid collisions
         Off = 0,
         DepthMode,
@@ -92,6 +98,10 @@ private:
     Mode _mode{ Off };
     glm::vec4 _size;
 
+#include "debug_deferred_buffer_shared.slh"
+
+    using ParametersBuffer = gpu::StructBuffer<DebugParameters>;
+
     struct CustomPipeline {
         gpu::PipelinePointer pipeline;
         mutable QFileInfo info;
@@ -103,9 +113,10 @@ private:
     const gpu::PipelinePointer& getPipeline(Mode mode, std::string customFile = std::string());
     std::string getShaderSourceCode(Mode mode, std::string customFile = std::string());
 
+    ParametersBuffer _parameters;
     StandardPipelines _pipelines;
     CustomPipelines _customPipelines;
-    int _geometryId { 0 };
+    int _geometryId{ 0 };
 };
 
 #endif  // hifi_DebugDeferredBuffer_h

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -68,7 +68,7 @@ enum DeferredShader_MapSlot {
     SCATTERING_SPECULAR_UNIT = 9,
     SKYBOX_MAP_UNIT = render::ShapePipeline::Slot::LIGHT_AMBIENT_MAP, // unit = 10
     SHADOW_MAP_UNIT = 11,
-    nextAvailableUnit = SHADOW_MAP_UNIT + SHADOW_CASCADE_MAX_COUNT
+    nextAvailableUnit = SHADOW_MAP_UNIT
 };
 enum DeferredShader_BufferSlot {
     DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT = 0,
@@ -534,9 +534,7 @@ void RenderDeferredSetup::run(const render::RenderContextPointer& renderContext,
 
         // Bind the shadow buffers
         if (globalShadow) {
-            for (unsigned int i = 0; i < globalShadow->getCascadeCount(); i++) {
+            batch.setResourceTexture(SHADOW_MAP_UNIT, globalShadow->map);
-                batch.setResourceTexture(SHADOW_MAP_UNIT+i, globalShadow->getCascade(i).map);
-            }
         }
 
         auto program = deferredLightingEffect->_directionalSkyboxLight;

libraries/render-utils/src/LightStage.cpp

@@ -74,8 +74,6 @@ LightStage::Shadow::Cascade::Cascade() :
     _frustum{ std::make_shared<ViewFrustum>() },
     _minDistance{ 0.0f },
     _maxDistance{ 20.0f } {
-    framebuffer = gpu::FramebufferPointer(gpu::Framebuffer::createShadowmap(MAP_SIZE));
-    map = framebuffer->getDepthStencilBuffer();
 }
 
 const glm::mat4& LightStage::Shadow::Cascade::getView() const {
@@ -127,8 +125,29 @@ LightStage::Shadow::Shadow(graphics::LightPointer light, float maxDistance, unsi
     Schema schema;
     schema.cascadeCount = cascadeCount;
     _schemaBuffer = std::make_shared<gpu::Buffer>(sizeof(Schema), (const gpu::Byte*) &schema);
+
+    // Create shadow cascade texture array
+    auto depthFormat = gpu::Element(gpu::SCALAR, gpu::FLOAT, gpu::DEPTH);  // Depth32 texel format
+    map = gpu::TexturePointer(gpu::Texture::createRenderBufferArray(depthFormat, MAP_SIZE, MAP_SIZE, cascadeCount));
+    gpu::Sampler::Desc samplerDesc;
+    samplerDesc._borderColor = glm::vec4(1.0f);
+    samplerDesc._wrapModeU = gpu::Sampler::WRAP_BORDER;
+    samplerDesc._wrapModeV = gpu::Sampler::WRAP_BORDER;
+    samplerDesc._filter = gpu::Sampler::FILTER_MIN_MAG_LINEAR;
+    samplerDesc._comparisonFunc = gpu::LESS;
+
+    map->setSampler(gpu::Sampler(samplerDesc));
+
     _cascades.resize(cascadeCount);
 
+    for (uint cascadeIndex=0; cascadeIndex < cascadeCount; cascadeIndex++) {
+        auto& cascade = _cascades[cascadeIndex];
+        std::string name = "Shadowmap Cascade ";
+        name += '0' + cascadeIndex;
+        cascade.framebuffer = gpu::FramebufferPointer(gpu::Framebuffer::create(name));
+        cascade.framebuffer->setDepthBuffer(map, depthFormat, cascadeIndex);
+    }
+
     setMaxDistance(maxDistance);
 }
 

libraries/render-utils/src/LightStage.h

@@ -53,7 +53,6 @@ public:
             Cascade();
 
             gpu::FramebufferPointer framebuffer;
-            gpu::TexturePointer map;
 
             const std::shared_ptr<ViewFrustum>& getFrustum() const { return _frustum; }
 
@@ -93,6 +92,8 @@ public:
 
         const graphics::LightPointer& getLight() const { return _light; }
 
+        gpu::TexturePointer map;
+
     protected:
 
 #include "Shadows_shared.slh"

libraries/render-utils/src/RenderShadowTask.cpp

@@ -227,7 +227,7 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     }
 
     const auto setupOutput = task.addJob<RenderShadowSetup>("ShadowSetup");
-    const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(2);
+    const auto queryResolution = setupOutput.getN<RenderShadowSetup::Outputs>(1);
     // Fetch and cull the items from the scene
 
     static const auto shadowCasterReceiverFilter = ItemFilter::Builder::visibleWorldItems().withTypeShape().withOpaque().withoutLayered().withTagBits(tagBits, tagMask);
@@ -248,10 +248,12 @@ void RenderShadowTask::build(JobModel& task, const render::Varying& input, rende
     const auto sortedShapes = task.addJob<DepthSortShapes>("DepthSortShadow", sortedPipelines, true);
 
     render::Varying cascadeFrustums[SHADOW_CASCADE_MAX_COUNT] = {
-        ViewFrustumPointer(),
+        ViewFrustumPointer()
-        ViewFrustumPointer(),
+#if SHADOW_CASCADE_MAX_COUNT>1
+        ,ViewFrustumPointer(),
         ViewFrustumPointer(),
         ViewFrustumPointer()
+#endif
     };
 
     for (auto i = 0; i < SHADOW_CASCADE_MAX_COUNT; i++) {
@@ -293,13 +295,15 @@ RenderShadowSetup::RenderShadowSetup() :
 
 void RenderShadowSetup::configure(const Config& configuration) {
     setConstantBias(0, configuration.constantBias0);
-    setConstantBias(1, configuration.constantBias1);
-    setConstantBias(2, configuration.constantBias2);
-    setConstantBias(3, configuration.constantBias3);
     setSlopeBias(0, configuration.slopeBias0);
+#if SHADOW_CASCADE_MAX_COUNT>1
+    setConstantBias(1, configuration.constantBias1);
     setSlopeBias(1, configuration.slopeBias1);
+    setConstantBias(2, configuration.constantBias2);
     setSlopeBias(2, configuration.slopeBias2);
+    setConstantBias(3, configuration.constantBias3);
     setSlopeBias(3, configuration.slopeBias3);
+#endif
 }
 
 void RenderShadowSetup::setConstantBias(int cascadeIndex, float value) {

libraries/render-utils/src/Shadow.slh

@@ -17,11 +17,11 @@
 #define SHADOW_SCREEN_SPACE_DITHER      1
 
 // the shadow texture
-uniform sampler2DShadow shadowMaps[SHADOW_CASCADE_MAX_COUNT];
+uniform sampler2DArrayShadow shadowMaps;
 
 // Sample the shadowMap with PCF (built-in)
 float fetchShadow(int cascadeIndex, vec3 shadowTexcoord) {
-    return texture(shadowMaps[cascadeIndex], shadowTexcoord);
+    return texture(shadowMaps, vec4(shadowTexcoord.xy, cascadeIndex, shadowTexcoord.z));
 }
 
 vec2 PCFkernel[4] = vec2[4](

libraries/render-utils/src/debug_deferred_buffer.slf

@@ -23,11 +23,18 @@ uniform sampler2D occlusionMap;
 uniform sampler2D occlusionBlurredMap;
 uniform sampler2D scatteringMap;
 uniform sampler2D velocityMap;
+uniform sampler2DArrayShadow shadowMaps;
 
 <@include ShadowCore.slh@>
 
 <$declareDeferredCurvature()$>
 
+<@include debug_deferred_buffer_shared.slh@>
+
+layout(std140) uniform parametersBuffer {
+    DebugParameters parameters;
+};
+
 float curvatureAO(float k) {
     return 1.0f - (0.0022f * k * k) + (0.0776f * k) + 0.7369f;
 }

libraries/render-utils/src/debug_deferred_buffer_shared.slh

@@ -0,0 +1,17 @@
+// glsl / C++ compatible source as interface for FadeEffect
+#ifdef __cplusplus
+#   define INT32 glm::int32
+#else
+#   define INT32 int
+#endif
+
+struct DebugParameters
+{
+	INT32   _shadowCascadeIndex;
+};
+
+    // <@if 1@>
+    // Trigger Scribe include 
+    // <@endif@> <!def that !> 
+//
+

libraries/render/src/render/CullTask.cpp

@@ -370,10 +370,13 @@ void CullShapeBounds::run(const RenderContextPointer& renderContext, const Input
     const auto& inShapes = inputs.get0();
     const auto& cullFilter = inputs.get1();
     const auto& boundsFilter = inputs.get2();
-    const auto& antiFrustum = inputs.get3();
+    ViewFrustumPointer antiFrustum;
     auto& outShapes = outputs.edit0();
     auto& outBounds = outputs.edit1();
 
+    if (!inputs[3].isNull()) {
+        antiFrustum = inputs.get3();
+    }
     outShapes.clear();
     outBounds = AABox();
 

scripts/system/edit.js

@@ -2373,7 +2373,6 @@ function selectParticleEntity(entityID) {
     particleExplorerTool.createWebView();
 
     particleExplorerTool.setActiveParticleEntity(entityID);
-    particleExplorerTool.setActiveParticleProperties(properties);
 
     // Switch to particle explorer
     var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");

scripts/system/emote.js

@@ -101,6 +101,7 @@ function onWebEventReceived(event) {
                 
                     // If user provides input during a sit, the avatar animation state should be restored
                     Controller.keyPressEvent.connect(restoreAnimation);
+                    Controller.enableMapping(eventMappingName);
                     MyAvatar.overrideAnimation(ANIMATIONS[emoteName].url, FPS, false, 0, frameCount);
                 
                 } else {
@@ -132,6 +133,7 @@ function restoreAnimation() {
     
     // Make sure the input is disconnected after animations are restored so it doesn't affect any emotes other than sit
     Controller.keyPressEvent.disconnect(restoreAnimation);
+    Controller.disableMapping(eventMappingName);
 }
                     
 // Note peek() so as to not interfere with other mappings.
@@ -151,7 +153,7 @@ eventMapping.from(Controller.Standard.RS).peek().to(restoreAnimation);
 eventMapping.from(Controller.Standard.RightGrip).peek().to(restoreAnimation);
 eventMapping.from(Controller.Standard.Back).peek().to(restoreAnimation);
 eventMapping.from(Controller.Standard.Start).peek().to(restoreAnimation);
-Controller.enableMapping(eventMappingName);
+
 
 button.clicked.connect(onClicked);
 tablet.screenChanged.connect(onScreenChanged);

scripts/system/libraries/entityList.js

@@ -99,12 +99,17 @@ EntityListTool = function(opts) {
                     url: url,
                     locked: properties.locked,
                     visible: properties.visible,
-                    verticesCount: valueIfDefined(properties.renderInfo.verticesCount),
+                    verticesCount: (properties.renderInfo !== undefined ? 
-                    texturesCount: valueIfDefined(properties.renderInfo.texturesCount),
+                        valueIfDefined(properties.renderInfo.verticesCount) : ""),
-                    texturesSize: valueIfDefined(properties.renderInfo.texturesSize),
+                    texturesCount: (properties.renderInfo !== undefined ? 
-                    hasTransparent: valueIfDefined(properties.renderInfo.hasTransparent),
+                        valueIfDefined(properties.renderInfo.texturesCount) : ""),
+                    texturesSize: (properties.renderInfo !== undefined ? 
+                        valueIfDefined(properties.renderInfo.texturesSize) : ""),
+                    hasTransparent: (properties.renderInfo !== undefined ? 
+                        valueIfDefined(properties.renderInfo.hasTransparent) : ""),
                     isBaked: properties.type == "Model" ? url.toLowerCase().endsWith(".baked.fbx") : false,
-                    drawCalls: valueIfDefined(properties.renderInfo.drawCalls),
+                    drawCalls: (properties.renderInfo !== undefined ? 
+                        valueIfDefined(properties.renderInfo.drawCalls) : ""),
                     hasScript: properties.script !== ""
                 });
             }

scripts/system/particle_explorer/hifi-entity-ui.js

@@ -61,12 +61,18 @@ function HifiEntityUI(parent) {
     this.parent = parent;
 
     var self = this;
+    this.sendPackage = {};
     this.settingsUpdateLock = false;
-    this.webBridgeSync = _.debounce(function (id, val) {
+    this.webBridgeSync = function(id, val) {
-        if (self.EventBridge && !self.settingsUpdateLock) {
+        if (!this.settingsUpdateLock) {
-            var sendPackage = {};
+            this.sendPackage[id] = val;
-            sendPackage[id] = val;
+            this.webBridgeSyncDebounce();
-            self.submitChanges(sendPackage);
+        }
+    };
+    this.webBridgeSyncDebounce = _.debounce(function () {
+        if (self.EventBridge) {
+            self.submitChanges(self.sendPackage);
+            self.sendPackage = {};
         }
     }, DEBOUNCE_TIMEOUT);
 }
@@ -159,7 +165,6 @@ HifiEntityUI.prototype = {
         var self = this;
         var fields = document.getElementsByTagName("input");
 
-        self.settingsUpdateLock = true;
         if (!currentProperties.locked) {
             for (var i = 0; i < fields.length; i++) {
                 fields[i].removeAttribute("disabled");
@@ -235,10 +240,6 @@ HifiEntityUI.prototype = {
                 }
             }
         }
-        // Now unlocking settings Update lock for sending messages on callbacks.
-        setTimeout(function () {
-            self.settingsUpdateLock = false;
-        }, DEBOUNCE_TIMEOUT * 2.5);
     },
     connect: function (EventBridge) {
         this.EventBridge = EventBridge;
@@ -253,28 +254,9 @@ HifiEntityUI.prototype = {
             data = JSON.parse(data);
 
             if (data.messageType === 'particle_settings') {
-                // Update settings
+                self.settingsUpdateLock = true;
-                var currentProperties = data.currentProperties;
+                self.fillFields(data.currentProperties);
-                // Update uninitialized variables
+                self.settingsUpdateLock = false;
-                if (!currentProperties.alphaStart) {
-                    currentProperties.alphaStart = currentProperties.alpha;
-                }
-                if (!currentProperties.alphaFinish) {
-                    currentProperties.alphaFinish = currentProperties.alpha;
-                }
-                if (!currentProperties.radiusStart) {
-                    currentProperties.radiusStart = currentProperties.particleRadius;
-                }
-                if (!currentProperties.radiusFinish) {
-                    currentProperties.radiusFinish = currentProperties.particleRadius;
-                }
-                if (!currentProperties.colorStart || !currentProperties.colorStart.red) {
-                    currentProperties.colorStart = currentProperties.color;
-                }
-                if (!currentProperties.colorFinish || !currentProperties.colorFinish.red) {
-                    currentProperties.colorFinish = currentProperties.color;
-                }
-                self.fillFields(currentProperties);
                 // Do expected property match with structure;
             } else if (data.messageType === 'particle_close') {
                 self.disableFields();

scripts/system/particle_explorer/particleExplorerTool.js

@@ -9,7 +9,8 @@
 //  Distributed under the Apache License, Version 2.0.
 //  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
 //
-/* global window, alert, ParticleExplorerTool, EventBridge, dat, listenForSettingsUpdates,createVec3Folder,createQuatFolder,writeVec3ToInterface,writeDataToInterface*/
+/* global window, alert, ParticleExplorerTool, EventBridge, dat, listenForSettingsUpdates, createVec3Folder, 
+   createQuatFolder, writeVec3ToInterface, writeDataToInterface */
 
 
 var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
@@ -17,7 +18,7 @@ var PARTICLE_EXPLORER_HTML_URL = Script.resolvePath('particleExplorer.html');
 ParticleExplorerTool = function() {
     var that = {};
     that.activeParticleEntity = 0;
-    that.activeParticleProperties = {};
+    that.updatedActiveParticleProperties = {};
 
     that.createWebView = function() {
         that.webView = Tablet.getTablet("com.highfidelity.interface.tablet.system");
@@ -30,7 +31,7 @@ ParticleExplorerTool = function() {
             return;
         }
         that.activeParticleEntity = 0;
-        that.activeParticleProperties = {};
+        that.updatedActiveParticleProperties = {};
 
         var messageData = {
             messageType: "particle_close"
@@ -38,44 +39,84 @@ ParticleExplorerTool = function() {
         that.webView.emitScriptEvent(JSON.stringify(messageData));
     };
 
-    function sendActiveParticleProperties() {
+    function sendParticleProperties(properties) {
         that.webView.emitScriptEvent(JSON.stringify({
             messageType: "particle_settings",
-            currentProperties: that.activeParticleProperties
+            currentProperties: properties
         }));
     }
 
+    function sendActiveParticleProperties() {
+        var properties = Entities.getEntityProperties(that.activeParticleEntity);
+        if (properties.emitOrientation) {
+            properties.emitOrientation = Quat.safeEulerAngles(properties.emitOrientation);
+        }
+        // Update uninitialized variables
+        if (isNaN(properties.alphaStart)) {
+            properties.alphaStart = properties.alpha;
+        }
+        if (isNaN(properties.alphaFinish)) {
+            properties.alphaFinish = properties.alpha;
+        }
+        if (isNaN(properties.radiusStart)) {
+            properties.radiusStart = properties.particleRadius;
+        }
+        if (isNaN(properties.radiusFinish)) {
+            properties.radiusFinish = properties.particleRadius;
+        }
+        if (isNaN(properties.colorStart.red)) {
+            properties.colorStart = properties.color;
+        }
+        if (isNaN(properties.colorFinish.red)) {
+            properties.colorFinish = properties.color;
+        }
+        sendParticleProperties(properties);
+    }
+    
+    function sendUpdatedActiveParticleProperties() {
+        sendParticleProperties(that.updatedActiveParticleProperties);
+        that.updatedActiveParticleProperties = {};
+    }
+
     that.webEventReceived = function(message) {
         var data = JSON.parse(message);
         if (data.messageType === "settings_update") {
-            if (data.updatedSettings.emitOrientation) {
+            var updatedSettings = data.updatedSettings;
-                data.updatedSettings.emitOrientation = Quat.fromVec3Degrees(data.updatedSettings.emitOrientation);
-            }
-            Entities.editEntity(that.activeParticleEntity, data.updatedSettings);
-
-            for (var key in data.updatedSettings) {
-                if (that.activeParticleProperties.hasOwnProperty(key)) {
-                    that.activeParticleProperties[key] = data.updatedSettings[key];
-                }
-            }
 
             var optionalProps = ["alphaStart", "alphaFinish", "radiusStart", "radiusFinish", "colorStart", "colorFinish"];
             var fallbackProps = ["alpha", "particleRadius", "color"];
-            var entityProps = Entities.getEntityProperties(that.activeParticleProperties, optionalProps);
+            for (var i = 0; i < optionalProps.length; i++) {
+                var fallbackProp = fallbackProps[Math.floor(i / 2)];
+                var optionalValue = updatedSettings[optionalProps[i]];
+                var fallbackValue = updatedSettings[fallbackProp];
+                if (optionalValue && fallbackValue) {
+                    delete updatedSettings[optionalProps[i]];
+                }
+            }
+            
+            if (updatedSettings.emitOrientation) {
+                updatedSettings.emitOrientation = Quat.fromVec3Degrees(updatedSettings.emitOrientation);
+            }
+            
+            Entities.editEntity(that.activeParticleEntity, updatedSettings);
+                    
+            var entityProps = Entities.getEntityProperties(that.activeParticleEntity, optionalProps);
+            
             var needsUpdate = false;
             for (var i = 0; i < optionalProps.length; i++) {
-                var fallback = fallbackProps[Math.floor(i / 2)];
+                var fallbackProp = fallbackProps[Math.floor(i / 2)];
-                if (data.updatedSettings[fallback]) {
+                var fallbackValue = updatedSettings[fallbackProp];
-                    var prop = optionalProps[i];
+                if (fallbackValue) {
-                    if (!that.activeParticleProperties[prop] || (fallback === "color" && !that.activeParticleProperties[prop].red)) {
+                    var optionalProp = optionalProps[i];
-                        that.activeParticleProperties[prop] = entityProps[fallback];
+                    if ((fallbackProp !== "color" && isNaN(entityProps[optionalProp])) || (fallbackProp === "color" && isNaN(entityProps[optionalProp].red))) {
+                        that.updatedActiveParticleProperties[optionalProp] = fallbackValue;
                         needsUpdate = true;
                     }
                 }
             }
 
             if (needsUpdate) {
-                sendActiveParticleProperties();
+                sendUpdatedActiveParticleProperties();
             }
             
         } else if (data.messageType === "page_loaded") {
@@ -85,10 +126,6 @@ ParticleExplorerTool = function() {
 
     that.setActiveParticleEntity = function(id) {
         that.activeParticleEntity = id;
-    };
-
-    that.setActiveParticleProperties = function(properties) {
-        that.activeParticleProperties = properties;
         sendActiveParticleProperties();
     };