Changeset 117 for cafu/trunk/Games/DeathMatch/Models/Static/Palette01.cmap

Timestamp:

08/15/10 00:56:03 (22 months ago)

Author:

Carsten

Message:

• Fixed the cmap loader code in CollModelManImplT::GetCM() as reported at <http://www.cafu.de/forum/viewtopic.php?f=2&t=762>.
• Upgraded all older cmap files to the current cmap version 13.

Files:

• cafu/trunk/Games/DeathMatch/Models/Static/Palette01.cmap (modified) (3 diffs)

cafu/trunk/Games/DeathMatch/Models/Static/Palette01.cmap

@@ -1 +1 @@
 // Cafu Map File
 // Written by CaWE, the Cafu World Editor.
+Version 13
 
 
-{ // Entity 0 (the world)
+{
   classname "worldspawn"
+  shlmap_patchsize "200.0"
   lightmap_patchsize "200.0"
-  shlmap_patchsize "200.0"
   wind_velocity "0.0"
   wind_velocity_var "0.0"
@@ -14 +15 @@
   fog_end "1.0"
   fog_color "0 0 0"
-  mapfile_version "11"
+  mru_mat_0 "TechDemo/walls/wall-13b"
 
-  { // Brush 0
-    ( 16 24 7 ) ( 22 24 7 ) ( 22 -28.0000038146973 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( 16 -28.0000038146973 0 ) ( 22 -28.0000038146973 0 ) ( 22 24 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( 16 24 7 ) ( 16 -28.0000038146973 7 ) ( 16 -28.0000038146973 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( 22 24 0 ) ( 22 -28.0000038146973 0 ) ( 22 -28.0000038146973 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+  {
+    ( 16 24 7 ) ( 22 24 7 ) ( 22 -28.000004 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( 16 -28.000004 0 ) ( 22 -28.000004 0 ) ( 22 24 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( 16 24 7 ) ( 16 -28.000004 7 ) ( 16 -28.000004 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( 22 24 0 ) ( 22 -28.000004 0 ) ( 22 -28.000004 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
     ( 22 24 7 ) ( 16 24 7 ) ( 16 24 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( 22 -28.0000038146973 0 ) ( 16 -28.0000038146973 0 ) ( 16 -28.0000038146973 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( 22 -28.000004 0 ) ( 16 -28.000004 0 ) ( 16 -28.000004 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
   }
 
   {
-    ( -3 24 7 ) ( 3 24 7 ) ( 3 -28.0000038146973 7 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( -3 -28.0000038146973 0 ) ( 3 -28.0000038146973 0 ) ( 3 24 0 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( -3 24 7 ) ( -3 -28.0000038146973 7 ) ( -3 -28.0000038146973 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( 3 24 0 ) ( 3 -28.0000038146973 0 ) ( 3 -28.0000038146973 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( -3 24 7 ) ( 3 24 7 ) ( 3 -28.000004 7 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -3 -28.000004 0 ) ( 3 -28.000004 0 ) ( 3 24 0 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -3 24 7 ) ( -3 -28.000004 7 ) ( -3 -28.000004 0 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( 3 24 0 ) ( 3 -28.000004 0 ) ( 3 -28.000004 7 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
     ( 3 24 7 ) ( -3 24 7 ) ( -3 24 0 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( 3 -28.0000038146973 0 ) ( -3 -28.0000038146973 0 ) ( -3 -28.0000038146973 7 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( 3 -28.000004 0 ) ( -3 -28.000004 0 ) ( -3 -28.000004 7 ) "Textures/meta/collisionmodel" ( 2 0.296875 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
   }
 
   {
-    ( -22 24.0000038146973 7 ) ( -16 24.0000038146973 7 ) ( -16 -28 7 ) "Textures/meta/collisionmodel" ( 2 0.59375 5.96046447753906e-008 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( -22 -28 0 ) ( -16 -28 0 ) ( -16 24.0000038146973 0 ) "Textures/meta/collisionmodel" ( 2 0.59375 5.96046447753906e-008 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( -22 24.0000038146973 7 ) ( -22 -28 7 ) ( -22 -28 0 ) "Textures/meta/collisionmodel" ( 2 -5.96046447753906e-008 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( -16 24.0000038146973 0 ) ( -16 -28 0 ) ( -16 -28 7 ) "Textures/meta/collisionmodel" ( 2 -5.96046447753906e-008 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( -16 24.0000038146973 7 ) ( -22 24.0000038146973 7 ) ( -22 24.0000038146973 0 ) "Textures/meta/collisionmodel" ( 2 0.59375 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -22 24.000004 7 ) ( -16 24.000004 7 ) ( -16 -28 7 ) "Textures/meta/collisionmodel" ( 2 0.59375 5.96046e-008 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -22 -28 0 ) ( -16 -28 0 ) ( -16 24.000004 0 ) "Textures/meta/collisionmodel" ( 2 0.59375 5.96046e-008 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -22 24.000004 7 ) ( -22 -28 7 ) ( -22 -28 0 ) "Textures/meta/collisionmodel" ( 2 -5.96046e-008 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( -16 24.000004 0 ) ( -16 -28 0 ) ( -16 -28 7 ) "Textures/meta/collisionmodel" ( 2 -5.96046e-008 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( -16 24.000004 7 ) ( -22 24.000004 7 ) ( -22 24.000004 0 ) "Textures/meta/collisionmodel" ( 2 0.59375 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
     ( -16 -28 0 ) ( -22 -28 0 ) ( -22 -28 7 ) "Textures/meta/collisionmodel" ( 2 0.59375 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
   }
@@ -62 +63 @@
 
   {
-    ( -22.0664577484131 7.61543941497803 8 ) ( 21.9268398284912 8.38334369659424 8 ) ( 22.0664596557617 0.384562253952026 8 ) "Textures/meta/collisionmodel" ( 2 -0.00109077314846218 0.156240478157997 0 ( 64 1.11695 0 ) ( 1.11695 -64 0 ) )
-    ( -21.9268398284912 -0.383346080780029 7 ) ( 22.0664596557617 0.384562253952026 7 ) ( 21.9268398284912 8.38334369659424 7 ) "Textures/meta/collisionmodel" ( 2 -0.00109077314846218 0.156240478157997 0 ( 64 1.11695 0 ) ( 1.11695 -64 0 ) )
-    ( -22.0664577484131 7.61543941497803 8 ) ( -21.9268398284912 -0.383346080780029 8 ) ( -21.9268398284912 -0.383346080780029 7 ) "Textures/meta/collisionmodel" ( 2 -0.156240478157997 0 0 ( -1.11696 64 0 ) ( 0 0 -64 ) )
-    ( 21.9268398284912 8.38334369659424 7 ) ( 22.0664596557617 0.384562253952026 7 ) ( 22.0664596557617 0.384562253952026 8 ) "Textures/meta/collisionmodel" ( 2 -0.156240478157997 0 0 ( -1.11696 64 0 ) ( 0 0 -64 ) )
-    ( 21.9268398284912 8.38334369659424 8 ) ( -22.0664577484131 7.61543941497803 8 ) ( -22.0664577484131 7.61543941497803 7 ) "Textures/meta/collisionmodel" ( 2 -0.00109077314846218 0 0 ( 64 1.11695 0 ) ( 0 0 -64 ) )
-    ( 22.0664596557617 0.384562253952026 7 ) ( -21.9268398284912 -0.383346080780029 7 ) ( -21.9268398284912 -0.383346080780029 8 ) "Textures/meta/collisionmodel" ( 2 -0.00109077314846218 0 0 ( 64 1.11695 0 ) ( 0 0 -64 ) )
+    ( -22.066458 7.6154394 8 ) ( 21.92684 8.383344 8 ) ( 22.06646 0.38456225 8 ) "Textures/meta/collisionmodel" ( 2 -0.00109077 0.15624 0 ( 64 1.11695 0 ) ( 1.11695 -64 0 ) )
+    ( -21.92684 -0.38334608 7 ) ( 22.06646 0.38456225 7 ) ( 21.92684 8.383344 7 ) "Textures/meta/collisionmodel" ( 2 -0.00109077 0.15624 0 ( 64 1.11695 0 ) ( 1.11695 -64 0 ) )
+    ( -22.066458 7.6154394 8 ) ( -21.92684 -0.38334608 8 ) ( -21.92684 -0.38334608 7 ) "Textures/meta/collisionmodel" ( 2 -0.15624 0 0 ( -1.11696 64 0 ) ( 0 0 -64 ) )
+    ( 21.92684 8.383344 7 ) ( 22.06646 0.38456225 7 ) ( 22.06646 0.38456225 8 ) "Textures/meta/collisionmodel" ( 2 -0.15624 0 0 ( -1.11696 64 0 ) ( 0 0 -64 ) )
+    ( 21.92684 8.383344 8 ) ( -22.066458 7.6154394 8 ) ( -22.066458 7.6154394 7 ) "Textures/meta/collisionmodel" ( 2 -0.00109077 0 0 ( 64 1.11695 0 ) ( 0 0 -64 ) )
+    ( 22.06646 0.38456225 7 ) ( -21.92684 -0.38334608 7 ) ( -21.92684 -0.38334608 8 ) "Textures/meta/collisionmodel" ( 2 -0.00109077 0 0 ( 64 1.11695 0 ) ( 0 0 -64 ) )
   }
 
   {
-    ( 0 0 8 ) ( 0 1000 8 ) ( 1000 0 8.00004386901855 ) "Textures/meta/collisionmodel" ( 2 0 0.390625 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( 1.45912599563599 21.4005146026611 -0 ) ( -996.224609375 89.4243850708008 0 ) ( 1.45912599563599 21.4005146026611 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( -22 -0 0 ) ( -22.0000877380371 -1000 0 ) ( -22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 -0.390625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( 17.3076915740967 -3.46153831481934 -0 ) ( 213.423828125 977.119140625 0 ) ( 17.3076915740967 -3.46153831481934 -1000 ) "Textures/meta/collisionmodel" ( 2 -0.390625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( 0 15 0 ) ( 1000 14.9999561309814 0 ) ( 0 15 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( -0 -0 7 ) ( -0 1000 7 ) ( -1000 -0 7.00004386901855 ) "Textures/meta/collisionmodel" ( 2 0 0.390625 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( 0 0 8 ) ( 0 1000 8 ) ( 1000 0 8.000044 ) "Textures/meta/collisionmodel" ( 2 0 0.390625 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( 1.459126 21.400515 -0 ) ( -996.2246 89.424385 0 ) ( 1.459126 21.400515 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -22 -0 0 ) ( -22.000088 -1000 0 ) ( -22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 -0.390625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( 17.307692 -3.4615383 -0 ) ( 213.42383 977.11914 0 ) ( 17.307692 -3.4615383 -1000 ) "Textures/meta/collisionmodel" ( 2 -0.390625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( 0 15 0 ) ( 1000 14.999956 0 ) ( 0 15 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -0 -0 7 ) ( -0 1000 7 ) ( -1000 -0 7.000044 ) "Textures/meta/collisionmodel" ( 2 0 0.390625 0 ( 64 0 0 ) ( 0 -64 0 ) )
   }
 
   {
-    ( 0 0 8 ) ( 0 1000 8 ) ( 1000 0 8.00004386901855 ) "Textures/meta/collisionmodel" ( 2 0 -0.125 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( -0.238513141870499 -10.4945783615112 0 ) ( -999.980407714844 12.2268590927124 0 ) ( -0.238513141870499 -10.4945783615112 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( -22 -0 0 ) ( -22.0000877380371 -1000 0 ) ( -22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.125 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( 0 0 8 ) ( 0 1000 8 ) ( 1000 0 8.000044 ) "Textures/meta/collisionmodel" ( 2 0 -0.125 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -0.23851314 -10.494578 0 ) ( -999.9804 12.226859 0 ) ( -0.23851314 -10.494578 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -22 -0 0 ) ( -22.000088 -1000 0 ) ( -22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.125 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
     ( 22 0 -0 ) ( 22 1000 0 ) ( 22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.125 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( -0 -19 -0 ) ( 1000 -19.0000438690186 0 ) ( 0 -19 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( -0 -0 7 ) ( -0 1000 7 ) ( -1000 -0 7.00004386901855 ) "Textures/meta/collisionmodel" ( 2 0 -0.125 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -0 -19 -0 ) ( 1000 -19.000044 0 ) ( 0 -19 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -0 -0 7 ) ( -0 1000 7 ) ( -1000 -0 7.000044 ) "Textures/meta/collisionmodel" ( 2 0 -0.125 0 ( 64 0 0 ) ( 0 -64 0 ) )
   }
 
   {
-    ( 0 0 8 ) ( 0 1000 8 ) ( 1000 0 8.00004386901855 ) "Textures/meta/collisionmodel" ( 2 0 -0.265625 0 ( 64 0 0 ) ( 0 -64 0 ) )
-    ( -1.39125978946686 -20.4051418304443 0 ) ( -999.074951171875 47.6187286376953 0 ) ( -1.39125978946686 -20.4051418304443 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( -22 -0 0 ) ( -22.0000877380371 -1000 0 ) ( -22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.265625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
+    ( 0 0 8 ) ( 0 1000 8 ) ( 1000 0 8.000044 ) "Textures/meta/collisionmodel" ( 2 0 -0.265625 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -1.3912598 -20.405142 0 ) ( -999.07495 47.61873 0 ) ( -1.3912598 -20.405142 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -22 -0 0 ) ( -22.000088 -1000 0 ) ( -22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.265625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
     ( 22 0 -0 ) ( 22 1000 0 ) ( 22 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.265625 0 0 ( 0 64 0 ) ( 0 0 -64 ) )
-    ( -0 -27 -0 ) ( 1000 -27.0000438690186 0 ) ( 0 -27 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
-    ( -0 -0 7 ) ( -0 1000 7 ) ( -1000 -0 7.00004386901855 ) "Textures/meta/collisionmodel" ( 2 0 -0.265625 0 ( 64 0 0 ) ( 0 -64 0 ) )
+    ( -0 -27 -0 ) ( 1000 -27.000044 0 ) ( 0 -27 -1000 ) "Textures/meta/collisionmodel" ( 2 0 0 0 ( 64 0 0 ) ( 0 0 -64 ) )
+    ( -0 -0 7 ) ( -0 1000 7 ) ( -1000 -0 7.000044 ) "Textures/meta/collisionmodel" ( 2 0 -0.265625 0 ( 64 0 0 ) ( 0 -64 0 ) )
   }
 }
 
-{ // Entity 1
+{
   classname "static_detail_model"
   angles "-0 90 -0"