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
61cddf9
..
95c19c5
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-18,7
+18,6
@@
#include "types.h"
\r
#include "scene.h"
\r
\r
#include "types.h"
\r
#include "scene.h"
\r
\r
-
\r
/**
\r
* Event hander for main menu events
\r
* @param id ID of menu item selected
\r
/**
\r
* Event hander for main menu events
\r
* @param id ID of menu item selected
\r
@@
-189,10
+188,10
@@
void windowReshape(int w, int h) {
glLoadIdentity();
\r
if (w <= h)
\r
glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
\r
glLoadIdentity();
\r
if (w <= h)
\r
glOrtho(near, far, near*(GLfloat)h/(GLfloat)w,
\r
- far*(GLfloat)h/(GLfloat)w,
near, far
);
\r
+ far*(GLfloat)h/(GLfloat)w,
-100, 100
);
\r
else
\r
glOrtho(near*(GLfloat)w/(GLfloat)h,
\r
else
\r
glOrtho(near*(GLfloat)w/(GLfloat)h,
\r
- far*(GLfloat)w/(GLfloat)h, near, far, near
, far
);
\r
+ far*(GLfloat)w/(GLfloat)h, near, far, near
Clip, farClip
);
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
}
\r
glMatrixMode(GL_MODELVIEW);
\r
glLoadIdentity();
\r
}
\r
@@
-286,7
+285,7
@@
void display() {
\r
// Draw teapot for a test object
\r
glPushMatrix();
\r
\r
// Draw teapot for a test object
\r
glPushMatrix();
\r
- glTranslatef(0.0,
0.5
, 0.0); // **NOTE: Teapot does not rest on surface
\r
+ glTranslatef(0.0,
1.0
, 0.0); // **NOTE: Teapot does not rest on surface
\r
glColor3f(0.5, 0.5, 0.5);
\r
glutSolidTeapot(1);
\r
glPopMatrix();
\r
glColor3f(0.5, 0.5, 0.5);
\r
glutSolidTeapot(1);
\r
glPopMatrix();
\r
UCC
git Repository :: git.ucc.asn.au