mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-08 12:39:49 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,138 Commits 99 Branches 46 Tags
e3699a43a8a08dead716e6ada473d6bd2ca24034
Commit Graph

1788 Commits

Author SHA1 Message Date
Alexander Bock
e3699a43a8 Update Ghoul and SGCT 
Adapt to changes by using more string_view
 2020-08-09 20:11:40 +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
Alexander Bock
c3cb10453b Intermediate commit 2020-08-04 01:11:00 +02:00
Lovisa Hassler
8428c0da7b Adding bounding sphere property to scenegraph node 2020-07-15 20:57:48 +02:00
Emma Broman
a7ea25d311 Merge branch 'master' into issue/733 2020-07-08 15:33:39 +02:00
Alexander Bock
96b775d939 Merge branch 'master' into feature/profiles 
# Conflicts:
#	data/assets/asteroids.scene
 2020-07-07 12:59:52 +02:00
Alexander Bock
ea95054bd2 Add the ability to render out the current recording time during a session recording 2020-07-02 16:37:11 +02:00
Jonathas Costa
607a13da31 Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too. 2020-06-30 12:05:07 -04:00
Emma Broman
6b4c329a29 Refactor 2020-06-30 14:00:32 +02:00
Jonathas Costa
e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04:00
Alexander Bock
3e1cf6b2e3 Intermediate commit for meta information 2020-06-23 10:32:51 +02:00
Alexander Bock
89f1835994 Add the option to add vertical offset to the on-screen log 
Set the default vertical offset when using the user interface
 2020-06-22 22:15:34 +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
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