git.ucc.asn.au
/
atyndall
/
cits2231.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b360766
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 07:19:50 +0000
(15:19 +0800)
committer
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 07:19:50 +0000
(15:19 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
7ea99c8
..
1d72da5
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-109,6
+109,17
@@
char *dirDefault2 = "/cslinux/examples/CITS2231/project-files/models-textures";
\r
char dataDir[200]; // Stores the directory name for the meshes and textures.
\r
\r
\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, 20.0 },
\r
+ { 20.0, 0.0, 20.0 },
\r
+ { 20.0, 0.0, -20.0 },
\r
+ { -20.0, 0.0, -20.0 },
\r
+};
\r
+
\r
+static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; // White light
\r
+static GLfloat lightPosition[4];
\r
+static float lightAngle = 10.0, lightHeight = 20;
\r
+
\r
/**
\r
* Prints out error message when file cannot be read
\r
* @param fileName Name of file that could not be read
\r
/**
\r
* Prints out error message when file cannot be read
\r
* @param fileName Name of file that could not be read
\r
@@
-491,17
+502,10
@@
void mouse(int btn, int state, int x, int y) {
\r
}
\r
\r
\r
}
\r
\r
-static GLfloat floorVertices[4][3] = {
\r
- { -20.0, 0.0, 20.0 },
\r
- { 20.0, 0.0, 20.0 },
\r
- { 20.0, 0.0, -20.0 },
\r
- { -20.0, 0.0, -20.0 },
\r
-};
\r
-
\r
-/* Draw a floor (possibly textured). */
\r
-static void
\r
-drawFloor(void)
\r
-{
\r
+/**
\r
+ * Draw a floor.
\r
+ */
\r
+void drawFloor() {
\r
glDisable(GL_LIGHTING);
\r
\r
//if (useTexture) {
\r
glDisable(GL_LIGHTING);
\r
\r
//if (useTexture) {
\r
@@
-526,12
+530,6
@@
drawFloor(void)
glEnable(GL_LIGHTING);
\r
}
\r
\r
glEnable(GL_LIGHTING);
\r
}
\r
\r
-
\r
-static GLfloat lightColor[] = {1.0, 1.0, 1.0, 1.0}; /* green-tinted */
\r
-static GLfloat lightPosition[4];
\r
-static float lightAngle = 10.0, lightHeight = 20;
\r
-
\r
-
\r
/**
\r
* Display function
\r
*/
\r
/**
\r
* Display function
\r
*/
\r
@@
-575,8
+573,8
@@
void display() {
* init function; sets initial OpenGL state
\r
*/
\r
void init() {
\r
* init function; sets initial OpenGL state
\r
*/
\r
void init() {
\r
-
\r
glMatrixMode(GL_PROJECTION);
\r
glMatrixMode(GL_PROJECTION);
\r
+ glLoadIdentity();
\r
gluPerspective(
\r
60.0, /* field of view in degree */
\r
1.0, /* aspect ratio */
\r
gluPerspective(
\r
60.0, /* field of view in degree */
\r
1.0, /* aspect ratio */
\r
@@
-585,6
+583,7
@@
void init() {
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\r
);
\r
\r
glMatrixMode(GL_MODELVIEW);
\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
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
UCC
git Repository :: git.ucc.asn.au