CVS: data/Aircraft/c172p/Models bumpspec-fuselage.eff, NONE, 1.1 bumpspec-tail.eff, NONE, 1.1 bumpspec-wing.eff, NONE, 1.1 c172p.xml, 1.40, 1.41

Update of /var/cvs/FlightGear-0.9/data/Aircraft/c172p/Models
In directory baron.flightgear.org:/tmp/cvs-serv15641/Models

Modified Files:
	c172p.xml 
Added Files:
	bumpspec-fuselage.eff bumpspec-tail.eff bumpspec-wing.eff 
Log Message:
Add normal-map effect to c172p, including update to paintkit to allow
easy modification.


--- NEW FILE "bumpspec-fuselage.eff" ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Bump and specular effect -->
<PropertyList>
  <name>Aircraft/c172p/Models/Effects/bumpspec-fuselage</name>
  <inherits-from>Effects/bumpspec</inherits-from>
  <parameters>
    <texture n="2">
      <image>Aircraft/c172p/Models/Liveries/fuselage-normal.png</image>
      <filter>linear-mipmap-linear</filter>
      <wrap-s>repeat</wrap-s>
      <wrap-t>repeat</wrap-t>
      <internal-format>normalized</internal-format>
    </texture>
  </parameters>
</PropertyList>
--- NEW FILE "bumpspec-tail.eff" ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Bump and specular effect -->
<PropertyList>
  <name>Aircraft/c172p/Models/Effects/bumpspec-tail</name>
  <inherits-from>Effects/bumpspec</inherits-from>
  <parameters>
    <texture n="2">
      <image>Aircraft/c172p/Models/Liveries/tail-normal.png</image>
      <filter>linear-mipmap-linear</filter>
      <wrap-s>repeat</wrap-s>
      <wrap-t>repeat</wrap-t>
      <internal-format>normalized</internal-format>
    </texture>
  </parameters>
</PropertyList>
--- NEW FILE "bumpspec-wing.eff" ---
<?xml version="1.0" encoding="utf-8"?>
<!-- Bump and specular effect -->
<PropertyList>
  <name>Aircraft/c172p/Models/Effects/bumpspec-wing</name>
  <inherits-from>Effects/bumpspec</inherits-from>
  <parameters>
    <texture n="2">
      <image>Aircraft/c172p/Models/Liveries/wing-normal.png</image>
      <filter>linear-mipmap-linear</filter>
      <wrap-s>repeat</wrap-s>
      <wrap-t>repeat</wrap-t>
      <internal-format>normalized</internal-format>
    </texture>
  </parameters>
</PropertyList>
Index: c172p.xml
===================================================================
RCS file: /var/cvs/FlightGear-0.9/data/Aircraft/c172p/Models/c172p.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- c172p.xml	9 Dec 2009 14:43:33 -0000	1.40
+++ c172p.xml	7 Apr 2010 23:07:47 -0000	1.41
@@ -7,8 +7,34 @@
    <pitch-deg>-3.0</pitch-deg>  
    <z-m> -0.065 </z-m>
  </offsets>
+ 
+ <!-- Normal shader effect. Separate effects required for each normal map texture -->
+
+ <effect>
+    <inherits-from>Aircraft/c172p/Models/Effects/bumpspec-wing</inherits-from>
+    <object-name>wing_1</object-name>
+    <object-name>flaps</object-name>
+    <object-name>rightaileron</object-name>
+    <object-name>leftaileron</object-name>
+
+ </effect>
+ 
+ <effect>
+    <inherits-from>Aircraft/c172p/Models/Effects/bumpspec-fuselage</inherits-from>
+    <object-name>fuselage_1</object-name>
+ </effect>
+ 
+  <effect>
+    <inherits-from>Aircraft/c172p/Models/Effects/bumpspec-tail</inherits-from>
+    <object-name>vstab</object-name>
+    <object-name>rudder_1</object-name>
+    <object-name>hstab</object-name>
+    <object-name>elevatorleft</object-name>
+    <object-name>elevatorright</object-name>
+ </effect>
+
 
- <nasal>
+  <nasal>
    <load>
      var livery_update = aircraft.livery_update.new(
      "Aircraft/c172p/Models/Liveries", 10,


------------------------------------------------------------------------------
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