Showing the changes to libraries/script-engine/src/ScriptEngine.cpp (1 of 10 files). Show all
Unified · Split
| @@ -44,22 +44,28 @@ static QScriptValue soundConstructor(QScriptContext* context, QScriptEngine* eng · 43 unmodified lines | ||
| 44 | 44 | |
| 45 | 45 | ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, const QString& fileNameString, |
| 46 | 46 | AbstractControllerScriptingInterface* controllerScriptingInterface) : |
| 47 | + | |
| 48 | + _scriptContents(scriptContents), | |
| 49 | + _isFinished(false), | |
| 50 | + _isRunning(false), | |
| 51 | + _isInitialized(false), | |
| 52 | + _engine(), | |
| 47 | 53 | _isAvatar(false), |
| 48 | 54 | _avatarIdentityTimer(NULL), |
| 49 | 55 | _avatarBillboardTimer(NULL), |
| 50 | − _avatarData(NULL) | |
| 56 | + _timerFunctionMap(), | |
| 57 | + _controllerScriptingInterface(controllerScriptingInterface), | |
| 58 | + _avatarData(NULL), | |
| 59 | + _wantMenuItems(wantMenuItems), | |
| 60 | + _scriptMenuName(), | |
| 61 | + _fileNameString(fileNameString), | |
| 62 | + _quatLibrary(), | |
| 63 | + _vec3Library() | |
| 51 | 64 | { |
| 52 | − _scriptContents = scriptContents; | |
| 53 | − _isFinished = false; | |
| 54 | − _isRunning = false; | |
| 55 | − _isInitialized = false; | |
| 56 | − _fileNameString = fileNameString; | |
| 57 | − | |
| 58 | 65 | QByteArray fileNameAscii = fileNameString.toLocal8Bit(); |
| 59 | 66 | const char* scriptMenuName = fileNameAscii.data(); |
| 60 | 67 | |
| 61 | 68 | // some clients will use these menu features |
| 62 | − _wantMenuItems = wantMenuItems; | |
| 63 | 69 | if (!fileNameString.isEmpty()) { |
| 64 | 70 | _scriptMenuName = "Stop "; |
| 65 | 71 | _scriptMenuName.append(scriptMenuName); |
| @@ -69,7 +75,6 @@ ScriptEngine::ScriptEngine(const QString& scriptContents, bool wantMenuItems, co · 3 unmodified lines | ||
| 69 | 75 | _scriptMenuName.append(_scriptNumber); |
| 70 | 76 | } |
| 71 | 77 | _scriptNumber++; |
| 72 | − _controllerScriptingInterface = controllerScriptingInterface; | |
| 73 | 78 | } |
| 74 | 79 | |
| 75 | 80 | ScriptEngine::~ScriptEngine() { |