From: Ash Tyndall Date: Sat, 8 Oct 2011 06:30:35 +0000 (+0800) Subject: (no commit message) X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=029de1695bc7b9f91b559a224a71e9be7aedd8a2;p=atyndall%2Fcits2231.git --- diff --git a/scene.c b/scene.c index 9f29cc0..bd003f5 100644 --- a/scene.c +++ b/scene.c @@ -246,7 +246,34 @@ void processLightEvents(int id) { } +int makeSubmenuFromArray( const char *menuEntries[], void *callback ) { + int menuEntriesSize = sizeof(menuEntries) / sizeof(menuEntries[0]); + int menuNumber = menuEntriesSize / 10 + 1; + int submenuObjects[menuNumber-1]; + for( int i = 0; i < menuNumber; i++ ) { + submenuObjects[i] = glutCreateMenu(callback); + int startNum = i*11 - (i-1); + for ( int j = startNum - 1; j < (startNum+9); j++ ) { + if ( j == menuEntriesSize ) break; // Detect if we've reached the end of the array + glutAddMenuEntry( menuEntries[j], j ); + } + } + + int mainMenu = glutCreateMenu(callback); + for ( int i = 0; i < menuNumber; i++ ) { + char name[10]; // buffer to hold name + int startNum = i*11 - (i-1); + int endNum = startNum + 9; + if ( i == menuNumber - 1 ) { // We're on the last one + endNum = startNum + 3; + } + sprintf(name, "%d-%d", startNum, endNum); + glutAddSubMenu( name, submenuObjects[i] ); + } + + return mainMenu; +} void makeMenu() { // Construct material menu @@ -268,31 +295,21 @@ void makeMenu() { glutAddMenuEntry("R/G/B/All Light 2", LIGHT_RGBALL_LIGHT_2); // Construct add object submenus - int objectMenuEntriesSize = sizeof(objectMenuEntries) / sizeof(objectMenuEntries[0]); - int menuNumber = objectMenuEntriesSize / 10 + 1; - int addObjectSubmenu[menuNumber-1]; + int addObjectMenu = makeSubmenuFromArray( objectMenuEntries, processObjectEvents ); + + // Construct texture/ground texture submenus +/* int textureMenuEntries = sizeof(textureMenuEntries) / sizeof(textureMenuEntries[0]); + int menuNumber = textureMenuEntries / 10 + 1; + int textureSubmenu[menuNumber-1]; for( int i = 0; i < menuNumber; i++ ) { - addObjectSubmenu[i] = glutCreateMenu(processObjectEvents); + textureSubmenu[i] = glutCreateMenu(processTextureEvents); int startNum = i*11 - (i-1); for ( int j = startNum - 1; j < (startNum+9); j++ ) { if ( j == objectMenuEntriesSize ) break; // Detect if we've reached the end of the array glutAddMenuEntry( objectMenuEntries[j], j ); } - } - - // Construct add object menu - int addObjectMenu = glutCreateMenu(processObjectEvents); - for ( int i = 0; i < menuNumber; i++ ) { - char name[10]; // buffer to hold name - int startNum = i*11 - (i-1); - int endNum = startNum + 9; - if ( i == menuNumber - 1 ) { // We're on the last one - endNum = startNum + 3; - } - sprintf(name, "%d-%d", startNum, endNum); - glutAddSubMenu( name, addObjectSubmenu[i] ); - } + }*/ int mainMenu = glutCreateMenu(processMainEvents);