New ball image. Fixes, code clean up. Removal of unused functions.

git-svn-id: svn://mattst88.com/svn/glpong3d/trunk@13 4dd1920e-271a-0410-bca0-81b404a81564

1 files changed, 15 insertions, 5 deletions

diff --git a/glpong3d.h b/glpong3d.h
index dfe6cab..9cd2bc9 100644
--- a/glpong3d.h
+++ b/glpong3d.h
@@ -4,11 +4,23 @@
 #include "SDL.h"

 #include "SDL_opengl.h"

 

-#include "ball.h"

-#include "paddle.h"

-

 GLuint background;

 

+GLuint paddle_texture;

+GLuint ball_texture;

+

+typedef struct {

+	GLfloat w, h, x, y, z;

+	GLfloat r, g, b;

+} Paddle_t;

+

+typedef struct {

+	GLfloat w, h, x, y, z;

+	GLfloat r, g, b;

+	GLfloat xv, yv, zv;

+	GLfloat rotate;

+} Ball_t;

+

 typedef struct {

 	GLfloat x, y;

 } Mouse_t;

@@ -40,7 +52,5 @@ void GLPong_Move();
 

 GLuint SDL_GL_SurfaceToTexture(SDL_Surface * surface);

 __inline__ unsigned int NextPow2(unsigned int value);

-void glEnable2D();

-void glDisable2D();

 

 #endif