View difference between Paste ID: 6C2RTMb2 and R7Daf8n5

-#include "Draw.h"
+#ifndef DRAW_H_INCLUDED
-///vars to add to structs
+#define DRAW_H_INCLUDED
 
-	float bw,bh;//blit width/height if non pwr 2 textures
+#include <GL/gl.h>
 #include <GL/glext.h>
 #include <stdint.h>
-	float bw,bh;
+
 
 ///OGL texture structs
-///Draw Funcs to replace (also replace "GL_TEXTURE_RECTANGLE_NV" with "GL_TEXTURE_2D")
+//textures are the format OGL blits, non editable data -(loaded sprites/images)
-bool IsPowerOfTwo(uint32_t x)
+
-{
+	protected:
-    return ((x & (x - 1)) == 0);
+	bool texture_generated;
-}
+
-int HighestBit(uint32_t x)
+	public:
-{
+	GLuint Texture_ID;
-	if (IsPowerOfTwo(x)){return x;}
+	uint32_t w,h;
-	uint32_t y = 1<<31;
+
-	while (y>x){y=y>>1;}
+	void gen_texture(uint16_t w, uint16_t h, uint8_t *PixData);
- 	return y<<1;
+
-}
+	OGL_Texture();
-void OGL_Texture::gen_texture(uint16_t width, uint16_t height, uint8_t *PixData){
+	~OGL_Texture();
-	if (width==0 || height==0){printf("ERROR! WIDTH OR HEIGHT OF TEXTURE == 0"); exit(1);}
+
-	//delete old texture if existing
+//surfaces contain editable pixel data, can be cast to textures for blitting -(effects, debug/primitive data draws)
-	if (texture_generated && Texture_ID){
+
-		glDeleteTextures(1,&Texture_ID);
+	uint32_t w,h;
-	}
+	uint8_t bpp;
-	//Power of two texture support
+	uint8_t *PixData;
-	w = width;
+
-	h = height;
+	void Create_Surface(uint16_t w,uint16_t h, char bpp);
-	uint8_t *NewPixData = PixData;
+	void Clear_Surface(uint8_t r, uint8_t g, uint8_t b, uint8_t a=255);
-	bool todelete = false;
+	void Set_Surface_AlphaKey(uint8_t r, uint8_t g, uint8_t b);
-	if (!(IsPowerOfTwo(w) && IsPowerOfTwo(h))){
+	void gen_texture();
-		uint32_t new_w = HighestBit(w);
+
-		uint32_t new_h = HighestBit(h);
+	OGL_Surface();
-		NewPixData = new uint8_t[new_w*new_h*4];
+	~OGL_Surface();
-		memset(NewPixData,255, new_w*new_h*4);
+
-		uint32_t pos1 = 0;
+
-		uint32_t pos2 = 0;
+OGL_Texture *Texture_Cast(OGL_Surface *Surface);
-		for (uint32_t y = 0; y<h; y++){
+
-			for (uint32_t x = 0; x<w; x++){
+
-				NewPixData[pos1]  = PixData[pos2];
+
-				NewPixData[pos1+1]= PixData[pos2+1];
+
-				NewPixData[pos1+2]= PixData[pos2+2];
+enum Image_Options{
-				NewPixData[pos1+3]= PixData[pos2+3];
+	IMG_NORM  = 0,
-				pos1+=4;
+	IMG_HFLIP = 1,
-				pos2+=4;
+	IMG_VFLIP = 2,
-			}
+	IMG_ADD_BLEND = 3
-			pos1+=(new_w-w)*4;
+
-		}
+void DrawImage(OGL_Texture *Texture, int dx, int dy, float rot=0.0,float scale_x=1.0,float scale_y=1.0,float alpha=1.0,int options=0);
-		width= new_w;
+void DrawSubImage(OGL_Texture *Texture, int sx, int sy, int sw, int sh, int dx, int dy, float rot=0.0,float scale_x=1.0,float scale_y=1.0,float alpha=1.0,int options=0);
-		height= new_h;
+
-		bw = float(w)/float(new_w);
+//////////
-		bh = float(h)/float(new_h);
+//COLOUR//
-		todelete = true;
+//////////
-	}
+uint32_t make_col(uint8_t r, uint8_t g, uint8_t b, uint8_t a);
-	//generate texture
+uint32_t make_col(uint8_t r, uint8_t g, uint8_t b);
-	glGenTextures(1,&Texture_ID);
+
-	if (Texture_ID==0){printf("ERROR IN TEXTURE GENERATION! NO DEVICE CONTEXT?"); exit(1);}
+///////////////////
-	glEnable(GL_TEXTURE_2D);
+//DRAW PRIMITIVES//
-		glBindTexture(GL_TEXTURE_2D, Texture_ID);
+///////////////////
-		//2d texture, level of detail, number of components (3=rgb), w,h, border, byte order, data format, data
+bool putpixel(OGL_Surface *Surface, int x, int y, uint32_t col);
-		glTexImage2D(GL_TEXTURE_2D, 0,GL_RGBA8, width, height, 0, GL_BGRA,GL_UNSIGNED_BYTE, NewPixData);
+bool getpixel(OGL_Surface *Surface, int x, int y, uint32_t &col);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+//
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+void hline(OGL_Surface *Surface, int x, int y, int w, uint32_t col);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+void vline(OGL_Surface *Surface, int x, int y, int h, uint32_t col);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
+void line(OGL_Surface *Surface, int x1, int y1, int x2, int y2, uint32_t col);
-		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
+void box(OGL_Surface *Surface, int x, int y, int w, int h, uint32_t col);
-		glTexEnvi(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_REPLACE);
+void rect(OGL_Surface *Surface, int x, int y, int w, int h, uint32_t col);
-	glDisable(GL_TEXTURE_2D);
+void polyline(OGL_Surface *Surface, unsigned char n, int points[], uint32_t col);
-	texture_generated = true;
+void polygon(OGL_Surface *Surface, unsigned char n, int points[], uint32_t col);
-	//cleanup
+void circle(OGL_Surface *Surface, int x0, int y0, int radius, uint32_t col);
-	if (todelete){delete [] NewPixData;}
+void circle_fill(OGL_Surface *Surface, int x0, int y0, int radius, uint32_t col);
-}
+//
 
-///////////////
+#endif // DRAW_H_INCLUDED