mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-17 19:10:32 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,566 Commits 84 Branches 46 Tags
0899c499f0553aec39fbefeb074e8a7da5885475
Commit Graph

63 Commits

Author SHA1 Message Date
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566) 
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
 2018-03-20 09:30:59 +01:00
Alexander Bock
9709b22bac Turn Configuration keys from std::string to constexpr const char* for better startup performance 2018-03-08 19:24:03 +01:00
Emil Axelsson
4675554471 One Property Tree (#500) 
* Organize properties in one single property tree
* Update scenes to work with one property tree. Fix documentation issues.
 2018-03-06 16:59:06 +01:00
Alexander Bock
3ce9f523a6 Add new dedicated directory for screenshots 
* Add ability to have current date in file name path
 * Remove SGCT_ prefix for screenshots (closes #449)
 2018-02-26 23:46:03 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
339c45a7f6 Add specialized TaskRunner application "Sync" that only synchronizes all scenes in the asset folder 
Replace TaskRoot in openspace.cfg with ${TASK} in Taskrunner
Remove Launcher
 2017-12-26 20:13:23 +01:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Alexander Bock
c9aedb084b Add Lua functions to query keyboard bindings and remove individual keybinds 
Add core script file that defines possibility of rebinding keyboard commands to a different key
Enable the execution of global customization scripts
Make `scene_helper.lua` a script automatically included in the ScriptScheduler
 2017-12-08 14:58:18 -05:00
Emil Axelsson
62c5506250 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-13 11:18:00 +01:00
Alexander Bock
f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
 2017-11-12 10:50:11 -05:00
Emil Axelsson
19812af629 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-11 19:10:42 +01:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Emil Axelsson
c479cb5079 Merge branch 'feature/data-management' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-10 16:10:41 +01:00
Emil Axelsson
cb07af4a2b Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-10 16:07:58 +01:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
 2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351 Cleanup for coding style 
Add strict mode to check_style_guide script
 2017-11-08 10:35:39 -06:00
Emil Axelsson
87595812d2 Remove BOM 2017-11-06 21:22:43 +01:00
Emil Axelsson
1f33359697 Cleanup and better configuration of resource syncs 2017-11-05 23:17:51 +01:00
Alexander Bock
dc9831b6a6 Add progress bar to the loading screen 
Add configuration options to customize the loading screen
 2017-11-05 14:49:46 -05:00
Emil Axelsson
157d91d631 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-26 13:43:49 +02:00
Alexander Bock
eaca6c7487 Add SceneLicense information to the Scene 
Add documentation generator to SceneLicense
 2017-10-23 18:11:09 -07:00
Emil Axelsson
2623912ec9 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-10-16 11:07:24 +02:00
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350) 
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
 2017-09-22 12:03:23 +02:00
Emil Axelsson
aaed6ab6d7 Work on asset loader and assets 2017-09-15 14:05:43 +02:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits 
Update Ghoul
 2017-07-17 15:54:00 -04:00
Alexander Bock
4dba552fd1 Started switching OpenSpace projects to nested namespaces 
Various cleanups
 2017-07-15 20:01:55 -04:00
Matthew Territo
b4c128306f Merge branch 'master' into feature/statlogs 
* master:
  Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file
  Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set
 2017-07-13 18:16:23 -06:00
Alexander Bock
c3929f5d6d Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file 2017-07-13 14:52:13 -04:00
Matthew Territo
a91e48efe7 Add PerformanceMeasurement logging variables to ConfigurationManager. Read from logDir and file prefix from config file in PerformanceManager. 2017-07-06 17:01:21 -06:00
Matthew Territo
92f55f24d6 Merge remote-tracking branch 'origin/master' into feature/launcherconfigs 
# Conflicts:
#	ext/sgct
#	openspace.cfg
 2017-05-12 15:40:06 -06:00
Alexander Bock
bf16c76add Feature/opengldebug (#290) 
* Add InLIstVerifier

* Initial implementation of OpenGL debug messages

* Moving functionality into Ghoul

* Compile fix

* Update Ghoul repository
Make use of the moved OpenGL debug functions

* Update Ghoul to fix GCC and Clang compiler errors

* Add unit test for IntListVerifier
 2017-04-18 14:29:23 -04:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Emil Axelsson
cb7e81cf3d Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner. 
Conflicts:
	modules/volume/CMakeLists.txt
	modules/volume/linearlrucache.h
	src/engine/openspaceengine.cpp
 2017-03-02 18:20:01 +01:00
Alexander Bock
6748305267 Some cleanup of ConfigurationManager 2017-03-01 11:30:54 -05:00
Matthew Territo
895ad51e39 Add Launcher key to ConfigurationManager. Initial work. 2017-02-15 17:05:59 -07:00
Alexander Bock
6d9dc2bfeb Fixed include guards 
Removed unused writeToTexture file
 2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017 
Update Ghoul repository
Remove libgdal link
 2017-02-06 18:02:01 -05:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core 
Remove unused files
 2016-12-09 13:54:22 +01:00
Alexander Bock
70af0f0073 Add an option to the configuration manager to append the scene name to the cache directory (closing #159) 2016-11-07 13:39:01 +01:00
Alexander Bock
542f92e768 Add a fix to the window resolution for Retina displays 
Add a new setting to the ConfigurationManager that can specify whether to scale the onscreen text by window size or resolution
 2016-10-18 18:52:30 +02:00
Emil Axelsson
6c5c8d6839 Make gcc happy 2016-10-10 17:36:55 +02:00
Emil Axelsson
5e2ea10bcd Add http proxy support for GDAL 2016-10-07 20:42:32 +02:00
Alexander Bock
5c84fd8919 Potential GCC compile fix 2016-09-21 22:52:39 +02: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
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
752b82c3fb Rearrange Verifiers into their own files 
Make Documentation available for ConfigurationManager
 2016-09-15 08:08:10 +02: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
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