mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-08 12:30:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

Browse Source 
Conflicts:
	include/openspace/scene/scenegraphnode.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/interaction/interactionmode.cpp
This commit is contained in:
Emil Axelsson
2017-07-18 10:54:41 +02:00
parent 5c342ed6a2 9b924c3d97
commit 5ced910f79
253 changed files with 9999 additions and 5219 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/Launcher/mainwindow.cpp
+1 -1
View File
@@ -285,7 +285,7 @@ void MainWindow::initialize() {
_syncWidget->setSceneFiles(_sceneFiles);
// Load all available configuration files
QString configurationDirectory = QString::fromStdString(absPath("${SGCT}"));
QString configurationDirectory = QString::fromStdString(absPath("${CONFIG}"));
d = QDir(configurationDirectory);
d.setFilter(QDir::Files);
list = d.entryInfoList();
apps/OpenSpace/CMakeLists.txt
+4 -1
View File
@@ -84,10 +84,13 @@ if (OPENSPACE_SPOUT_SUPPORT)
set(SPOUT_INCLUDE_DIRS ${OPENSPACE_APPS_DIR}/OpenSpace/ext/spout)
set(SPOUT_LIBRARY ${OPENSPACE_APPS_DIR}/OpenSpace/ext/spout/SpoutLibrary.lib)
set(SPOUT_DEFINITIONS "OPENSPACE_HAS_SPOUT")
set(SGCT_SPOUT_SUPPORT ON CACHE BOOL "" FORCE)
endif ()
########################
# Spout section end #
# Spout section end #
########################
add_executable(${APPLICATION_NAME}
apps/OpenSpace/main.cpp
+2 -2
View File
@@ -442,10 +442,10 @@ void mainMousePosCallback(double x, double y) {
}
}
void mainMouseScrollCallback(double, double posY) {
void mainMouseScrollCallback(double posX, double posY) {
LTRACE("main::mainMouseScrollCallback(begin");
if (SgctEngine->isMaster()) {
OsEng.mouseScrollWheelCallback(posY);
OsEng.mouseScrollWheelCallback(posX, posY);
}
LTRACE("main::mainMouseScrollCallback(end)");
}