From db4e280e95bb3f004e2d1d168ac46c7433f8eeb6 Mon Sep 17 00:00:00 2001 From: samcake Date: Wed, 21 Feb 2018 12:04:41 -0800 Subject: [PATCH] Adding the stub of the ClassificationTracker class --- .../src/workload/ClassificationTracker.cpp | 24 ++++++++++ .../src/workload/ClassificationTracker.h | 45 +++++++++++++++++++ libraries/workload/src/workload/Engine.cpp | 6 ++- libraries/workload/src/workload/Engine.h | 2 +- libraries/workload/src/workload/Space.h | 2 + 5 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 libraries/workload/src/workload/ClassificationTracker.cpp create mode 100644 libraries/workload/src/workload/ClassificationTracker.h diff --git a/libraries/workload/src/workload/ClassificationTracker.cpp b/libraries/workload/src/workload/ClassificationTracker.cpp new file mode 100644 index 0000000000..009549737f --- /dev/null +++ b/libraries/workload/src/workload/ClassificationTracker.cpp @@ -0,0 +1,24 @@ +// +// ClassificationTracker.cpp +// libraries/workload/src/workload +// +// Created by Andrew Meadows 2018.02.21 +// Copyright 2018 High Fidelity, Inc. +// +// Originally from lighthouse3d. Modified to utilize glm::vec3 and clean up to our coding standards +// Simple plane class. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// +#include "ClassificationTracker.h" + +using namespace workload; + +void ClassificationTracker::configure(const Config& config) { +} + +void ClassificationTracker::run(const workload::WorkloadContextPointer& renderContext, Outputs& outputs) { + +} + diff --git a/libraries/workload/src/workload/ClassificationTracker.h b/libraries/workload/src/workload/ClassificationTracker.h new file mode 100644 index 0000000000..ca7a919769 --- /dev/null +++ b/libraries/workload/src/workload/ClassificationTracker.h @@ -0,0 +1,45 @@ +// +// ClassificationTracker.h +// libraries/workload/src/workload +// +// Created by Andrew Meadows 2018.02.21 +// Copyright 2018 High Fidelity, Inc. +// +// Originally from lighthouse3d. Modified to utilize glm::vec3 and clean up to our coding standards +// Simple plane class. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_workload_ClassificationTracker_h +#define hifi_workload_ClassificationTracker_h + +#include "Space.h" +#include "Engine.h" + +namespace workload { + + class ClassificationTrackerConfig : public Job::Config { + Q_OBJECT + public: + ClassificationTrackerConfig() : Job::Config(true) {} + }; + + class ClassificationTracker { + public: + using Config = ClassificationTrackerConfig; + using Outputs = Classifications; + using JobModel = workload::Job::ModelO; + + ClassificationTracker() {} + + void configure(const Config& config); + void run(const workload::WorkloadContextPointer& renderContext, Outputs& outputs); + + protected: + }; + +} // namespace workload + +#endif // hifi_workload_ClassificationTracker_h diff --git a/libraries/workload/src/workload/Engine.cpp b/libraries/workload/src/workload/Engine.cpp index 7e69731d4e..ba3e7706ca 100644 --- a/libraries/workload/src/workload/Engine.cpp +++ b/libraries/workload/src/workload/Engine.cpp @@ -16,6 +16,8 @@ #include +#include "ClassificationTracker.h" + namespace workload { // the "real Job" @@ -33,7 +35,7 @@ namespace workload { if (_isEnabled) { std::cout << _message.toStdString() << std::endl; } - } + } }; WorkloadContext::WorkloadContext() : task::JobContext(trace_workload()) {} @@ -47,6 +49,8 @@ namespace workload { using JobModel = Task::Model; void build(EngineModel& model, const Varying& in, Varying& out) { model.addJob("helloWorld"); + + auto classifications = model.addJob("classificationTracker"); } }; diff --git a/libraries/workload/src/workload/Engine.h b/libraries/workload/src/workload/Engine.h index a422c5d715..7a4a5d428f 100644 --- a/libraries/workload/src/workload/Engine.h +++ b/libraries/workload/src/workload/Engine.h @@ -43,7 +43,7 @@ namespace workload { Q_PROPERTY(QString message READ getMessage WRITE setMessage) QString _message {"Hello World."}; public: - HelloWorldConfig() : Job::Config(true) {} + HelloWorldConfig() : Job::Config(true) {} QString getMessage() const { return _message; } void setMessage(const QString& msg) { _message = msg; } }; diff --git a/libraries/workload/src/workload/Space.h b/libraries/workload/src/workload/Space.h index 3706d45434..f071c658a7 100644 --- a/libraries/workload/src/workload/Space.h +++ b/libraries/workload/src/workload/Space.h @@ -78,6 +78,8 @@ private: std::vector _freeIndices; }; +using Classifications = std::vector; + } // namespace workload #endif // hifi_workload_Space_h