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
f748458
..
8ce005b
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-226,7
+226,7
@@
void mouse(int button, int state, int x, int y) {
}
\r
}
\r
\r
}
\r
}
\r
\r
-void keyboard(unsigned char key, int x
, int y
) {
\r
+void keyboard(unsigned char key, int x
1, int y1
) {
\r
switch(key) {
\r
case 'w':
\r
z = z - 1;
\r
switch(key) {
\r
case 'w':
\r
z = z - 1;
\r
@@
-247,7
+247,7
@@
void keyboard(unsigned char key, int x, int y) {
y = y - 1;
\r
break;
\r
}
\r
y = y - 1;
\r
break;
\r
}
\r
- printf("Camera is now at (%f, %f, %f)", x, y, z);
\r
+ printf("Camera is now at (%f, %f, %f)
\n
", x, y, z);
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-279,11
+279,13
@@
void display() {
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
\r
glLoadIdentity();
\r
gluLookAt(
\r
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
\r
glLoadIdentity();
\r
gluLookAt(
\r
-
x, y, z
, /* eye is at (x,y,z) */
\r
+
0.0, 0.0, 10.0
, /* eye is at (x,y,z) */
\r
0.0, 0.0, 0.0, /* center is at (x,y,z) */
\r
0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
\r
0.0, 0.0, 0.0, /* center is at (x,y,z) */
\r
0.0, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
\r
+ glTranslatef(x, y, z);
\r
+
\r
// **NOTE: Currently this rotation function is all that moves the camera off
\r
// the flat surface. Need to integrate function into gluLookAt
\r
glRotatef(30.0, 1.0, 0.0, 0.0);
\r
// **NOTE: Currently this rotation function is all that moves the camera off
\r
// the flat surface. Need to integrate function into gluLookAt
\r
glRotatef(30.0, 1.0, 0.0, 0.0);
\r
UCC
git Repository :: git.ucc.asn.au