Changeset 117 for cafu/trunk/Games/DeathMatch/Models/Static/TonneTest.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/TonneTest.cmap (modified) (2 diffs)

cafu/trunk/Games/DeathMatch/Models/Static/TonneTest.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
-    ( 0 0 -0 ) ( 0 1000 0 ) ( -1000 0 4.3711388570955e-005 ) "Textures/meta/collisionmodel" ( 2 0.00323664071038365 -0.00473100645467639 0 ( 511.064 35.7276 0 ) ( 35.7276 -511.064 0 ) )
-    ( 21.2198677062988 -20.1807422637939 0 ) ( -667.921997070313 -744.807189941406 0 ) ( 21.2198677062988 -20.1807422637939 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 8.13793087005615 -20.3448276519775 -0 ) ( -920.338745117188 -391.735443115234 0 ) ( 8.13793087005615 -20.3448276519775 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664071038365 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
-    ( 27.6150226593018 -9.58637046813965 0 ) ( -300.330078125 -954.283142089844 0 ) ( 27.6150226593018 -9.58637046813965 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 24 0 0 ) ( 23.9999122619629 -1000 0 ) ( 24 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 7.49628686904907 4.10896158218384 0 ) ( 488.157623291016 -872.79736328125 0 ) ( 7.49628686904907 4.10896158218384 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( -5.11646032333374 -6.79159307479858 -0 ) ( 793.596618652344 -608.503601074219 0 ) ( -5.11646032333374 -6.79159307479858 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( -4.6756763458252 -28.0540580749512 -0 ) ( 981.71826171875 -192.453033447266 0 ) ( -4.6756763458252 -28.0540580749512 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664071038365 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
-    ( 17.1724147796631 -42.9310340881348 -0 ) ( 945.649108886719 328.459625244141 0 ) ( 17.1724147796631 -42.9310340881348 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664071038365 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
-    ( 38.5405120849609 -36.6390228271484 -0 ) ( 727.542358398438 688.120544433594 0 ) ( 38.5405120849609 -36.6390228271484 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 49.3703727722168 -19.537036895752 -0 ) ( 417.330841064453 910.304321289063 0 ) ( 49.3703727722168 -19.537036895752 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 41.730770111084 8.34615421295166 -0 ) ( -154.385360717773 988.926818847656 0 ) ( 41.730770111084 8.34615421295166 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 23.1263885498047 16.1616840362549 -0 ) ( -549.698547363281 835.839416503906 0 ) ( 23.1263885498047 16.1616840362549 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( 9.19961643218994 12.2088041305542 -0 ) ( -789.447692871094 614.008117675781 0 ) ( 9.19961643218994 12.2088041305542 -1000 ) "Textures/meta/collisionmodel" ( 2 0.0047310059890151 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
-    ( -0.702702820301056 -4.21621704101563 0 ) ( -987.096618652344 160.18278503418 0 ) ( -0.702702820301056 -4.21621704101563 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664071038365 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
-    ( 0 0 44 ) ( 0 1000 44 ) ( 1000 0 44.0000419616699 ) "Textures/meta/collisionmodel" ( 2 0.00323664071038365 -0.00473100645467639 0 ( 511.064 35.7276 0 ) ( 35.7276 -511.064 0 ) )
+  {
+    ( 0 0 -0 ) ( 0 1000 0 ) ( -1000 0 4.371139e-005 ) "Textures/meta/collisionmodel" ( 2 0.00323664 -0.00473101 0 ( 511.064 35.7276 0 ) ( 35.7276 -511.064 0 ) )
+    ( 21.219868 -20.180742 0 ) ( -667.922 -744.8072 0 ) ( 21.219868 -20.180742 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 8.137931 -20.344828 -0 ) ( -920.33875 -391.73544 0 ) ( 8.137931 -20.344828 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
+    ( 27.615023 -9.58637 0 ) ( -300.33008 -954.28314 0 ) ( 27.615023 -9.58637 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 24 0 0 ) ( 23.999912 -1000 0 ) ( 24 0 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 7.496287 4.1089616 0 ) ( 488.15762 -872.79736 0 ) ( 7.496287 4.1089616 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( -5.1164603 -6.791593 -0 ) ( 793.5966 -608.5036 0 ) ( -5.1164603 -6.791593 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( -4.6756763 -28.054058 -0 ) ( 981.71826 -192.45303 0 ) ( -4.6756763 -28.054058 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
+    ( 17.172415 -42.931034 -0 ) ( 945.6491 328.45963 0 ) ( 17.172415 -42.931034 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
+    ( 38.540512 -36.639023 -0 ) ( 727.54236 688.12054 0 ) ( 38.540512 -36.639023 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 49.370373 -19.537037 -0 ) ( 417.33084 910.3043 0 ) ( 49.370373 -19.537037 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 41.73077 8.346154 -0 ) ( -154.38536 988.9268 0 ) ( 41.73077 8.346154 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 23.126389 16.161684 -0 ) ( -549.69855 835.8394 0 ) ( 23.126389 16.161684 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( 9.199616 12.208804 -0 ) ( -789.4477 614.0081 0 ) ( 9.199616 12.208804 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00473101 0 0 ( -35.7277 511.064 0 ) ( 0 0 -512 ) )
+    ( -0.7027028 -4.216217 0 ) ( -987.0966 160.18279 0 ) ( -0.7027028 -4.216217 -1000 ) "Textures/meta/collisionmodel" ( 2 0.00323664 0 0 ( 511.064 35.7276 0 ) ( 0 0 -512 ) )
+    ( 0 0 44 ) ( 0 1000 44 ) ( 1000 0 44.000042 ) "Textures/meta/collisionmodel" ( 2 0.00323664 -0.00473101 0 ( 511.064 35.7276 0 ) ( 35.7276 -511.064 0 ) )
   }
 }
 
-{ // Entity 1
+{
   classname "static_detail_model"
   angles "-0 90 -0"