From 55ec0d3e844109ad0b929cc765951168e2a593be Mon Sep 17 00:00:00 2001 From: samcake Date: Thu, 24 May 2018 17:25:00 -0700 Subject: [PATCH] Fixing the merge conflicts and repairing the regulation values --- libraries/workload/src/workload/ViewTask.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/workload/src/workload/ViewTask.cpp b/libraries/workload/src/workload/ViewTask.cpp index 1f8ea883ed..4562f06aa9 100644 --- a/libraries/workload/src/workload/ViewTask.cpp +++ b/libraries/workload/src/workload/ViewTask.cpp @@ -71,9 +71,9 @@ void SetupViews::run(const WorkloadContextPointer& renderContext, const Input& i ControlViews::ControlViews() { - regionBackFronts[0] = DEFAULT_R1_BACK_FRONT; - regionBackFronts[1] = DEFAULT_R2_BACK_FRONT; - regionBackFronts[2] = DEFAULT_R3_BACK_FRONT; + regionBackFronts[0] = glm::vec2(1.0f, 3.0f); + regionBackFronts[1] = glm::vec2(1.0f, 5.0f); + regionBackFronts[2] = glm::vec2(1.0f, 10.0f); regionRegulators[0] = Regulator(std::chrono::milliseconds(2), regionBackFronts[0], 5.0f * regionBackFronts[0], glm::vec2(0.4f, 0.2f), 0.5f * glm::vec2(0.3f, 0.2f)); regionRegulators[1] = Regulator(std::chrono::milliseconds(2), regionBackFronts[1], 8.0f * regionBackFronts[1], glm::vec2(0.4f, 0.2f), 0.5f * glm::vec2(0.3f, 0.2f)); regionRegulators[2] = Regulator(std::chrono::milliseconds(2), regionBackFronts[2], 10.0f * regionBackFronts[2], glm::vec2(0.4f, 0.2f), 0.5f * glm::vec2(0.3f, 0.2f));