Alexander Bock
|
dcfef3557f
|
Update copyright header
|
2017-12-29 20:11:22 +01:00 |
|
Alexander Bock
|
c9a3c68f19
|
Fix style guide issues
Update Ghoul repository
|
2017-12-29 19:18:06 +01:00 |
|
Emil Axelsson
|
2baa0cbb6d
|
Fix bug with assets changing state prematurely, while loading
|
2017-12-22 00:15:23 +01:00 |
|
Emil Axelsson
|
c763b7c30c
|
Fix state inconsistency bug in asset system
|
2017-12-20 12:13:18 +01:00 |
|
Emil Axelsson
|
09182c9274
|
Cleanup code
|
2017-12-19 11:48:30 +01:00 |
|
Emil Axelsson
|
f7dc598f60
|
Small code cleanup
|
2017-12-19 11:17:56 +01:00 |
|
Emil Axelsson
|
ff317d4b2f
|
Show loading screen when loading assets
|
2017-12-18 11:55:14 +01:00 |
|
Emil Axelsson
|
fd550fc372
|
Fix compilation issues and bugs on windows
|
2017-12-18 10:22:42 +01:00 |
|
Emil Axelsson
|
df259f6d02
|
Multithreaded scene initialization
|
2017-12-17 17:34:46 +01:00 |
|
Emil Axelsson
|
7cc05ba2e0
|
More code cleanup
|
2017-12-16 15:37:46 +01:00 |
|
Emil Axelsson
|
84dfbe7b80
|
Clean up asset related code
|
2017-12-16 12:51:46 +01:00 |
|
Emil Axelsson
|
814de72bc2
|
Fix bugs in asset management
|
2017-12-15 18:51:22 +01:00 |
|
Emil Axelsson
|
75cf6dcf71
|
Asset work in progress
|
2017-12-15 13:21:10 +01:00 |
|
Emil Axelsson
|
a774b7b5b2
|
Start implementing support for removing assets
|
2017-12-12 17:48:33 +01:00 |
|
Emil Axelsson
|
d1305bee6b
|
Cleanup
|
2017-12-12 15:21:17 +01:00 |
|
Emil Axelsson
|
1417db5ed7
|
Let assets control their own lifecycle
|
2017-12-12 14:55:30 +01:00 |
|
Emil Axelsson
|
e0504980ad
|
Initialize requested assets when they are ready
|
2017-12-11 11:12:39 +01:00 |
|
Emil Axelsson
|
0396832ae5
|
Change notification mechanisms for assets
|
2017-12-08 17:36:45 +01:00 |
|
Emil Axelsson
|
f3dfade201
|
Start adding support for removing assets
|
2017-12-08 16:02:45 +01:00 |
|
Emil Axelsson
|
4a43ca44f2
|
Render asset tree in gui
|
2017-12-07 18:44:08 +01:00 |
|
Emil Axelsson
|
9630e735db
|
An asset can only be considered synchronized when all required assets are synchronized
|
2017-12-07 11:07:15 +01:00 |
|
Emil Axelsson
|
175d21de9a
|
Remove experimental code
|
2017-12-06 15:16:52 +01:00 |
|
Emil Axelsson
|
79581c8556
|
Add lua function to set camera state without loading from file
|
2017-12-06 14:58:14 +01:00 |
|
Emil Axelsson
|
d16efef3d9
|
Automatically initialize assets
|
2017-12-05 16:01:59 +01:00 |
|
Emil Axelsson
|
f3aeecaf23
|
Callbacks for asset state changes
|
2017-11-17 00:15:54 +01:00 |
|
Emil Axelsson
|
436062381e
|
Asset loading and synchronization
|
2017-11-16 19:29:45 +01:00 |
|
Emil Axelsson
|
7c80384d12
|
Decentralize asset synchronization
|
2017-11-16 15:09:55 +01:00 |
|
Emil Axelsson
|
816de9b29a
|
Asset compile fix
|
2017-11-16 14:11:22 +01:00 |
|
Emil Axelsson
|
c52ce23156
|
Asset management
|
2017-11-15 22:53:04 +01:00 |
|
Emil Axelsson
|
27823e9af6
|
Asset syncing
|
2017-11-15 13:12:10 +01:00 |
|
Emil Axelsson
|
95e6592f68
|
Asset synchronization
|
2017-11-15 09:38:42 +01:00 |
|
Emil Axelsson
|
62f58a9749
|
Start on asset gui
|
2017-11-14 20:46:03 +01:00 |
|
Emil Axelsson
|
ce9b75117e
|
More work on assets (not compiling)
|
2017-11-14 17:23: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 |
|
Emil Axelsson
|
2fa42859cd
|
Decentralize resource synchronization. Remove notion of SynchronizationJob.
|
2017-11-12 19:09:16 +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 |
|
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 |
|
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
|
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 |
|
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 |
|
Emil Axelsson
|
c7f16189d8
|
Compile fix for macOS
|
2017-11-01 14:31:14 +01: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
|
fba556b11f
|
Always create a camera
|
2017-10-31 10:55:20 +01:00 |
|