1
0
Fork 0
Commit graph

39 commits

Author SHA1 Message Date
Stuart Buchanan
fc27175690 Reduce shader attribute usage by packing floats
Previously we required 6 shader attributes to pass
in all the required information for the building shader.
By using packing techniques this has been reduced to 4.

This should improve support for integrated graphics cards.
2020-03-26 22:06:21 +00:00
Stuart Buchanan
5a0fc45853 Fix Building share when model shader off. 2020-01-27 13:38:22 +00:00
Stuart Buchanan
119fb5efe2 Random Buildings - improved texture mapping
Previously the front and side faces of random/OSM buildings
had identical texture coordinates.  This resulted in the sides
of buildings texture mapping being squeezed or stretched.

This change generates a separate texture mapping for the sides
of the buildings.
2019-11-23 17:08:04 +00:00
Stuart Buchanan
564e7b31fd Shader buildings multiple roof types
Shader buildings now support different roof types
- flat
- gabled
- hipped
- pyramidal

Primarily for osm2city use.
2019-10-08 21:39:40 +01:00
Stuart Buchanan
87e9118965 Shader buildings - split wall and roof tex index
Previously there was very limited texture variations
as a given texture index was used for both the wall
and ceiling.  Now these can be specified separately,
allowing for more variation in both STG defined and
random buildings.

Requires simgear commit 053bda26a43314a91b01b08cd4617da82f7ab807
2019-09-25 21:56:22 +01:00
Stuart Buchanan
4784a929d7 Instance based random buildings
Replace random buildings with one using proper instancing.
Also implement more control over rendering of random buildings.
see README.scenery for details.
2019-08-20 17:02:27 +01:00
Thorsten Renk
69e8d90247 ALS: Tentative fix for random building fog issue II - fall back to old up-vector computations when building flag is set 2018-02-11 09:46:21 +02:00
Thorsten Renk
662d782f98 Groundwork for ALS g-force blackout filter, WIP 2017-03-03 19:50:13 +02:00
Thorsten Renk
f881091bbb Fix lowest quality building shader bug 2016-11-17 18:58:45 +02:00
Thorsten Renk
8bf55eec3c More work on ALS filter code - noise and vignette for night vision, IR vision work 2016-03-17 14:40:37 +02:00
Emilian Huminiuc
9d7b575a45 Revert Shaders/model-ALS-ultra.frag (ALS ubershader) changes made necessary by the last commit.
Add ALS specific vertex shader for ubershader.vert and buildings-ubershader.vert named model-ALS-ultra.vert and buildings-model-ALS-ultra.vert respectively. This partly reverts 3dc0e641c1 . Aircraft modelers and other consumers need not take any action.
2015-05-14 14:56:04 +02:00
Edward d'Auvergne
39d86a06ea Removal of the unused executable bit from the affected Effects files. 2015-04-29 17:40:43 +02:00
Emilian Huminiuc
3dc0e641c1 Rewrite ubershader reflection. Objects using the dynamic option will now display the reflection properly when affected by a spin/rotate animation. Improved appearance of reflection + normalmap. Normalmap support added to random-buildings when ubershader active.
Also fixes some bugs exposed on AMD GPUs
2015-03-29 13:49:36 +02:00
Thorsten Renk
2c0513816c ALS maintenance - reworked light curves, streamlining, minor bugfixes,... 2014-12-15 15:50:47 +02:00
Clément de l'Hamaide
f6f433529f Revert "UniformFactory: merge current uniform per <name> of effect"
Talking with Emilian about this commit, we came to the conclusion we don't want share uniform between .eff file
This reverts commit 91a6a27f32ee5f79e1d7e0d4570e879a902de58f.
2014-11-16 22:09:41 +01:00
Clément de l'Hamaide
95640a1b6f UniformFactory: merge current uniform per <name> of effect 2014-11-16 20:21:20 +01:00
Thorsten Renk
f8f8e9b709 ALS secondary lights and Rayleigh haze for models, cleanup of naming conventions 2014-10-12 11:13:58 +03:00
Thorsten Renk
20dda77d6f ALS secondary lights and Rayleigh haze for model ubershader and random buildings 2014-10-11 16:12:19 +03:00
Thorsten Renk
a05863e541 Cloud shadows for urban effect/random buildings 2014-03-11 11:53:57 +02:00
Clément de l'Hamaide
cad2dc9e06 Fix missing elements in texture declaration in effects files. Fixes bug #1267 2013-11-18 03:17:58 +01:00
Thorsten Renk
9c95d09f60 Model ubershader for Atmospheric Light Scattering 2013-01-31 14:15:18 +02:00
Thorsten Renk
db546a6fd6 Bugfixes for random building in Atmosperhic Light Scattering 2013-01-30 10:04:27 +02:00
Emilian Huminiuc
72c876aec6 Ubershader fixes
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2013-01-17 11:32:00 +02:00
Stuart Buchanan
6d9168150d Fix random buildings after latest procedural texture changes. 2012-12-05 20:31:50 +00:00
Emilian Huminiuc
b650a0eb51 Make sure shaders are disabled as long as /sim/rendering/shaders/quality-level is 0 or non existing.
This should help those checking out models in fgviewer
To enable effects in fgviewer run it with:
fgviewer --prop /sim/rendering/shaders/quality-level -1
Also fix random buildings not showing up when model shader was set to 0 and generic was enabled.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-11-18 00:39:02 +02:00
Emilian Huminiuc
e184642e87 Adjust reflection strength on random buildings; add and use a new cubemap for the random buildings.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-14 00:12:49 +03:00
Emilian Huminiuc
d1a44f10b7 Restore random buildings reflection.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-14 00:12:05 +03:00
Stuart Buchanan
2f0a1683b7 Improve memory and instantiation time of random buildings. 2012-09-12 22:46:03 +01:00
Emilian Huminiuc
cebf6f4d9c buildings.eff: adapt technique numbering to previous effect changes
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-09-09 15:01:26 +03:00
Stuart Buchanan
4ec24853a8 Create an Environment Settings dialog for non-weather environment settings
such as snow level, dust, wetness, and texture set.

