mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-03 01:59:35 -06:00
Code Issues Packages Projects Releases Wiki Activity
3,647 Commits 99 Branches 46 Tags
fa136ecb99967aa80d2b00fe3086792b629b90bb
Commit Graph

174 Commits

Author SHA1 Message Date
Alexander Bock
fa136ecb99 Merge branch 'feature/synchronization' into develop 2016-09-22 17:58:05 +02:00
Alexander Bock
6938b59f00 Add application of blending and warping to the takeScreenshot function 2016-09-22 10:28:10 +02:00
Alexander Bock
5c84fd8919 Potential GCC compile fix 2016-09-21 22:52:39 +02:00
Alexander Bock
2ed8042667 Add methods to disable synchronization during scene loading as the application will get killed by the sync timeout otherwise 2016-09-21 22:29:52 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock
0a13d5430f Make DocumentationEngine into a singleton object 
Add documentation to DocumentationEngine
Add unique identifier to Documentation class (and enforce in DocumentationEngine)
 2016-09-19 09:31:34 +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
0cd40512dd Generalize Syncable interface and use mutex locks for SyncData 2016-09-16 12:21:19 -04:00
Alexander Bock
a25a9b4a2d Add the ability to the FactoryManager to write documentation about all registered classes 
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
 2016-09-16 17:37:02 +02:00
Erik Broberg
9e59cd3b8d Use SyncEngine for synchronizing all synced state in RenderEngine 2016-09-15 17:52:22 -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
6024070745 Add new classes SyncEngine and SyncData to encapsulate SGCT synchronization 2016-09-15 17:02:00 -04:00
Alexander Bock
408280a533 Rearrange and rename constants in ConfigurationManager 
Make use of constants in ConfigurationManager documentation
 2016-09-15 17:58:31 +02:00
Alexander Bock
a354f13ef3 Adding DocumentationEngine 2016-09-15 13:48:28 +02:00
Alexander Bock
752b82c3fb Rearrange Verifiers into their own files 
Make Documentation available for ConfigurationManager
 2016-09-15 08:08:10 +02:00
Erik Broberg
9c5deaba82 Use double buffering for time and camera syncing 2016-09-07 21:39:29 -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
d59156e81b Enable render global frame number and add as global property 2016-09-02 18:23:44 -04:00
Erik Broberg
9bdbf95961 --amend 2016-09-01 15:25:56 -04:00
Erik Broberg
cc2c26a3e7 Enable OpenSpace checking isUsingSwapGroups and isSwapGroupMaster 2016-09-01 15:19:25 -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
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Matthew Territo
c3ae58afba Add access to deltaTime/getDt in SGCT/WindowWrapper 2016-08-11 19:19:07 -06:00
Alexander Bock
6bd0ef7102 Make OpenSpaceModule a properties::PropertyOwner so that it can own properties 
Add properties owned by OpenSpaceModule to the global settings engine (closing #104)
 2016-07-31 19:26:55 +02:00
Matthew Territo
fdb90f74ac Added scene selector in the SettingsEngine, in the GUI under Global Properties. 
Has placeholder functionality for what's coming in the next commit.
 2016-07-27 16:45:43 -06:00
Matthew Territo
a2c96f5a36 Added ability to cycle through average frametime, FPS and average FPS 
"t" and "Shift+t" are Lua bindings in common.lua
Maybe needs to be part of SettingsEngine instead, but the display code was already in RenderEngine, so it'll do for now on this branch
 2016-07-20 16:33:37 -06: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
dc32dfe075 Added functionality to print all keybindings to file when a scene is loaded 2016-07-14 00:28:09 -04:00
Alexander Bock
e40d393824 Make the DownloadManager not a singleton (closing #43) 2016-06-30 00:43:03 +02:00
Alexander Bock
438e34b272 Enable feature to limit the GUI, console, and Log output to a single window in a multi-window setup 2016-06-27 02:11:49 +02:00
Alexander Bock
f2347a5f56 Merge remote-tracking branch 'origin/feature/iSWA' into release/ips 2016-06-17 11:31:33 +02:00
Matthew Territo
5925bd9c63 Added logging to the script engine and the associated properties in openspace.cfg table. Fixed comment for PropertyDocumentation in scene.cpp 2016-06-16 17:03:48 +02:00
Alexander Bock
5cc278c97f Add ModelMatrix retrieval to WindowWrapper 2016-06-16 00:57:31 +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
30264fb00e Add Lua function to check whether a specific module is loaded (closing #36) 2016-06-04 19:38:56 +02:00
Alexander Bock
4409003524 Merge commit '4ae4ecca3cc69eba5b59e62e19bd52877602fcdd' into develop 
Conflicts:
	data/scene/default.scene
 2016-06-04 19:06:54 +02:00
Michael Nilsson
f9f9e9abd1 cleanup, update ghoul ref 2016-06-03 11:32:09 -04:00
Alexander Bock
0508faf7ce Some changes to make GUI optional 2016-06-01 23:15:02 +02:00
Michael Nilsson
f2b802b317 MemoryFile har now char pointer and size instead of string 2016-05-06 16:39:24 -04:00
Michael Nilsson
d63dd7db44 remove thrown exception from fetchFile and replaced with corrupted flag in returned MemoryFile 2016-05-06 15:56:12 -04:00
Michael Nilsson
cbd6fd9234 iswacygnets now use new download funtions aswell 2016-05-06 15:09:09 -04:00
Michael Nilsson
47e2abf87d new download function using std::future and std::async 2016-05-06 10:48:27 -04:00
Michael Nilsson
d0e6c8dd6e removed progresscallback from downloadToMemory 2016-05-05 11:07:00 -04:00
Michael Nilsson
0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04: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
Sebastian Piwell
f13367e717 Kameleon plane 2016-04-25 10:37:06 -04:00
Sebastian Piwell
0246cd482e Solved merge conflict 2016-04-22 20:01:15 -04:00