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]
/
helper.c
diff --git
a/helper.c
b/helper.c
index
f6ecc8c
..
ab96c88
100644
(file)
--- a/
helper.c
+++ b/
helper.c
@@
-298,16
+298,20
@@
int addSceneObject(int id) {
curObject = nObjects;
curObject = nObjects;
- sceneObjs[nObjects].mesh = -1;
- sceneObjs[nObjects].texture = -1;
+ sceneObjs[nObjects].mesh = -1; // Teapot is -1 mesh
+ sceneObjs[nObjects].texture.id = -1; // No texture
+ sceneObjs[nObjects].texture.scale = 1;
sceneObjs[nObjects].x = 0;
sceneObjs[nObjects].y = 0;
sceneObjs[nObjects].z = 0;
sceneObjs[nObjects].x = 0;
sceneObjs[nObjects].y = 0;
sceneObjs[nObjects].z = 0;
- sceneObjs[nObjects].scale = (vector*)calloc( 3, sizeof(vector[0]) );
+ sceneObjs[nObjects].scale[0] = 1;
+ sceneObjs[nObjects].scale[1] = 1;
+ sceneObjs[nObjects].scale[2] = 1;
- sceneObjs[nObjects].rotation.parameter = 0;
- sceneObjs[nObjects].rotation.vect = (vector*)calloc( 3, sizeof(vector[0]) );
+ sceneObjs[nObjects].rotation.x = 0;
+ sceneObjs[nObjects].rotation.y = 0;
+ sceneObjs[nObjects].rotation.z = 0;
nObjects += 1; // New object in scene
nObjects += 1; // New object in scene
UCC
git Repository :: git.ucc.asn.au