X-Git-Url: https://harrygodden.com/git/?a=blobdiff_plain;f=model.h;h=9f5bdb5451e39a826b97304bd85635db04c059a1;hb=1d06671f87a9d24596fc6808d8e0db889a818750;hp=fc71a4f1413c4a6e0938e7408c94eae54da31ea5;hpb=fdd41609e59c7df548682b25001f0015dc1acbea;p=carveJwlIkooP6JGAAIwe30JlM.git

diff --git a/model.h b/model.h
index fc71a4f..9f5bdb5 100644
--- a/model.h
+++ b/model.h
@@ -7,21 +7,22 @@
 
 #include "skaterift.h"
 
-#define MDL_VERSION_NR 101
+#define MDL_VERSION_MIN 101
+#define MDL_VERSION_NR 102
 
-enum mdl_shader
-{
+enum mdl_shader{
    k_shader_standard                = 0,
    k_shader_standard_cutout         = 1,
    k_shader_terrain_blend           = 2,
    k_shader_standard_vertex_blend   = 3,
    k_shader_water                   = 4,
    k_shader_invisible               = 5,
-   k_shader_boundary                = 6
+   k_shader_boundary                = 6,
+   k_shader_fxglow                  = 7,
+   k_shader_cubemap                 = 8
 };
 
-enum mdl_surface_prop
-{
+enum mdl_surface_prop{
    k_surface_prop_concrete          = 0,
    k_surface_prop_wood              = 1,
    k_surface_prop_grass             = 2,
@@ -29,15 +30,20 @@ enum mdl_surface_prop
    k_surface_prop_metal             = 4
 };
 
-enum material_flag
-{
-   k_material_flag_skate_target     = 0x00000001,
-   k_material_flag_collision        = 0x00000002,
-   k_material_flag_grow_grass       = 0x00000004,
-   k_material_flag_grindable        = 0x00000008,
-   k_material_flag_invisible        = 0x00000010,
-   k_material_flag_boundary         = 0x00000020,
-   k_material_flag_preview_visibile = 0x00000040
+enum material_flag{
+   k_material_flag_skate_target     = 0x0001,
+   k_material_flag_collision        = 0x0002,
+   k_material_flag_grow_grass       = 0x0004,
+   k_material_flag_grindable        = 0x0008,
+   k_material_flag_invisible        = 0x0010,
+   k_material_flag_boundary         = 0x0020,
+   k_material_flag_preview_visibile = 0x0040,
+   k_material_flag_walking          = 0x0080,
+
+   k_material_flag_ghosts      =
+      k_material_flag_boundary|
+      k_material_flag_invisible|
+      k_material_flag_walking
 };
 
 #pragma pack(push,1)
@@ -413,10 +419,10 @@ VG_STATIC void mdl_open( mdl_context *mdl, const char *path, void *lin_alloc )
    if( l != 1 )
       mdl_load_fatal_corrupt( mdl );
 
-   if( mdl->info.version < MDL_VERSION_NR ){
+   if( mdl->info.version < MDL_VERSION_MIN ){
       vg_warn( "For model: %s\n", path );
-      vg_warn( "  version: %u (current: %u)\n", mdl->info.version, 
-               MDL_VERSION_NR );
+      vg_warn( "  version: %u (min: %u, current: %u)\n", 
+               mdl->info.version, MDL_VERSION_MIN, MDL_VERSION_NR );
 
       vg_fatal_error( "Legacy model version incompatable" );
    }