git.ucc.asn.au
/
atyndall
/
cits2231.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(no commit message)
[atyndall/cits2231.git]
/
scene.c
diff --git
a/scene.c
b/scene.c
index
b6caf70
..
73e04ee
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-556,24
+556,21
@@
motion(int x, int y)
\r
void idle() {
\r
angle = (int)(angle + 10) % 360;
\r
\r
void idle() {
\r
angle = (int)(angle + 10) % 360;
\r
-
//angle2 = (int)(angle2 + 10) % 360;
\r
-
printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
\r
-
sleep(0.5
);
\r
-
glutPostRedisplay();
\r
+ //angle2 = (int)(angle2 + 10) % 360;
\r
+ printf("Angle 1: %f, Angle 2: %f\n", angle, angle2);
\r
+
sleep(1
);
\r
+ glutPostRedisplay();
\r
}
\r
\r
\r
}
\r
\r
\r
-int drawFloorRecurse =
4
;
\r
+int drawFloorRecurse =
5
;
\r
\r
void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
\r
\r
\r
void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
\r
\r
- printf("%d, %d, %d, %d\n", x1, y2, x2, y2);
\r
-
\r
if ( drawFloorRecurse != recurseLevel ) {
\r
float xm = (x1 + x2) / 2.0;
\r
float ym = (y1 + y2) / 2.0;
\r
int rnew = recurseLevel + 1;
\r
if ( drawFloorRecurse != recurseLevel ) {
\r
float xm = (x1 + x2) / 2.0;
\r
float ym = (y1 + y2) / 2.0;
\r
int rnew = recurseLevel + 1;
\r
- printf("Recursing to level %d\n", rnew);
\r
\r
// Split into four sub-quads
\r
drawSquare(rnew, x1, y1, xm, ym);
\r
\r
// Split into four sub-quads
\r
drawSquare(rnew, x1, y1, xm, ym);
\r
@@
-582,7
+579,6
@@
void drawSquare(int recurseLevel, float x1, float y1, float x2, float y2) {
drawSquare(rnew, xm, y1, x2, ym);
\r
\r
} else {
\r
drawSquare(rnew, xm, y1, x2, ym);
\r
\r
} else {
\r
- printf("Drawing (%.10f, %.10f) -> (%.10f, %.10f)\n", x1, y2, x2, y2);
\r
glBegin(GL_QUADS);
\r
glVertex3f(x1, 0.0, y1);
\r
glVertex3f(x1, 0.0, y2);
\r
glBegin(GL_QUADS);
\r
glVertex3f(x1, 0.0, y1);
\r
glVertex3f(x1, 0.0, y2);
\r
UCC
git Repository :: git.ucc.asn.au