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 (from parent 1:
d0f6e6b
)
Fixed near/far left/right moving of objects. Starting work on moving lights.
author
Ash Tyndall
<
[email protected]
>
Sat, 22 Oct 2011 06:06:55 +0000
(14:06 +0800)
committer
Ash Tyndall
<
[email protected]
>
Sat, 22 Oct 2011 06:06:55 +0000
(14:06 +0800)
scene.c
patch
|
blob
|
history
diff --git
a/scene.c
b/scene.c
index
57803e5
..
a2fbea6
100644
(file)
--- a/
scene.c
+++ b/
scene.c
@@
-153,8
+153,8
@@
void makeMenu() {
// Construct light menu
\r
int lightMenu = glutCreateMenu(processLightEvents);
\r
glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);
\r
// Construct light menu
\r
int lightMenu = glutCreateMenu(processLightEvents);
\r
glutAddMenuEntry("Move Light 1", M_LIGHT_MOVE_LIGHT_1);
\r
- glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
\r
- glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
\r
+
//
glutAddMenuEntry("R/G/B/All Light 1", M_LIGHT_RGBALL_LIGHT_1);
\r
+
//
glutAddMenuEntry("Move Light 2", M_LIGHT_MOVE_LIGHT_2);
\r
glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);
\r
\r
// Construct object menu
\r
glutAddMenuEntry("R/G/B/All Light 2", M_LIGHT_RGBALL_LIGHT_2);
\r
\r
// Construct object menu
\r
@@
-173,7
+173,7
@@
void makeMenu() {
//glutAddSubMenu("Material", materialMenu);
\r
glutAddSubMenu("Texture", textureMenu);
\r
glutAddSubMenu("Ground texture", gTextureMenu);
\r
//glutAddSubMenu("Material", materialMenu);
\r
glutAddSubMenu("Texture", textureMenu);
\r
glutAddSubMenu("Ground texture", gTextureMenu);
\r
-
//
glutAddSubMenu("Lights", lightMenu);
\r
+ glutAddSubMenu("Lights", lightMenu);
\r
glutAddMenuEntry("Exit", M_EXIT);
\r
\r
// Bind to right mouse button
\r
glutAddMenuEntry("Exit", M_EXIT);
\r
\r
// Bind to right mouse button
\r
UCC
git Repository :: git.ucc.asn.au