Commit Graph

191 Commits

Author SHA1 Message Date
Alexander Bock 616a115536 Adding a Lua function to manually enable/disable the frame synchronization 2016-09-24 14:55:20 +02:00
Alexander Bock 8cf39cdd29 Only enable syncing after the first frame due to high initialization load 2016-09-24 09:07:15 +02:00
Emil Axelsson cd325686ad Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
	src/network/parallelconnection.cpp
	src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Emil Axelsson 112fe7fc54 synchronize time over parallel connection 2016-09-22 18:42:19 +02:00
Erik Broberg 7f393a3270 Inject SyncBuffer into SyncEngine. Add Doxygen comments for SyncEngine and SyncData 2016-09-16 20:32:29 -04:00
Erik Broberg ee0cc6d165 Remove explicit syncing in Time and Camera and let SyncEngine do the work 2016-09-15 17:03:46 -04:00
Erik Broberg aada13a656 Add debug functionalities: Busy wait for decode() and Log SGCT out-of-order errors 2016-09-06 12:44:03 -04:00
Erik Broberg b74b01d294 Add new class ScriptScheduler together with example input file: data/scene/osirisrex/scheduled_scripts.lua 2016-08-29 16:16:11 -04:00
Alexander Bock 9df88a6a79 Remove static SPICE kernel loading from the cfg file and move it into the preInitialization step of a scene (closing #117) 2016-07-18 14:54:36 +02:00
Alexander Bock f7f8f279de Move the LuaLibrary definition into its own file 2016-07-18 12:40:29 +02:00
Alexander Bock 6d8a16f19e Rendering ImGui, ScreenLog, and Information as a post-processing step to make it work in fisheye rendering (closing #119)
Disable SGCT ESC terminate handling and implement a method that optionally waits before closing the application (closing #120)
 - ESC key is now bound to a call to "openspace.toggleShutdown()" that will initiate a shutdown in 3 seconds unless ESC is pressed again
 - The countdown timer is set in the openspace.cfg
2016-07-17 02:33:45 +02:00
Alexander Bock e40d393824 Make the DownloadManager not a singleton (closing #43) 2016-06-30 00:43:03 +02:00
Gene Payne d5ddaf84b8 Working on global settings integrated in gui but no functionality yet 2016-06-15 14:46:19 +02:00
Alexander Bock 0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Alexander Bock 20532d704f Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02:00
Alexander Bock 75175512a8 First implementation of moving the startup scripts into the scene description files 2016-04-27 16:46:31 +02:00
Alexander Bock 906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock 877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock 2fce471743 Started cleanup of module structure 2015-12-14 10:50:38 -08:00
Alexander Bock e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock bbb622f555 Initial work on integrating fontrendering into ghoul 2015-11-02 21:40:45 -05:00
Alexander Bock 390f5be4a8 Removing includes of sgct.h 2015-10-26 16:14:38 -05:00
Alexander Bock 20861d68ad Changing WindowWrapper from pointer to reference 2015-10-26 15:10:15 -05:00
Alexander Bock f3fd055db8 Rename WindowHandler to WindowWrapper 2015-10-26 15:00:46 -05:00
Alexander Bock 49dbb1ce20 More work on converting to SGCT window handler
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05:00
Alexander Bock d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Alexander Bock 5456b5ee85 Started change moving from explicit SGCT functions to wrapper class 2015-10-25 13:50:39 -05:00
Alexander Bock f8f48acb98 Implementation of the windowhandler interface 2015-10-20 23:30:40 +02:00
Alexander Bock 678362eee2 Add a global propertyowner namespace to which the InteractionHandler is added, removing the need for the earlier hack 2015-07-06 15:55:42 +02:00
Joakim Kilby 13eb012a04 added a current run time variable for the openspace engine + get/set method.
run time is set in preSync from SGCT runtime at the moment
2015-06-24 17:51:32 +02:00
Joakim Kilby 9a74bd60b7 renamed osparallelconnection to parallel connection. Updated all files and CMakeLists to use new name.
started rebase work on parallel connection
2015-06-24 11:23:36 +02:00
Joakim Kilby 2d3ef442fb adding parallelconnection 2015-06-16 13:56:34 +02:00
Alexander Bock fc3faab5f1 Replace commandline argument with automatically detecting the supported OpenGL version 2015-05-28 20:33:22 +02:00
Alexander Bock 77cc5dba49 Moving onscreen gui into its own module 2015-05-26 22:52:12 +02:00
Alexander Bock 523abd6529 Modularized the base classes 2015-05-20 19:19:10 +02:00
Alexander Bock 683ce14449 Various cleanups in main.cpp
Adapted to new Ghoul version
2015-05-19 13:58:00 +02:00
Alexander Bock 597ed14014 Fixing CREDITS file
Removing many of clang warnings
2015-05-13 19:33:34 +02:00
Alexander Bock 4f8c1e4a14 Added methods to Hongkang parser that publish the results
More changes to the TImeline GUI
2015-05-02 22:24:03 +02:00
Alexander Bock 19417d87c8 Moved networking functions into their own engine class 2015-04-22 18:22:19 +02:00
Alexander Bock e6abdd97d2 Ability to request an OpenGL version from SGCT using commandline arguments 2015-03-03 14:53:35 +01:00
Alexander Bock bac0a9ad31 Disable the swap barrier before the scene load (and reactivating it afterwards) 2015-02-24 19:13:50 +01:00
Alexander Bock fb2c99b5ed Removed cppcheck warnings
Removed unused Interface file
2015-02-23 19:08:15 +01:00
Joakim Kilby a26214a38d Added boolean to OpenSpaceEngine declaring if this node is the master or not.
made sure it's set in the right place in main file.
removed all references to sgct::engine::instance()->isMaster() and replaced with calls to openspaceengine isMaster() function.
2015-02-20 10:45:33 +01:00
Joakim Kilby dce4835bab changing render function of openspaceengine and renderengine to take glm::mat4 matrices for Projection / ViewMatrix. 2015-02-19 15:19:20 +01:00
Alexander Bock a0fc77a893 Enable the ability to run setting scripts that are executed after the scene has been loaded 2015-02-17 20:10:50 +01:00
Alexander Bock 97d97a8a16 Merge branch 'develop' into features/imgui 2015-02-17 15:11:25 +01:00
Alexander Bock a6ebddb8eb Updated copyright header in all files 2015-02-17 14:20:03 +01:00
Alexander Bock 862bfd6947 Making most includes in openspaceengine into forward declarations 2015-02-17 10:36:18 +01:00
Joakim Kilby 32a56085d9 Added a delta time member variable to openspace engine and changed how dt is calculated.
it is now averaged over two frames instead of being just dt between two frames. This gives more stability
2015-02-09 13:52:00 +01:00
Alexander Bock cd012548af Intermediate work on making imgui into components 2014-12-18 19:15:57 +01:00