From 965feb6f7a97243e2e9b7facc03e8c03ec0f0be7 Mon Sep 17 00:00:00 2001 From: SamGondelman Date: Tue, 16 Jul 2019 11:24:19 -0700 Subject: [PATCH 01/13] condense direction light shaders using slp defines --- .../src/DeferredLightingEffect.cpp | 4 +- .../src/directional_ambient_light.slf | 57 ----------------- .../src/directional_ambient_light_shadow.slf | 63 ------------------ .../src/directional_skybox_light.slf | 40 ++++++++++-- .../src/directional_skybox_light_shadow.slf | 64 ------------------- .../directional_ambient_light.slp | 1 - .../directional_ambient_light_shadow.slp | 1 - .../render-utils/directional_skybox_light.slp | 1 + .../directional_skybox_light_shadow.slp | 1 - 9 files changed, 38 insertions(+), 194 deletions(-) delete mode 100644 libraries/render-utils/src/directional_ambient_light.slf delete mode 100644 libraries/render-utils/src/directional_ambient_light_shadow.slf delete mode 100644 libraries/render-utils/src/directional_skybox_light_shadow.slf delete mode 100644 libraries/render-utils/src/render-utils/directional_ambient_light.slp delete mode 100644 libraries/render-utils/src/render-utils/directional_ambient_light_shadow.slp delete mode 100644 libraries/render-utils/src/render-utils/directional_skybox_light_shadow.slp diff --git a/libraries/render-utils/src/DeferredLightingEffect.cpp b/libraries/render-utils/src/DeferredLightingEffect.cpp index 3b7c66d42d..8d7fc345ac 100644 --- a/libraries/render-utils/src/DeferredLightingEffect.cpp +++ b/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); diff --git a/libraries/render-utils/src/directional_ambient_light.slf b/libraries/render-utils/src/directional_ambient_light.slf deleted file mode 100644 index dd1b59f43e..0000000000 --- a/libraries/render-utils/src/directional_ambient_light.slf +++ /dev/null @@ -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); - - } -} diff --git a/libraries/render-utils/src/directional_ambient_light_shadow.slf b/libraries/render-utils/src/directional_ambient_light_shadow.slf deleted file mode 100644 index 34018125af..0000000000 --- a/libraries/render-utils/src/directional_ambient_light_shadow.slf +++ /dev/null @@ -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); - } -} diff --git a/libraries/render-utils/src/directional_skybox_light.slf b/libraries/render-utils/src/directional_skybox_light.slf index 8e2b38b478..20026283be 100644 --- a/libraries/render-utils/src/directional_skybox_light.slf +++ b/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); } diff --git a/libraries/render-utils/src/directional_skybox_light_shadow.slf b/libraries/render-utils/src/directional_skybox_light_shadow.slf deleted file mode 100644 index 2f289ed00f..0000000000 --- a/libraries/render-utils/src/directional_skybox_light_shadow.slf +++ /dev/null @@ -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); - } -} diff --git a/libraries/render-utils/src/render-utils/directional_ambient_light.slp b/libraries/render-utils/src/render-utils/directional_ambient_light.slp deleted file mode 100644 index 3aeca942ab..0000000000 --- a/libraries/render-utils/src/render-utils/directional_ambient_light.slp +++ /dev/null @@ -1 +0,0 @@ -VERTEX deferred_light diff --git a/libraries/render-utils/src/render-utils/directional_ambient_light_shadow.slp b/libraries/render-utils/src/render-utils/directional_ambient_light_shadow.slp deleted file mode 100644 index 3aeca942ab..0000000000 --- a/libraries/render-utils/src/render-utils/directional_ambient_light_shadow.slp +++ /dev/null @@ -1 +0,0 @@ -VERTEX deferred_light diff --git a/libraries/render-utils/src/render-utils/directional_skybox_light.slp b/libraries/render-utils/src/render-utils/directional_skybox_light.slp index 3aeca942ab..7e0a0dd1db 100644 --- a/libraries/render-utils/src/render-utils/directional_skybox_light.slp +++ b/libraries/render-utils/src/render-utils/directional_skybox_light.slp @@ -1 +1,2 @@ VERTEX deferred_light +DEFINES ambient:f shadow:f \ No newline at end of file diff --git a/libraries/render-utils/src/render-utils/directional_skybox_light_shadow.slp b/libraries/render-utils/src/render-utils/directional_skybox_light_shadow.slp deleted file mode 100644 index 3aeca942ab..0000000000 --- a/libraries/render-utils/src/render-utils/directional_skybox_light_shadow.slp +++ /dev/null @@ -1 +0,0 @@ -VERTEX deferred_light From 1eae39b78cbdf30dc2d4828557674f3697b7e430 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Fri, 19 Jul 2019 18:07:55 -0700 Subject: [PATCH 02/13] starting cleanup work --- launchers/darwin/CMakeLists.txt | 18 +++--- .../cmake/macros/SetPackagingParameters.cmake | 63 +++++++++++++++++++ launchers/darwin/src/Launcher.h | 4 ++ launchers/darwin/src/Launcher.m | 12 ++++ launchers/darwin/src/LauncherParams.h | 8 +++ 5 files changed, 98 insertions(+), 7 deletions(-) create mode 100644 launchers/darwin/cmake/macros/SetPackagingParameters.cmake create mode 100644 launchers/darwin/src/LauncherParams.h diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index 0a7ef70461..ae451ee73d 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -1,7 +1,8 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.2) 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 @@ -38,6 +39,7 @@ set(src_files src/LaunchInterface.h src/CustomUI.h src/CustomUI.m + src/LauncherParams.h src/main.mm nib/Window.xib nib/SplashScreen.xib @@ -59,15 +61,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}) diff --git a/launchers/darwin/cmake/macros/SetPackagingParameters.cmake b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake new file mode 100644 index 0000000000..f66f34678f --- /dev/null +++ b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake @@ -0,0 +1,63 @@ +# +# 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_GLOBAL_SERVICES "DEVELOPMENT") + set(USE_STABLE_GLOBAL_SERVICES 0) + set(BUILD_NUMBER 0) + set(APP_USER_MODEL_ID "com.highfidelity.console-dev") + + 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(DEPLOY_PACKAGE TRUE) + set(PRODUCTION_BUILD 1) + set(BUILD_VERSION ${RELEASE_NUMBER}) + set(BUILD_ORGANIZATION "High Fidelity") + + # add definition for this release type + add_definitions(-DPRODUCTION_BUILD) + + elseif (RELEASE_TYPE STREQUAL "PR") + set(DEPLOY_PACKAGE TRUE) + set(PR_BUILD 1) + set(BUILD_VERSION "PR${RELEASE_NUMBER}") + set(BUILD_ORGANIZATION "High Fidelity - PR${RELEASE_NUMBER}") + + # add definition for this release type + add_definitions(-DPR_BUILD) + else () + set(DEV_BUILD 1) + set(BUILD_VERSION "dev") + set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}") + + # add definition for this release type + add_definitions(-DDEV_BUILD) + endif () + + + + # create a header file our targets can use to find out the application version + #file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes") + #configure_file("${HF_CMAKE_DIR}/templates/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/includes/BuildInfo.h") + #include_directories("${CMAKE_BINARY_DIR}/includes") + +endmacro(SET_PACKAGING_PARAMETERS) diff --git a/launchers/darwin/src/Launcher.h b/launchers/darwin/src/Launcher.h index de67850bfe..cfeb66e008 100644 --- a/launchers/darwin/src/Launcher.h +++ b/launchers/darwin/src/Launcher.h @@ -5,6 +5,7 @@ #import "LatestBuildRequest.h" #import "OrganizationRequest.h" #import "DownloadScripts.h" +#import "LauncherParams.h"; typedef enum processStateTypes { @@ -59,7 +60,10 @@ struct LatestBuildInfo { @property (nonatomic, assign) NSProgressIndicator* progressIndicator; @property (nonatomic) double progressTarget; @property (nonatomic) struct LatestBuildInfo buildInfo; +@property (nonatomic) struct LauncherParams params; +- (struct LauncherParams) getLauncherParams; +- (void) setLuancherParams:(struct LauncherParams) aParams; - (NSProgressIndicator*) getProgressView; - (void) setProgressView:(NSProgressIndicator*) aProgressIndicator; - (void) displayNameEntered:(NSString*)aDisplayName; diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m index 1a84e9143d..c24af01b71 100644 --- a/launchers/darwin/src/Launcher.m +++ b/launchers/darwin/src/Launcher.m @@ -41,6 +41,8 @@ static BOOL const DELETE_ZIP_FILES = TRUE; latestBuildInfo.shouldDownload = FALSE; latestBuildInfo.requestBuildFinished = FALSE; self.buildInfo = latestBuildInfo; + struct LauncherParams launcherParams; + self.params = launcherParams; self.credentialsAccepted = TRUE; self.gotCredentialResponse = FALSE; self.waitingForCredentialReponse = FALSE; @@ -110,6 +112,16 @@ static BOOL const DELETE_ZIP_FILES = TRUE; return lerpValue; } +- (struct LauncherParams) getLauncherParams +{ + return self.params; +} + +- (void) setLauncherParams:(struct LauncherParams) aParams +{ + self.params = aParams; +} + - (BOOL) extractZipFileAtDestination:(NSString *)destination :(NSString*)file { NSTask* task = [[NSTask alloc] init]; diff --git a/launchers/darwin/src/LauncherParams.h b/launchers/darwin/src/LauncherParams.h new file mode 100644 index 0000000000..10a5a57541 --- /dev/null +++ b/launchers/darwin/src/LauncherParams.h @@ -0,0 +1,8 @@ +struct LauncherParams +{ + NSString* domainContentUrl; + NSString* interfaceUrl; + NSString* orginizationName; + NSString* displayName; + NSString* domainUrl; +} From 78d877a0b67e04a3d46aa8d78fc44f0fe4e1ef3b Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Mon, 22 Jul 2019 10:01:48 -0700 Subject: [PATCH 03/13] finish versioning --- launchers/darwin/CMakeLists.txt | 2 +- launchers/darwin/nib/DisplayNameScreen.xib | 10 ++++++++++ launchers/darwin/nib/ErrorScreen.xib | 10 ++++++++++ launchers/darwin/nib/LoginScreen.xib | 10 ++++++++++ launchers/darwin/nib/ProcessScreen.xib | 10 ++++++++++ launchers/darwin/nib/SplashScreen.xib | 10 ++++++++++ launchers/darwin/src/DisplayNameScreen.m | 4 ++-- launchers/darwin/src/ErrorViewController.m | 2 ++ launchers/darwin/src/Launcher.h | 4 ---- launchers/darwin/src/Launcher.m | 12 ------------ launchers/darwin/src/LauncherParams.h | 8 -------- launchers/darwin/src/LoginScreen.m | 2 ++ launchers/darwin/src/ProcessScreen.m | 2 ++ launchers/darwin/src/SplashScreen.m | 2 ++ 14 files changed, 61 insertions(+), 27 deletions(-) delete mode 100644 launchers/darwin/src/LauncherParams.h diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index ae451ee73d..e286e0d177 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -39,7 +39,6 @@ set(src_files src/LaunchInterface.h src/CustomUI.h src/CustomUI.m - src/LauncherParams.h src/main.mm nib/Window.xib nib/SplashScreen.xib @@ -81,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") diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib index 94fa739f8e..1115d2c55e 100644 --- a/launchers/darwin/nib/DisplayNameScreen.xib +++ b/launchers/darwin/nib/DisplayNameScreen.xib @@ -102,12 +102,22 @@ + + + + + + + + + + diff --git a/launchers/darwin/nib/ErrorScreen.xib b/launchers/darwin/nib/ErrorScreen.xib index 26abe80b29..8a55039034 100644 --- a/launchers/darwin/nib/ErrorScreen.xib +++ b/launchers/darwin/nib/ErrorScreen.xib @@ -69,12 +69,22 @@ + + + + + + + + + + diff --git a/launchers/darwin/nib/LoginScreen.xib b/launchers/darwin/nib/LoginScreen.xib index fc1ccfcc90..60bf69cd61 100644 --- a/launchers/darwin/nib/LoginScreen.xib +++ b/launchers/darwin/nib/LoginScreen.xib @@ -119,12 +119,22 @@ + + + + + + + + + + diff --git a/launchers/darwin/nib/ProcessScreen.xib b/launchers/darwin/nib/ProcessScreen.xib index d16d71e5fa..6413d523b8 100644 --- a/launchers/darwin/nib/ProcessScreen.xib +++ b/launchers/darwin/nib/ProcessScreen.xib @@ -53,6 +53,15 @@ + + + + + + + + + @@ -60,6 +69,7 @@ + diff --git a/launchers/darwin/nib/SplashScreen.xib b/launchers/darwin/nib/SplashScreen.xib index 3bbed22a59..2fdc19ad69 100644 --- a/launchers/darwin/nib/SplashScreen.xib +++ b/launchers/darwin/nib/SplashScreen.xib @@ -26,11 +26,21 @@ + + + + + + + + + + diff --git a/launchers/darwin/src/DisplayNameScreen.m b/launchers/darwin/src/DisplayNameScreen.m index 581eabc4ee..ecb619dc01 100644 --- a/launchers/darwin/src/DisplayNameScreen.m +++ b/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:)]; diff --git a/launchers/darwin/src/ErrorViewController.m b/launchers/darwin/src/ErrorViewController.m index 84dee95678..af45175254 100644 --- a/launchers/darwin/src/ErrorViewController.m +++ b/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 diff --git a/launchers/darwin/src/Launcher.h b/launchers/darwin/src/Launcher.h index cfeb66e008..de67850bfe 100644 --- a/launchers/darwin/src/Launcher.h +++ b/launchers/darwin/src/Launcher.h @@ -5,7 +5,6 @@ #import "LatestBuildRequest.h" #import "OrganizationRequest.h" #import "DownloadScripts.h" -#import "LauncherParams.h"; typedef enum processStateTypes { @@ -60,10 +59,7 @@ struct LatestBuildInfo { @property (nonatomic, assign) NSProgressIndicator* progressIndicator; @property (nonatomic) double progressTarget; @property (nonatomic) struct LatestBuildInfo buildInfo; -@property (nonatomic) struct LauncherParams params; -- (struct LauncherParams) getLauncherParams; -- (void) setLuancherParams:(struct LauncherParams) aParams; - (NSProgressIndicator*) getProgressView; - (void) setProgressView:(NSProgressIndicator*) aProgressIndicator; - (void) displayNameEntered:(NSString*)aDisplayName; diff --git a/launchers/darwin/src/Launcher.m b/launchers/darwin/src/Launcher.m index c24af01b71..1a84e9143d 100644 --- a/launchers/darwin/src/Launcher.m +++ b/launchers/darwin/src/Launcher.m @@ -41,8 +41,6 @@ static BOOL const DELETE_ZIP_FILES = TRUE; latestBuildInfo.shouldDownload = FALSE; latestBuildInfo.requestBuildFinished = FALSE; self.buildInfo = latestBuildInfo; - struct LauncherParams launcherParams; - self.params = launcherParams; self.credentialsAccepted = TRUE; self.gotCredentialResponse = FALSE; self.waitingForCredentialReponse = FALSE; @@ -112,16 +110,6 @@ static BOOL const DELETE_ZIP_FILES = TRUE; return lerpValue; } -- (struct LauncherParams) getLauncherParams -{ - return self.params; -} - -- (void) setLauncherParams:(struct LauncherParams) aParams -{ - self.params = aParams; -} - - (BOOL) extractZipFileAtDestination:(NSString *)destination :(NSString*)file { NSTask* task = [[NSTask alloc] init]; diff --git a/launchers/darwin/src/LauncherParams.h b/launchers/darwin/src/LauncherParams.h deleted file mode 100644 index 10a5a57541..0000000000 --- a/launchers/darwin/src/LauncherParams.h +++ /dev/null @@ -1,8 +0,0 @@ -struct LauncherParams -{ - NSString* domainContentUrl; - NSString* interfaceUrl; - NSString* orginizationName; - NSString* displayName; - NSString* domainUrl; -} diff --git a/launchers/darwin/src/LoginScreen.m b/launchers/darwin/src/LoginScreen.m index d654a14f1b..5b8cab2db6 100644 --- a/launchers/darwin/src/LoginScreen.m +++ b/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]]; diff --git a/launchers/darwin/src/ProcessScreen.m b/launchers/darwin/src/ProcessScreen.m index 85ec5c8d5b..876be3fea3 100644 --- a/launchers/darwin/src/ProcessScreen.m +++ b/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]]; diff --git a/launchers/darwin/src/SplashScreen.m b/launchers/darwin/src/SplashScreen.m index a1f726c1df..87d8681629 100644 --- a/launchers/darwin/src/SplashScreen.m +++ b/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 From 1d1b1a93d9eca07884806df26c6eaaa66284bfa3 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Mon, 22 Jul 2019 10:06:24 -0700 Subject: [PATCH 04/13] revert --- launchers/darwin/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/launchers/darwin/CMakeLists.txt b/launchers/darwin/CMakeLists.txt index e286e0d177..177a7722e5 100644 --- a/launchers/darwin/CMakeLists.txt +++ b/launchers/darwin/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.2) +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/") From 4b1d243551045363eea2e4b07b4cb7a049787cbd Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 23 Jul 2019 21:18:45 +1200 Subject: [PATCH 05/13] Fix link to coding standards --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 363064964a..46433a155c 100644 --- a/README.md +++ b/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) ========= From 08bfe00ac4076c49d0a8943c5c84c9619cc59df6 Mon Sep 17 00:00:00 2001 From: dante ruiz Date: Tue, 23 Jul 2019 14:09:46 -0700 Subject: [PATCH 06/13] making requested changes --- .../cmake/macros/SetPackagingParameters.cmake | 18 ------------------ launchers/darwin/nib/DisplayNameScreen.xib | 6 +++--- launchers/darwin/nib/ErrorScreen.xib | 6 +++--- launchers/darwin/nib/LoginScreen.xib | 6 +++--- launchers/darwin/nib/ProcessScreen.xib | 6 +++--- launchers/darwin/nib/SplashScreen.xib | 4 ++-- 6 files changed, 14 insertions(+), 32 deletions(-) diff --git a/launchers/darwin/cmake/macros/SetPackagingParameters.cmake b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake index f66f34678f..ed24b3bd6b 100644 --- a/launchers/darwin/cmake/macros/SetPackagingParameters.cmake +++ b/launchers/darwin/cmake/macros/SetPackagingParameters.cmake @@ -15,10 +15,7 @@ macro(SET_PACKAGING_PARAMETERS) set(PR_BUILD 0) set(PRODUCTION_BUILD 0) set(DEV_BUILD 0) - set(BUILD_GLOBAL_SERVICES "DEVELOPMENT") - set(USE_STABLE_GLOBAL_SERVICES 0) set(BUILD_NUMBER 0) - set(APP_USER_MODEL_ID "com.highfidelity.console-dev") set_from_env(RELEASE_TYPE RELEASE_TYPE "DEV") set_from_env(RELEASE_NUMBER RELEASE_NUMBER "") @@ -28,36 +25,21 @@ macro(SET_PACKAGING_PARAMETERS) set(BUILD_NUMBER ${RELEASE_NUMBER}) if (RELEASE_TYPE STREQUAL "PRODUCTION") - set(DEPLOY_PACKAGE TRUE) set(PRODUCTION_BUILD 1) set(BUILD_VERSION ${RELEASE_NUMBER}) - set(BUILD_ORGANIZATION "High Fidelity") # add definition for this release type add_definitions(-DPRODUCTION_BUILD) elseif (RELEASE_TYPE STREQUAL "PR") - set(DEPLOY_PACKAGE TRUE) set(PR_BUILD 1) set(BUILD_VERSION "PR${RELEASE_NUMBER}") - set(BUILD_ORGANIZATION "High Fidelity - PR${RELEASE_NUMBER}") # add definition for this release type add_definitions(-DPR_BUILD) else () set(DEV_BUILD 1) set(BUILD_VERSION "dev") - set(BUILD_ORGANIZATION "High Fidelity - ${BUILD_VERSION}") - - # add definition for this release type - add_definitions(-DDEV_BUILD) endif () - - - # create a header file our targets can use to find out the application version - #file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/includes") - #configure_file("${HF_CMAKE_DIR}/templates/BuildInfo.h.in" "${CMAKE_BINARY_DIR}/includes/BuildInfo.h") - #include_directories("${CMAKE_BINARY_DIR}/includes") - endmacro(SET_PACKAGING_PARAMETERS) diff --git a/launchers/darwin/nib/DisplayNameScreen.xib b/launchers/darwin/nib/DisplayNameScreen.xib index 1115d2c55e..9862c3773b 100644 --- a/launchers/darwin/nib/DisplayNameScreen.xib +++ b/launchers/darwin/nib/DisplayNameScreen.xib @@ -103,10 +103,10 @@ - + - - + + diff --git a/launchers/darwin/nib/ErrorScreen.xib b/launchers/darwin/nib/ErrorScreen.xib index 8a55039034..267c9b2f29 100644 --- a/launchers/darwin/nib/ErrorScreen.xib +++ b/launchers/darwin/nib/ErrorScreen.xib @@ -70,10 +70,10 @@ - + - - + + diff --git a/launchers/darwin/nib/LoginScreen.xib b/launchers/darwin/nib/LoginScreen.xib index 60bf69cd61..3ae91632c2 100644 --- a/launchers/darwin/nib/LoginScreen.xib +++ b/launchers/darwin/nib/LoginScreen.xib @@ -120,10 +120,10 @@ - + - - + + diff --git a/launchers/darwin/nib/ProcessScreen.xib b/launchers/darwin/nib/ProcessScreen.xib index 6413d523b8..c32abb5f9d 100644 --- a/launchers/darwin/nib/ProcessScreen.xib +++ b/launchers/darwin/nib/ProcessScreen.xib @@ -54,10 +54,10 @@ - + - - + + diff --git a/launchers/darwin/nib/SplashScreen.xib b/launchers/darwin/nib/SplashScreen.xib index 2fdc19ad69..988de78399 100644 --- a/launchers/darwin/nib/SplashScreen.xib +++ b/launchers/darwin/nib/SplashScreen.xib @@ -27,9 +27,9 @@ - + - + From 8dd18fbe621af366604b3a771a112d32b47c6800 Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 22 Jul 2019 17:03:07 -0700 Subject: [PATCH 07/13] Make sure the send thread terminates before delete --- assignment-client/src/octree/OctreeServer.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 477d3dd612..80e0060299 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/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 From 7f9ad4ac252116a7d81083427cc2866fd6b4ece3 Mon Sep 17 00:00:00 2001 From: Clement Date: Mon, 22 Jul 2019 17:02:28 -0700 Subject: [PATCH 08/13] Don't store unused cpuident data arrays --- libraries/shared/src/CPUIdent.cpp | 62 ++++++++++++------------------- libraries/shared/src/CPUIdent.h | 25 ++++++------- 2 files changed, 34 insertions(+), 53 deletions(-) diff --git a/libraries/shared/src/CPUIdent.cpp b/libraries/shared/src/CPUIdent.cpp index b11ba8950d..e760cd6f6a 100644 --- a/libraries/shared/src/CPUIdent.cpp +++ b/libraries/shared/src/CPUIdent.cpp @@ -82,39 +82,22 @@ std::vector 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 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(vendor) = data_[0][1]; - *reinterpret_cast(vendor + 4) = data_[0][3]; - *reinterpret_cast(vendor + 8) = data_[0][2]; + getCPUIDEX(cpui, 0, 0); + *reinterpret_cast(vendor) = cpui[1]; + *reinterpret_cast(vendor + 4) = cpui[3]; + *reinterpret_cast(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; } } diff --git a/libraries/shared/src/CPUIdent.h b/libraries/shared/src/CPUIdent.h index dbf0c3ea91..d7bf03002b 100644 --- a/libraries/shared/src/CPUIdent.h +++ b/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> data_; - std::vector> 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 }; }; }; From a6c569dd7861d69ee4b44336fbc22bf4701efc0f Mon Sep 17 00:00:00 2001 From: Anna Date: Tue, 23 Jul 2019 14:45:12 -0700 Subject: [PATCH 09/13] fixed index out of bounds checking when getting cpu, gpu or display in PlatformInstance.cpp --- .../platform/src/platform/backend/PlatformInstance.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/libraries/platform/src/platform/backend/PlatformInstance.cpp b/libraries/platform/src/platform/backend/PlatformInstance.cpp index 33b19cd012..24b1176a1f 100644 --- a/libraries/platform/src/platform/backend/PlatformInstance.cpp +++ b/libraries/platform/src/platform/backend/PlatformInstance.cpp @@ -42,7 +42,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); @@ -51,7 +52,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); @@ -60,7 +61,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); From 2051a9953cdd75a01cb9ba6f679081f7ee405863 Mon Sep 17 00:00:00 2001 From: Anna Date: Tue, 23 Jul 2019 16:00:11 -0700 Subject: [PATCH 10/13] change bounds checking to check if index is strictly less than 0 --- .../platform/src/platform/backend/PlatformInstance.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/platform/src/platform/backend/PlatformInstance.cpp b/libraries/platform/src/platform/backend/PlatformInstance.cpp index 24b1176a1f..46d7de52f5 100644 --- a/libraries/platform/src/platform/backend/PlatformInstance.cpp +++ b/libraries/platform/src/platform/backend/PlatformInstance.cpp @@ -43,7 +43,7 @@ void Instance::enumerateNics() { json Instance::getCPU(int index) { assert(index <(int) _cpus.size()); - if (index <= 0 || (int) _cpus.size() <= index) + if (index < 0 || (int) _cpus.size() <= index) return json(); return _cpus.at(index); @@ -52,7 +52,7 @@ json Instance::getCPU(int index) { json Instance::getGPU(int index) { assert(index <(int) _gpus.size()); - if (index <= 0 || (int) _gpus.size() <= index) + if (index < 0 || (int) _gpus.size() <= index) return json(); return _gpus.at(index); @@ -61,7 +61,7 @@ json Instance::getGPU(int index) { json Instance::getDisplay(int index) { assert(index <(int) _displays.size()); - if (index <= 0 || (int) _displays.size() <= index) + if (index < 0 || (int) _displays.size() <= index) return json(); return _displays.at(index); From b918979fab9cdf73d864e1f770d05e0a23bbabd7 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 24 Jul 2019 09:59:32 -0700 Subject: [PATCH 11/13] DEV-301: Adjust size of VR-mode header icon --- .../qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml b/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml index 822e485940..acabbe9485 100644 --- a/interface/resources/qml/hifi/simplifiedUI/topBar/SimplifiedTopBar.qml +++ b/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 } From 03b5f9f7f80291cb033bf52bd46eca2f5d6d444b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 24 Jul 2019 10:18:03 -0700 Subject: [PATCH 12/13] BUGZ-972: Fix errant log involving 'gated' property --- interface/resources/qml/hifi/audio/MicBarApplication.qml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/interface/resources/qml/hifi/audio/MicBarApplication.qml b/interface/resources/qml/hifi/audio/MicBarApplication.qml index 838cc73cb8..3070ba3bbd 100644 --- a/interface/resources/qml/hifi/audio/MicBarApplication.qml +++ b/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 { From bae3ebd5771f5308f7d604766cb4279fc31c41b6 Mon Sep 17 00:00:00 2001 From: amer cerkic Date: Wed, 24 Jul 2019 14:07:58 -0700 Subject: [PATCH 13/13] fix android local build --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5e4746418d..f8fd5b7637 100644 --- a/CMakeLists.txt +++ b/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()