mirror of
https://github.com/Armored-Dragon/overte.git
synced 2025-03-11 16:13:16 +01:00
Moving the view controller up into workload and exposing timings
This commit is contained in:
samcake
parent
6d755a2127
commit
ba29ebaeb0
3 changed files with 196 additions and 73 deletions
|
|
@ -15,77 +15,6 @@
|
|||
|
||||
#include "PhysicsBoundary.h"
|
||||
|
||||
ControlViews::ControlViews() {
|
||||
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));
|
||||
}
|
||||
|
||||
void ControlViews::configure(const Config& config) {
|
||||
_data = config.data;
|
||||
}
|
||||
|
||||
void ControlViews::run(const workload::WorkloadContextPointer& runContext, const Input& inputs, Output& outputs) {
|
||||
const auto& inViews = inputs.get0();
|
||||
const auto& inTimings = inputs.get1();
|
||||
auto& outViews = outputs;
|
||||
outViews.clear();
|
||||
outViews = inViews;
|
||||
|
||||
if (_data.regulateViewRanges && inTimings.size()) {
|
||||
regulateViews(outViews, inTimings);
|
||||
|
||||
auto config = std::static_pointer_cast<Config>(runContext->jobConfig);
|
||||
config->dataExport = _dataExport;
|
||||
config->emitDirty();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
||||
glm::vec2 Regulator::run(const Timing_ns& regulationDuration, const Timing_ns& measured, const glm::vec2& current) {
|
||||
glm::vec2 next = current;
|
||||
|
||||
// Regulate next value based on current moving toward the goal budget
|
||||
float error_ms = std::chrono::duration<float, std::milli>(_budget - measured).count();
|
||||
float coef = error_ms / std::chrono::duration<float, std::milli>(regulationDuration).count();
|
||||
next += coef * (error_ms < 0.0f ? _speedDown : _speedUp);
|
||||
|
||||
// Clamp to min max
|
||||
next = glm::clamp(next, _minRange, _maxRange);
|
||||
|
||||
return next;
|
||||
}
|
||||
|
||||
void ControlViews::regulateViews(workload::Views& outViews, const workload::Timings& timings) {
|
||||
|
||||
for (auto& outView : outViews) {
|
||||
for (int r = 0; r < workload::Region::NUM_VIEW_REGIONS; r++) {
|
||||
outView.regionBackFronts[r] = regionBackFronts[r];
|
||||
}
|
||||
}
|
||||
|
||||
auto loopDuration = std::chrono::nanoseconds{ std::chrono::milliseconds(16) };
|
||||
_dataExport.ranges[workload::Region::R1] = regionBackFronts[workload::Region::R1] = regionRegulators[workload::Region::R1].run(loopDuration, timings[0], regionBackFronts[workload::Region::R1]);
|
||||
_dataExport.ranges[workload::Region::R2] = regionBackFronts[workload::Region::R2] = regionRegulators[workload::Region::R2].run(loopDuration, timings[0], regionBackFronts[workload::Region::R2]);
|
||||
_dataExport.ranges[workload::Region::R3] = regionBackFronts[workload::Region::R3] = regionRegulators[workload::Region::R3].run(loopDuration, timings[1], regionBackFronts[workload::Region::R3]);
|
||||
|
||||
_dataExport.timings[workload::Region::R1] = std::chrono::duration<float, std::milli>(timings[0]).count();
|
||||
_dataExport.timings[workload::Region::R2] = _dataExport.timings[workload::Region::R1];
|
||||
_dataExport.timings[workload::Region::R3] = std::chrono::duration<float, std::milli>(timings[1]).count();
|
||||
|
||||
for (auto& outView : outViews) {
|
||||
outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1];
|
||||
outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2];
|
||||
outView.regionBackFronts[workload::Region::R3] = regionBackFronts[workload::Region::R3];
|
||||
|
||||
workload::View::updateRegionsFromBackFronts(outView);
|
||||
}
|
||||
}
|
||||
|
||||
class WorkloadEngineBuilder {
|
||||
public:
|
||||
public:
|
||||
|
|
@ -99,8 +28,8 @@ public:
|
|||
|
||||
const auto usedViews = model.addJob<workload::SetupViews>("setupViews", inViews);
|
||||
|
||||
const auto controlViewsIn = ControlViews::Input(usedViews, inTimings).asVarying();
|
||||
const auto fixedViews = model.addJob<ControlViews>("controlViews", controlViewsIn);
|
||||
const auto controlViewsIn = workload::ControlViews::Input(usedViews, inTimings).asVarying();
|
||||
const auto fixedViews = model.addJob<workload::ControlViews>("controlViews", controlViewsIn);
|
||||
|
||||
const auto regionTrackerOut = model.addJob<workload::SpaceClassifierTask>("spaceClassifier", fixedViews);
|
||||
|
||||
|
|
|
|||
|
|
@ -69,3 +69,77 @@ void SetupViews::run(const WorkloadContextPointer& renderContext, const Input& i
|
|||
}
|
||||
|
||||
|
||||
|
||||
ControlViews::ControlViews() {
|
||||
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));
|
||||
}
|
||||
|
||||
void ControlViews::configure(const Config& config) {
|
||||
_data = config.data;
|
||||
}
|
||||
|
||||
void ControlViews::run(const workload::WorkloadContextPointer& runContext, const Input& inputs, Output& outputs) {
|
||||
const auto& inViews = inputs.get0();
|
||||
const auto& inTimings = inputs.get1();
|
||||
auto& outViews = outputs;
|
||||
outViews.clear();
|
||||
outViews = inViews;
|
||||
|
||||
if (_data.regulateViewRanges && inTimings.size()) {
|
||||
regulateViews(outViews, inTimings);
|
||||
}
|
||||
|
||||
// Export the timings for debuging
|
||||
if (inTimings.size()) {
|
||||
_dataExport.timings[workload::Region::R1] = std::chrono::duration<float, std::milli>(inTimings[0]).count();
|
||||
_dataExport.timings[workload::Region::R2] = _dataExport.timings[workload::Region::R1];
|
||||
_dataExport.timings[workload::Region::R3] = std::chrono::duration<float, std::milli>(inTimings[1]).count();
|
||||
|
||||
auto config = std::static_pointer_cast<Config>(runContext->jobConfig);
|
||||
config->dataExport = _dataExport;
|
||||
config->emitDirty();
|
||||
}
|
||||
}
|
||||
|
||||
glm::vec2 Regulator::run(const Timing_ns& regulationDuration, const Timing_ns& measured, const glm::vec2& current) {
|
||||
glm::vec2 next = current;
|
||||
|
||||
// Regulate next value based on current moving toward the goal budget
|
||||
float error_ms = std::chrono::duration<float, std::milli>(_budget - measured).count();
|
||||
float coef = error_ms / std::chrono::duration<float, std::milli>(regulationDuration).count();
|
||||
next += coef * (error_ms < 0.0f ? _speedDown : _speedUp);
|
||||
|
||||
// Clamp to min max
|
||||
next = glm::clamp(next, _minRange, _maxRange);
|
||||
|
||||
return next;
|
||||
}
|
||||
|
||||
void ControlViews::regulateViews(workload::Views& outViews, const workload::Timings& timings) {
|
||||
|
||||
for (auto& outView : outViews) {
|
||||
for (int r = 0; r < workload::Region::NUM_VIEW_REGIONS; r++) {
|
||||
outView.regionBackFronts[r] = regionBackFronts[r];
|
||||
}
|
||||
}
|
||||
|
||||
auto loopDuration = std::chrono::nanoseconds{ std::chrono::milliseconds(16) };
|
||||
_dataExport.ranges[workload::Region::R1] = regionBackFronts[workload::Region::R1] = regionRegulators[workload::Region::R1].run(loopDuration, timings[0], regionBackFronts[workload::Region::R1]);
|
||||
_dataExport.ranges[workload::Region::R2] = regionBackFronts[workload::Region::R2] = regionRegulators[workload::Region::R2].run(loopDuration, timings[0], regionBackFronts[workload::Region::R2]);
|
||||
_dataExport.ranges[workload::Region::R3] = regionBackFronts[workload::Region::R3] = regionRegulators[workload::Region::R3].run(loopDuration, timings[1], regionBackFronts[workload::Region::R3]);
|
||||
|
||||
for (auto& outView : outViews) {
|
||||
outView.regionBackFronts[workload::Region::R1] = regionBackFronts[workload::Region::R1];
|
||||
outView.regionBackFronts[workload::Region::R2] = regionBackFronts[workload::Region::R2];
|
||||
outView.regionBackFronts[workload::Region::R3] = regionBackFronts[workload::Region::R3];
|
||||
|
||||
workload::View::updateRegionsFromBackFronts(outView);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -98,6 +98,126 @@ namespace workload {
|
|||
void run(const workload::WorkloadContextPointer& renderContext, const Input& inputs);
|
||||
};
|
||||
|
||||
|
||||
class ControlViewsConfig : public workload::Job::Config {
|
||||
Q_OBJECT
|
||||
Q_PROPERTY(bool regulateViewRanges READ regulateViewRanges WRITE setRegulateViewRanges NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1Timing READ r1Timing NOTIFY dirty)
|
||||
Q_PROPERTY(float r2Timing READ r2Timing NOTIFY dirty)
|
||||
Q_PROPERTY(float r3Timing READ r3Timing NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1RangeBack READ r1RangeBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r2RangeBack READ r2RangeBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r3RangeBack READ r3RangeBack NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1RangeFront READ r1RangeFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r2RangeFront READ r2RangeFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r3RangeFront READ r3RangeFront NOTIFY dirty)
|
||||
/*
|
||||
Q_PROPERTY(float r1MinRangeBack READ r1MinRangeBack WRITE setR1MinRangeBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r2MinRangeBack READ r2MinRangeBack WRITE setR2MinRangeBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r3MinRangeBack READ r3MinRangeBack WRITE setR3MinRangeBack NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1MinRangeFront READ r1MinRangeFront WRITE setR1MinRangeFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r2MinRangeFront READ r2MinRangeFront WRITE setR2MinRangeFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r3MinRangeFront READ r3MinRangeFront WRITE setR3MinRangeFront NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1MaxRangeBack READ r1MaxRangeBack WRITE setR1MaxRangeBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r2MaxRangeBack READ r2MaxRangeBack WRITE setR2MaxRangeBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r3MaxRangeBack READ r3MaxRangeBack WRITE setR3MaxRangeBack NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1MaxRangeFront READ r1MaxRangeFront WRITE setR1MaxRangeFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r2MaxRangeFront READ r2MaxRangeFront WRITE setR2MaxRangeFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r3MaxRangeFront READ r3MaxRangeFront WRITE setR3MaxRangeFront NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1SpeedDownBack READ r1SpeedDownBack WRITE setR1SpeedDownBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r2SpeedDownBack READ r2SpeedDownBack WRITE setR2SpeedDownBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r3SpeedDownBack READ r3SpeedDownBack WRITE setR3SpeedDownBack NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1SpeedDownFront READ r1SpeedDownFront WRITE setR1SpeedDownFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r2SpeedDownFront READ r2SpeedDownFront WRITE setR2SpeedDownFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r3SpeedDownFront READ r3SpeedDownFront WRITE setR3SpeedDownFront NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1SpeedUpBack READ r1SpeedUpBack WRITE setR1SpeedUpBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r2SpeedUpBack READ r2SpeedUpBack WRITE setR2SpeedUpBack NOTIFY dirty)
|
||||
Q_PROPERTY(float r3SpeedUpBack READ r3SpeedUpBack WRITE setR3SpeedUpBack NOTIFY dirty)
|
||||
|
||||
Q_PROPERTY(float r1SpeedUpFront READ r1SpeedUpFront WRITE setR1SpeedUpFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r2SpeedUpFront READ r2SpeedUpFront WRITE setR2SpeedUpFront NOTIFY dirty)
|
||||
Q_PROPERTY(float r3SpeedUpFront READ r3SpeedUpFront WRITE setR3SpeedUpFront NOTIFY dirty)*/
|
||||
|
||||
public:
|
||||
|
||||
bool regulateViewRanges() const { return data.regulateViewRanges; }
|
||||
void setRegulateViewRanges(bool use) { data.regulateViewRanges = use; emit dirty(); }
|
||||
|
||||
float r1Timing() const { return dataExport.timings[workload::Region::R1]; }
|
||||
float r2Timing() const { return dataExport.timings[workload::Region::R2]; }
|
||||
float r3Timing() const { return dataExport.timings[workload::Region::R3]; }
|
||||
|
||||
float r1RangeBack() const { return dataExport.ranges[workload::Region::R1].x; }
|
||||
float r2RangeBack() const { return dataExport.ranges[workload::Region::R2].x; }
|
||||
float r3RangeBack() const { return dataExport.ranges[workload::Region::R3].x; }
|
||||
|
||||
float r1RangeFront() const { return dataExport.ranges[workload::Region::R1].y; }
|
||||
float r2RangeFront() const { return dataExport.ranges[workload::Region::R2].y; }
|
||||
float r3RangeFront() const { return dataExport.ranges[workload::Region::R3].y; }
|
||||
|
||||
struct Data {
|
||||
bool regulateViewRanges{ true };
|
||||
} data;
|
||||
|
||||
struct DataExport {
|
||||
static const int SIZE{ workload::Region::NUM_VIEW_REGIONS };
|
||||
float timings[SIZE];
|
||||
glm::vec2 ranges[SIZE];
|
||||
} dataExport;
|
||||
|
||||
void emitDirty() { emit dirty(); }
|
||||
signals:
|
||||
void dirty();
|
||||
};
|
||||
|
||||
struct Regulator {
|
||||
using Timing_ns = std::chrono::nanoseconds;
|
||||
Timing_ns _budget{ std::chrono::milliseconds(2) };
|
||||
glm::vec2 _minRange{ 2.0f, 5.0f };
|
||||
glm::vec2 _maxRange{ 50.0f, 100.0f };
|
||||
|
||||
glm::vec2 _speedDown{ 0.2f };
|
||||
glm::vec2 _speedUp{ 0.1f };
|
||||
|
||||
|
||||
Regulator() {}
|
||||
Regulator(const Timing_ns& budget_ns, const glm::vec2& minRange, const glm::vec2& maxRange, const glm::vec2& speedDown, const glm::vec2& speedUp) :
|
||||
_budget(budget_ns), _minRange(minRange), _maxRange(maxRange), _speedDown(speedDown), _speedUp(speedUp) {}
|
||||
|
||||
glm::vec2 run(const Timing_ns& regulationDuration, const Timing_ns& measured, const glm::vec2& current);
|
||||
};
|
||||
|
||||
class ControlViews {
|
||||
public:
|
||||
using Config = ControlViewsConfig;
|
||||
using Input = workload::VaryingSet2<workload::Views, workload::Timings>;
|
||||
using Output = workload::Views;
|
||||
using JobModel = workload::Job::ModelIO<ControlViews, Input, Output, Config>;
|
||||
|
||||
ControlViews();
|
||||
|
||||
void configure(const Config& config);
|
||||
void run(const workload::WorkloadContextPointer& runContext, const Input& inputs, Output& outputs);
|
||||
|
||||
std::array<glm::vec2, workload::Region::NUM_VIEW_REGIONS> regionBackFronts;
|
||||
std::array<Regulator, workload::Region::NUM_VIEW_REGIONS> regionRegulators;
|
||||
|
||||
void regulateViews(workload::Views& views, const workload::Timings& timings);
|
||||
|
||||
protected:
|
||||
Config::Data _data;
|
||||
Config::DataExport _dataExport;
|
||||
};
|
||||
|
||||
} // namespace workload
|
||||
|
||||
#endif // hifi_workload_ViewTask_h
|
||||
Loading…
Reference in a new issue