From: Ash Tyndall <git@atyndall.net>
Date: Sun, 9 Oct 2011 05:08:44 +0000 (+0800)
Subject: (no commit message)
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=19fa399bf0c4b47f6f23a320627533f0c902bca8;p=atyndall%2Fcits2231.git

---

diff --git a/scene.c b/scene.c
index f9df3c8..002fadc 100644
--- a/scene.c
+++ b/scene.c
@@ -52,6 +52,55 @@ typedef struct {
     float x,y,z;
 } SceneObject;
 
+// 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",
+  "6 Rocky", "7 Brick", "8 Water", "9 Paper", "10 Marble",
+  "11 Wood", "12 Scales", "13 Fur", "14 Denim", "15 Hessian",
+  "16 Orange Peel", "17 Ice Crystals", "18 Grass", "19 Corrugated Iron", "20 Styrofoam",
+  "21 Bubble Wrap", "22 Leather", "23 Camouflage", "24 Asphalt", "25 Scratched Ice",
+  "26 Rattan", "27 Snow", "28 Dry Mud", "29 Old Concrete", "30 Leopard Skin"
+};
+
+const char *objectMenuEntries[NMESH] = {
+  "1 Thin Dinosaur","2 Big Dog","3 Saddle Dinosaur", "4 Dragon", "5 Cleopatra",
+  "6 Bone I", "7 Bone II", "8 Rabbit", "9 Long Dragon", "10 Buddha",
+  "11 Sitting Rabbit", "12 Frog", "13 Cow", "14 Monster", "15 Sea Horse",
+  "16 Head", "17 Pelican", "18 Horse", "19 Kneeling Angel", "20 Porsche I",
+  "21 Truck", "22 Statue of Liberty", "23 Sitting Angel", "24 Metal Part", "25 Car",
+  "26 Apatosaurus", "27 Airliner", "28 Motorbike", "29 Dolphin", "30 Spaceman",
+  "31 Winnie the Pooh", "32 Shark", "33 Crocodile", "34 Toddler", "35 Fat Dinosaur",
+  "36 Chihuahua", "37 Sabre-toothed Tiger", "38 Lioness", "39 Fish", "40 Horse (head down)",
+  "41 Horse (head up)", "42 Skull", "43 Fighter Jet I", "44 Toad", "45 Convertible",
+  "46 Porsche II", "47 Hare", "48 Vintage Car", "49 Fighter Jet II", "50 Winged Monkey",
+  "51 Chef", "52 Parasaurolophus", "53 Rooster", "54 T-rex"
+};
+
 #define MAXOBJECTS 256
 SceneObject sceneObjs[MAXOBJECTS];  // An array with details of the objects in a scene
 int nObjects=0;                     // How many objects there are in the scene currently.
@@ -167,61 +216,22 @@ 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", 
-  "6 Rocky", "7 Brick", "8 Water", "9 Paper", "10 Marble", 
-  "11 Wood", "12 Scales", "13 Fur", "14 Denim", "15 Hessian",
-  "16 Orange Peel", "17 Ice Crystals", "18 Grass", "19 Corrugated Iron", "20 Styrofoam",
-  "21 Bubble Wrap", "22 Leather", "23 Camouflage", "24 Asphalt", "25 Scratched Ice",
-  "26 Rattan", "27 Snow", "28 Dry Mud", "29 Old Concrete", "30 Leopard Skin"
-};
-
-const char *objectMenuEntries[NMESH] = {
-  "1 Thin Dinosaur","2 Big Dog","3 Saddle Dinosaur", "4 Dragon", "5 Cleopatra", 
-  "6 Bone I", "7 Bone II", "8 Rabbit", "9 Long Dragon", "10 Buddha", 
-  "11 Sitting Rabbit", "12 Frog", "13 Cow", "14 Monster", "15 Sea Horse", 
-  "16 Head", "17 Pelican", "18 Horse", "19 Kneeling Angel", "20 Porsche I", 
-  "21 Truck", "22 Statue of Liberty", "23 Sitting Angel", "24 Metal Part", "25 Car", 
-  "26 Apatosaurus", "27 Airliner", "28 Motorbike", "29 Dolphin", "30 Spaceman", 
-  "31 Winnie the Pooh", "32 Shark", "33 Crocodile", "34 Toddler", "35 Fat Dinosaur", 
-  "36 Chihuahua", "37 Sabre-toothed Tiger", "38 Lioness", "39 Fish", "40 Horse (head down)", 
-  "41 Horse (head up)", "42 Skull", "43 Fighter Jet I", "44 Toad", "45 Convertible", 
-  "46 Porsche II", "47 Hare", "48 Vintage Car", "49 Fighter Jet II", "50 Winged Monkey", 
-  "51 Chef", "52 Parasaurolophus", "53 Rooster", "54 T-rex"
-};
+void processMainEvents(int id) {
+  switch (id) {
+    case ROTATE_MOVE_CAMERA:
+      // Do stuff
+      break;
 
+    case POSITION_SCALE:
+      // Do stuff
+      break;
 
+    case ROTATION_TEXTURE_SCALE:
+      // Do stuff
+      break;
 
-void processMainEvents(int id) {
-  switch (id) {
     case EXIT:
-      exit(0);
+      exit(EXIT_SUCCESS);
 
   }
 }
@@ -231,7 +241,40 @@ void processObjectEvents(int id) {
 }
 
 void processMaterialEvents(int id) {
+  switch (id) {
+    case MATERIAL_ALL_RGB:
+      // Do stuff
+      break;
+
+    case MATERIAL_AMBIENT_RGB:
+      // Do stuff
+      break;
+
+    case MATERIAL_DIFFUSE_RGB:
+      // Do stuff
+      break;
 
+    case MATERIAL_SPECULAR_RGB:
+      // Do stuff
+      break;
+
+    case MATERIAL_ALL_ADSS:
+      // Do stuff
+      break;
+
+    case MATERIAL_RED_ADSS:
+      // Do stuff
+      break;
+
+    case MATERIAL_GREEN_ADSS:
+      // Do stuff
+      break;
+
+    case MATERIAL_BLUE_ADSS:
+      // Do stuff
+      break;
+
+  }
 }
 
 void processTextureEvents(int id) {
@@ -243,7 +286,24 @@ void processGTextureEvents(int id) {
 }
 
 void processLightEvents(int id) {
+  switch (id) {
+    case LIGHT_MOVE_LIGHT_1:
+      // Do stuff
+      break;
+
+    case LIGHT_RGBALL_LIGHT_1:
+      // Do stuff
+      break;
+
+    case LIGHT_MOVE_LIGHT_2:
+      // Do stuff
+      break;
 
+    case LIGHT_RGBALL_LIGHT_2:
+      // Do stuff
+      break;
+
+  }
 }
 
 /**