(no commit message)

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index df115d1..c7d5318 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -216,10 +216,7 @@ const char *objectMenuEntries[NMESH] = {
   "51 Chef", "52 Parasaurolophus", "53 Rooster", "54 T-rex"\r
 };\r
 \r
-const char *materialMenuEntries[8] = {\r
-  "All R/G/B", "Ambient R/G/B", "Diffuse R/G/B", "Specular R/G/B",\r
-  "All Amb/Diff/Spec/Shine", "Red Amb/Diff/Spec/Shine", "Green Amb/Diff/Spec/Shine", "Blue Amb/Diff/Spec/Shine"\r
-};\r
+\r
 \r
 void processMainEvents(int id) {\r
   switch (id) {\r
@@ -252,13 +249,65 @@ void processLightEvents(int id) {
 \r
 \r
 void makeMenu() {\r
-  glutCreateMenu(processMainEvents);\r
+  // Construct material menu\r
+  int materialMenu = glutCreateMenu(processMaterialEvents);\r
+  glutAddMenuEntry("All R/G/B", MATERIAL_ALL_RGB);\r
+  glutAddMenuEntry("Ambient R/G/B", MATERIAL_AMBIENT_RGB);\r
+  glutAddMenuEntry("Diffuse R/G/B", MATERIAL_DIFFUSE_RGB);\r
+  glutAddMenuEntry("Specular R/G/B", MATERIAL_SPECULAR_RGB);\r
+  glutAddMenuEntry("All Amb/Diff/Spec/Shine", MATERIAL_ALL_ADSS);\r
+  glutAddMenuEntry("Red Amb/Diff/Spec/Shine", MATERIAL_RED_ADSS);\r
+  glutAddMenuEntry("Green Amb/Diff/Spec/Shine", MATERIAL_GREEN_ADSS);\r
+  glutAddMenuEntry("Blue Amb/Diff/Spec/Shine", MATERIAL_BLUE_ADSS);\r
+\r
+  // Construct light menu\r
+  int lightMenu = glutCreateMenu(processLightEvents);\r
+  glutAddMenuEntry("Move Light 1", LIGHT_MOVE_LIGHT_1);\r
+  glutAddMenuEntry("R/G/B/All Light 1", LIGHT_RGBALL_LIGHT_1);\r
+  glutAddMenuEntry("Move Light 2", LIGHT_MOVE_LIGHT_2);\r
+  glutAddMenuEntry("R/G/B/All Light 2", LIGHT_RGBALL_LIGHT_2);\r
+\r
+  // Construct add object submenus\r
+  int objectMenuEntriesSize = sizeof(objectMenuEntries) / sizeof(objectMenuEntries[0]);\r
+  int menuNumber = objectMenuEntriesSize / 10 + 1;\r
+  int addObjectSubmenu[menuNumber-1];\r
+\r
+  for( int i = 0; i < menuNumber; i++ ) {\r
+    addObjectSubmenu[i] = glutCreateMenu(processObjectEvents);\r
+    int startNum = i*11 - (i-1);\r
+    for ( int j = startNum - 1; j < (startNum+9); j++ ) {\r
+      if ( j == objectMenuEntriesSize ) break; // Detect if we've reached the end of the array\r
+      glutAddMenuEntry( objectMenuEntries[j], j );\r
+    }\r
+  }\r
+\r
+  // Construct add object menu\r
+  int addObjectMenu = glutCreateMenu(processObjectEvents);\r
+  for ( int i = 0; i < menuNumber; i++ ) {\r
+    char name[10]; // buffer to hold name\r
+    int startNum = i*11 - (i-1);\r
+    int endNum = startNum + 9;\r
+    if ( i == menuNumber - 1 ) { // We're on the last one\r
+      endNum = startNum + 4;\r
+    }\r
+    sprintf(name, "%d-%d", startNum, endNum);\r
+    glutAddSubMenu( name, addObjectSubmenu[i] );\r
+  }\r
+\r
+\r
+  int mainMenu = glutCreateMenu(processMainEvents);\r
 \r
   glutAddMenuEntry("Rotate/Move Camera", ROTATE_MOVE_CAMERA);\r
-  //Add object\r
+  glutAddSubMenu("Add object", addObjectMenu);\r
   glutAddMenuEntry("Position/Scale", POSITION_SCALE);\r
   glutAddMenuEntry("Rotation/Texture Scale", ROTATION_TEXTURE_SCALE);\r
   //material\r
+  \r
+  \r
+\r
+  glutSetMenu(mainMenu);\r
+  glutAddSubMenu("Material", materialMenu);\r
+  \r
   //texture\r
   //ground texture\r
   //lights\r
@@ -269,22 +318,6 @@ void makeMenu() {
   glutAttachMenu(GLUT_RIGHT_BUTTON);\r
 }\r
 \r
-    \r
-/*void createGLUTMenus() {\r
-\r
-       int menu,submenu;\r
-\r
-       submenu = glutCreateMenu(processMenuEvents);\r
-       glutAddMenuEntry("Red",RED);\r
-       glutAddMenuEntry("Blue",BLUE);\r
-       glutAddMenuEntry("Green",GREEN);\r
-\r
-       menu = glutCreateMenu(processMenuEvents);\r
-       glutAddMenuEntry("White",WHITE);\r
-       glutAddSubMenu("RGB Menu",submenu);\r
-       glutAttachMenu(GLUT_RIGHT_BUTTON);\r
-*/\r
-\r
 void display() {\r
    // You probably want to change both of the following.\r
    glClear(GL_COLOR_BUFFER_BIT);\r