fly/fgdata
1
0
Fork 0
Code Activity
7075 commits 7 branches 0 tags 4.4 GiB
Commit graph

380 commits

Author SHA1 Message Date
Stuart Buchanan
08243eb083 Speculative fix for shader cast issue on Mac. 2013-05-31 19:50:57 +01:00
Stuart Buchanan
3929e8d091 Use square tree textures with reduce UV coordinates. 2013-05-19 21:30:20 +01:00
Stuart Buchanan
1e09cf85ef Use step function rather than cast of boolean expression. 2013-05-13 22:59:25 +01:00
Stuart Buchanan
613db9668f Fix warning on some GPUs. 2013-05-10 20:20:08 +01:00
Stuart Buchanan
5689d76dca Change tree texture format from a 8x4 block to 32x1 to avoid UV bleeding problems. 2013-05-10 20:04:18 +01:00
Vivian Meazza
f025dd3e32 Tidy up formatting after reinstating Rainbow effect 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-04-28 09:27:38 +01:00
Vivian Meazza
8509e4acba Consolidate Fresnel and rainbow look-up textures. Reinstate Rainbow effect in ALS shader 
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2013-04-26 20:18:46 +01:00
Thorsten Renk
f62550e115 Optional overlay texture for models 2013-04-22 11:32:28 +03:00
Thorsten Renk
cea50f52ed Proper wetness effect on runway and airfield green dependent on quality level 2013-04-22 10:41:44 +03:00
Thorsten Renk
c877c8b4e5 3d noise based fog and deeper shadows for lower quality terrain, urban and water shaders 2013-04-22 10:02:14 +03:00
Stuart Buchanan
266313486d Add dynamic selection of tree texture based on season and snow level. 
All tree texture sheets now contain 4 different texture sets for
different conditions.  See Docs/README.materials for details.

Also retire the -summer and -winter variants of tree textures, which
are now redundant.
 2013-04-20 21:09:03 +01:00
Thorsten Renk
4817183507 Isotropic lighting for trees in Atmospheric Light Scattering 2013-04-16 12:48:54 +03:00
Thorsten Renk
df35c11af2 Packice overlay and water color variations for high quality water shader in Atmospheric Light Scattering 2013-04-15 14:29:04 +03:00
Thorsten Renk
402d75a602 Deeper shadows and fog/snow continuity across terrain tiles for highest quality level terrain shader of Atmospheric Light Scattering 2013-04-15 14:00:22 +03:00
Thorsten Renk
2c6a962a34 Modified cloud lighting with dependence on air pollution 2013-04-09 09:52:19 +03:00
Thorsten Renk
f2ebbbbc70 Updates to Advanced Weather and cloud shaders - better support for low visibility conditions, improved framerates for Thunderstorm scenario 2013-03-01 09:40:05 +02:00
Thorsten Renk
9ffb8a3d52 'The Flag' for Atmospheric Light Scattering 2013-03-01 09:11:10 +02:00
Thorsten Renk
2d2a5eb3be Replaced hard fogging near field cutoff by a sliding cutoff 2013-02-25 14:11:40 +02:00
Thorsten Renk
deba78c4da Autumn colors by pixel postprocessing with color rotation encoded in the terrain texture alpha channel, used for Atmospheric Light Scattering 2013-02-11 14:01:31 +02:00
Thorsten Renk
930b3d4fd5 Configurable parameter support for detailed terrain shader quality level 2013-02-06 15:13:25 +02:00
Thorsten Renk
97349a17ef Bugfix for water flickering problem in Atmospheric Light Scattering 2013-02-06 13:48:45 +02:00
Thorsten Renk
0ee1a1053e Bugfix for airport grass shader 2013-02-04 15:19:58 +02:00
Thorsten Renk
4426b4a301 Bugfix for lower quality water shader in Atmospheric Light Scattering 2013-02-04 14:52:14 +02:00
Emilian Huminiuc
65e2b97c26 Sync with the other versions of the ubershader. 
Remove useless forward declaration of fog_Func.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2013-02-01 13:22:14 +02: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
Thorsten Renk
15f85a6a89 Reduced flickering for airport grass shader 2013-01-25 14:50:04 +02:00
Thorsten Renk
c948d93444 Indonesia regional texturing definitions 2013-01-21 14:05:05 +02:00
Thorsten Renk
c1157b762a The ultra-terrain shader 2013-01-21 13:57:18 +02:00
Emilian Huminiuc
d098796d46 use world coordinates for noise texture lookup 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2013-01-17 11:51:23 +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
4c4df3401e Do not render cloudlets on the back half of the cloud at ranges 
of > 10km.  50% performance improvements seen under overcast conditions.
 2012-12-16 22:20:23 +00:00
