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:
241ec71
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 00:26:57 +0000
(08:26 +0800)
committer
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 00:26:57 +0000
(08:26 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
d06dd3c
..
3c25623
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-297,7
+297,7
@@
void display() {
glLoadIdentity();
\r
\r
gluLookAt(
\r
glLoadIdentity();
\r
\r
gluLookAt(
\r
-
0.0, 8
.0, 30.0, /* eye is at (x,y,z) */
\r
+
30.0, 30
.0, 30.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
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
@@
-347,9
+347,6
@@
void display() {
* init function; sets initial OpenGL state
\r
*/
\r
void init() {
\r
* init function; sets initial OpenGL state
\r
*/
\r
void init() {
\r
- glMatrixMode(GL_MODELVIEW);
\r
- glLoadIdentity();
\r
-
\r
glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
\r
glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
\r
glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
\r
glLightfv(GL_LIGHT0, GL_POSITION, light0_pos);
\r
glLightfv(GL_LIGHT0, GL_AMBIENT, ambient0);
\r
glLightfv(GL_LIGHT0, GL_DIFFUSE, diffuse0);
\r
@@
-405,15
+402,6
@@
int main(int argc, char **argv) {
glEnable(GL_TEXTURE_2D);
\r
glLineWidth(1.0);
\r
\r
glEnable(GL_TEXTURE_2D);
\r
glLineWidth(1.0);
\r
\r
- // **NOTE: Currently the perspective and look-at code is static, for testing purposes
\r
- //glMatrixMode(GL_PROJECTION);
\r
- //gluPerspective(
\r
- // 40.0, /* field of view in degree */
\r
- // 1.0, /* aspect ratio */
\r
- // 1.0, /* Z near */ // **NOTE: Seems to be issue with near < 0 causing invisible everything
\r
- // 100.0 /* Z far */
\r
- // );
\r
-
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
\r
\r
glutReshapeFunc(windowReshape);
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
\r
\r
glutReshapeFunc(windowReshape);
\r
UCC
git Repository :: git.ucc.asn.au