Also add a parameter to control whether the snow level moves with METAR,
and retire /environment/mysnow-level-m.
2012-08-09 22:52:51 +01:00
Emilian Huminiuc
e7dcbcf494 Small fixes and tweaks. Fix ugly black faces paralel to view direction on random buildings.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-16 14:17:16 +03:00
Emilian Huminiuc
4f991859ca tweak random building reflections
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-07-15 00:37:32 +03:00
Stuart Buchanan
2f123b7100 Make random buildings compatible with the atmospheric scattering shader.
Also remove redundant test parameters from the tree effect.
2012-06-30 20:37:08 +01:00
Emilian Huminiuc
0ac64c8506 Effects/building.eff: Fix for random buldings appearing untextured when skydome was enabled.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-13 03:09:27 +03:00
Emilian Huminiuc
22352ec485 Switch building.eff to the ubershader.
Tweak building lightmap to work with ubershader.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-07 02:05:02 +03:00
Frederic Bouvier
7e1ed19307 Put encode_gbuffer in a separate shader to please ATI and/or Mac OSX that doesn't like to have gl_FragData and gl_FragColor in the same program, even if one is never called 2012-05-04 09:34:00 +02:00
Emilian Huminiuc
f26472f614 Remove useless include_fog.vert from some of the effects.
Fis c/p error in ubershader-deferred.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-03 00:01:59 +03:00
Stuart Buchanan
9dbebd3c2d Emissive lighting on random buildings. 2012-05-01 22:36:24 +01:00
Stuart Buchanan
5909285100 Building effect for random buildings. 2012-04-28 23:03:11 +01:00