From 17f8e789fcdabc762717985f261183183f68f43c Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 25 Apr 2018 15:53:50 -0700 Subject: [PATCH] less warning maybe ? --- libraries/workload/src/workload/RegionState.cpp | 2 +- .../developer/utilities/workload/test_physics_scene.js | 4 ++-- .../developer/utilities/workload/workloadInspector.qml | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/libraries/workload/src/workload/RegionState.cpp b/libraries/workload/src/workload/RegionState.cpp index f693e68904..47179ad6f7 100644 --- a/libraries/workload/src/workload/RegionState.cpp +++ b/libraries/workload/src/workload/RegionState.cpp @@ -72,5 +72,5 @@ void RegionState::run(const workload::WorkloadContextPointer& renderContext, con } auto config = std::static_pointer_cast(renderContext->jobConfig); - config->setNum(0, _state[0].size(), _state[1].size(), _state[2].size()); + config->setNum(0, (uint32_t) _state[0].size(), (uint32_t) _state[1].size(), (uint32_t) _state[2].size()); } diff --git a/scripts/developer/utilities/workload/test_physics_scene.js b/scripts/developer/utilities/workload/test_physics_scene.js index bbb9f3d7ea..e923bd0fea 100644 --- a/scripts/developer/utilities/workload/test_physics_scene.js +++ b/scripts/developer/utilities/workload/test_physics_scene.js @@ -56,8 +56,8 @@ function getTileColor(a, b, c) { function addObject(a, b, c, lifetime) { var center = getStagePosOriAt(a, b, c).pos; var offset = (Math.abs(a) + (Math.abs(b) % 2)) % 2; - var makePrim = (offset > 0 ? true : false) ; - if (makePrim) { + var makePrim = (offset == 0 ? true : false) ; + if (makePrim == true) { return (Entities.addEntity({ type: "Shape", shape: "Sphere", diff --git a/scripts/developer/utilities/workload/workloadInspector.qml b/scripts/developer/utilities/workload/workloadInspector.qml index 03bf5f640a..06d59eea16 100644 --- a/scripts/developer/utilities/workload/workloadInspector.qml +++ b/scripts/developer/utilities/workload/workloadInspector.qml @@ -179,7 +179,7 @@ Rectangle { } } } - RowLayout { + /*RowLayout { visible: Workload.getConfig("controlViews")["regulateViewRanges"] anchors.left: parent.left anchors.right: parent.right @@ -237,7 +237,7 @@ Rectangle { } } } - } + }*/ property var controlViews: Workload.getConfig("controlViews") PlotPerf { @@ -294,6 +294,7 @@ Rectangle { text: "Test" } Row { + spacing: 5 anchors.left: parent.left anchors.right: parent.right HifiControls.Button { @@ -310,13 +311,13 @@ Rectangle { _workload.broadcastClearScene() } } - HifiControls.Button { + /*HifiControls.Button { text: "bump floor" onClicked: { print("pressed") _workload.broadcastBumpUpFloor() } - } + }*/ } HifiControls.Label { id: gridSizeLabel