1 files changed, 21 insertions, 20 deletions

diff --git a/paddle.c b/paddle.c
index 7dcb2f2..4c4c9f0 100644
--- a/paddle.c
+++ b/paddle.c
@@ -14,7 +14,7 @@ GLPong_PaddleDraw(const Paddle_t * paddle) {
 	glBindTexture(GL_TEXTURE_2D, paddle_texture);
 	glEnable(GL_TEXTURE_2D);
 	glColor3f(paddle->r, paddle->g, paddle->b);
-	glTranslatef(paddle->coord.x + (paddle->w / 2), paddle->coord.y + (paddle->h / 2), paddle->coord.z);
+	glTranslatef(paddle->x + (paddle->w / 2), paddle->y + (paddle->h / 2), paddle->z);
 	glBegin(GL_QUADS);
 		glTexCoord2f(0.168f, 1.0f); glVertex2f(paddle->w / 2, paddle->h / 2);	/* Upper Right */
 		glTexCoord2f(0.832f, 1.0f); glVertex2f(-paddle->w / 2, paddle->h / 2);	/* Upper Left  */
@@ -27,33 +27,33 @@ GLPong_PaddleDraw(const Paddle_t * paddle) {
 	/* Lower Left */
 	glLoadIdentity();
 	glColor3f(0.0f, 0.0f, 1.0f);
-	glTranslatef(paddle->coord.x, paddle->coord.y, paddle->coord.z);
+	glTranslatef(paddle->x, paddle->y, paddle->z);
 	glBegin(GL_POINTS);
 		glVertex3f(0.0f, 0.0f, 0.0f);
 	glEnd();
 	/* Lower Right */
 	glLoadIdentity();
 	glColor3f(1.0f, 0.0f, 0.0f);
-	glTranslatef(paddle->coord.x + paddle->w, paddle->coord.y, paddle->coord.z);
+	glTranslatef(paddle->x + paddle->w, paddle->y, paddle->z);
 	glBegin(GL_POINTS);
 		glVertex3f(0.0f, 0.0f, 0.0f);
 	glEnd();
 	/* Top Right */
 	glLoadIdentity();
-	glTranslatef(paddle->coord.x + paddle->w, paddle->coord.y + paddle->h, paddle->coord.z);
+	glTranslatef(paddle->x + paddle->w, paddle->y + paddle->h, paddle->z);
 	glBegin(GL_POINTS);
 		glVertex3f(0.0f, 0.0f, 0.0f);
 	glEnd();
 	/* Top Left */
 	glLoadIdentity();
-	glTranslatef(paddle->coord.x, paddle->coord.y + paddle->h, paddle->coord.z);
+	glTranslatef(paddle->x, paddle->y + paddle->h, paddle->z);
 	glBegin(GL_POINTS);
 		glVertex3f(0.0f, 0.0f, 0.0f);
 	glEnd();
 	/* Center */
 	glLoadIdentity();
 	glColor3f(0.0f, 1.0f, 0.0f);
-	glTranslatef(paddle->coord.x + paddle->w / 2.0f, paddle->coord.y + paddle->h / 2.0f, paddle->coord.z);
+	glTranslatef(paddle->x + paddle->w / 2.0f, paddle->y + paddle->h / 2.0f, paddle->z);
 	glBegin(GL_POINTS);
 		glVertex3f(0.0f, 0.0f, 0.0f);
 	glEnd();
@@ -64,9 +64,9 @@ void
 GLPong_PaddleInit(Paddle_t * paddle, GLfloat z, GLuint texture) {
 	paddle->w = 0.66f;
 	paddle->h = 0.5f;
-	paddle->coord.x = paddle->w / 2.0f;
-	paddle->coord.y = paddle->h / 2.0f;
-	paddle->coord.z = z;
+	paddle->x = paddle->w / 2.0f;
+	paddle->y = paddle->h / 2.0f;
+	paddle->z = z;
 	paddle->r = 1.0f;
 	paddle->g = 1.0f;
 	paddle->b = 1.0f;
@@ -76,8 +76,8 @@ GLPong_PaddleInit(Paddle_t * paddle, GLfloat z, GLuint texture) {
 
 void
 GLPong_PaddleMove(Paddle_t * paddle, GLfloat x, GLfloat y) {
-	GLfloat old_x = paddle->coord.x;
-	GLfloat old_y = paddle->coord.y;
+	GLfloat old_x = paddle->x;
+	GLfloat old_y = paddle->y;
 	GLfloat mouse_x;
 	GLfloat mouse_y;
 
@@ -96,29 +96,30 @@ GLPong_PaddleMove(Paddle_t * paddle, GLfloat x, GLfloat y) {
 
 	mouse_x = x - (paddle->w / 2.0f);
 	mouse_y = -(y + (paddle->h / 2.0f));
-	printf("(mouse_x, mouse_y) = (%.3f, %.3f)\n", mouse_x, mouse_y);
 
+#ifdef DEBUG
+	printf("(mouse_x, mouse_y) = (%.3f, %.3f)\n", mouse_x, mouse_y);
 	printf("x diff is %f\n", fabs(mouse_x - old_x));
+	printf("y diff is %f\n", fabs(mouse_y - old_y));
+#endif
 
 	if (fabs(mouse_x - old_x) > 0.33f / 2.0f) {
 		if (mouse_x > old_x) {
-			paddle->coord.x += 0.33f / 2.0f;
+			paddle->x += 0.33f / 2.0f;
 		} else {
-			paddle->coord.x -= 0.33f / 2.0f;
+			paddle->x -= 0.33f / 2.0f;
 		}
 	} else {
-		paddle->coord.x = mouse_x;
+		paddle->x = mouse_x;
 	}
 
-	printf("y diff is %f\n", fabs(mouse_y - old_y));
-
 	if (fabs(mouse_y - old_y) > 0.25f / 2.0f) {
 		if (mouse_y > old_y) {
-			paddle->coord.y += 0.25f / 2.0f;
+			paddle->y += 0.25f / 2.0f;
 		} else {
-			paddle->coord.y -= 0.25f / 2.0f;
+			paddle->y -= 0.25f / 2.0f;
 		}
 	} else {
-		paddle->coord.y = mouse_y;
+		paddle->y = mouse_y;
 	}
 }