[Csp-commits] svn:csp r1554 - in trunk/CSP/CSPSim: . Data/XML/theater/balkan Data/XML/theater/balkan/Lightpylon1 Data/XML/theater/balkan/bureau01 Data/XML/theater/balkan/flag01 Data/XML/theater/balkan/hangar Data/XML/theater/balkan/hangar2 Data/XML/theater/balkan/runway Data/XML/theater/balkan/tower1

[<sv...@ww...>]

Author: mkrose
Date: 2005-06-06 19:37:56 -0700 (Mon, 06 Jun 2005)
New Revision: 1554

Modified:
   trunk/CSP/CSPSim/CHANGES.current
   trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/bureau01/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/flag01/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar2/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/objectives.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/runway/model.xml
   trunk/CSP/CSPSim/Data/XML/theater/balkan/tower1/model.xml
Log:
Partially fix depth buffer problem with airbase structures.
The floor of the open hangars will still z-fight with the
terrain.  Probably the best solution would be to create a
separate 3D model for the floor that uses polygon offset.
Another approach would be to add an option to enable polygon
offset without disabling depth writes.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1554

Modified: trunk/CSP/CSPSim/CHANGES.current
===================================================================
--- trunk/CSP/CSPSim/CHANGES.current	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/CHANGES.current	2005-06-07 02:37:56 UTC (rev 1554)
@@ -1,6 +1,14 @@
  Version 0.4.0 (in progress)
 ===========================
 
+2005-06-06: onsight
+ * Partially fix depth buffer problem with airbase structures.
+   The floor of the open hangars will still z-fight with the
+   terrain.  Probably the best solution would be to create a
+   separate 3D model for the floor that uses polygon offset.
+   Another approach would be to add an option to enable polygon
+   offset without disabling depth writes.
+
 2005-06-05: onsight
  * Finally remove screen size globals.  Add screen size hints
    to terrain classes.  Also add an debug config flag to disable

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/Lightpylon1/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,14 +3,7 @@
 <Object class="ObjectModel">
     <External name="model_path">Lightpylon1/Lightpylon1.osg</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0</Vector>
-    <Float name="polygon_offset">-1</Float>
-    <!--Bool name="lighting">false</Bool-->
-    <Float name="scale">1.0</Float>
-    <!--List name="contacts">
-        <Vector>0.0 0.0 0.0</Vector>
-    </List-->
+    <Vector name="axis_1">0 1 0</Vector>
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/bureau01/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/bureau01/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/bureau01/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,14 +3,7 @@
 <Object class="ObjectModel">
     <External name="model_path">bureau01/bureau01.3ds</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0</Vector>
-    <Float name="polygon_offset">-1</Float>
-    <!--Bool name="lighting">false</Bool-->
-    <Float name="scale">1.0</Float>
-    <!--List name="contacts">
-        <Vector>0.0 0.0 0.0</Vector>
-    </List-->
+    <Vector name="axis_1">0 1 0</Vector>
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/flag01/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/flag01/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/flag01/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,15 +3,8 @@
 <Object class="ObjectModel">
     <External name="model_path">flag01/flag01.osg</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0.0</Vector>
-    <Float name="polygon_offset">-1</Float>
-    <Bool name="lighting">true</Bool>
+    <Vector name="axis_1">0 1 0</Vector>
     <!--Int name="cull_face">1</Int-->
-    <Float name="scale">1.0</Float>
-    <!--List name="contacts">
-        <Vector>0.0 0.0 0.0</Vector>
-    </List-->
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,11 +3,8 @@
 <Object class="ObjectModel">
     <External name="model_path">Hangar/hangar01.3ds</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0</Vector>
-    <Float name="polygon_offset">-1</Float>
+    <Vector name="axis_1">0 1 0</Vector>
     <Int name="cull_face">0</Int>
-    <Float name="scale">1.0</Float>
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar2/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar2/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/hangar2/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,15 +3,7 @@
 <Object class="ObjectModel">
     <External name="model_path">hangar02/hangar02.3ds</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0.0</Vector>
-    <Float name="polygon_offset">-1</Float>
-    <Bool name="lighting">true</Bool>
-    <!--Int name="cull_face">1</Int-->
-    <Float name="scale">1.0</Float>
-    <!--List name="contacts">
-        <Vector>0.0 0.0 0.0</Vector>
-    </List-->
+    <Vector name="axis_1">0 1 0</Vector>
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/objectives.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/objectives.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/objectives.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -8,10 +8,9 @@
 			 test objects must be updated to use simdata
 			 LLA tags before they can be added back	into
 			 the theater.  -->
-		<Object	class="Objective">
+		<Object class="Objective">
 			<Path name="model">airbase</Path>
 			<LLA name="position">41.54 15.65 0.0</LLA>
-			<!--LLA	name="position">41.521 15.655 0.0</LLA-->
 			<Float name="orientation">0</Float>
 			<Int name="strategic_value_modifier">0</Int>
 		</Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/runway/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/runway/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/runway/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,11 +3,9 @@
 <Object class="ObjectModel">
     <External name="model_path">Runway/runway.3ds</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0</Vector>
+    <Vector name="axis_1">0 1 0</Vector>
     <Float name="polygon_offset">-20</Float>
     <Int name="cull_face">0</Int>
-    <Float name="scale">1.0</Float>
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>

Modified: trunk/CSP/CSPSim/Data/XML/theater/balkan/tower1/model.xml
===================================================================
--- trunk/CSP/CSPSim/Data/XML/theater/balkan/tower1/model.xml	2005-06-06 07:07:16 UTC (rev 1553)
+++ trunk/CSP/CSPSim/Data/XML/theater/balkan/tower1/model.xml	2005-06-07 02:37:56 UTC (rev 1554)
@@ -3,15 +3,7 @@
 <Object class="ObjectModel">
     <External name="model_path">tower1/tower1.3ds</External>
     <Vector name="axis_0">1 0 0</Vector>
-    <Vector name="axis_1">0 1.0 0.0</Vector>
-    <Vector name="offset">0 0 0.0</Vector>
-    <Float name="polygon_offset">-1</Float>
-    <Bool name="lighting">true</Bool>
-    <!--Int name="cull_face">1</Int-->
-    <Float name="scale">1.0</Float>
-    <!--List name="contacts">
-        <Vector>0.0 0.0 0.0</Vector>
-    </List-->
+    <Vector name="axis_1">0 1 0</Vector>
     <Bool name="smooth">true</Bool>
     <Bool name="filter">true</Bool>
 </Object>