From 5de585e3204776cfe20b2c064658fa83bafddfdc Mon Sep 17 00:00:00 2001 From: David Rowe Date: Sat, 17 Jun 2017 13:56:44 +1200 Subject: [PATCH] Leap Motion activation --- .../hifiLeapMotion/src/LeapMotionPlugin.cpp | 19 +++++++++++++++++++ plugins/hifiLeapMotion/src/LeapMotionPlugin.h | 7 +++++++ 2 files changed, 26 insertions(+) diff --git a/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp b/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp index f9cdf8a958..4d2cc474bd 100644 --- a/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp +++ b/plugins/hifiLeapMotion/src/LeapMotionPlugin.cpp @@ -28,6 +28,10 @@ const char* SENSOR_ON_HMD = "HMD"; const char* DEFAULT_SENSOR_LOCATION = SENSOR_ON_DESKTOP; void LeapMotionPlugin::pluginUpdate(float deltaTime, const controller::InputCalibrationData& inputCalibrationData) { + if (!_enabled) { + return; + } + // TODO } @@ -73,6 +77,21 @@ void LeapMotionPlugin::init() { } } +bool LeapMotionPlugin::activate() { + InputPlugin::activate(); + + if (_enabled) { + // Nothing required to be done to start up Leap Motion. + return true; + } + + return false; +} + +void LeapMotionPlugin::deactivate() { + InputPlugin::deactivate(); +} + const char* SETTINGS_ENABLED_KEY = "enabled"; const char* SETTINGS_SENSOR_LOCATION_KEY = "sensorLocation"; diff --git a/plugins/hifiLeapMotion/src/LeapMotionPlugin.h b/plugins/hifiLeapMotion/src/LeapMotionPlugin.h index f42d4ccaf5..60b476a443 100644 --- a/plugins/hifiLeapMotion/src/LeapMotionPlugin.h +++ b/plugins/hifiLeapMotion/src/LeapMotionPlugin.h @@ -31,6 +31,9 @@ public: virtual void init() override; + virtual bool activate() override; + virtual void deactivate() override; + virtual void saveSettings() const override; virtual void loadSettings() override; @@ -54,6 +57,10 @@ protected: }; std::shared_ptr _inputDevice{ std::make_shared() }; + +private: + Leap::Controller _controller; + }; #endif // hifi_LeapMotionPlugin_h