Commit Graph

240 Commits

Author SHA1 Message Date
Alexander Bock e00a51d822 Removing some more global state 2020-06-18 10:59:22 +02:00
Alexander Bock a433ed1a72 Removing more of ProfileFile 2020-06-18 10:14:21 +02:00
Alexander Bock 02b109f4db More simplification 2020-06-18 09:58:31 +02:00
Alexander Bock 1e0f427dcf More profile file cleanup 2020-06-18 09:37:38 +02:00
Alexander Bock fe989d1ea1 Continuing on the work to use the struct variant of profiles 2020-06-17 19:02:11 +02:00
Alexander Bock d2fd3b8f1f Include helper assets and base assets explicitly
Add a new function to export profile struct to module text
2020-06-17 11:12:01 +02:00
Alexander Bock 52ca39fc22 Replace 'required' with 'require' and 'requested' with 'request'
Continue the work of factoring out the serialization and deserialization of the profile files
2020-06-17 09:33:41 +02:00
Alexander Bock 809ee9c753 Adding struct to hold parsed Profile 2020-06-16 16:39:51 +02:00
Alexander Bock 9d922f2634 Remove explicit read-in function 2020-06-16 13:22:19 +02:00
Alexander Bock 393e064874 Yet more cleanup
Add ProfileError class
2020-06-16 11:05:56 +02:00
Alexander Bock d7e976f67f Add some more fixes 2020-06-15 16:07:50 +02:00
Alexander Bock b64784b122 First small cleanup 2020-06-15 10:23:53 +02:00
Alexander Bock f9d1b030ef Small cleanup 2020-06-14 18:34:52 +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 3a1bec6e7d Merge branch 'master' into feature/license 2020-06-12 17:36:31 +02:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
GPayne 0f06f9d233 Merge branch 'master' into feature/profiles 2020-05-14 19:31:19 -06:00
GPayne dfb61097b2 Finished testing new save-settings-to-profile feature 2020-05-14 13:20:05 -06:00
Alexander Bock f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z)
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
2020-05-12 15:27:24 +02:00
Alexander Bock f605ea9422 Some more cleanup 2020-05-10 14:03:42 +02:00
Alexander Bock d1e5670ce5 More cleanup of asset ownership 2020-05-09 18:33:01 +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 01f0a864dc Yet more cleanup of Asset-related files 2020-05-06 20:33:27 +02:00
Alexander Bock fa56e9ecf4 Some more cleanup of the assets 2020-05-06 16:21:47 +02:00
GPayne 02fb61d95d Continued unit testing work 2020-05-05 20:57:54 -06:00
Alexander Bock 5a41084027 Add loading of meta information from assets 2020-05-05 00:29:46 +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 83ef5ed245 Switched profile-to-scene conversion from lua script to Profile class 2020-04-15 16:31:05 -06:00
Alexander Bock f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
GPayne 3d96836ee1 Added unit tests for conversion from profile to scene 2020-04-07 20:39:31 -06:00
GPayne 924a0085a7 Additional work on converting from profile to scene/asset format 2020-04-05 21:47:51 -06:00
GPayne 5a6ff37759 Created unit tests for profileFile 2020-04-03 21:43:24 -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 126f2ac4cf Check for selfinclusion of assets (closes #1032)
Make sure that OpenSpace doesn't crash when bailing out early
2020-02-11 14:09:14 +01: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 24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
liuloppan 78eb673611 Feature/gui for touch (#967)
Merging in feature gui for touch. Enable touch module to run.
Currently only run on development mode with the "touch" scene.
2019-09-18 23:49:51 +02:00
Micah Acinapura 1149a61dce resurrecting consolidated documentation (#897)
* Resurrecting consolidated documentation, lots to improve still but better then before
2019-06-03 06:19:45 -06: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 21fd957f28 Add an option for hardcoding a fixed bounding sphere that is used if there is no renderable attached to a scenegraph node 2019-02-20 16:55:48 +01:00
Emil Axelsson 2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +01:00
Alexander Bock c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00