Still progressing

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

2 files changed, 6 insertions, 4 deletions

diff --git a/glpong3d.c b/glpong3d.c
index 43798ce..fe040a3 100644
--- a/glpong3d.c
+++ b/glpong3d.c
@@ -41,9 +41,9 @@ void GLPong_Init() {
 	GLPong.Ball.x = -(GLPong.Ball.w / 2);

 	GLPong.Ball.y = -(GLPong.Ball.h / 2);

 	GLPong.Ball.z = -3.0f;

-	GLPong.Ball.xv = 0.02f;

-	GLPong.Ball.yv = 0.01f;

-	GLPong.Ball.zv = -0.01f;

+	GLPong.Ball.xv = 0.0f;

+	GLPong.Ball.yv = 0.0f;

+	GLPong.Ball.zv = -0.03f;

 	

 	GLPong.Front.w = 0.66f;

 	GLPong.Front.h = 0.5f;

@@ -226,7 +226,7 @@ void GLPong_Draw() {
 	glEnable(GL_TEXTURE_2D);

 	glTranslatef(GLPong.Mouse.x, -GLPong.Mouse.y, GLPong.Front.z);

 	glBegin(GL_QUADS);

-		glTexCoord2f(0.168f, 1.0f); glVertex2f(GLPong.Front.w / 2, GLPong.Front.h / 2);	/* Upper Right */

+		glTexCoord2f(0.168f, 1.0f); glVertex2f(GLPong.Front.w / 2, GLPong.Front.h / 2);		/* Upper Right */

 		glTexCoord2f(0.832f, 1.0f); glVertex2f(-GLPong.Front.w / 2, GLPong.Front.h / 2);	/* Upper Left  */

 		glTexCoord2f(0.832f, 0.0f); glVertex2f(-GLPong.Front.w / 2, -GLPong.Front.h / 2);	/* Lower Left */

 		glTexCoord2f(0.168f, 0.0f); glVertex2f(GLPong.Front.w / 2, -GLPong.Front.h / 2);	/* Lower Right */

@@ -317,6 +317,7 @@ GLuint SDL_GL_SurfaceToTexture(SDL_Surface * surface) {
 	

 	return texture;

 }

+

 /*

 GLuint SDL_GL_NPOTSurfaceToTexture(SDL_Surface * surface, GLfloat * wratio, GLfloat * hratio) {

 	SDL_Surface * pow2 = NULL;

diff --git a/paddle.h b/paddle.h
index c9c23a3..c0c8b0c 100644
--- a/paddle.h
+++ b/paddle.h
@@ -2,6 +2,7 @@
 #define PADDLE_H

 

 GLuint paddle_texture;

+GLuint paddle_hit_texture;

 

 typedef struct {

 	GLfloat w, h, x, y, z;