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:
bf2acca
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 07:15:18 +0000
(15:15 +0800)
committer
Ash Tyndall
<
[email protected]
>
Tue, 18 Oct 2011 07:15:18 +0000
(15:15 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
bad6fa2
..
7ea99c8
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-575,10
+575,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
- glEnable(GL_CULL_FACE);
\r
- glEnable(GL_DEPTH_TEST);
\r
- glEnable(GL_TEXTURE_2D);
\r
- glLineWidth(3.0);
\r
\r
glMatrixMode(GL_PROJECTION);
\r
gluPerspective(
\r
\r
glMatrixMode(GL_PROJECTION);
\r
gluPerspective(
\r
@@
-588,7
+584,7
@@
void init() {
900.0 /* Z far */
\r
);
\r
\r
900.0 /* Z far */
\r
);
\r
\r
-
//
glMatrixMode(GL_MODELVIEW);
\r
+ glMatrixMode(GL_MODELVIEW);
\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
@@
-633,6
+629,9
@@
int main(int argc, char **argv) {
glClearDepth(1.0f); // Depth Buffer Setup
\r
glEnable(GL_DEPTH_TEST); // Enables Depth Testing
\r
glDepthFunc(GL_LEQUAL); // the type
\r
glClearDepth(1.0f); // Depth Buffer Setup
\r
glEnable(GL_DEPTH_TEST); // Enables Depth Testing
\r
glDepthFunc(GL_LEQUAL); // the type
\r
+ glEnable(GL_CULL_FACE);
\r
+ glEnable(GL_TEXTURE_2D);
\r
+ glLineWidth(3.0);
\r
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
\r
\r
\r
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
\r
\r
UCC
git Repository :: git.ucc.asn.au