Doum and Nipa palms, Normal maps and specmaps for the new trees

This was SVN commit r22141.

binaries/data/mods/public/art/actors/flora/trees/bamboo.xml

@@ -8,6 +8,8 @@
       </props>
       <textures>
         <texture file="gaia/bamboo_1.png" name="baseTex"/>
+        <texture file="gaia/bamboo_1_norm.png" name="normTex"/>
+        <texture file="gaia/bamboo_1_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -19,5 +21,5 @@
       <mesh>gaia/bamboo_2.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/bamboo_single.xml

@@ -5,6 +5,8 @@
     <variant name="base">
       <textures>
         <texture file="gaia/bamboo_1.png" name="baseTex"/>
+        <texture file="gaia/bamboo_1_norm.png" name="normTex"/>
+        <texture file="gaia/bamboo_1_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -19,5 +21,5 @@
       <mesh>gaia/bamboo_single_3.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/banyan.xml

@@ -10,6 +10,8 @@
       </props>
       <textures>
         <texture file="gaia/banyan_trunk_1.png" name="baseTex"/>
+        <texture file="gaia/banyan_trunk_1_norm.png" name="normTex"/>
+        <texture file="gaia/banyan_trunk_1_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -21,5 +23,5 @@
       <mesh>gaia/banyan_2_trunk.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/banyan_leaves.xml

@@ -1,6 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <actor version="1">
   <castshadow/>
+  <group>
+    <variant name="base">
+      <textures>
+        <texture file="gaia/banyan_leaves_1_norm.png" name="normTex"/>
+        <texture file="gaia/banyan_leaves_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
   <group>
     <variant name="a">
       <textures>
@@ -16,5 +24,5 @@
       <mesh>gaia/banyan_2_leaves.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new.xml

@@ -11,6 +11,8 @@
       </props>
       <textures>
         <texture file="gaia/tree_baobab_trunk.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_trunk_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_trunk_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -25,5 +27,5 @@
       <mesh>gaia/baobab_3_trunk.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_branches.xml

@@ -5,6 +5,8 @@
     <variant frequency="1" name="base">
       <textures>
         <texture file="gaia/tree_baobab_dead.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_dead_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -22,5 +24,5 @@
       <mesh>gaia/baobab_1_branches_dead.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_dead.xml

@@ -8,6 +8,8 @@
       </props>
       <textures>
         <texture file="gaia/tree_baobab_trunk.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_trunk_spec.png" name="specTex"/>
+        <texture file="gaia/tree_baobab_trunk_norm.png" name="normTex"/>
       </textures>
     </variant>
   </group>
@@ -19,5 +21,5 @@
       <mesh>gaia/baobab_3_trunk.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_leaves.xml

@@ -8,16 +8,22 @@
     <variant frequency="4" name="a">
       <textures>
         <texture file="gaia/tree_baobab.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="b">
       <textures>
         <texture file="gaia/tree_baobab_thin.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_thin_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_thin_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="c">
       <textures>
         <texture file="gaia/tree_baobab_sparse.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_sparse_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_sparse_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -32,5 +38,5 @@
       <mesh>gaia/baobab_3_leaves.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_leaves_dead.xml

@@ -5,6 +5,8 @@
     <variant frequency="1" name="base">
       <textures>
         <texture file="gaia/tree_baobab_dead.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_dead_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -13,5 +15,5 @@
       <mesh>gaia/baobab_1_leaves.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_sapling.xml

@@ -8,6 +8,8 @@
       </props>
       <textures>
         <texture file="gaia/tree_baobab_trunk.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_trunk_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_trunk_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -16,5 +18,5 @@
       <mesh>gaia/baobab_sapling_1_trunk.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_sapling_leaves.xml

@@ -8,16 +8,22 @@
     <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/tree_baobab.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="b">
       <textures>
         <texture file="gaia/tree_baobab_thin.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_thin_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_thin_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="c">
       <textures>
         <texture file="gaia/tree_baobab_sparse.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_sparse_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_sparse_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -26,5 +32,5 @@
       <mesh>gaia/baobab_sapling_1_leaves.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_young.xml