Stuart Buchanan
024f7494e4 Discard cloud fragments with a transparency >98% 2012-12-16 22:16:16 +00:00
Thorsten Renk
f4c828c4de Yet more bugfixes 2012-12-14 15:27:26 +02:00
Thorsten Renk
4d10e77226 Atmospheric Light Scattering shader bugfixes 2012-12-14 14:31:08 +02:00
Thorsten Renk
8bcc21263f Runway effect with bumpmap and snow for Atmospheric Light Scattering 2012-12-13 12:17:51 +02:00
Thorsten Renk
35f63578ac Improvements for the hires grass texture effect 2012-12-12 15:03:55 +02:00
Stuart Buchanan
cb1ce70688 Increase opacity of clouds, discard transparent fragments. 2012-12-05 21:37:16 +00:00
Stuart Buchanan
6d9168150d Fix random buildings after latest procedural texture changes. 2012-12-05 20:31:50 +00:00
Thorsten Renk
ed80612c98 Atmospheric Light Scattering update 2012-12-05 20:31:27 +00:00
Stuart Buchanan
d722d98164 Fix urban shader, broken by 9e8735c64996614174d2d86526f258f44bacd7c4 2012-12-01 20:51:30 +00:00
Thorsten Renk
3c1ee0527b Shader updates 2012-10-06 21:13:50 +01:00
Emilian Huminiuc
6e8f1b7fee Restore the foam to the Rembrandt water shader 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-10-06 14:14:27 +03:00
Stuart Buchanan
65dbc4cc0b Remove hardcoded maximum snow level. Now configured via Environment Settings. 2012-10-05 22:13:24 +01: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
efe52f4bf9 ubershader: fix reflection under Rembrandt 
model-combined & model-combined-deferred effects: improve Rembrandt behaviour, and provide better effects for transparent
surfaces under Rembrandt.

This change breaks current effects using normalmaps when inheriting from model-combined-deferred under
Rembrandt.
Aircraft developers please change the technique numbers in the "normalmap include" part of your effects file from
<technique n="8"> to <technique n="7"> (again, only if inheriting from model-combined-deferred, and using normalmaps)

Effects inheriting from model-combined do not neeed any adaptation.

Sorry for the nuisance caused by this change.

Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-09-09 13:54:07 +03:00
Emilian Huminiuc
cc770cecb7 restore transition.frag that got broken 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-20 13:42:16 +03:00
Vivian Meazza
b3922c08c1 Merge branch 'master' of D:\Git_New\fgdata 2012-08-19 21:55:51 +01:00
Emilian Huminiuc
7d883b3db1 ubershader: reenable ambient-correction under Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-19 23:40:32 +03:00
Vivian Meazza
d09a45837f Merge branch 'master' of D:\Git_New\fgdata 
Conflicts:
	Shaders/transition.frag

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
 2012-08-14 00:06:15 +01:00
Emilian Huminiuc
00c352f235 Hopefuly fix yet another weird behaviour on ATI gpus (take two) 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-13 23:58:12 +01:00
Emilian Huminiuc
56d84d24da Hopefuly fix yet another weird behaviour on ATI gpus 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-08-13 16:50:03 +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
Frederic Bouvier
c20b4b1fbb No code change - Improve readability by reindenting files 2012-08-08 09:03:00 +02:00
Thorsten Renk
9be134b34d Procedural Texturing 2012-08-07 09:01:14 +02:00
Frederic Bouvier
ddfe61e323 Preserve film grain aspect ratio 2012-08-06 10:27:29 +01:00
Frederic Bouvier
52ae094a94 Add film wear to the cinema postprocessing effects 2012-08-06 10:27:21 +01:00
Frederic Bouvier
4a71f7a16d Get rid of unsigned int and 'invalid operation' at after RenderBin::Draw(..) 2012-08-06 10:27:17 +01:00
Frederic Bouvier
8e6ed31b94 Add lateral chromatic aberration (purple/green fringe) to the cinema postprocessing effects (Rembrandt) 2012-08-06 10:27:03 +01:00
Frederic Bouvier
5ebabff309 Make vignetting and distortion play nice together 2012-08-06 10:26:59 +01:00
Frederic Bouvier
5907f9469d Add radial lens distortion to the cinema postprocessing effects (Rembrandt) 2012-08-06 10:26:55 +01:00
Frederic Bouvier
5627a4e8f8 Cinema effects in the Rembrandt framework 2012-08-05 00:08:27 +01:00
Frederic Bouvier
6013f3360e Night vision post processing effect in Rembrandt 2012-08-05 00:08:23 +01:00
Stuart Buchanan
0e14a09698 Add rotation of trees, and fix issue 825 2012-07-31 21:44:38 +01:00
Emilian Huminiuc
e67d04ead9 Cleanup some implicit casts 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-31 21:40:15 +03:00
Stuart Buchanan
0604e3975b Add an additional random rotation to trees so the quads are not 
all oriented N/S and E/W, helping to disguise the limited set of
textures used.
 2012-07-24 22:12:11 +01:00
