History

Merging old and new controller interfaces

Brad Davis committed 11 years ago

Commit 0063f9a1 parent 619fce043 files · +1088 −1103Browse files

Showing the changes to libraries/script-engine/src/ScriptEngine.h (1 of 43 files). Show all

Unified · Split

libraries/script-engine/src/ScriptEngine.h+4−3
@@ -26,8 +26,10 @@ · 25 unmodified lines
2626 #include <LimitedNodeList.h>
2727 #include <EntityItemID.h>
2828 #include <EntitiesScriptEngineProvider.h>
29+#include <controllers/ScriptingInterface.h>
2930
30−#include "AbstractControllerScriptingInterface.h"
31+
32+#include "MouseEvent.h"
3133 #include "ArrayBufferClass.h"
3234 #include "AudioScriptingInterface.h"
3335 #include "Quat.h"
@@ -53,7 +55,7 @@ class ScriptEngine : public QScriptEngine, public ScriptUser, public EntitiesScr · 19 unmodified lines
5355 public:
5456 ScriptEngine(const QString& scriptContents = NO_SCRIPT,
5557 const QString& fileNameString = QString(""),
56− AbstractControllerScriptingInterface* controllerScriptingInterface = NULL,
58+ controller::ScriptingInterface* controllerScriptingInterface = nullptr,
5759 bool wantSignals = true);
5860
5961 ~ScriptEngine();
@@ -182,7 +184,6 @@ private: · 122 unmodified lines
182184 QObject* setupTimerWithInterval(const QScriptValue& function, int intervalMS, bool isSingleShot);
183185 void stopTimer(QTimer* timer);
184186
185− AbstractControllerScriptingInterface* _controllerScriptingInterface;
186187 QString _fileNameString;
187188 Quat _quatLibrary;
188189 Vec3 _vec3Library;

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