mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-21 18:38:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge with develop and solve conflicts.

Browse Source
This commit is contained in:
Kalle Bladin
2016-07-18 17:26:30 -04:00
parent 6691dab91e a244defdbc
commit 541fbba322
62 changed files with 754 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/onscreengui/CMakeLists.txt
+1 -1
View File
@@ -33,7 +33,7 @@ set(HEADER_FILES
${CMAKE_CURRENT_SOURCE_DIR}/include/guipropertycomponent.h
${CMAKE_CURRENT_SOURCE_DIR}/include/guitimecomponent.h
${CMAKE_CURRENT_SOURCE_DIR}/include/guiiswacomponent.h
${CMAKE_CURRENT_SOURCE_DIR}/src/renderproperties.cpp
${CMAKE_CURRENT_SOURCE_DIR}/include/renderproperties.h
)
source_group("Header Files" FILES ${HEADER_FILES})
modules/onscreengui/include/gui.h
+1 -1
View File
@@ -61,7 +61,7 @@ public:
void render();
static openspace::scripting::ScriptEngine::LuaLibrary luaLibrary();
static openspace::scripting::LuaLibrary luaLibrary();
//protected:
GuiHelpComponent _help;
modules/onscreengui/src/gui.cpp
+1 -1
View File
@@ -499,7 +499,7 @@ void GUI::render() {
ImGui::End();
}
scripting::ScriptEngine::LuaLibrary GUI::luaLibrary() {
scripting::LuaLibrary GUI::luaLibrary() {
return {
"gui",
{
modules/onscreengui/src/renderproperties.cpp
+1 -1
View File
@@ -46,7 +46,7 @@ void renderTooltip(Property* prop) {
void executeScript(const std::string& id, const std::string& value) {
std::string script =
"openspace.setPropertyValue('" + id + "', " + value + ");";
"openspace.setPropertyValueSingle('" + id + "', " + value + ");";
OsEng.scriptEngine().queueScript(script);
}