@@ -10,6 +10,8 @@
       </props>
       <textures>
         <texture file="gaia/tree_baobab_trunk.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_trunk_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_trunk_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -21,5 +23,5 @@
       <mesh>gaia/baobab_young_2_trunk.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_young_branches.xml

@@ -5,6 +5,8 @@
     <variant frequency="1" name="base">
       <textures>
         <texture file="gaia/tree_baobab_dead.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_dead_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -16,5 +18,5 @@
       <mesh>gaia/baobab_young_2_branches.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/baobab_new_young_leaves.xml

@@ -8,16 +8,22 @@
     <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/tree_baobab.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="3" name="b">
       <textures>
         <texture file="gaia/tree_baobab_thin.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_thin_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_thin_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="c">
       <textures>
         <texture file="gaia/tree_baobab_sparse.png" name="baseTex"/>
+        <texture file="gaia/tree_baobab_sparse_norm.png" name="normTex"/>
+        <texture file="gaia/tree_baobab_sparse_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -29,5 +35,5 @@
       <mesh>gaia/baobab_young_2_leaves.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/cedar_atlas.xml

@@ -13,11 +13,15 @@
     <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/cedar_atlas_1.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_1_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="1" name="b">
       <textures>
         <texture file="gaia/cedar_atlas_2.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_2_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_2_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -32,5 +36,5 @@
       <mesh>gaia/cedar_atlas_3.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/cedar_atlas_dead.xml

@@ -12,6 +12,8 @@
     <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/cedar_atlas_dead.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_dead_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -26,5 +28,5 @@
       <mesh>gaia/cedar_atlas_3.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/cedar_atlas_deadbranches.xml

@@ -5,6 +5,8 @@
     <variant frequency="100" name="Base">
       <textures>
         <texture file="gaia/cedar_atlas_dead.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_dead_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -19,5 +21,5 @@
       <mesh>gaia/cedar_atlas_3_dead.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/cedar_atlas_sapling.xml

@@ -8,6 +8,8 @@
     <variant frequency="1" name="b">
       <textures>
         <texture file="gaia/cedar_atlas_2.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_2_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_2_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -16,5 +18,5 @@
       <mesh>gaia/cedar_atlas_sapling_1.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/cedar_atlas_young.xml

@@ -13,11 +13,15 @@
     <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/cedar_atlas_1.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_1_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant frequency="2" name="b">
       <textures>
         <texture file="gaia/cedar_atlas_2.png" name="baseTex"/>
+        <texture file="gaia/cedar_atlas_2_norm.png" name="normTex"/>
+        <texture file="gaia/cedar_atlas_2_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -32,5 +36,5 @@
       <mesh>gaia/cedar_atlas_young_3.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/mangrove.xml

@@ -9,6 +9,8 @@
       </props>
       <textures>
         <texture file="gaia/mangrove_roots_1.png" name="baseTex"/>
+        <texture file="gaia/mangrove_roots_1_norm.png" name="normTex"/>
+        <texture file="gaia/mangrove_roots_1_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant name="b">
@@ -17,6 +19,8 @@
       </props>
       <textures>
         <texture file="gaia/mangrove_roots_2.png" name="baseTex"/>
+        <texture file="gaia/mangrove_roots_2_norm.png" name="normTex"/>
+        <texture file="gaia/mangrove_roots_2_spec.png" name="specTex"/>
       </textures>
     </variant>
     <variant name="c">
@@ -25,6 +29,8 @@
       </props>
       <textures>
         <texture file="gaia/mangrove_roots_3.png" name="baseTex"/>
+        <texture file="gaia/mangrove_roots_3_norm.png" name="normTex"/>
+        <texture file="gaia/mangrove_roots_3_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -36,5 +42,5 @@
       <mesh>gaia/mangrove_2_stilts.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/mangrove_leaves.xml

@@ -2,17 +2,25 @@
 <actor version="1">
   <castshadow/>
   <group>
-    <variant name="a">
+    <variant frequency="100" name="base">
+      <textures>
+        <texture file="gaia/mangrove_norm.png" name="normTex"/>
+        <texture file="gaia/mangrove_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="a">
       <textures>
         <texture file="gaia/mangrove_1.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="b">
