mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-18 03:20:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
8,025 Commits 84 Branches 46 Tags
2eecb08bcf0d89cf02a5eac5ffe5f00ae5be623d
Commit Graph

169 Commits

Author SHA1 Message Date
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
Alexander Bock
157c653afc Moved the volume.asset from customization to scene/milkyway/milkyway/volume.asset 
Make the Galaxy volume a default
Small changes here and there
 2019-08-23 16:36:43 +02:00
Jonathas Costa
805401c409 Testing... 2019-08-22 11:18:21 -04:00
Jonathas Costa
5c65801bd9 Testing new AA algorithm for current lines. 2019-08-20 23:03:49 -04:00
Jonathas Costa
33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
Jonathas Costa
3a0b5f0c15 Changed rendering order back for orbits and other improvements. 2019-08-01 12:20:36 -04:00
Jonathas Costa
a6b90991b2 Merging Master 2019-07-22 16:47:58 -04:00
Jonathas Costa
6b5ce52173 Merged master. It broke the bloom filter. 2019-06-19 20:47:37 -04:00
Emil Axelsson
50ff2d96d2 Cleanup for Spheres and PSC (#827) 
* Fade fixes
  * Clean up RenderableSphere. Add orientation properties.
  * Sane defaults for Digital Universe
  * Clean up New Horizons related code
  * Add basic scene
  * Add ability to initialize rotation as quaternion and mat3
  * Adapt legacy code to new Renderable interface
 2019-04-24 13:34:49 +02:00
Emil Axelsson
e78121febc Feature/screenspace renderables (#830) 
* Add ability to position screen space renderables in 3D
  * Independent face camera setting
  * More intuitive local rotation
  * Cleanup
  * Introduce global and master rotation. Remove DisableSceneOnMaster. Revisit screenspace renderables.
 2019-04-24 13:34:01 +02:00
Alexander Bock
bb3db7ada7 Feature/jenkins fix (#816) 
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
 2019-03-24 11:19:39 +01:00
Jonathas Costa
88ad250c85 Copied changes from old HDR branch to new one. 2019-01-10 14:17:29 -05:00
Emil Axelsson
1632c09af3 Coordinate Axes 
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
 2018-11-13 08:09:14 -05:00
Emil Axelsson
6007f1d70d Feature/model lighting (#670) 
* Fix NH texture and add lighting options
* Add missing comma
* Light sources: work in progress.
* Add light sources
* Remove unused values
* Add types to documentation
* Add light sources to various missions
* Code cleanup based on review
 2018-07-13 09:01:43 +02:00
Alexander Bock
a881eef156 Cleanup in Renderers 2018-04-22 09:15:42 +00:00
Jonathas Costa
d5af5aab5d Fixed interaction of trail points with ATM. (#602) 
* Fixed interaction of trail points with ATM.
* Added fix from SunEarh day.
 2018-04-20 22:47:17 -04:00
Jonathas Costa
206ff69e41 Fixed normals. (#553) 2018-03-14 13:18:19 -04:00
Alexander Bock
737e82584a Issue/24 (#549) 
* Implemented property animation mechanism
 * Added easing functions to Ghoul and make them usable in animation
 * Make sure that we don't leave properties around if SceneGraphNodes are deleted
 * Adding opacity settings to base renderables
 2018-03-13 10:35:10 -04:00