Fixed material levels of quality more.

Added AO to dock prop.

This was SVN commit r12414.

binaries/data/mods/public/art/actors/props/structures/romans/dock.xml

@@ -4,8 +4,11 @@
   <group>
     <variant frequency="1" name="Base">
       <mesh>props/rome_dock_1.dae</mesh>
-      <textures><texture file="props/wood_c.png" name="baseTex"/></textures>
+      <textures>
+	    <texture file="props/wood_c.png" name="baseTex"/>
+	    <texture file="props/ao/rome_dock_1.png" name="aoTex"/>
+	  </textures>
     </variant>
   </group>
-  <material>player_trans.xml</material>
+  <material>player_trans_ao.xml</material>
 </actor>

binaries/data/mods/public/art/actors/structures/romans/dock.xml

@@ -6,7 +6,6 @@
       <mesh>structural/rome_dock.dae</mesh>
       <props>
         <prop actor="props/structures/romans/dock.xml" attachpoint="root"/>
-        <prop actor=""/>
       </props>
       <textures>
 	    <texture file="structural/rome_struct_2.png" name="baseTex"/>

binaries/data/mods/public/art/materials/basic_trans_ao.xml

@@ -4,30 +4,13 @@
     <alpha_blending/>
     <define name="USE_TRANSPARENT" value="1"/>
     <alternative material="basic_trans.xml" quality="2"/>
-    <alternative material="alphatest.xml" if="CFG_FORCE_ALPHATEST"/>
-    
-    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
-		   provide a specular colour multiplier. 
-		   Material must provide a uniform definition for "specularPower" that controls
-		   the glossiness of the effect.
-	 COMMENT: The intensity of the colour controls the specular amount, so black pixels have
-		  no specularity. 
-	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
-	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
-    <define name="USE_SPECULAR_MAP" value="1"/>
-    
-    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
-		   The Alpha channel of the texture defines the amount of self-illumination, with 
-		   transparency being no self-illumination.
-	 COMMENT: Full self-illumination means the screen colour of a pixel is equal to its baseTex value.
-	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
-    <define name="USE_SELF_LIGHT" value="1"/>
-    
+    <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+
     <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
                    The model must provide a second, non-overlapping set of UV coordinates.
 	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    <define name="USE_AO" value="0"/>
-    
+    <define name="USE_AO" value="1"/>
+
     <!-- Settings for effects above:
          First value: Normal mapping intensity.
 	 Second value: Specular power.

binaries/data/mods/public/art/materials/basic_trans_ao_parallax_spec.xml

@@ -39,7 +39,7 @@
     <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
                    The model must provide a second, non-overlapping set of UV coordinates.
 	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    <define name="USE_AO" value="0"/>
+    <define name="USE_AO" value="1"/>
     
     <!-- Settings for effects above:
          First value: Normal mapping intensity.

binaries/data/mods/public/art/materials/basic_trans_ao_spec.xml

@@ -5,7 +5,7 @@
     <define name="USE_TRANSPARENT" value="1"/>
     <alternative material="basic_trans_ao.xml" quality="3"/>
     <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
-    
+
     <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
 		   provide a specular colour multiplier. 
 		   Material must provide a uniform definition for "specularPower" that controls
@@ -15,19 +15,19 @@
 	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
 	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
     <define name="USE_SPECULAR_MAP" value="1"/>
-    
+
     <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
 		   The Alpha channel of the texture defines the amount of self-illumination, with 
 		   transparency being no self-illumination.
 	 COMMENT: Full self-illumination means the screen colour of a pixel is equal to its baseTex value.
 	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
     <define name="USE_SELF_LIGHT" value="1"/>
-    
+
     <!-- REQUIRES: Actor must provide a texture named "aoTex", where the R channel is the Ambient Occlusion.
                    The model must provide a second, non-overlapping set of UV coordinates.
 	 COMMENT: The texture is combined using a multiply blend of (2 * ao * baseTex). -->
-    <define name="USE_AO" value="0"/>
-    
+    <define name="USE_AO" value="1"/>
+
     <!-- Settings for effects above:
          First value: Normal mapping intensity.
 	 Second value: Specular power.

binaries/data/mods/public/art/materials/basic_trans_parallax_spec.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<material>
+    <shader effect="model_transparent"/>
+    <alpha_blending/>
+    <define name="USE_TRANSPARENT" value="1"/>
+    <alternative material="basic_trans_spec.xml" quality="8"/>
+    <alternative material="alphatest_ao_parallax_spec.xml" if="CFG_FORCE_ALPHATEST"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "normTex", where the Alpha channel
+                   is the heightmap (white = high). 
+         COMMENT: Pixels that are exactly white are calculated more efficiently (on average) 
+		  if dynamic branching is supported by the player's GPU.
+	 EFFICIENCY: This is a moderately expensive effect, so use with care. -->
+    <conditional_define name="USE_PARALLAX_MAP" value="1" type="draw_range" conf="PARALLAX_DIST"/>
+    <conditional_define name="USE_HQ_PARALLAX" value="1" type="draw_range" conf="PARALLAX_HQ_DIST"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "normTex", where the RGB channels
+		   are a normal map corresponding to XYZ normals.
+	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
+    <define name="USE_NORMAL_MAP" value="1"/>
+    
+    <!-- REQUIRES: Actor must provide a texture named "specTex", where the RGB channels
+		   provide a specular colour multiplier. 
+		   Material must provide a uniform definition for "specularPower" that controls
+		   the glossiness of the effect.
+	 COMMENT: The intensity of the colour controls the specular amount, so black pixels have
+		  no specularity. 
+	 COMPATIBILITY: This effect is incompatible with the old "USE_SPECULAR" effect.
+	 EFFICIENCY: This is a relatively inexpensive effect that should run easily on most hardware. -->
+    <define name="USE_SPECULAR_MAP" value="1"/>
+    
+    <!-- REQUIRES: That "USE_SPECULAR_MAP" is enabled and a texture named "specTex" is provided by the Actor.
+		   The Alpha channel of the texture defines the amount of self-illumination, with 
+		   transparency being no self-illumination.
+	 COMMENT: Full self-illumination means the screen colour of a pixel is equal to its baseTex value.
+	 EFFICIENCY: This is a very cheap effect, however it also requires the calculation of specular. -->
+    <define name="USE_SELF_LIGHT" value="1"/>
+    
+    <!-- Settings for effects above:
+         First value: Normal mapping intensity.
+	 Second value: Specular power.
+	 Third value: Parallax scale.
+	 Fourth value: AO amount. -->
+    <uniform name="effectSettings" value="1.0 50.0 0.0075 0.85"/>
+</material>