1
0
Fork 0
Commit graph

286 commits

Author SHA1 Message Date
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