Frederic Bouvier
d9d6255107 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt - forgotten shaders 2012-07-22 19:53:27 +02:00
Emilian Huminiuc
05e3eb80f4 Make the other sunlight shaders recognize water matId. 
Remove duplicate fogFunc line in runway.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-19 22:08:35 +03: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
Frederic Bouvier
3ac767a974 SSAO: Special case for ATI owners 2012-07-14 11:48:08 +02:00
Frederic Bouvier
48c9664e83 Remove unnecessary unsigned keyword and dependancy on GL_EXT_gpu_shader4 extension 2012-07-13 19:32:31 +02:00
Emilian Huminiuc
6a992c65d6 Fix overdark runway in rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 18:47:19 +03:00
Emilian Huminiuc
fb58a3211f some tweaks to runway shader 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-13 17:53:00 +03:00
Frederic Bouvier
129eefcc3e Improve light reflections on water 2012-07-13 14:46:31 +02:00
Frederic Bouvier
fd4f42da0f Fix 'Phong distortion' artifact on specular lighting and shininess factor on additional lights in Rembrandt 2012-07-12 00:31:22 +02:00
Frederic Bouvier
d06e249f16 Fix 'Phong distortion' artifact on specular lighting and disappearing emission (due to undefined pow(0,0) called) in Rembrandt 2012-07-11 23:59:10 +02:00
Emilian Huminiuc
9d49f9643f Make water-inland.eff Rembrandt compatible. 
Fix a longstanding ati bug in transition.frag
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-08 15:58:42 +03:00
Stuart Buchanan
ab21e069f7 Correct atmospheric scattering for trees, where we were applying ambient lighting twice, making them too dark, and not using an alpha test. 
Also fix the tropical trees, where only half the texture was defined.
 2012-07-02 23:27:44 +01:00
Emilian Huminiuc
8174ea8593 More transition.frag cleanups 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-02 23:34:00 +03:00
Emilian Huminiuc
a31dfa779e Cleanup a bit the transition shaders 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-02 23:17:17 +03:00
Emilian Huminiuc
a76a84d287 fix runway shader normals in Rembrandt. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-07-01 23:20:02 +03:00
Stuart Buchanan
145a759fb8 Add support for atmospheric scattering to the random vegetation shader. 2012-06-30 00:38:14 +01:00
Emilian Huminiuc
8fa569e77f make transition effect Rembrandt compatible. 
Note: this is the transition effect used by the materials-dds.xml
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-28 23:43:08 +03:00
Emilian Huminiuc
c001b6d679 transition.frag: fix shading 
ubershader.frag: fix ambient
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-28 14:37:45 +03:00
Frederic Bouvier
59e0f41283 Get rid of TexGen magic and do the projective texturing for shadow mapping ourself 2012-06-27 21:04:51 +02:00
Frederic Bouvier
4e241640b6 Add a bloom strength property and a slider in the Rembrandt dialog 2012-06-26 09:02:21 +02:00
Emilian Huminiuc
f6b74fc128 Add material ID to provide increased specular effect in Rembrandt for water and ubershader. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-26 02:18:00 +03:00
Emilian Huminiuc
ce18b24ba9 fix water specular with Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-25 21:15:32 +03:00
Emilian Huminiuc
eeefbc596b Fix wrong water-gbuffer.frag from previous commit 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-24 20:37:34 +03:00
Emilian Huminiuc
174f40d52b Adapt water shader to Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-24 20:18:46 +03:00
Emilian Huminiuc
333d70aeca Make runway shader work with Rembrandt 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-23 23:13:49 +03:00
Emilian Huminiuc
42e4428f8d adapt water_lightfield shader to the previous changes 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-16 21:27:59 +03:00
Emilian Huminiuc
6ef4f5eca0 Make water efect use png textures by default, and rely on their dds counterparts only when using the dds materials file. 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-06-16 18:57:14 +03:00
Flightgear Development
23536748f7 Terrain haze bugfixes 2012-06-11 20:23:31 +02:00
Frederic Bouvier
1932ddb014 Allow to select debugged buffers in Rembrandt 2012-05-18 12:42:34 +02:00
Frederic Bouvier
58c5a389ce Allow to adjust ambient occlusion strength 2012-05-18 09:00:48 +02:00
Emilian Huminiuc
e21807bb33 formatting cleanup 
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
 2012-05-17 20:16:29 +03:00
Frederic Bouvier
41ff7da797 Show bloom buffer 2012-05-12 23:38:40 +02:00
Frederic Bouvier
be5a51ec5d Bloom effect for the Rembrandt renderer 2012-05-12 13:06:45 +02:00