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
Emma Broman
3cc2d2aedf
Fix for compile errors in Linux in exoplanets module
2020-10-07 17:12:06 +02:00
Emma Broman
3310d954b3
Fix typo
2020-09-28 16:14:55 +02:00
Lovisa Hassler
ceb5c85e5c
Removed duplicated documentation for vec4 color
2020-09-28 16:02:39 +02:00
Emma Broman
754128a9e7
Some final cleanup
2020-09-28 11:37:28 +02:00
Emma Broman
fdf25f18a2
Merge branch 'master' into thesis/2018/exoplanets
2020-09-25 08:56:30 +02:00
Emma Broman
eb330fed8f
Don't bind texture if nullptr
...
Lead to an exception when enabling the exoplanets renderablebillboardclouds during runtime. Should probably investigate why the renderBillboard function is called with a nullptr texture in the first place...
2020-09-25 08:55:41 +02:00
Emma Broman
193923e33b
Merge branch 'master' into thesis/2018/exoplanets
2020-09-23 09:56:41 +02:00
Emma Broman
c32de00bd8
Remvoe trailing whitespaces
2020-09-23 08:41:33 +02:00
Emma Broman
78996bb9d9
Cleanup and avoid using variable that might not have been defined
2020-09-22 11:13:26 +02:00
Emma Broman
5d9f6ec5a0
Increase trail resolution for highly eccentric orbits
2020-09-22 10:53:05 +02:00
Emma Broman
e74433b3f0
Add function to print a list of available exoplanet systems to the log
2020-09-22 08:21:57 +02:00
Emma Broman
7bd0e0bc00
Tiny refactor
2020-09-21 14:46:42 +02:00
Emma Broman
1a5c0d3672
More cleanup
...
string_view and avoid warnings from implicit conversions
2020-09-18 14:34:06 +02:00
Emma Broman
938fc49f82
Fix spelling mistake
2020-09-18 11:14:07 +02:00
Emma Broman
32c2e59330
Change uppercase struct variables to camelcase
2020-09-18 11:10:15 +02:00
Emma Broman
fe4bb00108
Even more cleanup
2020-09-18 10:23:47 +02:00
Emma Broman
614c523c69
Cleanup data reading in csvtobintask
2020-09-18 10:11:32 +02:00
Emma Broman
d0806e0136
Cleanup
2020-09-18 09:33:04 +02:00
Emma Broman
f2b4909a32
Some cleanup of helper functions
2020-09-18 08:50:06 +02:00
Emma Broman
5671ea1463
Update copyright end year (woops)
2020-09-17 16:36:02 +02:00
Emma Broman
0d1e464a64
Documentation cleanup and capitalize first letter in "Disc" in renderable
2020-09-16 15:16:15 +02:00
Emma Broman
57e25050e1
Abort if trying to add the same system twice
2020-09-16 14:34:37 +02:00
Emma Broman
e0333553cb
Some final cleanup
2020-09-16 14:33:55 +02:00
Emma Broman
2483d4a3fb
Cleanup rendering code
2020-09-16 11:19:55 +02:00
Emma Broman
0b4593a194
Put exoplanet data files on server and fetch using HttpSynchronization
2020-09-16 09:32:16 +02:00
Emma Broman
4e73a1b2ef
Cleanup csvtobin task slightly
2020-09-14 11:27:32 +02:00
Alexander Bock
98bfee301d
Various Xcode compile fixes
2020-09-14 10:38:46 +02:00
Emma Broman
c8e8cf315c
Revert exoplanet star glare, for now
2020-09-14 09:12:28 +02:00
Emma Broman
2aa31abe45
Merge branch 'master' into thesis/2018/exoplanets
2020-09-11 13:43:01 +02:00
Alexander Bock
af6e15da40
Merge remote-tracking branch 'origin/master' into feature/openglstatecache
...
# Conflicts:
# ext/ghoul
# modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
# modules/digitaluniverse/rendering/renderableplanescloud.cpp
# src/util/screenlog.cpp
2020-09-04 14:02:17 +02: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
6eb0aea757
Address PR comments
2020-09-04 13:46:20 +02:00
Emma Broman
6bbc0342f4
Todo comment
2020-09-03 11:29:24 +02:00
Emma Broman
2bc0dd8efd
Add a glare to the host star, similar to the sun
2020-09-03 11:29:12 +02:00
Emma Broman
bf7695ef69
Reduce disc opacity a bit, so that trails are more visible
2020-09-02 11:12:18 +02:00
Emma Broman
6e5695b5dd
Rename disc texture and remove debug texture for planets (cat..)
2020-09-02 11:07:31 +02:00
Emma Broman
1ea486fb1b
Render disc using blending, to avoid problems with trails being covered by disc
2020-09-02 10:55:15 +02:00
Alexander Bock
20d1e391cb
Adding a new ImGui component for explicitly adding GIBS layer
2020-09-01 02:27:08 +02:00
Alexander Bock
7e06f310eb
Update submodules
...
Remove warnings and MSVC analyzer information messages
2020-09-01 01:18:17 +02:00
Emma Broman
15eaea1bc5
Remove eccentricity uncertainty discs
...
They can be reimplemented later, if desired. But that requires creating useful textures.
2020-08-31 15:32:08 +02:00
Emma Broman
01f198bfb0
Add consts and refactor planet translation
2020-08-31 12:06:11 +02:00
Emma Broman
12fc3d5ab6
Combine star parent node with renderable globe
2020-08-31 11:48:55 +02:00
Emma Broman
4b1d8da972
Fix problem with parent node's tranformation being applied twice
...
Scene graph nodes inherit their parent's transformation nowadays, but not when this code was implemented.
2020-08-31 11:20:06 +02:00
Emma Broman
3d97585483
Add GUI path and cleanup node indentifiers
2020-08-31 10:12:51 +02:00
Emma Broman
acbf670bc4
Avoid problems with exoplanets names that include whitespaces
2020-08-31 09:18:00 +02:00
Alexander Bock
d0508be631
First commit
2020-08-30 22:00:13 +02:00
