Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-04 17:30:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

less warning maybe ?

Browse source
This commit is contained in:
samcake 2018-04-25 15:53:50 -07:00
parent 5db3eee4ad
commit 17f8e789fc
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/workload/src/workload/RegionState.cpp
View file

@ -72,5 +72,5 @@ void RegionState::run(const workload::WorkloadContextPointer& renderContext, con
} }
auto config = std::static_pointer_cast<Config>(renderContext->jobConfig); auto config = std::static_pointer_cast<Config>(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());
} }

4
scripts/developer/utilities/workload/test_physics_scene.js
View file

@ -56,8 +56,8 @@ function getTileColor(a, b, c) {
function addObject(a, b, c, lifetime) { function addObject(a, b, c, lifetime) {
var center = getStagePosOriAt(a, b, c).pos; var center = getStagePosOriAt(a, b, c).pos;
var offset = (Math.abs(a) + (Math.abs(b) % 2)) % 2; var offset = (Math.abs(a) + (Math.abs(b) % 2)) % 2;
var makePrim = (offset > 0 ? true : false) ; var makePrim = (offset == 0 ? true : false) ;
if (makePrim) { if (makePrim == true) {
return (Entities.addEntity({ return (Entities.addEntity({
type: "Shape", type: "Shape",
shape: "Sphere", shape: "Sphere",

9
scripts/developer/utilities/workload/workloadInspector.qml
View file

@ -179,7 +179,7 @@ Rectangle {
} }
} }
} }
RowLayout { /*RowLayout {
visible: Workload.getConfig("controlViews")["regulateViewRanges"] visible: Workload.getConfig("controlViews")["regulateViewRanges"]
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
@ -237,7 +237,7 @@ Rectangle {
} }
} }
} }
} }*/
property var controlViews: Workload.getConfig("controlViews") property var controlViews: Workload.getConfig("controlViews")
PlotPerf { PlotPerf {
@ -294,6 +294,7 @@ Rectangle {
text: "Test" text: "Test"
} }
Row { Row {
spacing: 5
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
HifiControls.Button { HifiControls.Button {
@ -310,13 +311,13 @@ Rectangle {
_workload.broadcastClearScene() _workload.broadcastClearScene()
} }
} }
HifiControls.Button { /*HifiControls.Button {
text: "bump floor" text: "bump floor"
onClicked: { onClicked: {
print("pressed") print("pressed")
_workload.broadcastBumpUpFloor() _workload.broadcastBumpUpFloor()
} }
} }*/
} }
HifiControls.Label { HifiControls.Label {
id: gridSizeLabel id: gridSizeLabel