Make the VBO handling in RSurf_PrepareVerticesForBatch much more consistent by refact...

[xonotic/darkplaces.git] / model_sprite.h

diff --git a/model_sprite.h b/model_sprite.h
index c07c8883601554cc9d9c8d26e0960af722d14f63..f6408dad64df55a37a53e8c018521312ac8f55e2 100644 (file)
--- a/model_sprite.h
+++ b/model_sprite.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -18,6 +18,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 */
 
+#ifndef MODEL_SPRITE_H
+#define MODEL_SPRITE_H
+
 /*
 ==============================================================================
 
@@ -31,32 +34,8 @@ SPRITE MODELS
 // FIXME: shorten these?
 typedef struct mspriteframe_s
 {
-       int             width;
-       int             height;
        float   up, down, left, right;
-       int             gl_texturenum, gl_fogtexturenum;
 } mspriteframe_t;
 
-typedef struct
-{
-       int                             numframes;
-       float                   *intervals;
-       mspriteframe_t  *frames[1];
-} mspritegroup_t;
+#endif
 
-typedef struct
-{
-       spriteframetype_t       type;
-       mspriteframe_t          *frameptr;
-} mspriteframedesc_t;
-
-typedef struct
-{
-       int                                     type;
-       int                                     maxwidth;
-       int                                     maxheight;
-       int                                     numframes;
-       float                           beamlength;             // remove?
-       void                            *cachespot;             // remove?
-       mspriteframedesc_t      frames[1];
-} msprite_t;