Commit Graph

2177 Commits

Author SHA1 Message Date
Emil Axelsson c032e4a66e Add missing constructors 2017-11-14 11:26:23 +01:00
Emil Axelsson 81f45aed71 Work on http synchronization 2017-11-13 23:01:22 +01:00
Emil Axelsson c171e6ae86 Work on http download interface 2017-11-13 19:03:58 +01:00
Emil Axelsson 27f36209fa Improve implementation and interface of http downloads 2017-11-13 14:59:39 +01: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 3f6e5e6ace Merge pull request #415 from OpenSpace/feature/loadingscreen-refactor
Feature/loadingscreen refactor
2017-11-12 13:24:48 -06:00
Emil Axelsson 2fa42859cd Decentralize resource synchronization. Remove notion of SynchronizationJob. 2017-11-12 19:09:16 +01:00
Alexander Bock b6d841c677 Correctly use group identifier name in property rendering
Fix indexing in Dropbox of OptionProperty
Finishing touches on FixedRotation (closes #137)
2017-11-12 12:33:10 -05: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
Emil Axelsson a73f2e0d00 Work on asset synchronization 2017-11-11 18:48:07 +01:00
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock f29b15a37f Add a rotation method that follows a fixed scene graph node
Add missing file for ImGui
2017-11-10 17:15:00 -05:00
Emil Axelsson 916f94d70e Terminate torrent thread on destruction 2017-11-10 16:42:55 +01: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 bc95d13c31 Updated ImGui external 2017-11-10 09:58:53 -05:00
Alexander Bock 7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock 7b12a241ed Remove BOMs
Fix coding style and script
2017-11-09 19:10:32 -05:00
Alexander Bock aa20c677dd Move onscreen rendering into SGCT's render2D function (closes #181)
Same fix makes GUI windows work again (closes #412)
2017-11-09 18:12:13 -05:00
Alexander Bock 51a71d5ce2 Compile fix to adjust to runTime method not existing anymore 2017-11-09 14:58:43 -05:00
Alexander Bock 5fe98b85ff Merge pull request #403 from OpenSpace/feature/fieldlineSequence
Feature/fieldlinesSequence
2017-11-09 12:23:13 -06:00
Alexander Bock 5f391de33c Fix crash when adding layers through globebrowsing interface due to missing initialization
Fix crash that would happen if the resetting of the tile layer would throw an exception
2017-11-09 12:01:35 -05:00
Alexander Bock d1735af1ed Fix compile error in iswa module 2017-11-09 11:41:27 -05:00
Alexander Bock 88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
Alexander Bock ca7053d8f2 Fix bug with layer support for height maps 2017-11-09 10:20:33 -05:00
Alexander Bock 8866a13ff6 More coding style fixes 2017-11-08 21:36:06 -06: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 44806687bf Fix bug with applying colormap in RenderableBillboardsCloud 2017-11-08 12:21:15 -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
Alexander Bock 80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -06:00
Emil Axelsson 8da01993cd Add support for Magnet Links 2017-11-07 00:00:26 +01:00
Emil Axelsson 87595812d2 Remove BOM 2017-11-06 21:22:43 +01:00
Emil Axelsson e201dec907 Start work on TorrentSynchronization 2017-11-06 19:07:52 +01:00
Emil Axelsson 1f33359697 Cleanup and better configuration of resource syncs 2017-11-05 23:17:51 +01:00
Emil Axelsson 43664d34b7 Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-11-05 20:04:47 +01:00
Emil Axelsson 88c5733d00 Only synchronize http resources if missing 2017-11-05 19:34:17 +01:00
Emil Axelsson 03aab55a1f Asset synchronization using HTTP 2017-11-05 19:02:31 +01:00
Alexander Bock b886925616 Move OpenGL in globebrowsing from constructors into initialization functions
Place entire scene loading into separate thread
2017-11-03 16:25:06 -04:00
Alexander Bock 78e3320cde Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Alexander Bock ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00
Emil Axelsson a7a0715200 Restructure sync directories and change sync API 2017-11-01 12:31:40 +01:00
Emil Axelsson 2313a275d3 Resource syncing infrastructure 2017-10-31 17:46:48 +01: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 1c2622248c Remove unused shaders 2017-10-24 03:35:41 -07:00
Alexander Bock 10bcd9a3d3 Add display for current time and ability to return to today to the space/time component 2017-10-24 02:53:51 -07:00
Alexander Bock 97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Oskar Carlbaum afd91fc4af Move all kameleon dependency to separate files named 'kameleonfieldlinehelper' 2017-10-22 14:55:59 +02:00
Alexander Bock c204a1e9f0 Make RenderableConstellationBounds not crash if the file is missing 2017-10-21 10:27:14 -04:00