+    <variant frequency="1" name="b">
       <textures>
         <texture file="gaia/mangrove_2.png" name="baseTex"/>
       </textures>
     </variant>
-    <variant name="c">
+    <variant frequency="1" name="c">
       <textures>
         <texture file="gaia/mangrove_3.png" name="baseTex"/>
       </textures>
@@ -26,5 +34,5 @@
       <mesh>gaia/mangrove_2_leaves.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/palm_doum.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <group>
+    <variant frequency="3" name="base">
+      <textures>
+        <texture file="gaia/palm_doum_1.png" name="baseTex"/>
+        <texture file="gaia/palm_doum_1_norm.png" name="normTex"/>
+        <texture file="gaia/palm_doum_1_spec.png" name="specTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="3" name="1">
+      <mesh>gaia/palm_doum_1.dae</mesh>
+    </variant>
+    <variant frequency="1" name="2">
+      <mesh>gaia/palm_doum_2.dae</mesh>
+    </variant>
+  </group>
+  <material>trans_wind_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/flora/trees/palm_nipa.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<actor version="1">
+  <castshadow/>
+  <float/>
+  <group>
+    <variant frequency="1" name="base">
+      <textures>
+        <texture file="gaia/palm_nipa_spec.png" name="specTex"/>
+        <texture file="gaia/palm_nipa_norm.png" name="normTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="3" name="a">
+      <textures>
+        <texture file="gaia/palm_nipa_1.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="2" name="b">
+      <textures>
+        <texture file="gaia/palm_nipa_2.png" name="baseTex"/>
+      </textures>
+    </variant>
+    <variant frequency="1" name="c">
+      <textures>
+        <texture file="gaia/palm_nipa_3.png" name="baseTex"/>
+      </textures>
+    </variant>
+  </group>
+  <group>
+    <variant frequency="1" name="1">
+      <mesh>gaia/palm_nipa_1.dae</mesh>
+    </variant>
+    <variant frequency="3" name="2">
+      <mesh>gaia/palm_nipa_2.dae</mesh>
+    </variant>
+  </group>
+  <material>trans_wind_parallax_spec.xml</material>
+</actor>

binaries/data/mods/public/art/actors/flora/trees/pine_black.xml

@@ -7,6 +7,10 @@
         <prop actor="flora/trees/pine_black_deadbranches.xml" attachpoint="root"/>
         <prop actor="props/flora/decal_pine.xml" attachpoint="root"/>
       </props>
+      <textures>
+        <texture file="gaia/blackpine_norm.png" name="normTex"/>
+        <texture file="gaia/blackpine_spec.png" name="specTex"/>
+      </textures>
     </variant>
   </group>
   <group>
@@ -37,5 +41,5 @@
       <mesh>gaia/pine_black_3_live.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/pine_black_dead.xml

@@ -5,6 +5,8 @@
     <variant frequency="100" name="Base">
       <textures>
         <texture file="gaia/blackpine_dead.png" name="baseTex"/>
+        <texture file="gaia/blackpine_dead_norm.png" name="normTex"/>
+        <texture file="gaia/blackpine_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -19,5 +21,5 @@
       <mesh>gaia/pine_black_3_live.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/art/actors/flora/trees/pine_black_deadbranches.xml

@@ -5,6 +5,8 @@
     <variant frequency="100" name="Base">
       <textures>
         <texture file="gaia/blackpine_dead.png" name="baseTex"/>
+        <texture file="gaia/blackpine_dead_norm.png" name="normTex"/>
+        <texture file="gaia/blackpine_dead_spec.png" name="specTex"/>
       </textures>
     </variant>
   </group>
@@ -19,5 +21,5 @@
       <mesh>gaia/pine_black_3_dead.dae</mesh>
     </variant>
   </group>
-  <material>basic_trans_wind.xml</material>
+  <material>trans_wind_parallax_spec.xml</material>
 </actor>

binaries/data/mods/public/simulation/templates/gaia/flora_tree_palm_doum.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Entity parent="template_gaia_flora_tree">
+  <Identity>
+    <SpecificName>Doum Palm</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>flora/trees/palm_doum.xml</Actor>
+  </VisualActor>
+</Entity>