Completed menu functionality, added two functions roundUp and makeSubmenuFromArray...

[atyndall/cits2231.git] / scene.c

diff --git a/scene.c b/scene.c
index 2a5ab65..f9df3c8 100644 (file)
--- a/scene.c
+++ b/scene.c
@@ -246,7 +246,60 @@ void processLightEvents(int id) {
 \r
 }\r
 \r
+/**\r
+ * Rounds up numbers, from http://stackoverflow.com/questions/3407012/c-rounding-up-to-the-nearest-multiple-of-a-number\r
+ * @param numToRound Number to round\r
+ * @param multiple Multiple to round up to\r
+ * @return Rounded number\r
+ */\r
+int roundUp(int numToRound, int multiple) {\r
+  if(multiple == 0) {\r
+    return numToRound;\r
+  }\r
 \r
+  int remainder = numToRound % multiple;\r
+  if (remainder == 0)\r
+    return numToRound;\r
+  return numToRound + multiple - remainder;\r
+}\r
+\r
+/**\r
+ * Makes a submenu from an array of items, splitting the list into subsubmenus\r
+ * of only 10 items.\r
+ * @param menuEntries Array of menu items\r
+ * @param menuEntriesSize Size of menuEntries\r
+ * @param callback Callback function for this array of menu items\r
+ * @return Reference to menu created\r
+ */\r
+int makeSubmenuFromArray( const char *menuEntries[], unsigned int menuEntriesSize, void *callback ) {\r
+  if ( menuEntriesSize == 0 ) return -1;\r
+\r
+  int menuNumber = roundUp(menuEntriesSize, 10) / 10;\r
+  int submenuObjects[menuNumber-1];\r
+\r
+  for( int i = 0; i < menuNumber; i++ ) {\r
+    submenuObjects[i] = glutCreateMenu(callback);\r
+    int startNum = i*11 - (i-1);\r
+    for ( int j = startNum - 1; j < (startNum+9); j++ ) {\r
+      if ( j == menuEntriesSize ) break; // Detect if we've reached the end of the array\r
+      glutAddMenuEntry( menuEntries[j], j + 1 );\r
+    }\r
+  } \r
+\r
+  int mainMenu = glutCreateMenu(callback);\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 + (menuEntriesSize - startNum); // Work out final number\r
+    }\r
+    sprintf(name, "%d-%d", startNum, endNum);\r
+    glutAddSubMenu( name, submenuObjects[i] );\r
+  }\r
+\r
+  return mainMenu;\r
+}\r
 \r
 void makeMenu() {\r
   // Construct material menu\r
@@ -267,44 +320,28 @@ void makeMenu() {
   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 addObjectSubmenu[6];\r
-\r
-  for( int i = 0; i < 6; i++ ) {\r
-    addObjectSubmenu[i] = glutCreateMenu(processObjectEvents);\r
-    for ( int j = i; j < (i+9); j++ ) {\r
-      glutAddMenuEntry( objectMenuEntries[j], j );\r
-    }\r
-  }\r
-\r
-  // Construct add object menu\r
-  int addObjectMenu = glutCreateMenu(processObjectEvents);\r
-  for ( int i = 0; addObjectSubmenu[i]; i++ ) {\r
-    char * name = { (char)i };\r
-    glutAddSubMenu( name, addObjectSubmenu[i] );\r
-  }\r
+  // Construct object menu\r
+  int objectMenuEntriesSize = sizeof(objectMenuEntries) / sizeof(objectMenuEntries[0]);\r
+  int objectMenu = makeSubmenuFromArray( objectMenuEntries, objectMenuEntriesSize, processObjectEvents );\r
 \r
+  // Construct texture / ground texture menus\r
+  int textureMenuEntriesSize = sizeof(textureMenuEntries) / sizeof(textureMenuEntries[0]);\r
+  int textureMenu = makeSubmenuFromArray( textureMenuEntries, textureMenuEntriesSize, processTextureEvents );\r
+  int gTextureMenu = makeSubmenuFromArray( textureMenuEntries, textureMenuEntriesSize, processGTextureEvents );\r
 \r
+  // Construct main menu\r
   int mainMenu = glutCreateMenu(processMainEvents);\r
-\r
   glutAddMenuEntry("Rotate/Move Camera", ROTATE_MOVE_CAMERA);\r
-  //Add object\r
+  glutAddSubMenu("Add object", objectMenu);\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
-\r
-\r
+  glutAddSubMenu("Texture", textureMenu);\r
+  glutAddSubMenu("Ground texture", gTextureMenu);\r
+  glutAddSubMenu("Lights", lightMenu);\r
   glutAddMenuEntry("Exit", EXIT);\r
 \r
+  // Bind to right mouse button\r
   glutAttachMenu(GLUT_RIGHT_BUTTON);\r
 }\r
 \r