Showing the changes to interface/src/Application.cpp (1 of 80 files). Show all
Unified · Split
| @@ -172,6 +172,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer &startup_time) : · 171 unmodified lines | ||
| 172 | 172 | _nodeBoundsDisplay(this), |
| 173 | 173 | _previousScriptLocation(), |
| 174 | 174 | _applicationOverlay(), |
| 175 | + _undoStack(), | |
| 176 | + _undoStackScriptingInterface(&_undoStack), | |
| 175 | 177 | _runningScriptsWidget(NULL), |
| 176 | 178 | _runningScriptsWidgetWasVisible(false), |
| 177 | 179 | _trayIcon(new QSystemTrayIcon(_window)), |
| @@ -3766,8 +3768,9 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 3588 unmodified lines | ||
| 3766 | 3768 | // AvatarManager has some custom types |
| 3767 | 3769 | AvatarManager::registerMetaTypes(scriptEngine); |
| 3768 | 3770 | |
| 3769 | − // hook our avatar object into this script engine | |
| 3771 | + // hook our avatar and avatar hash map object into this script engine | |
| 3770 | 3772 | scriptEngine->setAvatarData(_myAvatar, "MyAvatar"); // leave it as a MyAvatar class to expose thrust features |
| 3773 | + scriptEngine->setAvatarHashMap(&_avatarManager, "AvatarList"); | |
| 3771 | 3774 | |
| 3772 | 3775 | CameraScriptableObject* cameraScriptable = new CameraScriptableObject(&_myCamera, &_viewFrustum); |
| 3773 | 3776 | scriptEngine->registerGlobalObject("Camera", cameraScriptable); |
| @@ -3810,6 +3813,8 @@ ScriptEngine* Application::loadScript(const QString& scriptFilename, bool isUser · 36 unmodified lines | ||
| 3810 | 3813 | scriptEngine->registerGlobalObject("Joysticks", &JoystickScriptingInterface::getInstance()); |
| 3811 | 3814 | qScriptRegisterMetaType(scriptEngine, joystickToScriptValue, joystickFromScriptValue); |
| 3812 | 3815 | |
| 3816 | + scriptEngine->registerGlobalObject("UndoStack", &_undoStackScriptingInterface); | |
| 3817 | + | |
| 3813 | 3818 | #ifdef HAVE_RTMIDI |
| 3814 | 3819 | scriptEngine->registerGlobalObject("MIDI", &MIDIManager::getInstance()); |
| 3815 | 3820 | #endif |