Merge pull request #2556 from ey6es/master

Fix for shadows' showing up on the wrong side of objects.

interface/interface_en.ts

@@ -14,12 +14,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3608"/>
+        <location filename="src/Application.cpp" line="3610"/>
         <source>Open Script</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Application.cpp" line="3609"/>
+        <location filename="src/Application.cpp" line="3611"/>
         <source>JavaScript Files (*.js)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -113,18 +113,18 @@
 <context>
     <name>Menu</name>
     <message>
-        <location filename="src/Menu.cpp" line="459"/>
+        <location filename="src/Menu.cpp" line="456"/>
         <source>Open .ini config file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Menu.cpp" line="461"/>
-        <location filename="src/Menu.cpp" line="473"/>
+        <location filename="src/Menu.cpp" line="458"/>
+        <location filename="src/Menu.cpp" line="470"/>
         <source>Text files (*.ini)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="src/Menu.cpp" line="471"/>
+        <location filename="src/Menu.cpp" line="468"/>
         <source>Save .ini config file</source>
         <translation type="unfinished"></translation>
     </message>

interface/resources/shaders/shadow_map.frag

@@ -10,7 +10,8 @@
 
 uniform sampler2DShadow shadowMap;
 
+varying vec4 shadowColor;
+
 void main(void) {
-    gl_FragColor = gl_Color * mix(vec4(0.8, 0.8, 0.8, 1.0), vec4(1.0, 1.0, 1.0, 1.0),
-        shadow2D(shadowMap, gl_TexCoord[0].stp));
+    gl_FragColor = mix(shadowColor, gl_Color, shadow2D(shadowMap, gl_TexCoord[0].stp));
 }

interface/resources/shaders/shadow_map.vert

@@ -0,0 +1,28 @@
+#version 120
+
+//
+//  shadow_map.vert
+//  vertex shader
+//
+//  Created by Andrzej Kapolka on 3/27/14.
+//  Copyright (c) 2014 High Fidelity, Inc. All rights reserved.
+//
+
+varying vec4 shadowColor;
+
+void main(void) {
+    // the shadow color includes only the ambient terms
+    shadowColor = gl_Color * (gl_LightModel.ambient + gl_LightSource[0].ambient);
+    
+    // the normal color includes diffuse
+    vec4 normal = normalize(gl_ModelViewMatrix * vec4(gl_Normal, 0.0));
+    gl_FrontColor = shadowColor + gl_Color * (gl_LightSource[0].diffuse * max(0.0, dot(normal, gl_LightSource[0].position)));
+    
+    // generate the shadow texture coordinate using the eye position
+    vec4 eyePosition = gl_ModelViewMatrix * gl_Vertex;
+    gl_TexCoord[0] = vec4(dot(gl_EyePlaneS[0], eyePosition), dot(gl_EyePlaneT[0], eyePosition),
+        dot(gl_EyePlaneR[0], eyePosition), 1.0); 
+    
+    // use the fixed function transform
+    gl_Position = ftransform();
+}

interface/src/Application.cpp

@@ -1636,6 +1636,8 @@ void Application::updateLOD() {
     // adjust it unless we were asked to disable this feature, or if we're currently in throttleRendering mode
     if (!Menu::getInstance()->isOptionChecked(MenuOption::DisableAutoAdjustLOD) && !isThrottleRendering()) {
         Menu::getInstance()->autoAdjustLOD(_fps);
+    } else {
+        Menu::getInstance()->resetLODAdjust();
     }
 }
 

interface/src/Menu.cpp

