diff options
author | Ixtli <cg@325i.org> | 2010-03-07 17:53:38 +0900 |
---|---|---|
committer | Enne Walker <ennewalker@users.sourceforge.net> | 2010-04-24 10:19:41 -0400 |
commit | 8e76bc63a3f566246e6e52af815db6b839e9760c (patch) | |
tree | 91d840aaa4ce1e3bc7dc56dfd66b06bfa1b2c632 /crawl-ref/source/glwrapper.h | |
parent | c3202e35e305cd092245a33db223568156b43f34 (diff) | |
download | crawl-ref-8e76bc63a3f566246e6e52af815db6b839e9760c.tar.gz crawl-ref-8e76bc63a3f566246e6e52af815db6b839e9760c.zip |
Updated files to conform to crawl coding standards
Diffstat (limited to 'crawl-ref/source/glwrapper.h')
-rw-r--r-- | crawl-ref/source/glwrapper.h | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/crawl-ref/source/glwrapper.h b/crawl-ref/source/glwrapper.h index eaac3bd2a1..0a5cfc60a3 100644 --- a/crawl-ref/source/glwrapper.h +++ b/crawl-ref/source/glwrapper.h @@ -26,8 +26,7 @@ enum MipMapOptions MIPMAP_MAX }; -// TODO: Ixtli - Remove QUADS entirely. Then, -// TODO: Ixtli - Remove drawing_modes entirely +// TODO: Ixtli - Remove QUADS entirely. typedef enum { GLW_POINTS, @@ -41,18 +40,18 @@ struct GLPrimitive { GLPrimitive(long unsigned int sz, size_t ct, unsigned int vs, const void* v_pt, const void *c_pt, const void *t_pt); - + // Primitive Metadata drawing_modes mode; unsigned int vertSize; // Coords per vertex long unsigned int size; size_t count; - + // Primitive Data const void *vert_pointer; const void *colour_pointer; const void *texture_pointer; - + // Primitive render manipulations GLW_3VF *pretranslate; GLW_3VF *prescale; @@ -79,7 +78,7 @@ class GLStateManager { public: static void init(); - + // State Manipulation static void set(const GLState& state); static void pixelStoreUnpackAlignment(unsigned int bpp); @@ -87,29 +86,29 @@ public: static void resetViewForResize(coord_def &m_windowsz); static void setTransform(GLW_3VF *translate, GLW_3VF *scale); static void resetTransform(); - + // Drawing GLPrimitives static void drawGLPrimitive(const GLPrimitive &prim); - + // Drawing tiles-specific objects static void drawTextBlock(unsigned int x_pos, unsigned int y_pos, long unsigned int stride, bool drop_shadow, size_t count, const void *pos_verts, const void *tex_verts, const void *color_verts); static void drawColorBox(long unsigned int stride, size_t count, const void *pos_verts, const void *color_verts); - + // Texture-specific functinos static void deleteTextures(size_t count, unsigned int *textures); static void generateTextures(size_t count, unsigned int *textures); static void bindTexture(unsigned int texture); static void loadTexture(unsigned char *pixels, unsigned int width, unsigned int height, MipMapOptions mip_opt); - + // Debug #ifdef DEBUG static bool _valid(int num_verts, drawing_modes mode); #endif - + protected: }; |