From 0ab60a4b3cc09b9d1e67a36f6c96afd88c5004b1 Mon Sep 17 00:00:00 2001 From: Vivian Meazza <vivian.meazza@lineone.net> Date: Sat, 3 Dec 2011 23:53:29 +0000 Subject: [PATCH 1/3] Add wintree .dds textures Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net> --- materials-dds.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/materials-dds.xml b/materials-dds.xml index 0198fc0a7..6de58d94d 100644 --- a/materials-dds.xml +++ b/materials-dds.xml @@ -2575,7 +2575,7 @@ Shared parameters for various materials. <shininess>1.2</shininess> <light-coverage>20000000.0</light-coverage> <wood-coverage>8000.0</wood-coverage> - <tree-texture>Textures.high/Trees/mixed-shrub-winter.png</tree-texture> + <tree-texture>Textures/Trees/mixed-shrub-winter.png</tree-texture> <tree-varieties>8</tree-varieties> <tree-range-m alias="/params/forest/tree-range-m"/> <tree-height-m>2.0</tree-height-m> From 3b9bea6609f5267e2e707ed8121040d8368d670f Mon Sep 17 00:00:00 2001 From: Vivian Meazza <vivian.meazza@lineone.net> Date: Sun, 4 Dec 2011 17:42:07 +0000 Subject: [PATCH 2/3] Make default renderbin 0 Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net> --- Effects/model-combined.eff | 39 +++++++++++++++++++++++++++----------- 1 file changed, 28 insertions(+), 11 deletions(-) diff --git a/Effects/model-combined.eff b/Effects/model-combined.eff index d59134df4..b32db1096 100644 --- a/Effects/model-combined.eff +++ b/Effects/model-combined.eff @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Reflections + Bumpmapping + specular + Lightmap +<!-- Reflections + Bumpmapping + specular+Lightmap please see Docs/README.model-combined.eff for documentation --> <PropertyList> @@ -92,13 +92,16 @@ please see Docs/README.model-combined.eff for documentation <ambient_correction type="float">0.05</ambient_correction> <!-- quality slider --> <shader_quality type="int">2</shader_quality> - <!--<use>/sim/rendering/shaders/model/quality</use> - </shader_quality>--> - <vertex-program-two-side type="bool">false</vertex-program-two-side> - <cull-face>back</cull-face> + <!--<use>/sim/rendering/shaders/model</use> + </quality>--> + <rendering-hint>opaque</rendering-hint> + <transparent>false</transparent> + <render-bin> + <bin-number>1</bin-number> + <bin-name>RenderBin</bin-name> + </render-bin> <!-- INTERNAL USE --> - <rendering-hint>transparent</rendering-hint> - <shade-model>smooth</shade-model> + <shade-model>smooth</shade-model> <model_hdg> <use>orientation/model/heading-deg</use> </model_hdg> @@ -128,7 +131,6 @@ please see Docs/README.model-combined.eff for documentation <use>/sim/rendering/scattering-shader</use> </fogtype> <!-- END fog include --> - </parameters> <!--<generate> @@ -194,15 +196,26 @@ please see Docs/README.model-combined.eff for documentation <shade-model> <use>shade-model</use> </shade-model> - <vertex-program-two-side> - <use>vertex-program-two-side</use> - </vertex-program-two-side> <cull-face> <use>cull-face</use> </cull-face> <rendering-hint> <use>rendering-hint</use> </rendering-hint> + <blend> + <use>transparent</use> + </blend> + <alpha-test> + <use>transparent</use> + </alpha-test> + <render-bin> + <bin-number> + <use>render-bin/bin-number</use> + </bin-number> + <bin-name> + <use>render-bin/bin-name</use> + </bin-name> + </render-bin> <!-- Diffuse texture unit--> <texture-unit> <unit>0</unit> @@ -338,6 +351,10 @@ please see Docs/README.model-combined.eff for documentation <type>noise</type> </texture-unit> + <vertex-program-two-side> + <use>vertex-program-two-side</use> + </vertex-program-two-side> + <program> <vertex-shader n="0">Shaders/include_fog.vert</vertex-shader> <vertex-shader n="1">Shaders/ubershader.vert</vertex-shader> From 4464a74f2ab7996010f5d9921dc4c912456746e5 Mon Sep 17 00:00:00 2001 From: Vivian Meazza <vivian.meazza@lineone.net> Date: Sun, 4 Dec 2011 20:51:33 +0000 Subject: [PATCH 3/3] Merge branch 'master' of gitorious.org:fg/fgdata into work