ElonOlsson
423d854615
Merge branch 'master' into thesis/2020/radiation
2021-09-13 18:23:33 -04:00
ElonOlsson
505215964a
more pr comments fixed
2021-09-10 17:11:44 -04:00
Alexander Bock
b649509bf0
Feature/model shader ( #1723 )
...
* Add support for RenderableModel to take custom shader code
* Added example to highlight usage
2021-08-24 10:45:19 +02:00
ElonOlsson
743e2452f8
merge master to thesis branch
2021-08-16 15:23:49 -04:00
Alexander Bock
309bce2e30
Fix DebugAxis helper; Increase the sensitivity to prevent loss of color in debug axis ( closes #1560 )
2021-07-28 14:49:29 +02:00
ElonOlsson
7689cf1f65
master merge
2021-06-16 18:22:57 -04:00
Malin Ejdbo
9f7b8aa32b
Merge branch 'master' into feature/jwst
...
* Resolve conflict
2021-05-31 15:45:10 +02:00
Malin Ejdbo
31b834dbb2
Address PR comments
2021-05-31 15:34:54 +02:00
Alexander Bock
744ba0dc9b
Feature/side by side ( #1613 )
...
* Make atmosphere, raycasting, and trails work with side_by_side stereo
2021-05-28 23:31:10 +02:00
ElonOlsson
d96f12396f
merge + codegen doc return
2021-05-26 11:00:50 -04:00
Malin Ejdbo
4202b21ebc
Merge branch 'master' into feature/jwst
...
* Resolve conflicts
2021-05-26 14:21:10 +02:00
Alexander Bock
c3ba532bdb
Feature/cleanup ( #1608 )
...
* Revert screenlog back to showing Info and above messages
* Various code cleanup
2021-05-25 14:08:33 +02:00
ElonOlsson
fcc690fa09
master merge + seed point files from directory fix
2021-05-18 12:00:53 -04:00
ElonOlsson
9d1ece1163
finish merge + manual time offset property
2021-05-12 15:37:22 -04:00
Malin Ejdbo
0ae8849adf
Merge branch 'master' into feature/jwst
2021-05-12 09:34:52 +02:00
Alexander Bock
09e28ff49e
Enable Screenspace renderable to have a multiplicative color; Add new asset to show a target marker ( closes #85 ); Fix bug with wrong documentation shown in RenderablePlane
2021-05-08 18:08:56 +02:00
Malin Ejdbo
19c845b422
Add initial version of RenderablePrism
2021-05-07 16:53:13 +02:00
ElonOlsson
4f67a649b9
mirror backside parameter of renderableplane, renamed renderabletimevaryingplaneimagelocal to renderableplanetimevaryingimage. mm.
2021-03-12 12:27:01 -05:00
Malin Ejdbo
775d9751dd
Apply mesh transform in shader including normals and tangents
...
* Update Ghoul
* Loading several models have not yet been updated and will not work with
this commit
2021-03-09 11:26:37 +01:00
Malin Ejdbo
4fb8a36952
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Emma Broman
97144df4da
Add a colored glare to exoplanet stars ( #1511 )
...
* Add possibility to multiply color to an image plane
* Add a colored glare to exoplanet stars (issue #1305 )
2021-03-02 09:30:03 +01:00
Malin Ejdbo
f65eaaba4d
Address OpenSpace PR comments
2021-02-05 14:14:13 +01:00
Malin Ejdbo
73fd118ee2
Merge branch 'master' into feature/multitexturing
...
* Resolve conflicts
2021-02-01 11:57:31 +01:00
Emma Broman
ef091a1044
Adress review comments
2021-02-01 11:01:14 +01:00
Emma Broman
10d615cdc8
Update disc rendering to not conflict with atmosphere
2021-01-26 15:09:23 +01:00
Emma Broman
76d599d284
Add a basic disc renderable
2021-01-26 15:08:37 +01:00
Malin Ejdbo
22d0c947c7
Remove numbering of textures in model shader and update ghoul
2021-01-12 16:24:40 +01:00
Alexander Bock
29a76c7d33
Coding style pass on shader code
2021-01-02 21:11:13 +01:00
Alexander Bock
7004c02b86
Happy new year
2021-01-02 15:26:51 +01:00
Jonathas Costa
3fbefa5324
Feature/orion changes ( #1359 )
...
* Changed RenderableModel to allow user-control depth and blending.
* Updated RenderableModel to correctly handle the Orion Nebula model.
Co-authored-by: Alexander Bock <mail@alexanderbock.eu >
2020-11-04 13:11:25 +01:00
Jonathas Costa
db4f16f75f
Issue/1223 ( #1358 )
2020-11-04 12:59:42 +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
Emma Broman
cb19f730df
Mixed cleanup
2020-07-10 11:25:26 +02:00
Emma Broman
bdb6e626ba
Color values specified with vec3 instead of vec4
2020-07-10 11:25:26 +02:00
Jonathas Costa
e64f557bb4
Proposed solution.
2020-06-29 15:58:04 -04:00
Jonathas Costa
071bea6b25
Fixed ISS' normals transformation.
2020-06-28 13:08:07 -04:00
Jonathas Costa
4c49cc0fdf
Removed 4-tuple color in favor of 3-tulpe color plus opacity. Changed abs to fabs when needed.
2020-06-08 13:47:47 -04:00
Jonathas Costa
ea72753ea3
Small changes.
2020-06-05 15:51:56 -04:00
Jonathas Costa
fbd83c9e84
Removed hack and fixed SGCT.
2020-06-05 17:15:54 -04:00
Jonathas Costa
2c1035f05d
Temporary solution for precision problems in spherical grids.
2020-05-28 17:01:08 -04:00
Alexander Bock
5e29145395
Coding style cleanup
2020-02-14 19:37:06 +01:00
Alexander Bock
43851899c7
Cleanup of more copyright headers
...
Add debug groups and object names to the OpenGL objects in the framebuffer renderer
2020-02-13 14:59:13 +01:00
Alexander Bock
d8e9db76a3
Update the copyright header to 2020
2020-02-10 21:51:01 +01:00
Jonathas Costa
d2e442203d
Added new shaders and code for Apple's trails lines.
2020-02-03 12:59:29 -05:00
Jonathas Costa
a4352edcf2
Merge branch 'master' into feature/AALines2
2020-01-06 09:43:04 -05:00
Alexander Bock
207db3c824
Remove PowerScaledCoordinates and rename PowerScaledSphere to Sphere ( closes #4 )
2019-12-27 23:29:28 +01:00
Jonathas Costa
8d186fbdfc
Merged master.
2019-12-08 18:52:16 -05:00
liuloppan
386ce8bec6
Feature/nodelines ( #1013 )
...
* Setup line render between Mars and Earth
* Updating property handling
* Precision fix
* Cleanup and making functions and variables private
* Adding linewidth property
* Using opacity property for line color
* Cleanup from review
2019-12-02 15:10:11 +01:00
Jonathas Costa
5708bf8416
New fast AA for lines is working.
2019-08-23 16:56:30 -04:00
Jonathas Costa
ac24a1bb56
Merged master.
2019-08-23 16:29:32 -04:00
