1
0
Fork 0
Commit graph

7400 commits

Author SHA1 Message Date
Alexis Bory
76880701bb Merge branch 'work' 2012-06-03 22:52:50 +02:00
Frederic Bouvier
be6c2e3fc6 Disable stereoscopic options in Rembrandt 2012-06-03 16:19:10 +02:00
Alexis Bory
4235f2baef Merge branch 'work' 2012-06-03 14:09:53 +02:00
Alexis Bory
4e9044040d Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-06-03 13:45:23 +02:00
Olivier JACQ
759f72f8f9 French Translation update
File format update
2012-05-29 16:08:43 +02:00
Vivian Meazza
ce77e04690 Revert "add Model movement"
This reverts commit 7b8be5146ed2225828525a51a6167232a33e16b0.

Too soon!

Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-28 10:59:35 +01:00
Vivian Meazza
ddef6248be Merge branch 'master' of D:\Git_New\fgdata 2012-05-28 09:37:36 +01:00
Stuart Buchanan
d18371b6e3 Ensure that each texture referred to in the base, default and region material.xml file exists under the Textures directory, by generating appropriate 256x256 png textures from the Textures.high/ directory. 2012-05-27 22:54:04 +01:00
Vivian Meazza
ee9fef9472 add Model movement
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-27 22:08:34 +01:00
Stuart Buchanan
268b4566d7 Further masks and material updates for regional textures.
- Masks for European Urban, and Asian Rice
- Change tree types to deciduous for Urban/Town and reduce size to match buildings.
2012-05-27 22:04:53 +01:00
Stuart Buchanan
e456bc9daa Tiled images and object masks for regional materials. 2012-05-26 00:11:33 +01:00
BARANGER Emmanuel
a889baf9a2 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-05-25 23:23:34 +02:00
Vivian Meazza
1ce58917f0 Merge branch 'master' into work 2012-05-20 22:27:00 +01:00
Anders Gidenstam
24d9e19cd8 Nasal/string.nas: Corrected a misspelled variable name. 2012-05-20 22:50:59 +02:00
Frederic Bouvier
eea2f89080 Fix menubar 2012-05-18 12:53:33 +02:00
Frederic Bouvier
e27aa0c4d9 Add another digit to ambient occlusion strength 2012-05-18 12:43:28 +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
Alexis Bory
e3adea046f Merge branch 'work' 2012-05-17 16:19:08 +02:00
James Turner
898b3769d3 Add default FlightPlan delegate for the route-manager. 2012-05-15 17:51:48 +01:00
Frederic Bouvier
d98dc36c93 Use the new configuration options to describe the lighting stage of the default rendering pipeline of the Rembrandt renderer 2012-05-13 19:02:23 +02: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
ThorstenB
1480f8622f UFO: add optional GPWS for testing 2012-05-12 23:50:46 +02:00
Frederic Bouvier
41ff7da797 Show bloom buffer 2012-05-12 23:38:40 +02:00
Stuart Buchanan
8fa093ce76 Add flags for bloom and ambient occlusion to Rendering Dialog. 2012-05-12 22:02:04 +01:00
Frederic Bouvier
df915f823f Restore default for normal buffer (8 bit) 2012-05-12 18:27:51 +02:00
Frederic Bouvier
a00ac78d6e Implement /sim/rendering/rembrandt/use-color-for-depth in default pipeline 2012-05-12 13:31:32 +02:00
Frederic Bouvier
be5a51ec5d Bloom effect for the Rembrandt renderer 2012-05-12 13:06:45 +02:00
Frederic Bouvier
2163651c43 Avoid duplication of fullscreen vertex shader 2012-05-12 11:47:18 +02:00
Frederic Bouvier
1a5cc682a9 Add condition on ambient occlusion and a menu item to switch it on and off if the stage is enabled in the pipeline 2012-05-12 09:20:13 +02:00
Frederic Bouvier
7d573e3292 Remove user archive from renderer 2012-05-12 09:20:11 +02:00
Frederic Bouvier
961219a091 Add ambient occlusion to default pipeline 2012-05-12 09:20:09 +02:00
Frederic Bouvier
140263d611 Screen space ambient occlusion effect 2012-05-12 09:20:07 +02:00
Frederic Bouvier
c5732c38ba Generic blur effect 2012-05-12 09:20:05 +02:00
Frederic Bouvier
5cfca250b1 rename /sim/rendering/rembrandt -> /sim/rendering/rembrandt/enabled
and put rembrandt-related properties in /sim/rendering/rembrandt/
2012-05-12 09:20:04 +02:00
Frederic Bouvier
17740f9cf7 First round of changes toward a programmable rendering pipeline.
Stages are predefined for now.
2012-05-12 09:20:01 +02:00
Frederic Bouvier
37df6a3ec1 Syntax change for deferred buffers 2012-05-12 09:19:59 +02:00
Frederic Bouvier
754339b264 Syntax change for deferred buffers 2012-05-12 09:19:58 +02:00
BARANGER Emmanuel
ae32a82e18 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-05-11 18:13:22 +02:00
Christian Schmitt
ddea904dcb Remove old signs material 2012-05-11 11:10:40 +02:00
Emilian Huminiuc
626d758f30 Add texture and material definition for casing on 3d Taxiway signs.
Signed-off-by: Emilian Huminiuc <emilianh@gmail.com>
2012-05-11 11:51:34 +03:00
Stuart Buchanan
76b0a99ab5 Building mask for european town texture, and increase in tree density. 2012-05-10 23:05:06 +01:00
James Turner
3389049325 Switch route-manager to use Nasal APIs for more commands.
Airways routing is now driven via Nasal.
2012-05-09 00:23:54 +01:00
syd
465ff76b27 Merge commit 'refs/merge-requests/147' of git://gitorious.org/fg/fgdata into merge-requests/147 2012-05-08 13:04:40 -06:00
Flightgear Development
4a735b4b47 Regional textures 1.0 2012-05-07 20:04:16 +01:00
Vivian Meazza
bf2c6cb859 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-05-07 19:13:01 +01:00
Vivian Meazza
f0d21c1f60 Optimisation and tidying
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
2012-05-07 19:11:34 +01:00
BARANGER Emmanuel
7b20bf2d04 Merge branch 'master' of git://gitorious.org/fg/fgdata 2012-05-07 18:55:44 +02:00
Vivian Meazza
15af3ae0a9 Merge branch 'master' of gitorious.org:fg/fgdata into work 2012-05-07 17:47:43 +01:00