(no commit message)

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