Adjusting the regulators and moving task to use chrono nad interesting tests

Sam Gateau committed 8 years ago

Commit 97934fe1 parent 99a0e426 files · +62 −33Browse files

Showing the changes to interface/src/workload/GameWorkload.cpp (1 of 6 files). Show all

Unified · Split

interface/src/workload/GameWorkload.cpp+7−4

@@ -17,10 +17,12 @@ · 16 unmodified lines
17	17	#pragma optimize( "[optimization-list]", off )
18	18
19	19	ControlViews::ControlViews() {
20		− regionBackFronts[0] = glm::vec2(2.0f, 10.0f);
21		− regionBackFronts[1] = glm::vec2(5.0f, 30.0f);
22		− regionBackFronts[2] = glm::vec2(10.0f, 100.0f);
23		−
	20	+ regionBackFronts[0] = glm::vec2(1.0f, 3.0f);
	21	+ regionBackFronts[1] = glm::vec2(2.0f, 10.0f);
	22	+ regionBackFronts[2] = glm::vec2(4.0f, 20.0f);
	23	+ regionRegulators[0] = Regulator(std::chrono::milliseconds(2), regionBackFronts[0], 5.0f * regionBackFronts[0], glm::vec2(0.3f, 0.2f), 0.5f * glm::vec2(0.3f, 0.2f));
	24	+ regionRegulators[1] = Regulator(std::chrono::milliseconds(2), regionBackFronts[1], 5.0f * regionBackFronts[1], glm::vec2(0.3f, 0.2f), 0.5f * glm::vec2(0.3f, 0.2f));
	25	+ regionRegulators[2] = Regulator(std::chrono::milliseconds(2), regionBackFronts[2], 5.0f * regionBackFronts[2], glm::vec2(0.3f, 0.2f), 0.5f * glm::vec2(0.3f, 0.2f));
24	26	}
25	27
26	28	void ControlViews::configure(const Config& config) {
@@ -62,6 +64,7 @@ void ControlViews::regulateViews(workload::Views& outViews, const workload::Timi · 35 unmodified lines
62	64	}
63	65
64	66	auto loopDuration = std::chrono::nanoseconds{ std::chrono::milliseconds(16) };
	67	+ regionBackFronts[workload::Region::R1] = regionRegulators[workload::Region::R1].run(loopDuration, timings[0], regionBackFronts[workload::Region::R1]);
65	68	regionBackFronts[workload::Region::R2] = regionRegulators[workload::Region::R2].run(loopDuration, timings[0], regionBackFronts[workload::Region::R2]);
66	69	regionBackFronts[workload::Region::R3] = regionRegulators[workload::Region::R3].run(loopDuration, timings[1], regionBackFronts[workload::Region::R3]);
67	70