From: Ash Tyndall <git@atyndall.net>
Date: Sat, 8 Oct 2011 05:36:48 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=22329df92ae535d24f8e07444a1299e7ed19bb86;p=atyndall%2Fcits2231.git

---

diff --git a/scene.c b/scene.c
index 18cb9fb..2a5ab65 100644
--- a/scene.c
+++ b/scene.c
@@ -249,14 +249,7 @@ void processLightEvents(int id) {
 
 
 void makeMenu() {
-  int mainMenu = glutCreateMenu(processMainEvents);
-
-  glutAddMenuEntry("Rotate/Move Camera", ROTATE_MOVE_CAMERA);
-  //Add object
-  glutAddMenuEntry("Position/Scale", POSITION_SCALE);
-  glutAddMenuEntry("Rotation/Texture Scale", ROTATION_TEXTURE_SCALE);
-  //material
-  
+  // Construct material menu
   int materialMenu = glutCreateMenu(processMaterialEvents);
   glutAddMenuEntry("All R/G/B", MATERIAL_ALL_RGB);
   glutAddMenuEntry("Ambient R/G/B", MATERIAL_AMBIENT_RGB);
@@ -267,6 +260,41 @@ void makeMenu() {
   glutAddMenuEntry("Green Amb/Diff/Spec/Shine", MATERIAL_GREEN_ADSS);
   glutAddMenuEntry("Blue Amb/Diff/Spec/Shine", MATERIAL_BLUE_ADSS);
 
+  // Construct light menu
+  int lightMenu = glutCreateMenu(processLightEvents);
+  glutAddMenuEntry("Move Light 1", LIGHT_MOVE_LIGHT_1);
+  glutAddMenuEntry("R/G/B/All Light 1", LIGHT_RGBALL_LIGHT_1);
+  glutAddMenuEntry("Move Light 2", LIGHT_MOVE_LIGHT_2);
+  glutAddMenuEntry("R/G/B/All Light 2", LIGHT_RGBALL_LIGHT_2);
+
+  // Construct add object submenus
+  int addObjectSubmenu[6];
+
+  for( int i = 0; i < 6; i++ ) {
+    addObjectSubmenu[i] = glutCreateMenu(processObjectEvents);
+    for ( int j = i; j < (i+9); j++ ) {
+      glutAddMenuEntry( objectMenuEntries[j], j );
+    }
+  }
+
+  // Construct add object menu
+  int addObjectMenu = glutCreateMenu(processObjectEvents);
+  for ( int i = 0; addObjectSubmenu[i]; i++ ) {
+    char * name = { (char)i };
+    glutAddSubMenu( name, addObjectSubmenu[i] );
+  }
+
+
+  int mainMenu = glutCreateMenu(processMainEvents);
+
+  glutAddMenuEntry("Rotate/Move Camera", ROTATE_MOVE_CAMERA);
+  //Add object
+  glutAddMenuEntry("Position/Scale", POSITION_SCALE);
+  glutAddMenuEntry("Rotation/Texture Scale", ROTATION_TEXTURE_SCALE);
+  //material
+  
+  
+
   glutSetMenu(mainMenu);
   glutAddSubMenu("Material", materialMenu);
   
@@ -280,22 +308,6 @@ void makeMenu() {
   glutAttachMenu(GLUT_RIGHT_BUTTON);
 }
 
-    
-/*void createGLUTMenus() {
-
-	int menu,submenu;
-
-	submenu = glutCreateMenu(processMenuEvents);
-	glutAddMenuEntry("Red",RED);
-	glutAddMenuEntry("Blue",BLUE);
-	glutAddMenuEntry("Green",GREEN);
-
-	menu = glutCreateMenu(processMenuEvents);
-	glutAddMenuEntry("White",WHITE);
-	glutAddSubMenu("RGB Menu",submenu);
-	glutAttachMenu(GLUT_RIGHT_BUTTON);
-*/
-
 void display() {
    // You probably want to change both of the following.
    glClear(GL_COLOR_BUFFER_BIT);