X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;ds=inline;f=scene.c;h=5b3f3a881cee768997108717452c1d40daf8d629;hb=e621bfb4edf5934205815019f7ce7b4e4491c72b;hp=251c556eed6255b068a2caea349bd780a66f6ac0;hpb=3315f206fb8eb69a23612cd9be5fc558316fa52b;p=atyndall%2Fcits2231.git

diff --git a/scene.c b/scene.c
index 251c556..5b3f3a8 100644
--- a/scene.c
+++ b/scene.c
@@ -167,6 +167,31 @@ void getTexture(int i) { // getTexture(i) loads texture i if it isn't already lo
     glBindTexture(GL_TEXTURE_2D, 0);  // Back to default texture
 }
 
+// Menu enum
+enum menu {
+  // Main menu
+  ROTATE_MOVE_CAMERA,
+  POSITION_SCALE,
+  ROTATION_TEXTURE_SCALE,
+  EXIT,
+
+  // Material submenu
+  MATERIAL_ALL_RGB,
+  MATERIAL_AMBIENT_RGB,
+  MATERIAL_DIFFUSE_RGB,
+  MATERIAL_SPECULAR_RGB,
+  MATERIAL_ALL_ADSS,
+  MATERIAL_RED_ADSS,
+  MATERIAL_GREEN_ADSS,
+  MATERIAL_BLUE_ADSS,
+
+  // Light submenu
+  LIGHT_MOVE_LIGHT_1,
+  LIGHT_RGBALL_LIGHT_1,
+  LIGHT_MOVE_LIGHT_2,
+  LIGHT_RGBALL_LIGHT_2
+};
+
 // Menu arrays
 const char *textureMenuEntries[NTEXTURE] = {
   "1 Plain", "2 Rust", "3 Concrete", "4 Carpet", "5 Beach Sand", 
@@ -191,13 +216,14 @@ const char *objectMenuEntries[NMESH] = {
   "51 Chef", "52 Parasaurolophus", "53 Rooster", "54 T-rex"
 };
 
-const char *materialMenuEntries[8] = {
-  "All R/G/B", "Ambient R/G/B", "Diffuse R/G/B", "Specular R/G/B",
-  "All Amb/Diff/Spec/Shine", "Red Amb/Diff/Spec/Shine", "Green Amb/Diff/Spec/Shine", "Blue Amb/Diff/Spec/Shine"
-};
+
 
 void processMainEvents(int id) {
-   if(id == 99) exit(0);
+  switch (id) {
+    case EXIT:
+      exit(0);
+
+  }
 }
 
 void processObjectEvents(int id) {
@@ -220,18 +246,64 @@ void processLightEvents(int id) {
 
 }
 
+
+
 void makeMenu() {
-  int main, object, material, texture, gtexture, light;
+  // Construct material menu
+  int materialMenu = glutCreateMenu(processMaterialEvents);
+  glutAddMenuEntry("All R/G/B", MATERIAL_ALL_RGB);
+  glutAddMenuEntry("Ambient R/G/B", MATERIAL_AMBIENT_RGB);
+  glutAddMenuEntry("Diffuse R/G/B", MATERIAL_DIFFUSE_RGB);
+  glutAddMenuEntry("Specular R/G/B", MATERIAL_SPECULAR_RGB);
+  glutAddMenuEntry("All Amb/Diff/Spec/Shine", MATERIAL_ALL_ADSS);
+  glutAddMenuEntry("Red Amb/Diff/Spec/Shine", MATERIAL_RED_ADSS);
+  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++ ) {
+    glutAddSubMenu( "1", addObjectSubmenu[i] );
+  }
 
-  object = glutCreateMenu(processObjectEvents);
-  for ( int i = 0; objectMenuEntries[i]; i++ ) {
-    glutAddMenuEntry( objectMenuEntries[i], 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);
+  
+  //texture
+  //ground texture
+  //lights
+
+
+  glutAddMenuEntry("Exit", EXIT);
 
-  glutCreateMenu(mymenu);
-  glutAddMenuEntry("Exit", 99);
   glutAttachMenu(GLUT_RIGHT_BUTTON);
 }