mostly dynamic GL binding (more needs to be done, but it's closer)

[xonotic/darkplaces.git] / model_shared.h

diff --git a/model_shared.h b/model_shared.h
index 1fe9adcc0f81f09c13d4774603573c045de69bf0..2e70d78380b098664c19cb75ef33b19ef563c552 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -163,8 +163,8 @@ typedef struct model_s
        int                             numtextures;
        texture_t               **textures;
 
-       byte                    *visdata;
-       byte                    *lightdata;
+       qbyte                   *visdata;
+       qbyte                   *lightdata;
        char                    *entities;
 
        int                             numportals;
@@ -180,14 +180,9 @@ typedef struct model_s
 
        animscene_t             *animscenes; // [numframes]
 
-       // Q2 model information
-//     md2triangle_t   *md2data_tris;
-       // FIXME: redesign to use triangle mesh
-       int                             *md2data_glcmds;
-
-       float                   *mdldata_texcoords;
-       int                             *mdldata_indices;
-
+       // Q1 and Q2 models are the same after loading
+       int                             *mdlmd2data_indices;
+       float                   *mdlmd2data_texcoords;
        md2frame_t              *mdlmd2data_frames;
        trivertx_t              *mdlmd2data_pose;
 
@@ -216,7 +211,7 @@ model_t;
 
 // model loading
 extern model_t *loadmodel;
-extern byte    *mod_base;
+extern qbyte *mod_base;
 // sky/water subdivision
 extern cvar_t gl_subdivide_size;
 // texture fullbrights
@@ -230,7 +225,7 @@ void Mod_TouchModel (char *name);
 void Mod_UnloadModel (model_t *mod);
 
 mleaf_t *Mod_PointInLeaf (float *p, model_t *model);
-byte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
+qbyte *Mod_LeafPVS (mleaf_t *leaf, model_t *model);
 
 void Mod_ClearUsed(void);
 void Mod_PurgeUnused(void);