Commit Graph

58 Commits

Author SHA1 Message Date
Alexander Bock
0068ae111d No longer expose the request function on the asset object but still retain it for the add functionality 2020-08-18 00:30:12 +02:00
Alexander Bock
4c9555425b Cleanup of asset handling and move more functionality to the Profile 2020-06-18 23:09:26 +02:00
Alexander Bock
1e9df1cb4b Merge branch 'master' into feature/profiles
# Conflicts:
#	include/openspace/scene/assetloader.h
#	src/scene/assetloader.cpp
2020-06-14 17:54:25 +02:00
Alexander Bock
433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
Alexander Bock
f605ea9422 Some more cleanup 2020-05-10 14:03:42 +02:00
GPayne
fe24b0c446 Finished unit tests for profile save current feature 2020-05-07 15:39:50 -06:00
Alexander Bock
d3cce906c1 Memory hygiene cleanup 2020-05-07 13:08:34 +02:00
Alexander Bock
befef58e80 More cleanup 2020-05-06 21:54:02 +02:00
Alexander Bock
340444ce0d Cleanup AssetManager class 2020-05-06 21:40:23 +02:00
Alexander Bock
fa56e9ecf4 Some more cleanup of the assets 2020-05-06 16:21:47 +02:00
Alexander Bock
875404246f Add meta information to Asset class 2020-05-05 00:00:48 +02:00
Alexander Bock
b4eb168c76 Turning shared_ptr into pointers (part 1) 2020-05-04 23:21:18 +02:00
Alexander Bock
c8dff5c217 First pass of asset cleanup 2020-05-04 22:56:12 +02:00
GPayne
1fbb9e8acf Completed code for detecting and storing changes made since startup 2020-04-23 12:06:34 -06:00
GPayne
207c7d5657 Profile file handler in progress 2020-03-27 15:10:46 -06:00
GPayne
6253a5cf2e First pass on tracking changed properties/assets since initialization 2020-03-22 20:59:15 -06:00
Alexander Bock
c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Alexander Bock
f5662b3fe4 Add function to asset Lua namespace that can check whether another asset exists 2017-12-31 19:41:56 -05:00
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
f7dc598f60 Small code cleanup 2017-12-19 11:17:56 +01:00
Emil Axelsson
7cc05ba2e0 More code cleanup 2017-12-16 15:37:46 +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
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
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
a7a0715200 Restructure sync directories and change sync API 2017-11-01 12:31:40 +01:00
Emil Axelsson
19393feac8 Work on syncing and initialization of assets 2017-10-31 10:04:02 +01:00
Emil Axelsson
a9c74977fd Work on asset management 2017-10-27 14:42:45 +02:00
Emil Axelsson
f9ec20812d Introduce AssetManager 2017-10-27 10:57:39 +02:00
Emil Axelsson
9e5a033cd2 Use shared pointers for assets 2017-10-19 15:48:07 +02:00
Emil Axelsson
81298f10be Work on asset synchronization and initialization 2017-10-16 19:08:22 +02:00
Emil Axelsson
18c50afeb5 Work on data management. Add some tests 2017-10-13 16:56:53 +02: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
Emil Axelsson
c0b9e1d1a7 Clean up code 2017-10-10 16:43:12 +02:00
Emil Axelsson
b6bee846a2 Work on data management 2017-09-21 16:29:21 +02:00
Emil Axelsson
f4901fa4cf Work on asset management 2017-09-18 18:13:20 +02:00
Emil Axelsson
aaed6ab6d7 Work on asset loader and assets 2017-09-15 14:05:43 +02:00
Emil Axelsson
bf45937619 Compile fix in asset and assetloader 2017-09-15 11:13:46 +02:00