Merge branch 'master' into bugz-1029a

CMakeLists.txt

@@ -10,7 +10,7 @@ endif()
 include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/macros/TargetPython.cmake")
 target_python()
 
-if (WIN32)
+if (WIN32 AND NOT HIFI_ANDROID)
     # Force x64 toolset
     set(CMAKE_GENERATOR_TOOLSET "host=x64" CACHE STRING "64-bit toolset" FORCE)
 endif()

README.md

@@ -17,7 +17,7 @@ Documentation
 =========
 Documentation is available at [docs.highfidelity.com](https://docs.highfidelity.com), if something is missing, please suggest it via a new job on Worklist (add to the hifi-docs project).
 
-There is also detailed [documentation on our coding standards](https://wiki.highfidelity.com/wiki/Coding_Standards).
+There is also detailed [documentation on our coding standards](CODING_STANDARD.md).
 
 Contributor License Agreement (CLA)
 =========

assignment-client/src/octree/OctreeServer.cpp

@@ -1292,6 +1292,7 @@ void OctreeServer::aboutToFinish() {
     for (auto& it : _sendThreads) {
         auto& sendThread = *it.second;
         sendThread.setIsShuttingDown();
+        sendThread.terminate();
     }
 
     // Clear will destruct all the unique_ptr to OctreeSendThreads which will call the GenericThread's dtor

interface/resources/qml/hifi/audio/MicBarApplication.qml

@@ -39,8 +39,8 @@ Rectangle {
     }
 
     Component.onCompleted: {
-        AudioScriptingInterface.noiseGateOpened.connect(function() { gated = false; });
-        AudioScriptingInterface.noiseGateClosed.connect(function() { gated = true; });
+        AudioScriptingInterface.noiseGateOpened.connect(function() { root.gated = false; });
+        AudioScriptingInterface.noiseGateClosed.connect(function() { root.gated = true; });
         HMD.displayModeChanged.connect(function() {
             muted = AudioScriptingInterface.muted;
             pushToTalk = AudioScriptingInterface.pushToTalk;
@@ -151,7 +151,7 @@ Rectangle {
         readonly property string yellow: "#C0C000";
         readonly property string fill: "#55000000";
         readonly property string border: standalone ? "#80FFFFFF" : "#55FFFFFF";
-        readonly property string icon: (muted || clipping) ? mutedColor : gated ? gatedColor : unmutedColor;
+        readonly property string icon: (muted || clipping) ? mutedColor : root.gated ? gatedColor : unmutedColor;
     }
 
     Item {
@@ -169,7 +169,7 @@ Rectangle {
             Image {
                 id: image;
                 source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
-                    clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon;
+                    clipping ? clippingIcon : root.gated ? gatedIcon : unmutedIcon;
                 width: 29;
                 height: 32;
                 anchors {

interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml

@@ -362,8 +362,8 @@ Rectangle {
             id: displayModeImage
             source: HMD.active ? "./images/desktopMode.svg" : "./images/vrMode.svg"
             anchors.centerIn: parent
-            width: HMD.active ? 25 : 43
-            height: 22
+            width: HMD.active ? 25 : 26
+            height: HMD.active ? 22 : 14
             visible: false
         }
 

launchers/darwin/CMakeLists.txt

@@ -2,6 +2,7 @@ cmake_minimum_required(VERSION 3.0)
 set(ENV{MACOSX_DEPLOYMENT_TARGET} 10.9)
 project(HQLauncher)
 set (CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules/")
+include("cmake/macros/SetPackagingParameters.cmake")
 set(src_files
   src/Launcher.h
   src/Launcher.m
@@ -59,15 +60,17 @@ set_target_properties(${this_target} PROPERTIES
 set(MACOSX_BUNDLE_ICON_FILE "interface.icns")
 
 function(set_from_env _RESULT_NAME _ENV_VAR_NAME _DEFAULT_VALUE)
-    if (NOT DEFINED ${_RESULT_NAME}) 
-        if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "")
-            set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE)
-        else()
-            set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE)
-        endif()
+  if (NOT DEFINED ${_RESULT_NAME}) 
+    if ("$ENV{${_ENV_VAR_NAME}}" STREQUAL "")
+      set (${_RESULT_NAME} ${_DEFAULT_VALUE} PARENT_SCOPE)
+    else()
+      set (${_RESULT_NAME} $ENV{${_ENV_VAR_NAME}} PARENT_SCOPE)
     endif()
+  endif()
 endfunction()
 
+  set_packaging_parameters()
+
 add_executable(${PROJECT_NAME} MACOSX_BUNDLE ${src_files})
 set_target_properties(${PROJECT_NAME} PROPERTIES OUTPUT_NAME ${APP_NAME}
   MACOSX_BUNDLE_BUNDLE_NAME ${APP_NAME})
@@ -77,6 +80,7 @@ if ("${LAUNCHER_HMAC_SECRET}" STREQUAL "")
 endif()
 
 target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_HMAC_SECRET="${LAUNCHER_HMAC_SECRET}")
+target_compile_definitions(${PROJECT_NAME} PRIVATE LAUNCHER_BUILD_VERSION="${BUILD_VERSION}")
 
 file(GLOB NIB_FILES "nib/*.xib")
 

launchers/darwin/cmake/macros/SetPackagingParameters.cmake

@@ -0,0 +1,45 @@
+#
+#  SetPackagingParameters.cmake
+#  cmake/macros
+#
+#  Created by Leonardo Murillo on 07/14/2015.
+#  Copyright 2015 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
+
+# This macro checks some Jenkins defined environment variables to determine the origin of this build
+# and decides how targets should be packaged.
+
+macro(SET_PACKAGING_PARAMETERS)
+  set(PR_BUILD 0)
+  set(PRODUCTION_BUILD 0)
+  set(DEV_BUILD 0)
+  set(BUILD_NUMBER 0)
+
+  set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV")
+  set_from_env(RELEASE_NUMBER RELEASE_NUMBER "")
+  set_from_env(STABLE_BUILD STABLE_BUILD 0)
+
+  message(STATUS "The RELEASE_TYPE variable is: ${RELEASE_TYPE}")
+  set(BUILD_NUMBER ${RELEASE_NUMBER})
+
+  if (RELEASE_TYPE STREQUAL "PRODUCTION")
+    set(PRODUCTION_BUILD 1)
+    set(BUILD_VERSION ${RELEASE_NUMBER})
+
+    # add definition for this release type
+    add_definitions(-DPRODUCTION_BUILD)
+
+  elseif (RELEASE_TYPE STREQUAL "PR")
+    set(PR_BUILD 1)
+    set(BUILD_VERSION "PR${RELEASE_NUMBER}")
+
+    # add definition for this release type
+    add_definitions(-DPR_BUILD)
+  else ()
+    set(DEV_BUILD 1)
+    set(BUILD_VERSION "dev")
+  endif ()
+
+endmacro(SET_PACKAGING_PARAMETERS)

launchers/darwin/nib/DisplayNameScreen.xib

@@ -102,12 +102,22 @@
                         <action selector="termsOfService:" target="YVh-OH-vU8" id="bgc-08-8Lj"/>
                     </connections>
                 </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="oJs-u5-OOJ">
+                    <rect key="frame" x="380" y="0.0" width="130" height="14"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="H6o-Xs-wK1">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
             </subviews>
             <point key="canvasLocation" x="138.5" y="154"/>
         </customView>
         <customObject id="YVh-OH-vU8" customClass="DisplayNameScreen">
             <connections>
                 <outlet property="backgroundImage" destination="aus-lo-eVi" id="SRc-pV-lXG"/>
+                <outlet property="buildVersion" destination="oJs-u5-OOJ" id="avj-j2-5P6"/>
                 <outlet property="displayName" destination="Vhg-rq-xUH" id="Fb5-im-2hx"/>
                 <outlet property="smallLogo" destination="j8K-TD-h7e" id="OVd-p3-nu6"/>
             </connections>

launchers/darwin/nib/ErrorScreen.xib

@@ -69,12 +69,22 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="CBD-Vk-Xd4"/>
                 </imageView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Omk-5j-C6r">
+                    <rect key="frame" x="381" y="0.0" width="130" height="14"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="xpG-oP-agI">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
             </subviews>
             <point key="canvasLocation" x="138.5" y="152"/>
         </customView>
         <customObject id="nWn-x7-LxT" customClass="ErrorViewController">
             <connections>
                 <outlet property="backgroundImage" destination="eih-a8-Pqa" id="2xh-8r-1Qu"/>
+                <outlet property="buildVersion" destination="Omk-5j-C6r" id="aTp-c3-RVy"/>
                 <outlet property="smallLogo" destination="ugn-Hk-gWL" id="EVI-d3-mf5"/>
                 <outlet property="voxelImage" destination="jmW-5q-Mf3" id="NiI-cY-tAf"/>
             </connections>

launchers/darwin/nib/LoginScreen.xib

@@ -119,12 +119,22 @@
                         <action selector="havingTrouble:" target="NkF-nk-81S" id="tsf-tC-aqq"/>
                     </connections>
                 </textField>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EsT-hn-six">
+                    <rect key="frame" x="380" y="0.0" width="130" height="14"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="AGt-jH-mX2">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
             </subviews>
             <point key="canvasLocation" x="138.5" y="154"/>
         </customView>
         <customObject id="NkF-nk-81S" customClass="LoginScreen">
             <connections>
                 <outlet property="backgroundImage" destination="L56-Jv-0N8" id="INT-rB-YtG"/>
+                <outlet property="buildVersion" destination="EsT-hn-six" id="Z4k-Gv-U5g"/>
                 <outlet property="button" destination="jKE-fV-Tjv" id="or6-tG-r6R"/>
                 <outlet property="header" destination="hIC-qf-Abj" id="sVQ-rl-cvR"/>
                 <outlet property="orginization" destination="L7W-3n-OKy" id="TiL-wn-Z2b"/>

launchers/darwin/nib/ProcessScreen.xib

@@ -53,6 +53,15 @@
                     <rect key="frame" x="68" y="78" width="394" height="20"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                 </progressIndicator>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="U3I-TA-xRz">
+                    <rect key="frame" x="380" y="0.0" width="130" height="14"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="8YH-Td-daK">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
             </subviews>
             <point key="canvasLocation" x="138.5" y="154"/>
         </customView>
@@ -60,6 +69,7 @@
             <connections>
                 <outlet property="background" destination="kuY-e2-Hqb" id="CBc-bD-ux7"/>
                 <outlet property="boldStatus" destination="EMF-E4-qLL" id="udm-8B-7lt"/>
+                <outlet property="buildVersion" destination="U3I-TA-xRz" id="HDI-tW-1cC"/>
                 <outlet property="progressView" destination="aEr-fi-fkV" id="OUy-Qp-tiP"/>
                 <outlet property="smallLogo" destination="uh2-4K-n56" id="pYg-hP-nr5"/>
                 <outlet property="smallStatus" destination="BSg-lp-njL" id="ziz-ek-Lq4"/>

launchers/darwin/nib/SplashScreen.xib

@@ -26,11 +26,21 @@
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="qC6-tI-Uwf"/>
                 </imageView>
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EgF-VK-Hfo">
+                    <rect key="frame" x="380" y="0.0" width="130" height="14"/>
+                    <autoresizingMask key="autoresizingMask"/>
+                    <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Label" id="gWS-UL-cjB">
+                        <font key="font" metaFont="smallSystem"/>
+                        <color key="textColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                        <color key="backgroundColor" name="systemGrayColor" catalog="System" colorSpace="catalog"/>
+                    </textFieldCell>
+                </textField>
             </subviews>
             <point key="canvasLocation" x="119.5" y="134"/>
         </customView>
         <customObject id="iJ0-FI-XIf" customClass="SplashScreen">
             <connections>
+                <outlet property="buildVersion" destination="EgF-VK-Hfo" id="lVp-Ua-9Mt"/>
                 <outlet property="imageView" destination="qtD-mb-qqq" id="rCt-Gd-Uux"/>
                 <outlet property="logoImage" destination="2i5-Zw-nH7" id="7tM-sX-cvR"/>
             </connections>

launchers/darwin/src/DisplayNameScreen.m

@@ -6,6 +6,7 @@
 @property (nonatomic, assign) IBOutlet NSImageView* backgroundImage;
 @property (nonatomic, assign) IBOutlet NSImageView* smallLogo;
 @property (nonatomic, assign) IBOutlet NSTextField* displayName;
+@property (nonatomic, assign) IBOutlet NSTextField* buildVersion;
 @end
 
 @implementation DisplayNameScreen
@@ -13,10 +14,9 @@
     [self.backgroundImage setImage: [NSImage imageNamed:hifiBackgroundFilename]];
     [self.smallLogo setImage: [NSImage imageNamed:hifiSmallLogoFilename]];
     NSMutableAttributedString* displayNameString = [[NSMutableAttributedString alloc] initWithString:@"Display Name"];
-    
+    [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]];
     [displayNameString addAttribute:NSForegroundColorAttributeName value:[NSColor grayColor] range:NSMakeRange(0, displayNameString.length)];
     [displayNameString addAttribute:NSFontAttributeName value:[NSFont systemFontOfSize:18] range:NSMakeRange(0,displayNameString.length)];
-    
     [self.displayName setPlaceholderAttributedString:displayNameString];
     [self.displayName setTarget:self];
     [self.displayName setAction:@selector(login:)];

launchers/darwin/src/ErrorViewController.m

@@ -6,6 +6,7 @@
 @property (nonatomic, assign) IBOutlet NSImageView* backgroundImage;
 @property (nonatomic, assign) IBOutlet NSImageView* smallLogo;
 @property (nonatomic, assign) IBOutlet NSImageView* voxelImage;
+@property (nonatomic, assign) IBOutlet NSTextField* buildVersion;
 
 @end
 
@@ -16,6 +17,7 @@
     [self.backgroundImage setImage:[NSImage imageNamed:hifiBackgroundFilename]];
     [self.smallLogo setImage:[NSImage imageNamed:hifiSmallLogoFilename]];
     [self.voxelImage setImage:[NSImage imageNamed:hifiVoxelFilename]];
+    [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]];
 }
 
 -(IBAction)resartLauncher:(id)sender

launchers/darwin/src/LoginScreen.m

@@ -12,6 +12,7 @@
 @property (nonatomic, assign) IBOutlet NSTextField* smallHeader;
 @property (nonatomic, assign) IBOutlet NSTextField* trouble;
 @property (nonatomic, assign) IBOutlet NSButton* button;
+@property (nonatomic, assign) IBOutlet NSTextField* buildVersion;
 @end
 
 @implementation LoginScreen
@@ -36,6 +37,7 @@
         [self.button setTitle:@"TRY AGAIN"];
     }
 
+    [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]];
     [self.backgroundImage setImage:[NSImage imageNamed:hifiBackgroundFilename]];
     [self.smallLogo setImage:[NSImage imageNamed:hifiSmallLogoFilename]];
 

launchers/darwin/src/ProcessScreen.m

@@ -9,6 +9,7 @@
 @property (nonatomic, assign) IBOutlet NSTextField* boldStatus;
 @property (nonatomic, assign) IBOutlet NSTextField* smallStatus;
 @property (nonatomic, assign) IBOutlet NSProgressIndicator* progressView;
+@property (nonatomic, assign) IBOutlet NSTextField* buildVersion;
 @end
 
 @implementation ProcessScreen
@@ -37,6 +38,7 @@
         default:
             break;
     }
+    [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]];
     [self.background setImage: [NSImage imageNamed:hifiBackgroundFilename]];
     [self.smallLogo setImage: [NSImage imageNamed:hifiSmallLogoFilename]];
     [self.voxelImage setImage: [NSImage imageNamed:hifiVoxelFilename]];

launchers/darwin/src/SplashScreen.m

@@ -6,6 +6,7 @@
 @property (nonatomic, assign) IBOutlet NSImageView* imageView;
 @property (nonatomic, assign) IBOutlet NSImageView* logoImage;
 @property (nonatomic, assign) IBOutlet NSButton* button;
+@property (nonatomic, assign) IBOutlet NSTextField* buildVersion;
 @end
 
 @implementation SplashScreen
@@ -15,5 +16,6 @@
 -(void)awakeFromNib {
     [self.imageView setImage:[NSImage imageNamed:hifiBackgroundFilename]];
     [self.logoImage setImage:[NSImage imageNamed:hifiLargeLogoFilename]];
+    [self.buildVersion setStringValue: [@"V." stringByAppendingString:@LAUNCHER_BUILD_VERSION]];
 }
 @end

libraries/platform/src/platform/backend/PlatformInstance.cpp

@@ -107,7 +107,8 @@ void Instance::enumerateNics() {
 
 json Instance::getCPU(int index) {
     assert(index <(int) _cpus.size());
-    if (index >= (int)_cpus.size())
+
+    if (index < 0 || (int) _cpus.size() <= index)
         return json();
 
     return _cpus.at(index);
@@ -116,7 +117,7 @@ json Instance::getCPU(int index) {
 json Instance::getGPU(int index) {
     assert(index <(int) _gpus.size());
 
-    if (index >=(int) _gpus.size())
+    if (index < 0 || (int) _gpus.size() <= index)
         return json();
     
     return _gpus.at(index);
@@ -126,7 +127,7 @@ json Instance::getGPU(int index) {
 json Instance::getDisplay(int index) {
     assert(index <(int) _displays.size());
     
-    if (index >=(int) _displays.size())
+    if (index < 0 || (int) _displays.size() <= index)
         return json();
 
     return _displays.at(index);

libraries/render-utils/src/DeferredLightingEffect.cpp

@@ -44,10 +44,10 @@ using namespace render;
 static void loadLightProgram(int programId, bool lightVolume, gpu::PipelinePointer& program);
 
 void DeferredLightingEffect::init() {
-    loadLightProgram(shader::render_utils::program::directional_ambient_light, false, _directionalAmbientSphereLight);
+    loadLightProgram(shader::render_utils::program::directional_skybox_light_ambient, false, _directionalAmbientSphereLight);
     loadLightProgram(shader::render_utils::program::directional_skybox_light, false, _directionalSkyboxLight);
 
-    loadLightProgram(shader::render_utils::program::directional_ambient_light_shadow, false, _directionalAmbientSphereLightShadow);
+    loadLightProgram(shader::render_utils::program::directional_skybox_light_ambient_shadow, false, _directionalAmbientSphereLightShadow);
     loadLightProgram(shader::render_utils::program::directional_skybox_light_shadow, false, _directionalSkyboxLightShadow);
 
     loadLightProgram(shader::render_utils::program::local_lights_shading, true, _localLight);

libraries/render-utils/src/directional_ambient_light.slf

@@ -1,57 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-//  Generated on <$_SCRIBE_DATE$>
-//
-//  directional_ambient_light.frag
-//  fragment shader
-//
-//  Created by Andrzej Kapolka on 9/3/14.
-//  Copyright 2016 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
-//
-<@include DeferredBufferRead.slh@>
-<@include render-utils/ShaderConstants.h@>
-
-<@include GlobalLight.slh@>
-<$declareEvalAmbientSphereGlobalColor(supportScattering)$>
-
-layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
-#define _texCoord0 _texCoord01.xy
-#define _texCoord1 _texCoord01.zw
-layout(location=0) out vec4 _fragColor;
-
-void main(void) {
-    DeferredFrameTransform deferredTransform = getDeferredFrameTransform();
-    DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
-
-    float shadowAttenuation = 1.0;
-
-    if (frag.mode == FRAG_MODE_UNLIT || frag.mode == FRAG_MODE_LIGHTMAPPED) {
-        discard;
-    } else {
-        vec4 midNormalCurvature = vec4(0);
-        vec4 lowNormalCurvature = vec4(0);
-        unpackMidLowNormalCurvature(_texCoord0, midNormalCurvature, lowNormalCurvature);
-        float check = float(frag.mode == FRAG_MODE_SCATTERING);
-        midNormalCurvature = check * midNormalCurvature;
-        lowNormalCurvature = check * lowNormalCurvature;
-
-        vec3 color = evalAmbientSphereGlobalColor(
-            getViewInverse(),
-            shadowAttenuation,
-            frag.obscurance,
-            frag.position.xyz,
-            frag.normal,
-            frag.albedo,
-            frag.fresnel,
-            frag.metallic,
-            frag.roughness,
-            frag.scattering,
-            midNormalCurvature,
-            lowNormalCurvature);
-        _fragColor = vec4(color, 1.0);
-
-    }
-}

libraries/render-utils/src/directional_ambient_light_shadow.slf

@@ -1,63 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-//  Generated on <$_SCRIBE_DATE$>
-//
-//  directional_ambient_light_shadow.frag
-//  fragment shader
-//
-//  Created by Zach Pomerantz on 1/18/2016.
-//  Copyright 2016 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
-//
-<@include DeferredBufferRead.slh@>
-<@include render-utils/ShaderConstants.h@>
-
-<@include GlobalLight.slh@>
-<$declareEvalAmbientSphereGlobalColor(isScattering)$>
-
-<@include Shadow.slh@>
-
-layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
-#define _texCoord0 _texCoord01.xy
-#define _texCoord1 _texCoord01.zw
-layout(location=0) out vec4 _fragColor;
-
-void main(void) {
-    DeferredFrameTransform deferredTransform = getDeferredFrameTransform();
-    DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
-
-    vec4 viewPos = vec4(frag.position.xyz, 1.0);
-    vec4 worldPos = getViewInverse() * viewPos;
-    Light shadowLight = getKeyLight();
-    vec3 worldLightDirection = getLightDirection(shadowLight);
-    float shadowAttenuation = evalShadowAttenuation(worldLightDirection, worldPos, -viewPos.z, frag.normal);
-
-    if (frag.mode == FRAG_MODE_UNLIT || frag.mode == FRAG_MODE_LIGHTMAPPED) {
-        discard;
-    } else {
-        vec4 midNormalCurvature = vec4(0);
-        vec4 lowNormalCurvature = vec4(0);
-        unpackMidLowNormalCurvature(_texCoord0, midNormalCurvature, lowNormalCurvature);
-        float check = float(frag.mode == FRAG_MODE_SCATTERING);
-        midNormalCurvature = check * midNormalCurvature;
-        lowNormalCurvature = check * lowNormalCurvature;
-
-        vec3 color =  evalAmbientSphereGlobalColor(
-                        getViewInverse(),
-                        shadowAttenuation,
-                        frag.obscurance,
-                        frag.position.xyz,
-                        frag.normal,
-                        frag.albedo,
-                        frag.fresnel,
-                        frag.metallic,
-                        frag.roughness,
-                        frag.scattering,
-                        midNormalCurvature,
-                        lowNormalCurvature);
-                        
-        _fragColor = vec4(color, 1.0);
-    }
-}

libraries/render-utils/src/directional_skybox_light.slf

@@ -1,10 +1,8 @@
 <@include gpu/Config.slh@>
 <$VERSION_HEADER$>
+//  <$_SCRIBE_FILENAME$>
 //  Generated on <$_SCRIBE_DATE$>
 //
-//  directional_skybox_light.frag
-//  fragment shader
-//
 //  Created by Sam Gateau on 5/8/2015.
 //  Copyright 2016 High Fidelity, Inc.
 //
@@ -15,20 +13,36 @@
 <@include render-utils/ShaderConstants.h@>
 
 <@include GlobalLight.slh@>
-<$declareEvalSkyboxGlobalColor(isScattering, _SCRIBE_NULL)$>
+<@if HIFI_USE_AMBIENT@>
+    <$declareEvalAmbientSphereGlobalColor(supportScattering)$>
+<@else@>
+    <$declareEvalSkyboxGlobalColor(supportScattering, _SCRIBE_NULL)$>
+<@endif@>
+
+<@if HIFI_USE_SHADOW@>
+    <@include Shadow.slh@>
+<@endif@>
 
 layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
 #define _texCoord0 _texCoord01.xy
 #define _texCoord1 _texCoord01.zw
+
 layout(location=0) out vec4 _fragColor;
 
 void main(void) {
     DeferredFrameTransform deferredTransform = getDeferredFrameTransform();
     DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
 
+<@if HIFI_USE_SHADOW@>
+    vec4 viewPos = vec4(frag.position.xyz, 1.0);
+    vec4 worldPos = getViewInverse() * viewPos;
+    Light shadowLight = getKeyLight();
+    vec3 worldLightDirection = getLightDirection(shadowLight);
+    float shadowAttenuation = evalShadowAttenuation(worldLightDirection, worldPos, -viewPos.z, frag.normal);
+<@else@>
     float shadowAttenuation = 1.0;
+<@endif@>
 
-    // Light mapped or not ?
     if (frag.mode == FRAG_MODE_UNLIT || frag.mode == FRAG_MODE_LIGHTMAPPED) {
         discard;
     } else {
@@ -39,6 +53,21 @@ void main(void) {
         midNormalCurvature = check * midNormalCurvature;
         lowNormalCurvature = check * lowNormalCurvature;
 
+<@if HIFI_USE_AMBIENT@>
+        vec3 color = evalAmbientSphereGlobalColor(
+                        getViewInverse(),
+                        shadowAttenuation,
+                        frag.obscurance,
+                        frag.position.xyz,
+                        frag.normal,
+                        frag.albedo,
+                        frag.fresnel,
+                        frag.metallic,
+                        frag.roughness,
+                        frag.scattering,
+                        midNormalCurvature,
+                        lowNormalCurvature);
+<@else@>
         vec3 color = evalSkyboxGlobalColor(
                         getViewInverse(),
                         shadowAttenuation,
@@ -52,6 +81,7 @@ void main(void) {
                         frag.scattering,
                         midNormalCurvature,
                         lowNormalCurvature);
+<@endif@>
 
         _fragColor = vec4(color, 1.0);
     }

libraries/render-utils/src/directional_skybox_light_shadow.slf

@@ -1,64 +0,0 @@
-<@include gpu/Config.slh@>
-<$VERSION_HEADER$>
-//  Generated on <$_SCRIBE_DATE$>
-//
-//  directional_skybox_light_shadow.frag
-//  fragment shader
-//
-//  Created by Zach Pomerantz on 1/18/2016.
-//  Copyright 2016 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
-//!>
-<@include DeferredBufferRead.slh@>
-<@include render-utils/ShaderConstants.h@>
-
-<@include GlobalLight.slh@>
-<$declareEvalSkyboxGlobalColor(isScattering, _SCRIBE_NULL)$>
-
-<@include Shadow.slh@>
-
-layout(location=RENDER_UTILS_ATTR_TEXCOORD01) in vec4 _texCoord01;
-#define _texCoord0 _texCoord01.xy
-#define _texCoord1 _texCoord01.zw
-layout(location=0) out vec4 _fragColor;
-
-void main(void) {
-    DeferredFrameTransform deferredTransform = getDeferredFrameTransform();
-    DeferredFragment frag = unpackDeferredFragment(deferredTransform, _texCoord0);
-
-    vec4 viewPos = vec4(frag.position.xyz, 1.0);
-    vec4 worldPos = getViewInverse() * viewPos;
-    Light shadowLight = getKeyLight();
-    vec3 worldLightDirection = getLightDirection(shadowLight);
-    float shadowAttenuation = evalShadowAttenuation(worldLightDirection, worldPos, -viewPos.z, frag.normal);
-
-    if (frag.mode == FRAG_MODE_UNLIT || frag.mode == FRAG_MODE_LIGHTMAPPED) {
-        discard;
-    } else {
-        vec4 midNormalCurvature = vec4(0);
-        vec4 lowNormalCurvature = vec4(0);
-        unpackMidLowNormalCurvature(_texCoord0, midNormalCurvature, lowNormalCurvature);
-        float check = float(frag.mode == FRAG_MODE_SCATTERING);
-        midNormalCurvature = check * midNormalCurvature;
-        lowNormalCurvature = check * lowNormalCurvature;
-
-        vec3 color =  evalSkyboxGlobalColor(
-                        getViewInverse(),
-                        shadowAttenuation,
-                        frag.obscurance,
-                        frag.position.xyz,
-                        frag.normal,
-                        frag.albedo,
-                        frag.fresnel,
-                        frag.metallic,
-                        frag.roughness,
-                        frag.scattering,
-                        midNormalCurvature,
-                        lowNormalCurvature);
-
-
-        _fragColor = vec4(color, 1.0);
-    }
-}

libraries/render-utils/src/render-utils/directional_ambient_light.slp

@@ -1 +0,0 @@
-VERTEX deferred_light

libraries/render-utils/src/render-utils/directional_ambient_light_shadow.slp

@@ -1 +0,0 @@
-VERTEX deferred_light

libraries/render-utils/src/render-utils/directional_skybox_light.slp

@@ -1 +1,2 @@
 VERTEX deferred_light
+DEFINES ambient:f shadow:f

libraries/render-utils/src/render-utils/directional_skybox_light_shadow.slp

@@ -1 +0,0 @@
-VERTEX deferred_light

libraries/shared/src/CPUIdent.cpp

@@ -82,39 +82,22 @@ std::vector<CPUIdent::Feature> CPUIdent::getAllFeatures() {
 };
 
 
-CPUIdent::CPUIdent_Internal::CPUIdent_Internal()
-        : nIds_{ 0 },
-        nExIds_{ 0 },
-        isIntel_{ false },
-        isAMD_{ false },
-        f_1_ECX_{ 0 },
-        f_1_EDX_{ 0 },
-        f_7_EBX_{ 0 },
-        f_7_ECX_{ 0 },
-        f_81_ECX_{ 0 },
-        f_81_EDX_{ 0 },
-        data_{},
-        extdata_{}
-    {
+CPUIdent::CPUIdent_Internal::CPUIdent_Internal() {
     //int cpuInfo[4] = {-1};
-    std::array<uint32_t, 4> cpui;
+    uint32_t cpui[4];
 
     // Calling __cpuid with 0x0 as the function_id argument
     // gets the number of the highest valid function ID.
-    getCPUID(cpui.data(), 0);
+    getCPUID(cpui, 0);
     nIds_ = cpui[0];
 
-    for (uint32_t i = 0; i <= nIds_; ++i) {
-        getCPUIDEX(cpui.data(), i, 0);
-        data_.push_back(cpui);
-    }
-
     // Capture vendor string
     char vendor[0x20];
     memset(vendor, 0, sizeof(vendor));
-    *reinterpret_cast<int*>(vendor) = data_[0][1];
-    *reinterpret_cast<int*>(vendor + 4) = data_[0][3];
-    *reinterpret_cast<int*>(vendor + 8) = data_[0][2];
+    getCPUIDEX(cpui, 0, 0);
+    *reinterpret_cast<int*>(vendor) = cpui[1];
+    *reinterpret_cast<int*>(vendor + 4) = cpui[3];
+    *reinterpret_cast<int*>(vendor + 8) = cpui[2];
     vendor_ = vendor;
     if (vendor_ == "GenuineIntel") {
         isIntel_ = true;
@@ -125,40 +108,41 @@ CPUIdent::CPUIdent_Internal::CPUIdent_Internal()
 
     // load bitset with flags for function 0x00000001
     if (nIds_ >= 1) {
-        f_1_ECX_ = data_[1][2];
-        f_1_EDX_ = data_[1][3];
+        getCPUIDEX(cpui, 1, 0);
+        f_1_ECX_ = cpui[2];
+        f_1_EDX_ = cpui[3];
     }
 
     // load bitset with flags for function 0x00000007
     if (nIds_ >= 7) {
-        f_7_EBX_ = data_[7][1];
-        f_7_ECX_ = data_[7][2];
+        getCPUIDEX(cpui, 7, 0);
+        f_7_EBX_ = cpui[1];
+        f_7_ECX_ = cpui[2];
     }
 
     // Calling __cpuid with 0x80000000 as the function_id argument
     // gets the number of the highest valid extended ID.
-    getCPUID(cpui.data(), 0x80000000);
+    getCPUID(cpui, 0x80000000);
     nExIds_ = cpui[0];
 
     char brand[0x40];
     memset(brand, 0, sizeof(brand));
 
-    for (uint32_t i = 0x80000000; i <= nExIds_; ++i) {
-        getCPUIDEX(cpui.data(), i, 0);
-        extdata_.push_back(cpui);
-    }
-
     // load bitset with flags for function 0x80000001
     if (nExIds_ >= 0x80000001) {
-        f_81_ECX_ = extdata_[1][2];
-        f_81_EDX_ = extdata_[1][3];
+        getCPUIDEX(cpui, 0x80000001, 0);
+        f_81_ECX_ = cpui[2];
+        f_81_EDX_ = cpui[3];
     }
 
     // Interpret CPU brand string if reported
     if (nExIds_ >= 0x80000004) {
-        memcpy(brand, extdata_[2].data(), sizeof(cpui));
-        memcpy(brand + 16, extdata_[3].data(), sizeof(cpui));
-        memcpy(brand + 32, extdata_[4].data(), sizeof(cpui));
+        getCPUIDEX(cpui, 0x80000002, 0);
+        memcpy(brand, cpui, sizeof(cpui));
+        getCPUIDEX(cpui, 0x80000003, 0);
+        memcpy(brand + 16, cpui, sizeof(cpui));
+        getCPUIDEX(cpui, 0x80000004, 0);
+        memcpy(brand + 32, cpui, sizeof(cpui));
         brand_ = brand;
     }
 }

libraries/shared/src/CPUIdent.h

@@ -100,25 +100,22 @@ public:
 private:
     static const CPUIdent_Internal CPU_Rep;
 
-    class CPUIdent_Internal
-    {
+    class CPUIdent_Internal {
     public:
         CPUIdent_Internal();
 
-        uint32_t nIds_;
-        uint32_t nExIds_;
+        uint32_t nIds_{ 0 };
+        uint32_t nExIds_{ 0 };
         std::string vendor_;
         std::string brand_;
-        bool isIntel_;
-        bool isAMD_;
-        std::bitset<32> f_1_ECX_;
-        std::bitset<32> f_1_EDX_;
-        std::bitset<32> f_7_EBX_;
-        std::bitset<32> f_7_ECX_;
-        std::bitset<32> f_81_ECX_;
-        std::bitset<32> f_81_EDX_;
-        std::vector<std::array<uint32_t, 4>> data_;
-        std::vector<std::array<uint32_t, 4>> extdata_;
+        bool isIntel_{ false };
+        bool isAMD_{ false };
+        std::bitset<32> f_1_ECX_{ 0 };
+        std::bitset<32> f_1_EDX_{ 0 };
+        std::bitset<32> f_7_EBX_{ 0 };
+        std::bitset<32> f_7_ECX_{ 0 };
+        std::bitset<32> f_81_ECX_{ 0 };
+        std::bitset<32> f_81_EDX_{ 0 };
     };
 };