@@ -393,8 +393,6 @@ void Menu::loadSettings(QSettings* settings) {
     _maxVoxels = loadSetting(settings, "maxVoxels", DEFAULT_MAX_VOXELS_PER_SYSTEM);
     _maxVoxelPacketsPerSecond = loadSetting(settings, "maxVoxelsPPS", DEFAULT_MAX_VOXEL_PPS);
     _voxelSizeScale = loadSetting(settings, "voxelSizeScale", DEFAULT_OCTREE_SIZE_SCALE);
-    _avatarLODDistanceMultiplier = loadSetting(settings, "avatarLODDistanceMultiplier",
-        DEFAULT_AVATAR_LOD_DISTANCE_MULTIPLIER);
     _boundaryLevelAdjust = loadSetting(settings, "boundaryLevelAdjust", 0);
 
     settings->beginGroup("View Frustum Offset Camera");
@@ -434,7 +432,6 @@ void Menu::saveSettings(QSettings* settings) {
     settings->setValue("maxVoxels", _maxVoxels);
     settings->setValue("maxVoxelsPPS", _maxVoxelPacketsPerSecond);
     settings->setValue("voxelSizeScale", _voxelSizeScale);
-    settings->setValue("avatarLODDistanceMultiplier", _avatarLODDistanceMultiplier);
     settings->setValue("boundaryLevelAdjust", _boundaryLevelAdjust);
     settings->beginGroup("View Frustum Offset Camera");
     settings->setValue("viewFrustumOffsetYaw", _viewFrustumOffset.yaw);
@@ -1203,7 +1200,10 @@ void Menu::autoAdjustLOD(float currentFPS) {
         if (now - _lastAvatarDetailDrop > ADJUST_AVATAR_LOD_DOWN_DELAY) {
             // attempt to lower the detail in proportion to the fps difference
             float targetFps = (ADJUST_LOD_DOWN_FPS + ADJUST_LOD_UP_FPS) * 0.5f;
-            _avatarLODDistanceMultiplier *= (targetFps / _fastFPSAverage.getAverage()); 
+            float averageFps = _fastFPSAverage.getAverage();
+            const float MAXIMUM_MULTIPLIER_SCALE = 2.0f;
+            _avatarLODDistanceMultiplier *= (averageFps < EPSILON) ? MAXIMUM_MULTIPLIER_SCALE :
+                qMin(MAXIMUM_MULTIPLIER_SCALE, targetFps / averageFps);
             _lastAvatarDetailDrop = now;
         }
     } else if (_fastFPSAverage.getAverage() > ADJUST_LOD_UP_FPS) {
@@ -1249,6 +1249,12 @@ void Menu::autoAdjustLOD(float currentFPS) {
     }
 }
 
+void Menu::resetLODAdjust() {
+    _fpsAverage.reset();
+    _fastFPSAverage.reset();
+    _lastAvatarDetailDrop = _lastAdjust = usecTimestampNow();
+}
+
 void Menu::setVoxelSizeScale(float sizeScale) {
     _voxelSizeScale = sizeScale;
 }

interface/src/Menu.h

@@ -85,6 +85,7 @@ public:
     // User Tweakable LOD Items
     QString getLODFeedbackText();
     void autoAdjustLOD(float currentFPS);
+    void resetLODAdjust();
     void setVoxelSizeScale(float sizeScale);
     float getVoxelSizeScale() const { return _voxelSizeScale; }
     float getAvatarLODDistanceMultiplier() const { return _avatarLODDistanceMultiplier; }

interface/src/renderer/FBXReader.cpp

@@ -1259,7 +1259,13 @@ FBXGeometry extractFBXGeometry(const FBXNode& node, const QVariantHash& mapping)
         remainingModels.insert(model.key());
     }
     while (!remainingModels.isEmpty()) {
-        QString topID = getTopModelID(parentMap, models, *remainingModels.constBegin());
+        QString first = *remainingModels.constBegin();
+        foreach (const QString& id, remainingModels) {
+            if (id < first) {
+                first = id;
+            }
+        }
+        QString topID = getTopModelID(parentMap, models, first);
         appendModelIDs(parentMap.value(topID), childMap, models, remainingModels, modelIDs);
     }
 

interface/src/voxels/VoxelSystem.cpp

@@ -506,8 +506,10 @@ void VoxelSystem::initVoxelMemory() {
             _perlinModulateProgram.setUniformValue("permutationNormalTexture", 0);
             _perlinModulateProgram.release();
 
-            _shadowMapProgram.addShaderFromSourceFile(QGLShader::Fragment, Application::resourcesPath()
-                                                      + "shaders/shadow_map.frag");
+            _shadowMapProgram.addShaderFromSourceFile(QGLShader::Vertex,
+                Application::resourcesPath() + "shaders/shadow_map.vert");
+            _shadowMapProgram.addShaderFromSourceFile(QGLShader::Fragment,
+                Application::resourcesPath() + "shaders/shadow_map.frag");
             _shadowMapProgram.link();
 
             _shadowMapProgram.bind();
@@ -1471,10 +1473,6 @@ void VoxelSystem::applyScaleAndBindProgram(bool texture) {
     if (Menu::getInstance()->isOptionChecked(MenuOption::Shadows)) {
         _shadowMapProgram.bind();
         glBindTexture(GL_TEXTURE_2D, Application::getInstance()->getTextureCache()->getShadowDepthTextureID());
-        glEnable(GL_TEXTURE_GEN_S);
-        glEnable(GL_TEXTURE_GEN_T);
-        glEnable(GL_TEXTURE_GEN_R);
-        glEnable(GL_TEXTURE_2D);
 
         glTexGenfv(GL_S, GL_EYE_PLANE, (const GLfloat*)&Application::getInstance()->getShadowMatrix()[0]);
         glTexGenfv(GL_T, GL_EYE_PLANE, (const GLfloat*)&Application::getInstance()->getShadowMatrix()[1]);
@@ -1496,10 +1494,7 @@ void VoxelSystem::removeScaleAndReleaseProgram(bool texture) {
     if (Menu::getInstance()->isOptionChecked(MenuOption::Shadows)) {
         _shadowMapProgram.release();
         glBindTexture(GL_TEXTURE_2D, 0);
-        glDisable(GL_TEXTURE_GEN_S);
-        glDisable(GL_TEXTURE_GEN_T);
-        glDisable(GL_TEXTURE_GEN_R);
-        glDisable(GL_TEXTURE_2D);
+        
 
     } else if (texture) {
         _perlinModulateProgram.release();