From 27227d6bd2c493df4f5d2fa6a89633fd13f0e399 Mon Sep 17 00:00:00 2001
From: Olivier Prat <olivier@zvork.fr>
Date: Tue, 8 Aug 2017 17:45:17 +0200
Subject: [PATCH] Simplified pick item jobs by using inherited enabled flag in
 render::Job::Config

---
 libraries/render-utils/src/PickItemsJob.cpp | 18 +++++++++---------
 libraries/render-utils/src/PickItemsJob.h   | 10 ++--------
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/libraries/render-utils/src/PickItemsJob.cpp b/libraries/render-utils/src/PickItemsJob.cpp
index 4665a45989..866510a115 100644
--- a/libraries/render-utils/src/PickItemsJob.cpp
+++ b/libraries/render-utils/src/PickItemsJob.cpp
@@ -10,22 +10,22 @@
 //
 #include "PickItemsJob.h"
 
+PickItemsJob::PickItemsJob() {
+}
+
 void PickItemsJob::configure(const Config& config) {
-	_isEnabled = config.isEnabled;
 }
 
 void PickItemsJob::run(const render::RenderContextPointer& renderContext, const PickItemsJob::Input& input, PickItemsJob::Output& output) {
     output.clear();
 
-	if (_isEnabled) {
-		float minIsectDistance = std::numeric_limits<float>::max();
-		auto& itemBounds = input;
-		auto itemID = findNearestItem(renderContext, itemBounds, minIsectDistance);
+    float minIsectDistance = std::numeric_limits<float>::max();
+    auto& itemBounds = input;
+    auto itemID = findNearestItem(renderContext, itemBounds, minIsectDistance);
 
-        if (render::Item::isValidID(itemID)) {
-            output.emplace_back(itemID);
-        }
-	}
+    if (render::Item::isValidID(itemID)) {
+        output.emplace_back(itemID);
+    }
 }
 
 render::ItemID PickItemsJob::findNearestItem(const render::RenderContextPointer& renderContext, const render::ItemBounds& inputs, float& minIsectDistance) const {
diff --git a/libraries/render-utils/src/PickItemsJob.h b/libraries/render-utils/src/PickItemsJob.h
index c6fea52207..b88c881b16 100644
--- a/libraries/render-utils/src/PickItemsJob.h
+++ b/libraries/render-utils/src/PickItemsJob.h
@@ -15,16 +15,10 @@
 #include <render/Engine.h>
 
 class PickItemsConfig : public render::Job::Config {
-	Q_OBJECT
-		Q_PROPERTY(bool isEnabled MEMBER isEnabled NOTIFY dirty)
 
 public:
 
-	bool isEnabled{ false };
-
-signals:
-
-	void dirty();
+    PickItemsConfig() : render::Job::Config(false) {}
 };
 
 class PickItemsJob {
@@ -36,7 +30,7 @@ public:
 	using Output = render::ItemBounds;
 	using JobModel = render::Job::ModelIO<PickItemsJob, Input, Output, Config>;
 
-	PickItemsJob() {}
+    PickItemsJob();
 
 	void configure(const Config& config);
 	void run(const render::RenderContextPointer& renderContext, const PickItemsJob::Input& input, PickItemsJob::Output& output);