Commit Graph

49 Commits

Author SHA1 Message Date
Alexander Bock fff6f8a627 General pass for code cleanup 2024-03-08 00:36:54 +01:00
Alexander Bock 6e29d898cf Update copyright header 2024-02-06 15:53:24 +01:00
Malin E 71caf31f02 Small clean up 2023-04-13 11:27:11 +02:00
Malin E 6d8f7b2fbd Handle override RenderBins from asset files 2023-04-13 10:59:23 +02:00
Malin E 184a8b59ac Fix hole cutting or side by side stereo
* And disable face culling for Orion model that is a one sided plane
2023-03-08 11:49:55 +01:00
Malin E a3b5300684 Update model shader example shaders 2023-03-08 10:24:26 +01:00
Malin E 98836e5393 Fix manual depth test hole cutting 2023-03-03 08:44:13 +01:00
Malin E 896ca0f108 Make debug texture prettier 2023-03-01 17:33:26 +01:00
Malin E bae8bbef3a Clean up some shader code 2023-02-22 14:50:55 +01:00
Malin E f6eac4f0c7 Take back manual depth test for the two pass model rendering 2023-02-21 18:08:38 +01:00
Malin E 7d2f781603 Only render with a two pass solution if the model is not opague 2023-02-08 14:14:59 +01:00
Malin E 14edda9e61 Remove problematic manual depth test code 2023-02-01 16:25:19 +01:00
Malin E f490fccee6 Merge branch 'master' into feature/model-opacity
* Solve conflicts in ghoul, renderablemodel.cpp and iss.asset
2023-02-01 14:52:33 +01:00
Alexander Bock 4f4764209f Happy new year 2023-01-02 11:19:33 +01:00
Malin E 560c58e499 Add manual depth test between models 2022-12-07 14:19:12 +01:00
Malin E 2cd09de2fa Fix support for transparent models 2022-11-14 10:27:20 +01:00
Malin E 77beb4c3af WIP First attempt at a solution 2022-09-14 14:36:33 +02:00
Alexander Bock c1252902c7 More Code Cleanup (#2192)
* Harmonizing ( and ) in function calls
* static const -> constexpr
* Fix compile issue
* Unify shader tab size
* Add _fs and _vs to shaders
* Harmonize spacing
2022-07-26 11:22:41 +02:00
Alexander Bock d7d279ea16 Happy new year 2022-01-01 12:32:55 +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
Malin Ejdbo 22d0c947c7 Remove numbering of textures in model shader and update ghoul 2021-01-12 16:24:40 +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
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01: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 33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04: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
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
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
Jonathas Costa 95e0cf478d Added support to G-Buffer. (#532) 2018-02-26 21:11:22 -05:00
Alexander Bock dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock cedd8adf0d Remove const qualifier from shaders as it causes shaders to not compile on Mac 2017-08-03 12:05:58 -04:00
Alexander Bock 19f8e30813 Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
2017-07-27 00:22:17 -04:00
Alexander Bock 77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock 88265a469d Cleanup of shader code 2017-07-19 01:27:01 -04:00
Alexander Bock e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Alexander Bock 35636890da Various fixes for the New Horizons scene
- Fix transparency issue making the New Horizons module invisible
  - Fix the offsets of the instruments on board New Horizons
  - Fix the missing projections occurred by switching the radius specifications from PSC to regular coordinates
  - Update the accurate kernel usage
2017-07-14 18:53:40 -04:00
Alexander Bock 94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Kalle Bladin 6b9358f975 Update path to consider line fade and create proper bounding sphere for renderable model. 2016-08-09 19:59:51 -04:00
Kalle Bladin 4e0bbe2da0 Solve bug that cause some vertices to be misplaced in MultiModelGeometry and calculate MVP matrix for renderable model in double precision 2016-08-02 19:14:52 -04:00
Kalle 5883d75047 Update render function in renderable model to avoid precision errors and remove psc dependency. 2016-07-22 17:05:34 -04:00
Alexander Bock 906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock f266f0bcee Updated copyright header 2016-02-05 22:47:37 +01:00
Emil Axelsson d4ff8119d1 refactor abuffer and add msaa support. volumes temporarily disabled. 2016-02-02 11:30:27 +01:00
Alexander Bock ca7dcd4762 Move shaders into their correct modules
Add path determination to modules that automatically sets correct path resolve tokens
2015-05-21 15:17:38 +02:00