CVS: data/Effects landmass.eff,1.4,1.5

Update of /var/cvs/FlightGear-0.9/data/Effects
In directory baron.flightgear.org:/tmp/cvs-serv21631/Effects

Modified Files:
	landmass.eff 
Log Message:
Add relief mapping to landmass effect

Index: landmass.eff
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Effects/landmass.eff,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- landmass.eff	27 Mar 2010 14:02:57 -0000	1.4
+++ landmass.eff	28 Mar 2010 17:00:19 -0000	1.5
@@ -3,8 +3,19 @@
   <name>Effects/landmass</name>
   <inherits-from>Effects/terrain-default</inherits-from>
   <parameters>
+    <texture n="2">
+      <image>Textures.high/Terrain/forest-relief.png</image>
+      <filter>linear-mipmap-linear</filter>
+      <wrap-s>repeat</wrap-s>
+      <wrap-t>repeat</wrap-t>
+      <internal-format>normalized</internal-format>
+    </texture>
     <snow-level><use>/sim/rendering/snow-level-m</use></snow-level>
   </parameters>
+  <generate>
+    <tangent type="int">6</tangent>
+    <binormal type="int">7</binormal>
+  </generate>
   <technique n="9">
     <predicate>
       <and>
@@ -46,17 +57,35 @@
       </texture-unit>
       <texture-unit>
         <unit>1</unit>
-          <image><use>texture[0]/image</use></image>
-          <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>
-            <use>texture[0]/internal-format</use>
-          </internal-format>
+        <image><use>texture[0]/image</use></image>
+        <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>
+          <use>texture[0]/internal-format</use>
+        </internal-format>
+      </texture-unit>
+      <texture-unit>
+        <unit>2</unit>
+        <image><use>texture[2]/image</use></image>
+        <filter><use>texture[2]/filter</use></filter>
+        <wrap-s><use>texture[2]/wrap-s</use></wrap-s>
+        <wrap-t><use>texture[2]/wrap-t</use></wrap-t>
+        <internal-format>
+          <use>texture[2]/internal-format</use>
+        </internal-format>
       </texture-unit>
       <program>
         <vertex-shader>Shaders/landmass.vert</vertex-shader>
         <fragment-shader>Shaders/landmass.frag</fragment-shader>
+        <attribute>
+          <name>tangent</name>
+          <index>6</index>
+        </attribute>
+        <attribute>
+          <name>binormal</name>
+          <index>7</index>
+        </attribute>
       </program>
       <uniform>
         <name>NoiseTex</name>
@@ -69,10 +98,20 @@
         <value type="int">1</value>
       </uniform>
       <uniform>
+        <name>NormalTex</name>
+        <type>sampler-2d</type>
+        <value type="int">2</value>
+      </uniform>
+      <uniform>
+        <name>depth_factor</name>
+        <type>float</type>
+        <value type="float">0.01</value>
+      </uniform>
+      <uniform>
         <name>snowlevel</name>
         <type>float</type>
         <value type="float">
-           <use>snow-level</use>
+          <use>snow-level</use>
         </value>
       </uniform>
     </pass>


------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev