Commit Graph

382 Commits

Author SHA1 Message Date
Gene Payne 2cfa0e06c3 Various bug fixes and removal of simulated test data 2020-09-17 19:35:54 -06: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 3a25ae79bc Changes to replace temp structs with openspace lib structs 2020-09-11 15:06:12 -06:00
GPayne 200a3d469b Added properties section for profile editor 2020-09-11 12:51:37 -06:00
GPayne 65ca88ad0e Time support for profile editor 2020-09-11 12:48:01 -06:00
GPayne ef61d0cb81 Support for pmodules in profiles 2020-09-11 12:45:40 -06:00
GPayne 66aa8bc4be MarkNodes and Meta support in profiles 2020-09-11 12:40:22 -06:00
GPayne cd084d12be Keybindings support for profiles 2020-09-11 12:36:24 -06:00
GPayne 0cfbdfcbfc Added support for delta times in profile 2020-09-11 12:32:04 -06:00
GPayne ca6260718b Added support for camera 2020-09-11 12:29:31 -06:00
GPayne 7e72d9fa8f Assets support 2020-09-11 12:26:59 -06:00
GPayne 0ec1cf69f8 New support for additional scripts in profile 2020-09-11 12:18:26 -06:00
GPayne ded7f3cd66 Updated tree model for assets 2020-09-11 12:09:44 -06:00
GPayne e2c8541421 Updated CMake cfg with moved src & include dirs 2020-09-11 11:58:07 -06:00
GPayne 61191d4f14 Moved to src and include directories 2020-09-11 11:53:32 -06:00
GPayne bb1e8813c7 Replaced launcher and profile-edit windows with updated version 2020-09-11 11:42:50 -06:00
GPayne 7d41cd5a49 Merged master in 2020-09-11 10:29:59 -06:00
Alexander Bock 00a00c9cc8 Merge branch 'master' into feature/general-performance
# Conflicts:
#	apps/OpenSpace/main.cpp
#	modules/server/src/topics/timetopic.cpp
2020-09-04 13:49:00 +02:00
Alexander Bock b99a4c7390 Update submodules 2020-09-04 13:47:26 +02:00
Alexander Bock 7e06f310eb Update submodules
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
GPayne 1b07268324 Working instantiation of Profile obj from launcher 2020-08-30 19:01:25 -06:00
Alexander Bock d0508be631 First commit 2020-08-30 22:00:13 +02:00
GPayne b54612a502 Added profile object access to launcher 2020-08-29 20:32:35 -06:00
GPayne 8dad4ee9fe Initial working launcher without profile code access yet 2020-08-28 12:00:57 -06:00
Alexander Bock 5aa2db2831 One more usecase of not creating a temporary std::string 2020-08-20 15:27:52 +02:00
Alexander Bock 1f2a97d7fd Merge branch 'master' into feature/general-performance 2020-08-20 15:20:05 +02:00
Alexander Bock 8730b721f4 Remove unused vTune code
Remove unused VLD code
2020-08-20 15:17:12 +02:00
Alexander Bock 015168f651 update submodules
No longer show log levels in log messages from SGCT twice
2020-08-20 14:52:27 +02:00
Alexander Bock 0f71f7b654 Update submodules 2020-08-17 21:35:22 +02:00
Alexander Bock 4f68f99c9d Remove dynamic memory allocation from TileMetaData 2020-08-13 15:37:00 +02:00
Alexander Bock e04fd0e132 Update SGCT repository 2020-08-10 15:58:59 +02:00
Alexander Bock e3699a43a8 Update Ghoul and SGCT
Adapt to changes by using more string_view
2020-08-09 20:11:40 +02:00
aniisaaden 17702c2129 Fixed include for Visual Studio Version 16.7.0 2020-08-06 13:36:08 +02:00
aniisaaden 1cfd716026 Revert "Fixed include for Visual studio Version 16.7.0"
This reverts commit 91862759d3.
2020-08-06 13:35:33 +02:00
aniisaaden 91862759d3 Fixed include for Visual studio Version 16.7.0 2020-08-06 13:28:16 +02:00
Alexander Bock 11f537e2e2 Fix issue with constellation art that left merge conflict annotations behind 2020-07-09 13:01:32 +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 bad2acb260 Update submodules 2020-07-06 15:55:00 +02:00
Micah Acinapura 6db7d503a3 Linux fixes clang (#1216)
* Changes to work on Linux.

* Multiple small fixes for Linux.

* Changes to have trails working on Linux again.

* Bring back AA Trail Lines on Linux.

* Included new branch with correction in cfitsio library linking.

* Updated SGCT.

* Changes to work on Linux.

* Remove extra #endif

* Changes to compile in Clang on Linux.

* Other fixes.

* Bring back some of the changes lost and updated clang building commands.

* requiring 10.15 for sgct, upadating sgct

Co-authored-by: Jonathas <jon.costa@gmail.com>
Co-authored-by: Tom Schober <tom@tomschober.com>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-06-25 18:55:20 -04:00
Alexander Bock f138708fd9 Update SGCT to not require the specification of projection planes if 3D rendering in not required
Remove comments as it is the preferred way of handling the web gui
2020-06-23 15:18:25 +02:00
Micah Acinapura 386e7d9312 fixed reading config files, single_gui.xml, and updating webmodules for sgct init changes 2020-06-22 10:23:04 -04:00
Alexander Bock e5719952b1 Add the ability to load images lazily for RenderablePlanes
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint

(cherry picked from commit 7f0c92430f)
2020-06-15 16:08:28 +02:00
Alexander Bock 7f0c92430f Add the ability to load images lazily for RenderablePlanes
Add ability to purge textures from RAM if they are read-only
Make use of both for constellation images to reduce the memory footprint
2020-06-15 16:07:16 +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 7fb81a9ca2 Improve the performance of Borisov's trajectory by reducing the sampling rate from one sample per minute to one sample per week (it doesn't really change directions that fast anyway) 2020-06-12 19:43:21 +02:00
Alexander Bock 433d96bbb4 SGCT compile fix
First pass for pull request
2020-06-11 00:24:58 +02:00
eriksunden 9c2b5eefb2 Updated SGCT submodule to latest changes 2020-05-25 11:02:55 +02:00
Alexander Bock 3b427bfd15 Cleaning up window delegate 2020-05-10 15:17:51 +02:00