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
81c5b56
..
a9a5d6b
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-484,8
+484,8
@@
void makeMenu() {
* @param h New height
\r
*/
\r
void windowReshape(int w, int h) {
\r
* @param h New height
\r
*/
\r
void windowReshape(int w, int h) {
\r
- GLdouble near = -10.0;
\r
- GLdouble far = 10.0;
\r
+ GLdouble near = -10
00
.0;
\r
+ GLdouble far = 10
00
.0;
\r
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
glMatrixMode(GL_PROJECTION);
\r
\r
glViewport(0, 0, (GLsizei) w, (GLsizei) h);
\r
glMatrixMode(GL_PROJECTION);
\r
@@
-557,7
+557,7
@@
motion(int x, int y)
void idle() {
\r
angle = (int)(angle + 10) % 360;
\r
//angle2 = (int)(angle2 + 10) % 360;
\r
void idle() {
\r
angle = (int)(angle + 10) % 360;
\r
//angle2 = (int)(angle2 + 10) % 360;
\r
- printf("Angle 1: %
d, Angle 2: %d
", angle, angle2);
\r
+ printf("Angle 1: %
f, Angle 2: %f\n
", angle, angle2);
\r
sleep(2);
\r
glutPostRedisplay();
\r
}
\r
sleep(2);
\r
glutPostRedisplay();
\r
}
\r
@@
-572,7
+572,7
@@
void drawFloor() {
// glEnable(GL_TEXTURE_2D);
\r
//}
\r
\r
// glEnable(GL_TEXTURE_2D);
\r
//}
\r
\r
-
/*
glBegin(GL_QUADS);
\r
+ glBegin(GL_QUADS);
\r
glTexCoord2f(0.0, 0.0);
\r
glVertex3fv(floorVertices[0]);
\r
glTexCoord2f(0.0, 16.0);
\r
glTexCoord2f(0.0, 0.0);
\r
glVertex3fv(floorVertices[0]);
\r
glTexCoord2f(0.0, 16.0);
\r
@@
-581,7
+581,7
@@
void drawFloor() {
glVertex3fv(floorVertices[2]);
\r
glTexCoord2f(16.0, 0.0);
\r
glVertex3fv(floorVertices[3]);
\r
glVertex3fv(floorVertices[2]);
\r
glTexCoord2f(16.0, 0.0);
\r
glVertex3fv(floorVertices[3]);
\r
- glEnd();
*/
\r
+ glEnd();
\r
\r
/*if (useTexture) {
\r
glDisable(GL_TEXTURE_2D);
\r
\r
/*if (useTexture) {
\r
glDisable(GL_TEXTURE_2D);
\r
@@
-622,7
+622,7
@@
void display() {
\r
glPushMatrix();
\r
\r
\r
glPushMatrix();
\r
\r
- glTranslatef(0.0, 0.0, 0.0);
\r
+
//
glTranslatef(0.0, 0.0, 0.0);
\r
glutWireTeapot(30); // Draw teapot for test
\r
glPopMatrix();
\r
\r
glutWireTeapot(30); // Draw teapot for test
\r
glPopMatrix();
\r
\r
@@
-650,10
+650,10
@@
void init() {
glLoadIdentity();
\r
\r
gluPerspective(
\r
glLoadIdentity();
\r
\r
gluPerspective(
\r
- 60.0, /* field of view in degree */
\r
- 1.0, /* aspect ratio */
\r
-
0.0, /* Z near */
\r
-
9
00.0 /* Z far */
\r
+
60.0, /* field of view in degree */
\r
+ 1.0, /* aspect ratio */
\r
+
-100
0.0, /* Z near */
\r
+
10
00.0 /* Z far */
\r
);
\r
\r
glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
\r
);
\r
\r
glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, 1);
\r
UCC
git Repository :: git.ucc.asn.au