History

fix issues with HMD lookout 2D, and cleanup

Brad Hefta-Gaub committed 10 years ago

Commit 6b76cf41 parent 6f85ee17 files · +15 −140Browse files

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

Unified · Split

interface/src/scripting/HMDScriptingInterface.h+0−4
@@ -23,7 +23,6 @@ class QScriptEngine; · 22 unmodified lines
23 23
24class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Dependency {24class HMDScriptingInterface : public AbstractHMDScriptingInterface, public Dependency {
25 Q_OBJECT25 Q_OBJECT
26 Q_PROPERTY(bool magnifier READ getMagnifier)
27 Q_PROPERTY(glm::vec3 position READ getPosition)26 Q_PROPERTY(glm::vec3 position READ getPosition)
28 Q_PROPERTY(glm::quat orientation READ getOrientation)27 Q_PROPERTY(glm::quat orientation READ getOrientation)
29public:28public:
@@ -31,11 +30,8 @@ public: · 1 unmodified line
31 static QScriptValue getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine);30 static QScriptValue getHUDLookAtPosition2D(QScriptContext* context, QScriptEngine* engine);
32 static QScriptValue getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine);31 static QScriptValue getHUDLookAtPosition3D(QScriptContext* context, QScriptEngine* engine);
33 32
34public slots:
35 void toggleMagnifier();
36 33
37private:34private:
38 bool getMagnifier() const;
39 // Get the position of the HMD35 // Get the position of the HMD
40 glm::vec3 getPosition() const;36 glm::vec3 getPosition() const;
41 37

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t