bugfix
Signed-off-by: Vivian Meazza <vivian.meazza@lineone.net>
This commit is contained in:
Vivian Meazza
parent
86f9ffac79
commit
8a8e229e21
1 changed files with 250 additions and 176 deletions
|
|
@ -78,14 +78,26 @@
|
||||||
<pass>
|
<pass>
|
||||||
<lighting>true</lighting>
|
<lighting>true</lighting>
|
||||||
<material>
|
<material>
|
||||||
<ambient><use>material/ambient</use></ambient>
|
<ambient>
|
||||||
<diffuse><use>material/diffuse</use></diffuse>
|
<use>material/ambient</use>
|
||||||
<specular><use>material/specular</use></specular>
|
</ambient>
|
||||||
<emissive><use>material/emissive</use></emissive>
|
<diffuse>
|
||||||
<shininess><use>material/shininess</use></shininess>
|
<use>material/diffuse</use>
|
||||||
|
</diffuse>
|
||||||
|
<specular>
|
||||||
|
<use>material/specular</use>
|
||||||
|
</specular>
|
||||||
|
<emissive>
|
||||||
|
<use>material/emissive</use>
|
||||||
|
</emissive>
|
||||||
|
<shininess>
|
||||||
|
<use>material/shininess</use>
|
||||||
|
</shininess>
|
||||||
<color-mode>ambient-and-diffuse</color-mode>
|
<color-mode>ambient-and-diffuse</color-mode>
|
||||||
</material>
|
</material>
|
||||||
<alpha-test><use>transparent</use></alpha-test>
|
<alpha-test>
|
||||||
|
<use>transparent</use>
|
||||||
|
</alpha-test>
|
||||||
<shade-model>smooth</shade-model>
|
<shade-model>smooth</shade-model>
|
||||||
<cull-face>back</cull-face>
|
<cull-face>back</cull-face>
|
||||||
<render-bin>
|
<render-bin>
|
||||||
|
|
@ -94,18 +106,27 @@
|
||||||
</render-bin>
|
</render-bin>
|
||||||
<texture-unit>
|
<texture-unit>
|
||||||
<unit>0</unit>
|
<unit>0</unit>
|
||||||
<image><use>texture[0]/image</use></image>
|
<image>
|
||||||
<filter><use>texture[0]/filter</use></filter>
|
<use>texture[0]/image</use>
|
||||||
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
|
</image>
|
||||||
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
|
<filter>
|
||||||
|
<use>texture[0]/filter</use>
|
||||||
|
</filter>
|
||||||
|
<wrap-s>
|
||||||
|
<use>texture[0]/wrap-s</use>
|
||||||
|
</wrap-s>
|
||||||
|
<wrap-t>
|
||||||
|
<use>texture[0]/wrap-t</use>
|
||||||
|
</wrap-t>
|
||||||
<internal-format>
|
<internal-format>
|
||||||
<use>texture[0]/internal-format</use>
|
<use>texture[0]/internal-format</use>
|
||||||
</internal-format>
|
</internal-format>
|
||||||
</texture-unit>
|
</texture-unit>
|
||||||
<program>
|
<program>
|
||||||
<vertex-shader>Shaders/include_fog.vert</vertex-shader>
|
<vertex-shader n="0">Shaders/include_fog.vert</vertex-shader>
|
||||||
<vertex-shader>Shaders/default.vert</vertex-shader>
|
<vertex-shader n="1">Shaders/default.vert</vertex-shader>
|
||||||
<fragment-shader>Shaders/terrain-nocolor.frag</fragment-shader>
|
<vertex-shader n="0">Shaders/include_fog.frag</vertex-shader>
|
||||||
|
<fragment-shader n="1">Shaders/terrain-nocolor.frag</fragment-shader>
|
||||||
</program>
|
</program>
|
||||||
<uniform>
|
<uniform>
|
||||||
<name>texture</name>
|
<name>texture</name>
|
||||||
|
|
@ -117,27 +138,53 @@
|
||||||
<pass>
|
<pass>
|
||||||
<lighting>true</lighting>
|
<lighting>true</lighting>
|
||||||
<material>
|
<material>
|
||||||
<ambient><use>material/ambient</use></ambient>
|
<ambient>
|
||||||
<diffuse><use>material/diffuse</use></diffuse>
|
<use>material/ambient</use>
|
||||||
<specular><use>material/specular</use></specular>
|
</ambient>
|
||||||
<emissive><use>material/emissive</use></emissive>
|
<diffuse>
|
||||||
<shininess><use>material/shininess</use></shininess>
|
<use>material/diffuse</use>
|
||||||
|
</diffuse>
|
||||||
|
<specular>
|
||||||
|
<use>material/specular</use>
|
||||||
|
</specular>
|
||||||
|
<emissive>
|
||||||
|
<use>material/emissive</use>
|
||||||
|
</emissive>
|
||||||
|
<shininess>
|
||||||
|
<use>material/shininess</use>
|
||||||
|
</shininess>
|
||||||
<color-mode>ambient-and-diffuse</color-mode>
|
<color-mode>ambient-and-diffuse</color-mode>
|
||||||
</material>
|
</material>
|
||||||
<blend><use>transparent</use></blend>
|
<blend>
|
||||||
<alpha-test><use>transparent</use></alpha-test>
|
<use>transparent</use>
|
||||||
|
</blend>
|
||||||
|
<alpha-test>
|
||||||
|
<use>transparent</use>
|
||||||
|
</alpha-test>
|
||||||
<shade-model>smooth</shade-model>
|
<shade-model>smooth</shade-model>
|
||||||
<cull-face>back</cull-face>
|
<cull-face>back</cull-face>
|
||||||
<render-bin>
|
<render-bin>
|
||||||
<bin-number><use>render-bin/bin-number</use></bin-number>
|
<bin-number>
|
||||||
<bin-name><use>render-bin/bin-name</use></bin-name>
|
<use>render-bin/bin-number</use>
|
||||||
|
</bin-number>
|
||||||
|
<bin-name>
|
||||||
|
<use>render-bin/bin-name</use>
|
||||||
|
</bin-name>
|
||||||
</render-bin>
|
</render-bin>
|
||||||
<texture-unit>
|
<texture-unit>
|
||||||
<unit>0</unit>
|
<unit>0</unit>
|
||||||
<image><use>texture[0]/image</use></image>
|
<image>
|
||||||
<filter><use>texture[0]/filter</use></filter>
|
<use>texture[0]/image</use>
|
||||||
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
|
</image>
|
||||||
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
|
<filter>
|
||||||
|
<use>texture[0]/filter</use>
|
||||||
|
</filter>
|
||||||
|
<wrap-s>
|
||||||
|
<use>texture[0]/wrap-s</use>
|
||||||
|
</wrap-s>
|
||||||
|
<wrap-t>
|
||||||
|
<use>texture[0]/wrap-t</use>
|
||||||
|
</wrap-t>
|
||||||
<internal-format>
|
<internal-format>
|
||||||
<use>texture[0]/internal-format</use>
|
<use>texture[0]/internal-format</use>
|
||||||
</internal-format>
|
</internal-format>
|
||||||
|
|
@ -198,7 +245,8 @@
|
||||||
<uniform>
|
<uniform>
|
||||||
<name>colorMode</name>
|
<name>colorMode</name>
|
||||||
<type>int</type>
|
<type>int</type>
|
||||||
<value>2</value> <!-- AMBIENT_AND_DIFFUSE -->
|
<value>2</value>
|
||||||
|
<!-- AMBIENT_AND_DIFFUSE -->
|
||||||
</uniform>
|
</uniform>
|
||||||
<depth>
|
<depth>
|
||||||
<function>lequal</function>
|
<function>lequal</function>
|
||||||
|
|
@ -210,27 +258,53 @@
|
||||||
<pass>
|
<pass>
|
||||||
<lighting>true</lighting>
|
<lighting>true</lighting>
|
||||||
<material>
|
<material>
|
||||||
<ambient><use>material/ambient</use></ambient>
|
<ambient>
|
||||||
<diffuse><use>material/diffuse</use></diffuse>
|
<use>material/ambient</use>
|
||||||
<specular><use>material/specular</use></specular>
|
</ambient>
|
||||||
<emissive><use>material/emissive</use></emissive>
|
<diffuse>
|
||||||
<shininess><use>material/shininess</use></shininess>
|
<use>material/diffuse</use>
|
||||||
|
</diffuse>
|
||||||
|
<specular>
|
||||||
|
<use>material/specular</use>
|
||||||
|
</specular>
|
||||||
|
<emissive>
|
||||||
|
<use>material/emissive</use>
|
||||||
|
</emissive>
|
||||||
|
<shininess>
|
||||||
|
<use>material/shininess</use>
|
||||||
|
</shininess>
|
||||||
<color-mode>ambient-and-diffuse</color-mode>
|
<color-mode>ambient-and-diffuse</color-mode>
|
||||||
</material>
|
</material>
|
||||||
<blend><use>transparent</use></blend>
|
<blend>
|
||||||
<alpha-test><use>transparent</use></alpha-test>
|
<use>transparent</use>
|
||||||
|
</blend>
|
||||||
|
<alpha-test>
|
||||||
|
<use>transparent</use>
|
||||||
|
</alpha-test>
|
||||||
<shade-model>smooth</shade-model>
|
<shade-model>smooth</shade-model>
|
||||||
<cull-face>back</cull-face>
|
<cull-face>back</cull-face>
|
||||||
<render-bin>
|
<render-bin>
|
||||||
<bin-number><use>render-bin/bin-number</use></bin-number>
|
<bin-number>
|
||||||
<bin-name><use>render-bin/bin-name</use></bin-name>
|
<use>render-bin/bin-number</use>
|
||||||
|
</bin-number>
|
||||||
|
<bin-name>
|
||||||
|
<use>render-bin/bin-name</use>
|
||||||
|
</bin-name>
|
||||||
</render-bin>
|
</render-bin>
|
||||||
<texture-unit>
|
<texture-unit>
|
||||||
<unit>0</unit>
|
<unit>0</unit>
|
||||||
<image><use>texture[0]/image</use></image>
|
<image>
|
||||||
<filter><use>texture[0]/filter</use></filter>
|
<use>texture[0]/image</use>
|
||||||
<wrap-s><use>texture[0]/wrap-s</use></wrap-s>
|
</image>
|
||||||
<wrap-t><use>texture[0]/wrap-t</use></wrap-t>
|
<filter>
|
||||||
|
<use>texture[0]/filter</use>
|
||||||
|
</filter>
|
||||||
|
<wrap-s>
|
||||||
|
<use>texture[0]/wrap-s</use>
|
||||||
|
</wrap-s>
|
||||||
|
<wrap-t>
|
||||||
|
<use>texture[0]/wrap-t</use>
|
||||||
|
</wrap-t>
|
||||||
<internal-format>
|
<internal-format>
|
||||||
<use>texture[0]/internal-format</use>
|
<use>texture[0]/internal-format</use>
|
||||||
</internal-format>
|
</internal-format>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue