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:
47f5872
)
(no commit message)
author
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 12:46:06 +0000
(20:46 +0800)
committer
Ash Tyndall
<
[email protected]
>
Fri, 21 Oct 2011 12:46:06 +0000
(20:46 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
77d2c10
..
4514e79
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-120,7
+120,10
@@
void processObjectEvents(int id) {
* @param id ID of texutre selected
\r
*/
\r
void processTextureEvents(int id) {
\r
* @param id ID of texutre selected
\r
*/
\r
void processTextureEvents(int id) {
\r
-
\r
+ if ( curObject >= 0 ) {
\r
+ sceneObjs[curObject].texture = id;
\r
+ glutPostRedisplay();
\r
+ }
\r
}
\r
\r
/**
\r
}
\r
\r
/**
\r
@@
-168,7
+171,7
@@
void makeMenu() {
glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);
\r
glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
\r
//glutAddSubMenu("Material", materialMenu);
\r
glutAddMenuEntry("Position/Scale", M_POSITION_SCALE);
\r
glutAddMenuEntry("Rotation/Texture Scale", M_ROTATION_TEXTURE_SCALE);
\r
//glutAddSubMenu("Material", materialMenu);
\r
-
//
glutAddSubMenu("Texture", textureMenu);
\r
+ glutAddSubMenu("Texture", textureMenu);
\r
glutAddSubMenu("Ground texture", gTextureMenu);
\r
//glutAddSubMenu("Lights", lightMenu);
\r
glutAddMenuEntry("Exit", M_EXIT);
\r
glutAddSubMenu("Ground texture", gTextureMenu);
\r
//glutAddSubMenu("Lights", lightMenu);
\r
glutAddMenuEntry("Exit", M_EXIT);
\r
UCC
git Repository :: git.ucc.asn.au