History

fixes after first review

- lots of cleaning of the syntax to respect the coding standard - Fixed the device tracker singleton for clean destruction - introduced the Factory for the Leapmotion itstead of a naked constructor

samcake committed 12 years ago

Commit c6e308b1 parent d6104e510 files · +344 −636Browse files

Showing the changes to interface/src/scripting/ControllerScriptingInterface.h (1 of 10 files). Show all

Unified · Split

interface/src/scripting/ControllerScriptingInterface.h+3−3
@@ -44,7 +44,6 @@ private: · 43 unmodified lines
44 SpatialEvent _eventCache;44 SpatialEvent _eventCache;
45 bool _isActive;45 bool _isActive;
46 46
47
48signals:47signals:
49};48};
50 49
@@ -77,7 +76,7 @@ public: · 26 unmodified lines
77 76
78 void updateInputControllers();77 void updateInputControllers();
79 78
80 void releaseInputController( AbstractInputController* input );79 void releaseInputController(AbstractInputController* input);
81 80
82public slots:81public slots:
83 virtual bool isPrimaryButtonPressed() const;82 virtual bool isPrimaryButtonPressed() const;
@@ -114,7 +113,8 @@ public slots: · 30 unmodified lines
114 113
115 virtual glm::vec2 getViewportDimensions() const;114 virtual glm::vec2 getViewportDimensions() const;
116 115
117 virtual AbstractInputController* createInputController( const QString& category, const QString& tracker );116 /// Factory to create an InputController
117 virtual AbstractInputController* createInputController(const QString& deviceName, const QString& tracker);
118 118
119private:119private:
120 const PalmData* getPrimaryPalm() const;120 const PalmData* getPrimaryPalm() const;