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:
4907cd7
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 12:36:37 +0000
(20:36 +0800)
committer
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 12:36:37 +0000
(20:36 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
d794a0f
..
d351afa
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-390,13
+390,13
@@
void display() {
SceneObject so = sceneObjs[i];
\r
\r
// Apply rotation vector
\r
SceneObject so = sceneObjs[i];
\r
\r
// Apply rotation vector
\r
- GLfloat* rv = &so.rotation.vector;
\r
- printf("%f, %f, %f\n",
rv[0], rv[1], rv
[2]);
\r
- glRotatef(so.rotation.amount,
rv[0], rv[1], rv
[2]);
\r
+
//
GLfloat* rv = &so.rotation.vector;
\r
+ printf("%f, %f, %f\n",
so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector
[2]);
\r
+ glRotatef(so.rotation.amount,
so.rotation.vector[0], so.rotation.vector[1], so.rotation.vector
[2]);
\r
\r
// Apply scaling vector
\r
\r
// Apply scaling vector
\r
- GLfloat* sv = &so.scale;
\r
- glScalef(s
v[0], sv[1], sv
[2]);
\r
+
//
GLfloat* sv = &so.scale;
\r
+ glScalef(s
o.scale[0], so.scale[1], so.scale
[2]);
\r
\r
// Apply translation vector
\r
glTranslatef(so.x, so.y, so.z);
\r
\r
// Apply translation vector
\r
glTranslatef(so.x, so.y, so.z);
\r
UCC
git Repository :: git.ucc.asn.au