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
386586e
..
c1e1eb9
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-112,6
+112,7
@@
void processLightEvents(int id) {
void processObjectEvents(int id) {
\r
// **NOTE: For the testing phase, only have the teapot
\r
addSceneObject(id);
\r
void processObjectEvents(int id) {
\r
// **NOTE: For the testing phase, only have the teapot
\r
addSceneObject(id);
\r
+ glutPostRedisplay();
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-390,7
+391,8
@@
void display() {
\r
// Apply rotation vector
\r
vector* rv = so.rotation.vect;
\r
\r
// Apply rotation vector
\r
vector* rv = so.rotation.vect;
\r
- glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);
\r
+ printf("%d, %d, %d\n", *rv[0], *rv[1], *rv[2]);
\r
+ /* glRotatef(so.rotation.parameter, *rv[0], *rv[1], *rv[2]);
\r
\r
// Apply scaling vector
\r
vector* sv = so.scale;
\r
\r
// Apply scaling vector
\r
vector* sv = so.scale;
\r
@@
-404,9
+406,8
@@
void display() {
getTexture(so.texture);
\r
glBindTexture(GL_TEXTURE_2D, so.texture);
\r
} else {
\r
getTexture(so.texture);
\r
glBindTexture(GL_TEXTURE_2D, so.texture);
\r
} else {
\r
- getTexture(0);
\r
glBindTexture(GL_TEXTURE_2D, 0);
\r
glBindTexture(GL_TEXTURE_2D, 0);
\r
- }
\r
+ }
*/
\r
\r
// Draw actual object
\r
if ( so.mesh > 0 ) {
\r
\r
// Draw actual object
\r
if ( so.mesh > 0 ) {
\r
UCC
git Repository :: git.ucc.asn.au