mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-09 21:21:19 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,366 Commits 83 Branches 46 Tags
8aac7d6400a723735bf3c8aa2665eee7fb42bedf
Commit Graph

660 Commits

Author SHA1 Message Date
Malin Ejdbo
8aac7d6400 Adjust to the new structure when loading list of models 
* Update Ghoul
 2020-12-22 14:49:07 +01:00
Malin Ejdbo
fbc8e584d8 Add support for list of model files in asset files 
* Load either one or several model files in asset files

* In the case of several model files, combine all models into one single ModelGeometry
 2020-11-05 15:52:07 +01:00
Malin Ejdbo
6eef29c423 Update Ghoul and add possiblity to force invivible meshes to render 
* Update Ghoul

* Add setting in asset file to specify if invisible meshes should be
  forced to render or not

* Change model shader to work with updated ghoul with embedded materials
  and textures

* In shader, render forced invisible meshes with procedural pink and
  green chessboard pattern
 2020-10-26 11:16:56 +01:00
Malin Ejdbo
6df1667583 Add multi model format support with Assimp 
* Update submodule Ghoul to point to branch feature/multitexturing

* Remove old datastructure for ModelGeometry (moved to ghoul)

* Change RenderableModel to work with new ModelGeomtry structure in
  ghoul

* Work in progress: Textures
 2020-10-20 10:32:12 +02:00
Alexander Bock
98bfee301d Various Xcode compile fixes 2020-09-14 10:38:46 +02:00
Alexander Bock
5f0b00da8a Update Ghoul repository 2020-09-13 19:15:26 +02:00
Alexander Bock
a070a2ad8f Update Ghoul repository 2020-09-13 19:08:35 +02:00
Alexander Bock
463bb6b868 Update ghoul repository 2020-09-04 14:03:22 +02:00
Alexander Bock
b99a4c7390 Update submodules 2020-09-04 13:47:26 +02:00
Alexander Bock
83622ce339 Add some more profilng code 
Update Ghoul repository
 2020-08-21 11:16:37 +02:00
Alexander Bock
5aa2db2831 One more usecase of not creating a temporary std::string 2020-08-20 15:27:52 +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
e93f1833be Make more use of temporary string objects in the TimeQuantizer 
Add GPU markers to the rendering
 2020-08-19 18:26:11 +02:00
Alexander Bock
6ac5d536fa Update Ghoul repository 
Adapt to Ghoul changes in MemoryPool
 2020-08-19 16:19:25 +02:00
Alexander Bock
88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock
71415e3cdb Update Ghoul repository 2020-08-18 10:09:28 +02:00
Alexander Bock
4d9dda9a73 Merge remote-tracking branch 'origin/master' into feature/general-performance 2020-08-18 08:56:30 +02:00
Alexander Bock
f5eec4e97f Update Ghoul repository (closes #1278) 2020-08-17 22:28:17 +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
38eac377e8 Introduce the date library 2020-08-13 10:47:30 +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
Alexander Bock
d39d4a91ec Move error message hack outside of scene render loop 
Use std::string_view instead of std::string in more places
 2020-08-06 16:02:45 +02:00
Alexander Bock
0e3539bb23 Remove dynamic allocation in RenderableTrail 2020-08-06 11:39:33 +02:00
Alexander Bock
c472ac131e Removing more dynamic memory allocations 2020-08-05 15:45:06 +02:00
Alexander Bock
2691dae11f Update Ghoul repository 2020-08-05 13:29:11 +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
33df5b9fd3 Working version that still bypasses memorypools 2020-08-04 11:43:16 +02:00
Alexander Bock
c3cb10453b Intermediate commit 2020-08-04 01:11:00 +02:00
Alexander Bock
1a98b57c3b Update Ghoul repository 2020-08-04 00:11:39 +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
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
d2fbfdbf22 Remove unused globebrowsing instrumentation 2020-06-12 21:50:05 +02:00
Alexander Bock
340444ce0d Cleanup AssetManager class 2020-05-06 21:40:23 +02:00
Alexander Bock
5a94c486f0 Removing warnings 2020-04-14 22:32:26 +02:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock
5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock
ef7ff0adeb Add options for AVX, AVX2, AVX512 compilation options 
Compile fix for scene.cpp
 2020-02-13 19:57:17 +01:00
Alexander Bock
de24e81bda Fix copyright header information 
Remove TimelineView application
 2020-02-12 22:36:11 +01:00
Alexander Bock
7abac51223 No longer add .txt extension to all UrlSynchronizations 2020-02-12 21:08:02 +01:00
Alexander Bock
81fda6c8db Update Ghoul repository 
Adapt to changes in Ghoul
 2020-02-12 00:01:24 +01:00
Alexander Bock
fde307ead9 Update Ghoul repository 2020-02-11 18:12:50 +01:00
Alexander Bock
9a714524ce Add try/catch block when downloading files to prevent an exception escaping the thread and killing the application (closes #1074) 2020-02-11 11:57:09 +01:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
49c793d976 Update Ghoul version 
Add initial Tracy profiling macros
 2020-02-10 14:50:41 +01:00
Alexander Bock
d2ae5f1ca2 Fix rendering issue due to uninitialized variables 2020-02-10 11:27:02 +01:00
Alexander Bock
1c35459ba9 Update SGCT and Ghoul repository to newest stable version 2020-02-04 09:46:43 +01:00
Jonathas Costa
6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00