mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 04:00:37 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,542 Commits 99 Branches 46 Tags
df22eeb6579d70b6024d300fc1883a1dfefa4fd0
Commit Graph

283 Commits

Author SHA1 Message Date
Alexander Bock
4b26305340 Merge branch 'master' into feature/profile-gui 
# Conflicts:
#	openspace.cfg
 2020-10-11 11:18:45 +02:00
Alexander Bock
96ed6cfb70 Merge branch 'master' into feature/asset-meta-update 2020-10-10 12:01:56 +02:00
Micah
d524ecf803 Merge branch 'master' into feature/profile-gui 2020-10-09 19:40:46 -04:00
Alexander Bock
50a456b87f Issue/1299 (#1312) 
Change profile file format from a custom one to JSON
 2020-10-09 17:32:30 +02:00
Micah
f617331c33 update to solarsystem for description on scene graph node. added earth observing trails for planets 2020-10-08 23:39:30 -04:00
Micah
0ccf4dfd1f update for gui meta panel 2020-10-04 16:26:52 -04:00
Gene Payne
180cddfaa3 Fixed parse exceptions and improved assets with path and variable name 2020-09-16 21:06:46 -06:00
GPayne
831bf87d0c Improved exceptions and added error message dialog UI 2020-09-16 07:11:50 -06:00
GPayne
0dcf4a5e82 Finished syncing profile editor with openspace lib profile structs 2020-09-13 23:51:16 -06:00
GPayne
7d41cd5a49 Merged master in 2020-09-11 10:29:59 -06:00
GPayne
1b07268324 Working instantiation of Profile obj from launcher 2020-08-30 19:01:25 -06:00
Alexander Bock
95db615dab Merge branch 'master' into feature/general-performance 2020-08-24 15:09:45 +02:00
Alexander Bock
3b786c0bb8 Merge pull request #1282 from OpenSpace/issue/1174 
Issue/1174 - step between delta time steps using GUI or keybindings
 2020-08-24 14:17:30 +02:00
Emma Broman
7692180bad Verify values on input and save delta times to profile when saving settings 2020-08-24 11:32:32 +02:00
Emma Broman
457dabe9b7 Add list of delta time steps, stepping functions and keybindings 2020-08-24 11:32:31 +02:00
Alexander Bock
6ac5d536fa Update Ghoul repository 
Adapt to Ghoul changes in MemoryPool
 2020-08-19 16:19:25 +02:00
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
77db3b6ce8 Remove caching of inverse model transform for every scene graph node 2020-08-11 11:43:50 +02:00
Alexander Bock
b78d1dd033 Merge branch 'master' into feature/memory-allocations 
# Conflicts:
#	include/openspace/scene/scenegraphnode.h
#	modules/imgui/include/gui.h
 2020-08-05 19:06:04 +02:00
Alexander Bock
6e9db78f40 Remove performance measurements that have been supersceded by using Tracy 2020-08-05 18:28:08 +02:00
Alexander Bock
696bc31861 Moving over more allocations to the memory pool 2020-08-05 11:19:09 +02:00
Alexander Bock
25247c7a37 Create SceneGraphNodes in memory pool 2020-08-05 10:46:16 +02:00
Alexander Bock
e783807d66 Next step towards enabling a managed memory version of templatefactory 2020-08-04 21:56:39 +02:00
Lovisa Hassler
8428c0da7b Adding bounding sphere property to scenegraph node 2020-07-15 20:57:48 +02:00
Alexander Bock
3e1cf6b2e3 Intermediate commit for meta information 2020-06-23 10:32:51 +02:00
Alexander Bock
b51b0898fc Remove 'require'/'request' parameters from asset inclusion in profiles 2020-06-22 10:05:19 +02:00
Alexander Bock
42e4e0a75b Convert keybinding keys to typed keys 2020-06-21 23:54:36 +02:00
Alexander Bock
338c8a9bd5 Adding the ability to add additional scripts to a profile when necessary 2020-06-21 14:26:15 +02:00
Alexander Bock
12611b1a9a Use the correct type for the navigation state 
Add unit tests to verify parsing of these parameters
 2020-06-21 12:31:18 +02:00
Alexander Bock
3ed2e25188 Removing global state from the Profile itself to make unit testing a bit easier 2020-06-20 23:35:46 +02:00
Alexander Bock
6321a72bb4 Cleaning up includes 2020-06-20 22:39:07 +02:00
Alexander Bock
a530c081fa Replace explicit lack of camera information through the monostate with an optional instead 2020-06-20 22:24:31 +02:00
Alexander Bock
18a53e6605 Replace explicit Time::Type::None by using an optional 2020-06-20 22:21:09 +02:00
Alexander Bock
a367148b1d Remove patch component from profile version 2020-06-20 22:14:10 +02:00
Alexander Bock
15db67bb59 Port basic profile unit testing 2020-06-20 15:28:51 +02:00
Alexander Bock
604935b640 Move profile information from ProfileData into Profile class 
Temporarily comment out unit tests
 2020-06-19 00:09:43 +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
12daf94cb5 Make time specification in profiles optional 
Provide a nicer error message when forgetting version and camera parameters
 2020-06-18 22:17:12 +02:00
Alexander Bock
b59b6cc2d2 Yet more cleanup 2020-06-18 19:40:16 +02:00
Alexander Bock
a8c5d3bb91 More cleanup 2020-06-18 18:07:04 +02:00
Alexander Bock
944bd38ae7 Rename saveCurrentSettings to saveSettings 2020-06-18 17:07:20 +02:00
Alexander Bock
83e933fa00 Automatically create new profile name if no name is specified 2020-06-18 15:47:17 +02:00
Alexander Bock
5bad314b0c Removing the last remnants of ProfileFile 2020-06-18 14:29:36 +02:00
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