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
26d0d42
..
3e0f34f
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-510,11
+510,26
@@
void display() {
glTranslatef( 0.0f, 0.0f, -5.0f); // Move into the Screen 10.0
\r
glutSolidTeapot(1);
\r
\r
glTranslatef( 0.0f, 0.0f, -5.0f); // Move into the Screen 10.0
\r
glutSolidTeapot(1);
\r
\r
- gluLookAt(1.0f, 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f);
\r
+ glMatrixMode(GL_MODELVIEW);
\r
+ glLoadIdentity();
\r
+ gluLookAt(0.7f, 0.4f, 0.9f, -2.0f, -1.0f, -7.0f, 1.0f, 10.0f, 1.0f);
\r
+
\r
\r
\r
+ glMatrixMode(GL_PROJECTION);
\r
+ glLoadIdentity();
\r
glutSwapBuffers();
\r
}
\r
\r
glutSwapBuffers();
\r
}
\r
\r
+/**
\r
+ * init function, sets OpenGL's starting state
\r
+ */
\r
+void init() {
\r
+ glMatrixMode(GL_PROJECTION);
\r
+ glLoadIdentity();
\r
+ gluPerspective( 60, 1, 0.1, 1000.0);
\r
+ glMatrixMode(GL_MODELVIEW);
\r
+}
\r
+
\r
/**
\r
* Main function
\r
* @param argc Number of arguments
\r
/**
\r
* Main function
\r
* @param argc Number of arguments
\r
@@
-554,10
+569,7
@@
int main(int argc, char **argv) {
\r
makeMenu();
\r
\r
\r
makeMenu();
\r
\r
- glMatrixMode(GL_PROJECTION);
\r
- glLoadIdentity();
\r
- gluPerspective( 60, 1, 0.1, 1000.0);
\r
- glMatrixMode(GL_MODELVIEW);
\r
+ init();
\r
\r
glutMainLoop();
\r
}
\r
\r
glutMainLoop();
\r
}
\r
UCC
git Repository :: git.ucc.asn.au