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
cfb80c0
..
16eae70
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-110,10
+110,10
@@
char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
char dataDir[200]; // Stores the directory name for the meshes and textures.
\r
\r
static GLfloat floorVertices[4][3] = {
\r
char dataDir[200]; // Stores the directory name for the meshes and textures.
\r
\r
static GLfloat floorVertices[4][3] = {
\r
- { -
20.0, 0.0, 2
0.0 },
\r
- {
20.0, 0.0, 2
0.0 },
\r
- {
20.0, 0.0, -2
0.0 },
\r
- { -
20.0, 0.0, -2
0.0 },
\r
+ { -
1000.0, 0.0, 100
0.0 },
\r
+ {
1000.0, 0.0, 100
0.0 },
\r
+ {
1000.0, 0.0, -100
0.0 },
\r
+ { -
1000.0, 0.0, -100
0.0 },
\r
};
\r
\r
static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light
\r
};
\r
\r
static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light
\r
@@
-537,8
+537,8
@@
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
- 0.0,
8.0, 60.0, /* eye is at (0,8,60
) */
\r
- 0.0,
8.0, 0.0, /* center is at (0,8,0
) */
\r
+ 0.0,
0.0, 60.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, 1.0, 0.0 /* up is in postivie Y direction */
\r
);
\r
\r
@@
-557,14
+557,10
@@
void display() {
glDisable(GL_BLEND);
\r
\r
glPushMatrix();
\r
glDisable(GL_BLEND);
\r
\r
glPushMatrix();
\r
- glDisable(GL_LIGHTING);
\r
-
\r
- glColor3f(1.0, 0.0, 1.0);
\r
- glTranslatef(0.0, 8.0, 0.0);
\r
+
\r
+ //glTranslatef(0.0, 0.0, 0.0);
\r
\r
\r
- glutSolidTeapot(1); // Draw teapot for test
\r
-
\r
- glEnable(GL_LIGHTING);
\r
+ glutSolidTeapot(5); // Draw teapot for test
\r
glPopMatrix();
\r
\r
glPushMatrix();
\r
glPopMatrix();
\r
\r
glPushMatrix();
\r
@@
-588,6
+584,7
@@
void display() {
*/
\r
void init() {
\r
glMatrixMode(GL_PROJECTION);
\r
*/
\r
void init() {
\r
glMatrixMode(GL_PROJECTION);
\r
+ glLoadIdentity();
\r
\r
gluPerspective(
\r
60.0, /* field of view in degree */
\r
\r
gluPerspective(
\r
60.0, /* field of view in degree */
\r
@@
-604,6
+601,7
@@
void init() {
glEnable(GL_LIGHTING);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
glEnable(GL_LIGHTING);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
+ glLoadIdentity();
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
UCC
git Repository :: git.ucc.asn.au