95e6592f68
Asset synchronization
2017-11-15 09:38:42 +01:00
62f58a9749
Start on asset gui
2017-11-14 20:46:03 +01:00
ce9b75117e
More work on assets (not compiling)
2017-11-14 17:23:58 +01:00
27f36209fa
Improve implementation and interface of http downloads
2017-11-13 14:59:39 +01:00
62c5506250
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-13 11:18:00 +01:00
2fa42859cd
Decentralize resource synchronization. Remove notion of SynchronizationJob.
2017-11-12 19:09:16 +01:00
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
19812af629
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-11 19:10:42 +01:00
a73f2e0d00
Work on asset synchronization
2017-11-11 18:48:07 +01:00
758e26789c
More coding style conformance
2017-11-11 11:25:49 -05:00
cb07af4a2b
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-11-10 16:07:58 +01:00
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
b50b52d351
Cleanup for coding style
...
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
e201dec907
Start work on TorrentSynchronization
2017-11-06 19:07:52 +01:00
1f33359697
Cleanup and better configuration of resource syncs
2017-11-05 23:17:51 +01:00
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
c7f16189d8
Compile fix for macOS
2017-11-01 14:31:14 +01:00
a7a0715200
Restructure sync directories and change sync API
2017-11-01 12:31:40 +01:00
2313a275d3
Resource syncing infrastructure
2017-10-31 17:46:48 +01:00
fba556b11f
Always create a camera
2017-10-31 10:55:20 +01:00
19393feac8
Work on syncing and initialization of assets
2017-10-31 10:04:02 +01:00
a9c74977fd
Work on asset management
2017-10-27 14:42:45 +02:00
f9ec20812d
Introduce AssetManager
2017-10-27 10:57:39 +02:00
157d91d631
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-26 13:43:49 +02:00
eaca6c7487
Add SceneLicense information to the Scene
...
Add documentation generator to SceneLicense
2017-10-23 18:11:09 -07:00
97445f4f9f
Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts
2017-10-23 14:43:25 -07:00
6d8ec8a7c6
Compile fix for clang
2017-10-22 20:54:55 +02:00
9e5a033cd2
Use shared pointers for assets
2017-10-19 15:48:07 +02:00
97f78a09df
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
2017-10-19 10:27:34 +02:00
81298f10be
Work on asset synchronization and initialization
2017-10-16 19:08:22 +02:00
bb5f4d4381
Rename GuiGrouping to GuiPath
...
Add GuiPath to existing scenegraph nodes
Add option to toggle tree representation
Add caption font to UI
2017-10-13 13:08:59 -04:00
18c50afeb5
Work on data management. Add some tests
2017-10-13 16:56:53 +02:00
ebd506975c
Added initial scenegraph node grouping support
2017-10-13 00:17:28 -04:00
6ebfb92a8d
Work on asset loading
2017-10-12 19:00:51 +02:00
6f3cc8f6a5
Work on asset loading
2017-10-11 17:06:51 +02:00
c0b9e1d1a7
Clean up code
2017-10-10 16:43:12 +02:00
b6bee846a2
Work on data management
2017-09-21 16:29:21 +02:00
f4901fa4cf
Work on asset management
2017-09-18 18:13:20 +02:00
8a30251fcb
Work on asset management
2017-09-18 12:56:55 +02:00
aaed6ab6d7
Work on asset loader and assets
2017-09-15 14:05:43 +02:00
bf45937619
Compile fix in asset and assetloader
2017-09-15 11:13:46 +02:00
af8bec1441
Prepare for data sync
2017-09-14 20:16:51 +02:00
2426545a05
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
src/rendering/renderengine.cpp
src/scene/scene.cpp
src/scene/sceneloader.cpp
tests/test_concurrentjobmanager.inl
tests/test_concurrentqueue.inl
tests/test_sceneloader.inl
2017-08-15 11:43:18 +02:00
c275b2f833
Feature/cmake cleanup ( #381 )
...
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31 )
* Cleaning up CMake files
* Restructure application specification
* Add parameter for library mode to all modules
* Add functions to handle global variable state
* Misc/remove warnings (#383 )
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
cb7319d5f2
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
data/scene/default.scene
modules/sync/syncmodule.h
openspace.cfg
src/engine/openspaceengine.cpp
src/scene/scene.cpp
src/scene/scene_doc.inl
src/scene/scenegraphnode.cpp
src/scene/scenegraphnode_doc.inl
src/scene/sceneloader.cpp
src/scripting/scriptengine.cpp
2017-08-14 11:17:25 +02:00
31377466ba
Remove return values from initialize and deinitialize functions
2017-07-28 17:51:25 -04:00
84a52c091a
Work on assets
2017-07-20 17:06:34 +02:00
5ced910f79
Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management
...
Conflicts:
include/openspace/scene/scenegraphnode.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/interaction/interactionmode.cpp
2017-07-18 10:54:41 +02:00
0e9edaeb12
Fix byte order mark commits
...
Update Ghoul
2017-07-17 15:54:00 -04:00
4dba552fd1
Started switching OpenSpace projects to nested namespaces
...
Various cleanups
2017-07-15 20:01:55 -04:00
Emil Axelsson