shuffle fields in msurface_t to reduce memory usage on 64bit

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@9853 d7cf8633-e32d-0410-b094-e92efae38249
::stable-branch::merge=8c602c91543518059e16e686eabd42a053b466ed

diff --git a/model_shared.h b/model_shared.h
index 36336d2d62f80c76af544e77c4f26479e0c6e267..d0d573693f06cca1ac880a40b16ed05a597dbaa8 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -566,6 +566,15 @@ typedef struct msurface_s
        rtexture_t *lightmaptexture;
        // the lighting direction texture fragment to use on the rendering mesh
        rtexture_t *deluxemaptexture;
+       // lightmaptexture rebuild information not used in q3bsp
+       msurface_lightmapinfo_t *lightmapinfo; // q1bsp
+       // fog volume info in q3bsp
+       struct q3deffect_s *effect; // q3bsp
+       // mesh information for collisions (only used by q3bsp curves)
+       int *data_collisionelement3i; // q3bsp
+       float *data_collisionvertex3f; // q3bsp
+       float *data_collisionbbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles
+       float *data_bbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles
 
        // surfaces own ranges of vertices and triangles in the model->surfmesh
        int num_triangles; // number of triangles
@@ -576,23 +585,13 @@ typedef struct msurface_s
        // shadow volume building information
        int num_firstshadowmeshtriangle; // index into model->brush.shadowmesh
 
-       // lightmaptexture rebuild information not used in q3bsp
-       msurface_lightmapinfo_t *lightmapinfo; // q1bsp
-
        // mesh information for collisions (only used by q3bsp curves)
        int num_collisiontriangles; // q3bsp
-       int *data_collisionelement3i; // q3bsp
        int num_collisionvertices; // q3bsp
-       float *data_collisionvertex3f; // q3bsp
-       struct q3deffect_s *effect; // q3bsp
-       // FIXME: collisionmarkframe should be kept in a separate array
-       int collisionmarkframe; // q3bsp // don't collide twice in one trace
-
-       // optimization...
-       float *data_collisionbbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles
        int num_collisionbboxstride;
-       float *data_bbox6f; // collision optimization - contains combined bboxes of every data_collisionstride triangles
        int num_bboxstride;
+       // FIXME: collisionmarkframe should be kept in a separate array
+       int collisionmarkframe; // q3bsp // don't collide twice in one trace
 }
 msurface_t;