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

CMakeLists.txt

@@ -186,7 +186,6 @@ setup_externals_binary_dir()
 option(GET_BULLET "Get Bullet library automatically as external project" 1)
 option(GET_GLM "Get GLM library automatically as external project" 1)
 option(GET_GVERB "Get Gverb library automatically as external project" 1)
-option(GET_SOXR "Get Soxr library automatically as external project" 1)
 option(GET_TBB "Get Threading Building Blocks library automatically as external project" 1)
 option(GET_LIBOVR "Get LibOVR library automatically as external project" 1)
 option(GET_VHACD "Get V-HACD library automatically as external project" 1)

libraries/audio/src/AudioSRC.h

@@ -31,6 +31,8 @@ public:
 
 private:
     float* _polyphaseFilter;
+    int* _stepTable;
+
     float* _history[MAX_CHANNELS];
     float* _inputs[MAX_CHANNELS];
     float* _outputs[MAX_CHANNELS];
@@ -45,10 +47,13 @@ private:
     int _numTaps;
     int _numHistory;
 
+    int _phase;
     int64_t _offset;
     int64_t _step;
 
-    int createPolyphaseFilter(int upFactor, int downFactor, float gain);
+    int createRationalFilter(int upFactor, int downFactor, float gain);
+    int createIrrationalFilter(int upFactor, int downFactor, float gain);
+
     int multirateFilter1(const float* input0, float* output0, int inputFrames);
     int multirateFilter2(const float* input0, const float* input1, float* output0, float* output1, int inputFrames);
 

libraries/entities-renderer/CMakeLists.txt

@@ -1,6 +1,6 @@
 set(TARGET_NAME entities-renderer)
 
-AUTOSCRIBE_SHADER_LIB(gpu model render)
+AUTOSCRIBE_SHADER_LIB(gpu model render render-utils)
 
 # use setup_hifi_library macro to setup our project and link appropriate Qt modules
 setup_hifi_library(Widgets Network Script)

libraries/entities-renderer/src/DeferredBufferWrite.slh

@@ -1,78 +0,0 @@
-<!
-//  DeferredBufferWrite.slh
-//  libraries/render-utils/src
-//
-//  Created by Sam Gateau on 1/12/15.
-//  Copyright 2013 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-!>
-<@if not DEFERRED_BUFFER_WRITE_SLH@>
-<@def DEFERRED_BUFFER_WRITE_SLH@>
-
-layout(location = 0) out vec4 _fragColor0;
-layout(location = 1) out vec4 _fragColor1;
-layout(location = 2) out vec4 _fragColor2;
-
-// the glow intensity
-uniform float glowIntensity;
-
-// the alpha threshold
-uniform float alphaThreshold;
-
-uniform sampler2D normalFittingMap;
-
-vec3 bestFitNormal(vec3 normal) {
-    vec3 absNorm = abs(normal);
-    float maxNAbs = max(absNorm.z, max(absNorm.x, absNorm.y));
-    
-    vec2 texcoord = (absNorm.z < maxNAbs ?
-    (absNorm.y < maxNAbs ? absNorm.yz : absNorm.xz) :
-    absNorm.xy);
-    texcoord = (texcoord.x < texcoord.y ? texcoord.yx : texcoord.xy);
-    texcoord.y /= texcoord.x;
-    vec3 cN = normal / maxNAbs;
-    float fittingScale = texture(normalFittingMap, texcoord).a;
-    cN *= fittingScale;
-    return (cN * 0.5 + 0.5);
-}
-
-float evalOpaqueFinalAlpha(float alpha, float mapAlpha) {
-    return mix(alpha * glowIntensity, 1.0 - alpha * glowIntensity, step(mapAlpha, alphaThreshold));
-}
-
-const vec3 DEFAULT_SPECULAR = vec3(0.1);
-const float DEFAULT_SHININESS = 10;
-
-void packDeferredFragment(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {
-    if (alpha != glowIntensity) {
-        discard;
-    }
-    _fragColor0 = vec4(diffuse.rgb, alpha);
-    _fragColor1 = vec4(bestFitNormal(normal), 1.0);
-    _fragColor2 = vec4(specular, shininess / 128.0);
-}
-
-void packDeferredFragmentLightmap(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess, vec3 emissive) {
-    if (alpha != glowIntensity) {
-        discard;
-    }
-    
-    _fragColor0 = vec4(diffuse.rgb, alpha);
-    //_fragColor1 = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
-    _fragColor1 = vec4(bestFitNormal(normal), 0.5);
-    _fragColor2 = vec4(emissive, shininess / 128.0);
-}
-
-void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 diffuse, vec3 specular, float shininess) {
-    if (alpha <= alphaThreshold) {
-        discard;
-    }
-    
-    _fragColor0 = vec4(diffuse.rgb, alpha);
-    //  _fragColor1 = vec4(normal, 0.0) * 0.5 + vec4(0.5, 0.5, 0.5, 1.0);
-    //  _fragColor2 = vec4(specular, shininess / 128.0);
-}
-
-<@endif@>

libraries/gpu/src/gpu/GLBackendInput.cpp

@@ -117,9 +117,9 @@ void GLBackend::updateInput() {
                 for (size_t locNum = 0; locNum < locationCount; ++locNum) {
                     newActivation.set(slot + locNum);
                     glVertexAttribFormat(slot + locNum, count, type, isNormalized, offset + locNum * perLocationSize);
-                    glVertexAttribDivisor(slot + locNum, attrib._frequency);
                     glVertexAttribBinding(slot + locNum, attrib._channel);
                 }
+                glVertexBindingDivisor(attrib._channel, attrib._frequency);
             }
             (void) CHECK_GL_ERROR();
         }

libraries/gpu/src/gpu/GLBackendTransform.cpp

@@ -97,7 +97,12 @@ void GLBackend::TransformStageState::preUpdate(size_t commandIndex, const Stereo
 
     if (_invalidModel) {
         _model.getMatrix(_object._model);
-        _model.getInverseMatrix(_object._modelInverse);
+
+        // FIXME - we don't want to be using glm::inverse() here but it fixes the flickering issue we are 
+        // seeing with planky blocks in toybox. Our implementation of getInverseMatrix() is buggy in cases
+        // of non-uniform scale. We need to fix that. In the mean time, glm::inverse() works.
+        //_model.getInverseMatrix(_object._modelInverse);
+        _object._modelInverse = glm::inverse(_object._model);
     }
 
     if (_invalidView || _invalidProj || _invalidViewport) {