Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 14481 Details for
Bug 23207
new ebuild GLUI
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
patch for glui
glui-2.1.0.beta-gentoo.patch (text/plain), 29.14 KB, created by
steven knight
on 2003-07-14 15:11:01 UTC
(
hide
)
Description:
patch for glui
Filename:
MIME Type:
Creator:
steven knight
Created:
2003-07-14 15:11:01 UTC
Size:
29.14 KB
patch
obsolete
>diff -Naur glui_v2_1_beta.orig/algebra3.cpp glui_v2_1_beta/algebra3.cpp >--- glui_v2_1_beta.orig/algebra3.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/algebra3.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -723,6 +723,8 @@ > { > int i, j; > >+ (void)file; >+ > fprintf( stderr, "%s:\n", name ); > > for( i = 0; i < 3; i++ ) >@@ -846,6 +848,7 @@ > { > int i, j; > >+ (void)file; > fprintf( stderr, "%s:\n", name ); > > for( i = 0; i < 4; i++ ) >diff -Naur glui_v2_1_beta.orig/arcball.cpp glui_v2_1_beta/arcball.cpp >--- glui_v2_1_beta.orig/arcball.cpp 2001-04-09 01:29:04.000000000 -0400 >+++ glui_v2_1_beta/arcball.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -83,7 +83,6 @@ > float mag; > vec2 v2 = (p - center) / radius; > vec3 v3( v2[0], v2[1], 0.0 ); >- vec3 axis; > > mag = v2*v2; > >@@ -138,6 +137,7 @@ > > void Arcball::mouse_motion( int x, int y, int shift, int ctrl, int alt ) > { >+ (void)shift; > /* Set the X constraint if CONTROL key is pressed, Y if ALT key */ > set_constraints( ctrl != 0, alt != 0 ); > >diff -Naur glui_v2_1_beta.orig/example1.cpp glui_v2_1_beta/example1.cpp >--- glui_v2_1_beta.orig/example1.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/example1.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -85,7 +85,7 @@ > > /**************************************** main() ********************/ > >-void main(int argc, char* argv[]) >+int main(int argc, char* argv[]) > { > /****************************************/ > /* Initialize GLUT and create window */ >@@ -136,6 +136,8 @@ > GLUI_Master.set_glutIdleFunc( myGlutIdle ); > > glutMainLoop(); >+ >+ return 0; /* never reached */ > } > > >diff -Naur glui_v2_1_beta.orig/example2.cpp glui_v2_1_beta/example2.cpp >--- glui_v2_1_beta.orig/example2.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/example2.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -181,7 +181,7 @@ > > /**************************************** main() ********************/ > >-void main(int argc, char* argv[]) >+int main(int argc, char* argv[]) > { > /****************************************/ > /* Initialize GLUT and create window */ >@@ -244,4 +244,6 @@ > GLUI_Master.set_glutIdleFunc( myGlutIdle ); > > glutMainLoop(); >+ >+ return 0; /* not reached */ > } >diff -Naur glui_v2_1_beta.orig/example3.cpp glui_v2_1_beta/example3.cpp >--- glui_v2_1_beta.orig/example3.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/example3.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -263,7 +263,7 @@ > > /**************************************** main() ********************/ > >-void main(int argc, char* argv[]) >+int main(int argc, char* argv[]) > { > /****************************************/ > /* Initialize GLUT and create window */ >@@ -392,5 +392,7 @@ > > /**** Regular GLUT main loop ****/ > glutMainLoop(); >+ >+ return 0; /* not reached */ > } > >diff -Naur glui_v2_1_beta.orig/example4.cpp glui_v2_1_beta/example4.cpp >--- glui_v2_1_beta.orig/example4.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/example4.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -253,7 +253,7 @@ > > /**************************************** main() ********************/ > >-void main(int argc, char* argv[]) >+int main(int argc, char* argv[]) > { > /****************************************/ > /* Initialize GLUT and create window */ >@@ -371,5 +371,7 @@ > /**** Regular GLUT main loop ****/ > > glutMainLoop(); >+ >+ return 0; /* not reached */ > } > >diff -Naur glui_v2_1_beta.orig/example5.cpp glui_v2_1_beta/example5.cpp >--- glui_v2_1_beta.orig/example5.cpp 1999-07-09 16:38:44.000000000 -0400 >+++ glui_v2_1_beta/example5.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -310,7 +310,7 @@ > > /**************************************** main() ********************/ > >-void main(int argc, char* argv[]) >+int main(int argc, char* argv[]) > { > /****************************************/ > /* Initialize GLUT and create window */ >@@ -478,5 +478,7 @@ > /**** Regular GLUT main loop ****/ > > glutMainLoop(); >+ >+ return 0; /* not reached */ > } > >diff -Naur glui_v2_1_beta.orig/glui.cpp glui_v2_1_beta/glui.cpp >--- glui_v2_1_beta.orig/glui.cpp 2001-04-09 01:34:30.000000000 -0400 >+++ glui_v2_1_beta/glui.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -107,6 +107,7 @@ > > void GLUI_Main::create_subwindow( int parent_window, int window_alignment ) > { >+ (void)window_alignment; > glut_window_id = glutCreateSubWindow( parent_window, 0,0, 100, 100 ); > glDisable( GL_DEPTH_TEST ); > glCullFace( GL_BACK ); >@@ -605,6 +606,9 @@ > { > GLUI_Control *new_control; > >+ (void)x; >+ (void)y; >+ > curr_modifiers = glutGetModifiers(); > > /*** If it's a tab or shift tab, we don't pass it on to the controls. >@@ -646,6 +650,9 @@ > { > curr_modifiers = glutGetModifiers(); > >+ (void)x; >+ (void)y; >+ > /*** Pass the keystroke onto the active control, if any ***/ > if ( active_control != NULL ) > active_control->special_handler( key, glutGetModifiers() ); >@@ -787,6 +794,7 @@ > > void GLUI_Main::entry(int state) > { >+ (void)state; > /*if ( NOT active_control OR ( active_control AND ( active_control->type == GLUI_CONTROL_EDITTEXT > OR active_control->type == GLUI_CONTROL_SPINNER) ) )*/ > glutSetCursor( GLUT_CURSOR_LEFT_ARROW ); >@@ -797,6 +805,7 @@ > > void GLUI_Main::visibility(int state) > { >+ (void)state; > } > > >diff -Naur glui_v2_1_beta.orig/glui.h glui_v2_1_beta/glui.h >--- glui_v2_1_beta.orig/glui.h 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui.h 2003-07-10 21:53:29.000000000 -0400 >@@ -295,8 +295,8 @@ > parent_node= child_head = child_tail = next_sibling = prev_sibling = NULL; > }; > >- friend GLUI_Rollout; >- friend GLUI_Main; >+ friend class GLUI_Rollout; >+ friend class GLUI_Main; > }; > > >@@ -559,11 +559,11 @@ > > /********** Friend classes *************/ > >- friend GLUI_Control; >- friend GLUI_Rotation; >- friend GLUI_Translation; >- friend GLUI; >- friend GLUI_Master_Object; >+ friend class GLUI_Control; >+ friend class GLUI_Rotation; >+ friend class GLUI_Translation; >+ friend class GLUI; >+ friend class GLUI_Master_Object; > > > /********** Misc functions *************/ >@@ -713,23 +713,24 @@ > virtual void get_float_array_val( float *array_ptr ); > > virtual int mouse_down_handler( int local_x, int local_y ) >- { return false; }; >+ { (void)local_x; (void)local_y; return false; }; > virtual int mouse_up_handler( int local_x, int local_y, int inside ) >- { return false; }; >+ { (void)local_x; (void)local_y; (void)inside; return false; }; > virtual int mouse_held_down_handler( int local_x, int local_y, int inside) >- { return false; }; >+ { (void)local_x; (void)local_y; (void)inside; return false; }; > virtual int key_handler( unsigned char key, int modifiers ) >- { return false; }; >+ { (void)key; (void)modifiers; return false; }; > virtual int special_handler( int key,int modifiers ) >- { return false; }; >+ { (void)key; (void)modifiers; return false; }; > > virtual void update_size( void ) { }; > virtual void idle( void ) { }; >- virtual int mouse_over( int state, int x, int y ) { return false; }; >+ virtual int mouse_over( int state, int x, int y ) >+ { (void)state; (void)x; (void)y; return false; }; > > virtual void enable( void ); > virtual void disable( void ); >- virtual void activate( int how ) { active = true; }; >+ virtual void activate( int how ) { (void)how; active = true; }; > virtual void disactivate( void ) { active = false; }; > > void hide_internal( int recurse ); >@@ -770,7 +771,7 @@ > void sync_live( int recurse, int draw ); /* Reads live variable */ > void init_live( void ); > void output_live( int update_main_gfx ); /** Writes live variable **/ >- virtual void set_text( char *t ) {}; >+ virtual void set_text( char *t ) { (void)t; }; > void execute_callback( void ); > void get_this_column_dims( int *col_x, int *col_y, > int *col_w, int *col_h, >@@ -815,7 +816,7 @@ > float_array_val[i] = last_live_float_array[i] = 0.0; > }; > >- ~GLUI_Control(); >+ virtual ~GLUI_Control(void); > }; > > >@@ -1478,7 +1479,7 @@ > glut_menu_id = -1; > }; > >- ~GLUI_Listbox(); >+ virtual ~GLUI_Listbox(); > }; > > >diff -Naur glui_v2_1_beta.orig/glui_button.cpp glui_v2_1_beta/glui_button.cpp >--- glui_v2_1_beta.orig/glui_button.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/glui_button.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -26,6 +26,9 @@ > int_val = 1; /** A button always in unpressed before here, so > now we invariably set it to 'depressed' **/ > >+ (void)local_x; >+ (void)local_y; >+ > currently_inside = true; > > draw_pressed(); >@@ -38,6 +41,9 @@ > > int GLUI_Button::mouse_up_handler( int local_x, int local_y, int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ > set_int_val( 0 ); /** A button always turns off after you press it **/ > > draw_unpressed(); >@@ -62,6 +68,9 @@ > int GLUI_Button::mouse_held_down_handler( int local_x, int local_y, > int new_inside) > { >+ (void)local_x; >+ (void)local_y; >+ > if ( NOT new_inside AND currently_inside == true ) { > draw_unpressed(); > } >@@ -79,6 +88,9 @@ > > int GLUI_Button::key_handler( unsigned char key,int modifiers ) > { >+ (void)key; >+ (void)modifiers; >+ > return false; > } > >@@ -135,6 +147,9 @@ > > void GLUI_Button::draw( int x, int y ) > { >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >diff -Naur glui_v2_1_beta.orig/glui_checkbox.cpp glui_v2_1_beta/glui_checkbox.cpp >--- glui_v2_1_beta.orig/glui_checkbox.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_checkbox.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -25,6 +25,9 @@ > { > orig_value = int_val; > >+ (void)local_x; >+ (void)local_y; >+ > TOGGLE_BOOL( int_val ); > > currently_inside = true; >@@ -42,6 +45,9 @@ > > int GLUI_Checkbox::mouse_up_handler( int local_x, int local_y, int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ > if ( NOT inside ) { > int_val = orig_value; > } >@@ -66,6 +72,10 @@ > int GLUI_Checkbox::mouse_held_down_handler( int local_x, int local_y, > int inside) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; >+ > /********** Toggle checked and unchecked bitmap if we're entering or > leaving the checkbox area **********/ > >@@ -93,6 +103,9 @@ > > int GLUI_Checkbox::key_handler( unsigned char key,int modifiers ) > { >+ (void)key; >+ (void)modifiers; >+ > return false; > } > >@@ -103,6 +116,9 @@ > { > int orig; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >diff -Naur glui_v2_1_beta.orig/glui_column.cpp glui_v2_1_beta/glui_column.cpp >--- glui_v2_1_beta.orig/glui_column.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/glui_column.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -27,6 +27,9 @@ > int panel_x, panel_y, panel_w, panel_h, panel_x_off, panel_y_off; > int y_diff; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >diff -Naur glui_v2_1_beta.orig/glui_control.cpp glui_v2_1_beta/glui_control.cpp >--- glui_v2_1_beta.orig/glui_control.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_control.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -184,6 +184,9 @@ > { > GLUI_Control *node; > >+ (void)x; >+ (void)y; >+ > /* printf( "%s %d\n", this->name.string, this->hidden );*/ > if ( NOT can_draw() ) > return; >diff -Naur glui_v2_1_beta.orig/glui_edittext.cpp glui_v2_1_beta/glui_edittext.cpp >--- glui_v2_1_beta.orig/glui_edittext.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_edittext.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -51,6 +51,10 @@ > > int GLUI_EditText::mouse_up_handler( int local_x, int local_y, int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; >+ > return false; > } > >@@ -224,7 +228,7 @@ > } > > /******** check whether we have space ******/ >- if ( (int)strlen( text ) + 2 >= sizeof( GLUI_String )) >+ if ( strlen( text ) + 2 >= sizeof( GLUI_String )) > return false; > > /******** We insert the character into the string ***/ >@@ -364,6 +368,9 @@ > int orig; > int name_x; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -484,6 +491,9 @@ > int text_x, i, sel_lo, sel_hi; > int orig; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -584,6 +594,8 @@ > { > int curr_x, i; > >+ (void)y; >+ > /*** See if we clicked outside box ***/ > if ( x < this->x_abs + text_x_offset ) > return -1; >@@ -1032,6 +1044,9 @@ > > int GLUI_EditText::mouse_over( int state, int x, int y ) > { >+ (void)x; >+ (void)y; >+ > if ( state ) { > /* curr_cursor = GLUT_CURSOR_TEXT; */ > glutSetCursor( GLUT_CURSOR_TEXT ); >diff -Naur glui_v2_1_beta.orig/glui_listbox.cpp glui_v2_1_beta/glui_listbox.cpp >--- glui_v2_1_beta.orig/glui_listbox.cpp 1999-07-09 16:38:48.000000000 -0400 >+++ glui_v2_1_beta/glui_listbox.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -23,6 +23,9 @@ > > int GLUI_Listbox::mouse_down_handler( int local_x, int local_y ) > { >+ (void)local_x; >+ (void)local_y; >+ > return false; > } > >@@ -31,6 +34,9 @@ > > int GLUI_Listbox::mouse_up_handler( int local_x, int local_y, int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; > > return false; > } >@@ -41,6 +47,9 @@ > int GLUI_Listbox::mouse_held_down_handler( int local_x, int local_y, > int inside) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; > > return false; > } >@@ -50,6 +59,9 @@ > > int GLUI_Listbox::key_handler( unsigned char key,int modifiers ) > { >+ (void)key; >+ (void)modifiers; >+ > return false; > } > >@@ -60,6 +72,9 @@ > { > int orig, name_x; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -324,6 +339,8 @@ > { > GLUI_Listbox_Item *item; > >+ (void)y; >+ > /* printf( "x/y: %d/%d\n", x, y ); */ > > if ( state AND enabled AND x > x_abs + text_x_offset) { >@@ -412,6 +429,8 @@ > { > GLUI_Listbox_Item *node, *new_node; > >+ (void)modifiers; >+ > node = get_item_ptr( int_val ); > new_node = NULL; > >diff -Naur glui_v2_1_beta.orig/glui_mouse_iaction.cpp glui_v2_1_beta/glui_mouse_iaction.cpp >--- glui_v2_1_beta.orig/glui_mouse_iaction.cpp 1999-07-09 16:38:42.000000000 -0400 >+++ glui_v2_1_beta/glui_mouse_iaction.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -23,7 +23,9 @@ > > int GLUI_Mouse_Interaction::mouse_down_handler( int local_x, int local_y ) > { >+#if 0 > int win_h = glutGet( GLUT_WINDOW_HEIGHT ); >+#endif > > /* iaction_mouse_down_handler( local_x, local_y ); */ > iaction_mouse_down_handler( local_x-x_abs, local_y-y_abs ); >@@ -70,6 +72,9 @@ > int text_width = string_width( this->name ); > int x_left = this->w/2 - text_width/2; > >+ (void)x; >+ (void)y; >+ > if ( NOT glui ) > return; > >@@ -112,6 +117,8 @@ > int center_x, center_y; > int drag_x, drag_y; > >+ (void)modifiers; >+ > center_x = w/2; > center_y = (h-18)/2; > drag_x = 0; >diff -Naur glui_v2_1_beta.orig/glui_panel.cpp glui_v2_1_beta/glui_panel.cpp >--- glui_v2_1_beta.orig/glui_panel.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_panel.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -25,6 +25,9 @@ > { > int top, orig; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >diff -Naur glui_v2_1_beta.orig/glui_radio.cpp glui_v2_1_beta/glui_radio.cpp >--- glui_v2_1_beta.orig/glui_radio.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_radio.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -23,6 +23,9 @@ > > void GLUI_RadioGroup::draw( int x, int y ) > { >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -116,6 +119,9 @@ > > int GLUI_RadioButton::mouse_down_handler( int local_x, int local_y ) > { >+ (void)local_x; >+ (void)local_y; >+ > if ( NOT group ) > return false; > >@@ -135,6 +141,9 @@ > int GLUI_RadioButton::mouse_up_handler( int local_x, int local_y, > int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ > if ( NOT group ) > return false; > >@@ -168,6 +177,9 @@ > int GLUI_RadioButton::mouse_held_down_handler( int local_x, int local_y, > int inside) > { >+ (void)local_x; >+ (void)local_y; >+ > if ( NOT inside AND currently_inside == true ) { > group->set_selected( orig_value ); > group->draw_group( true ); >@@ -189,6 +201,9 @@ > { > int orig; > >+ (void)x; >+ (void)y; >+ > orig = set_to_glut_window(); > > if ( NOT group OR NOT can_draw() ) >diff -Naur glui_v2_1_beta.orig/glui_rollout.cpp glui_v2_1_beta/glui_rollout.cpp >--- glui_v2_1_beta.orig/glui_rollout.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_rollout.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -90,6 +90,8 @@ > > int GLUI_Rollout::mouse_down_handler( int local_x, int local_y ) > { >+ (void)local_x; >+ > if ( local_y - y_abs > 18 ) { > initially_inside = currently_inside = false; > return false; >@@ -108,6 +110,10 @@ > > int GLUI_Rollout::mouse_up_handler( int local_x, int local_y, int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; >+ > draw_unpressed(); > > if ( currently_inside ) { >@@ -129,6 +135,9 @@ > { > int orig, left, right, top, bottom; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -267,6 +276,8 @@ > int local_x, int local_y, > int new_inside ) > { >+ (void)local_x; >+ > if ( NOT initially_inside ) > return false; > >diff -Naur glui_v2_1_beta.orig/glui_rotation.cpp glui_v2_1_beta/glui_rotation.cpp >--- glui_v2_1_beta.orig/glui_rotation.cpp 1999-07-09 16:38:48.000000000 -0400 >+++ glui_v2_1_beta/glui_rotation.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -28,7 +28,7 @@ > > init_ball(); > >- local_y = 2.0 * ball->center[1] - local_y; >+ local_y = static_cast<int>(2.0 * ball->center[1] - local_y); > > ball->mouse_down( local_x, local_y ); > >@@ -47,6 +47,10 @@ > int GLUI_Rotation::iaction_mouse_up_handler( int local_x, int local_y, > int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; >+ > copy_float_array_to_ball(); > > ball->mouse_up(); >@@ -60,12 +64,14 @@ > int GLUI_Rotation::iaction_mouse_held_down_handler( int local_x, int local_y, > int inside) > { >+ (void)inside; >+ > if ( NOT glui ) > return 0; > > copy_float_array_to_ball(); > >- local_y = 2.0 * ball->center[1] - local_y; >+ local_y = static_cast<int>(2.0 * ball->center[1] - local_y); > > /* printf( "%d %d\n", local_x, local_y ); */ > >@@ -159,6 +165,7 @@ > > void GLUI_Rotation::iaction_dump( FILE *output ) > { >+ (void)output; > } > > >@@ -166,6 +173,8 @@ > > int GLUI_Rotation::iaction_special_handler( int key,int modifiers ) > { >+ (void)key; >+ (void)modifiers; > > return false; > } >diff -Naur glui_v2_1_beta.orig/glui_separator.cpp glui_v2_1_beta/glui_separator.cpp >--- glui_v2_1_beta.orig/glui_separator.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_separator.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -26,6 +26,9 @@ > int width, indent, orig; > int cont_x, cont_y, cont_w, cont_h, cont_x_off, cont_y_off; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -41,7 +44,7 @@ > width = this->w; > } > >- indent = width * .05; >+ indent = static_cast<int>(width * .05); > > glLineWidth( 1.0 ); > glBegin( GL_LINES ); >diff -Naur glui_v2_1_beta.orig/glui_spinner.cpp glui_v2_1_beta/glui_spinner.cpp >--- glui_v2_1_beta.orig/glui_spinner.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_spinner.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -93,6 +93,10 @@ > > int GLUI_Spinner::mouse_up_handler( int local_x, int local_y, int inside ) > { >+ (void)local_x; >+ (void)local_y; >+ (void)inside; >+ > state = GLUI_SPINNER_STATE_NONE; > > /* printf("spinner: mouse up : %d/%d inside: %d\n",local_x,local_y,inside); */ >@@ -174,7 +178,8 @@ > > int GLUI_Spinner::key_handler( unsigned char key,int modifiers ) > { >- >+ (void)key; >+ (void)modifiers; > > return true; > } >@@ -186,6 +191,9 @@ > { > int orig; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >@@ -252,6 +260,8 @@ > > int GLUI_Spinner::special_handler( int key,int modifiers ) > { >+ (void)modifiers; >+ > if ( key == GLUT_KEY_UP ) { /** Simulate a click in the up arrow **/ > mouse_down_handler( x_abs + w - GLUI_SPINNER_ARROW_WIDTH + 1, > y_abs + GLUI_SPINNER_ARROW_Y+1 ); >diff -Naur glui_v2_1_beta.orig/glui_statictext.cpp glui_v2_1_beta/glui_statictext.cpp >--- glui_v2_1_beta.orig/glui_statictext.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/glui_statictext.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -25,6 +25,9 @@ > { > int orig; > >+ (void)x; >+ (void)y; >+ > if ( NOT can_draw() ) > return; > >diff -Naur glui_v2_1_beta.orig/glui_translation.cpp glui_v2_1_beta/glui_translation.cpp >--- glui_v2_1_beta.orig/glui_translation.cpp 1999-07-09 16:38:48.000000000 -0400 >+++ glui_v2_1_beta/glui_translation.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -83,6 +83,10 @@ > trans_mouse_code = GLUI_TRANSLATION_MOUSE_NONE; > locked = GLUI_TRANSLATION_LOCK_NONE; > >+ (void)local_x; >+ (void)local_y; >+ (void)inside; >+ > translate_and_draw_front(); > > return false; >@@ -97,6 +101,8 @@ > float x_off, y_off; > float off_array[2]; > >+ (void)inside; >+ > x_off = scale_factor * (float)(local_x - down_x); > y_off = -scale_factor * (float)(local_y - down_y); > >@@ -181,6 +187,7 @@ > > void GLUI_Translation::iaction_dump( FILE *output ) > { >+ (void)output; > } > > >@@ -188,6 +195,8 @@ > > int GLUI_Translation::iaction_special_handler( int key,int modifiers ) > { >+ (void)key; >+ (void)modifiers; > > return false; > } >@@ -301,9 +310,11 @@ > { > float x1 = .2, x2 = .4, y1 = .54, y2 = .94, y0; > float x1a, x1b; >+#if 0 > vec3 col1( 0.0, 0.0, 0.0 ), col2( .45, .45, .45 ), > col3( .7, .7, .7 ), col4( 1.0, 1.0, 1.0 ); > vec3 c1, c2, c3, c4, c5, c6; >+#endif > vec3 white(1.0,1.0,1.0), black(0.0,0.0,0.0), gray(.45,.45,.45), > bkgd(.7,.7,.7); > int c_off; /* color index offset */ >diff -Naur glui_v2_1_beta.orig/makefile glui_v2_1_beta/makefile >--- glui_v2_1_beta.orig/makefile 1999-07-09 16:38:44.000000000 -0400 >+++ glui_v2_1_beta/makefile 2003-07-10 21:53:29.000000000 -0400 >@@ -1,101 +1,103 @@ >- >-.SUFFIXES: .cpp >- >- >-#Change the following two lines to reflect the locations >-# of the GLUT library (.a) and includes on your system >- >-GLUT_LIB_LOCATION=/unc/walk/lib/sgi_irix >-GLUT_INC_LOCATION=/unc/walk/include >- >-CFLAGS = >- >- >-#for sgi -- comment out the lines below to use on HP >-CC=CC -g0 -o32 >-#CC=gcc >-#CC=g++ -O3 >-CPPFLAGS=-I${GLUT_INC_LOCATION} #-w >-GLLIBS=-L${GLUT_LIB_LOCATION} -lglut -lGL -lGLU >-LPATH=${GLUTPATH} >-INCS= >- >- >-libs = ${GLLIBS} -lXmu -lXext -lX11 -lXi -lm #-lmalloc >- >-LIBGLUI= -Llib -lglui >- >-All: lib/libglui.a bin/example1 bin/example2 bin/example3 bin/example4 bin/example5 >- >-GLUI_OBJS = glui_add_controls.o glui.o glui_bitmap_img_data.o glui_bitmaps.o glui_button.o glui_edittext.o glui_checkbox.o glui_node.o glui_radio.o glui_statictext.o glui_panel.o glui_separator.o glui_spinner.o glui_control.o glui_column.o glui_translation.o glui_rotation.o glui_mouse_iaction.o glui_listbox.o glui_rollout.o arcball.o algebra3.o quaternion.o >- >-bin/example1: $(GLUI_OBJS) example1.o lib/libglui.a >- @echo "Linking example1" >- $(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example1.o $(LIBGLUI) $(libs) -o bin/example1 >- >-bin/example2: $(GLUI_OBJS) example2.o lib/libglui.a >- @echo "Linking example2" >- $(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example2.o $(LIBGLUI) $(libs) -o bin/example2 >- >-bin/example3: $(GLUI_OBJS) example3.o lib/libglui.a >- @echo "Linking example3" >- $(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example3.o $(LIBGLUI) $(libs) -o bin/example3 >- >-bin/example4: $(GLUI_OBJS) example4.o lib/libglui.a >- @echo "Linking example4" >- $(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example4.o $(LIBGLUI) $(libs) -o bin/example4 >- >-bin/example5: $(GLUI_OBJS) example5.o lib/libglui.a >- @echo "Linking example5" >- $(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example5.o $(LIBGLUI) $(libs) -o bin/example5 >- >-lib/libglui.a: $(GLUI_OBJS) >- @echo "Creating library" >- ar -r lib/libglui.a $(GLUI_OBJS) >- >-.cpp.o: >- $(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $*.cpp >- >-.c.o: >- $(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $*.c >-clean: >- /bin/rm *.o >- >- >- >-algebra3.o: algebra3.h >-arcball.o: arcball.h algebra3.h quaternion.h stdinc.h >-example1.o: glui.h >-example2.o: glui.h >-example3.o: glui.h >-example4.o: glui.h >-glui.o: glui.h stdinc.h >-glui_add_controls.o: glui.h stdinc.h >-glui_bitmap_img_data.o: glui_img_checkbox_0.c glui_img_checkbox_1.c >-glui_bitmap_img_data.o: glui_img_radiobutton_0.c glui_img_radiobutton_1.c >-glui_bitmap_img_data.o: glui_img_uparrow.c glui_img_downarrow.c >-glui_bitmap_img_data.o: glui_img_leftarrow.c glui_img_rightarrow.c >-glui_bitmap_img_data.o: glui_img_spinup_1.c glui_img_spinup_0.c >-glui_bitmap_img_data.o: glui_img_spindown_1.c glui_img_spindown_0.c >-glui_bitmap_img_data.o: glui_img_checkbox_0_dis.c glui_img_checkbox_1_dis.c >-glui_bitmap_img_data.o: glui_img_radiobutton_0_dis.c >-glui_bitmap_img_data.o: glui_img_radiobutton_1_dis.c glui_img_spinup_dis.c >-glui_bitmap_img_data.o: glui_img_spindown_dis.c >-glui_bitmaps.o: glui.h stdinc.h >-glui_button.o: glui.h stdinc.h >-glui_checkbox.o: glui.h stdinc.h >-glui_column.o: glui.h stdinc.h >-glui_control.o: glui.h stdinc.h >-glui_edittext.o: glui.h stdinc.h >-glui_node.o: glui.h stdinc.h >-glui_panel.o: glui.h stdinc.h >-glui_radio.o: glui.h stdinc.h >-glui_separator.o: glui.h stdinc.h >-glui_spinner.o: glui.h stdinc.h >-glui_statictext.o: glui.h stdinc.h >-quaternion.o: quaternion.h algebra3.h stdinc.h >-glui_translation.o: glui.h stdinc.h >-glui_rotation.o: glui.h stdinc.h >-glui_mouse_iaction.o: glui.h stdinc.h >-glui_listbox.o: glui.h stdinc.h >-glui_rollout.o: glui.h stdinc.h >\ No newline at end of file >+VERSION = 2.1 >+MAJOR = 2 >+LIBNAME = libglui >+NAME = glui >+SONAME = $(LIBNAME).so.$(MAJOR) >+ >+CC = gcc >+CXX = g++ >+ >+CPPFLAGS = $(INCS) >+CFLAGS = >+CXXFLAGS = >+LDFLAGS = >+LDLIBS = $(LIBS) >+ >+GLLIBS = -lGL -lGLU -lglut >+INCS = >+LIBS = $(GLLIBS) -lm >+ >+LIBGLUI = -L./lib/ -lglui >+ >+GLUI = lib/$(LIBNAME).a >+SO_GLUI = lib/$(LIBNAME).so.0 >+ >+RM = rm -rf >+ >+EXAMPLES = bin/example1 bin/example2 bin/example3 bin/example4 bin/example5 >+EXAMPLES_SRC = $(wildcard example*.cpp) >+ >+all: static shared examples >+static: $(GLUI) >+shared: $(SO_GLUI) >+examples: $(EXAMPLES) >+ >+GLUI_SRCS = algebra3.cpp arcball.cpp $(wildcard glui*.cpp) quaternion.cpp >+GLUI_HDRS = $(wildcard glui*.h) >+GLUI_OBJS = $(GLUI_SRCS:.cpp=.o) >+ >+install: all >+ install $(GLUI) /usr/lib >+ install $(SO_GLUI) /usr/lib >+ install $(GLUI_HDRS) /usr/include/gl >+ install -D $(EXAMPLES) /usr/share/${NAME}/bin >+ install -D $(EXAMPLES_SRC) /usr/share/${NAME}/src >+ >+$(GLUI): $(GLUI_OBJS) >+ @echo "Creating library" >+ test -d $(dir $@) || mkdir -p $(dir $@) >+ ar -r $@ $^ >+ >+$(SO_GLUI): $(GLUI_OBJS) >+ @echo "Creating shared library" >+ test -d $(dir $@) || mkdir -p $(dir $@) >+ $(CXX) -o $@ -shared -Wl,-soname,$(SONAME) $^ $(LDLIBS) >+ >+bin/example%: example%.o $(GLUI) >+ @echo "Creating Examples" >+ test -d $(dir $@) || mkdir -p $(dir $@) >+ $(CXX) $(LDFLAGS) $(LDLIBS) $< $(LIBGLUI) -o $@ >+ >+.cpp.o: >+ $(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(INCS) $< >+ >+.c.o: >+ $(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $< >+ >+clean: >+ $(RM) *.o >+ $(RM) bin/* lib/ >+ $(RM) tags *~ >+ >+.SUFFIXES: .cpp >+.PHONY: all static shared example >+ >+algebra3.o: algebra3.h >+arcball.o: arcball.h algebra3.h quaternion.h >+glui.o: glui.h >+glui_add_controls.o: glui.h >+glui_bitmap_img_data.o: glui_img_checkbox_0.c glui_img_checkbox_1.c >+glui_bitmap_img_data.o: glui_img_radiobutton_0.c glui_img_radiobutton_1.c >+glui_bitmap_img_data.o: glui_img_uparrow.c glui_img_downarrow.c >+glui_bitmap_img_data.o: glui_img_leftarrow.c glui_img_rightarrow.c >+glui_bitmap_img_data.o: glui_img_spinup_1.c glui_img_spinup_0.c >+glui_bitmap_img_data.o: glui_img_spindown_1.c glui_img_spindown_0.c >+glui_bitmap_img_data.o: glui_img_checkbox_0_dis.c glui_img_checkbox_1_dis.c >+glui_bitmap_img_data.o: glui_img_radiobutton_0_dis.c >+glui_bitmap_img_data.o: glui_img_radiobutton_1_dis.c glui_img_spinup_dis.c >+glui_bitmap_img_data.o: glui_img_spindown_dis.c >+glui_bitmaps.o: glui.h >+glui_button.o: glui.h >+glui_checkbox.o: glui.h >+glui_column.o: glui.h >+glui_control.o: glui.h >+glui_edittext.o: glui.h >+glui_node.o: glui.h >+glui_panel.o: glui.h >+glui_radio.o: glui.h >+glui_separator.o: glui.h >+glui_spinner.o: glui.h >+glui_statictext.o: glui.h >+quaternion.o: quaternion.h algebra3.h >+glui_translation.o: glui.h >+glui_rotation.o: glui.h >+glui_mouse_iaction.o: glui.h >+glui_listbox.o: glui.h >diff -Naur glui_v2_1_beta.orig/quaternion.cpp glui_v2_1_beta/quaternion.cpp >--- glui_v2_1_beta.orig/quaternion.cpp 1999-07-09 16:38:46.000000000 -0400 >+++ glui_v2_1_beta/quaternion.cpp 2003-07-10 21:53:29.000000000 -0400 >@@ -110,7 +110,9 @@ > mat4 quat::to_mat4( void ) > { > float t, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz; >+#if 0 > vec3 a, c, b, d; >+#endif > > t = 2.0 / (v*v + s*s); >
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=14481">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 23207
:
13620
|
13669
|
14479
|
14480
| 14481 |
23436
|
23437
|
50628
|
50629
|
50630
|
50643
|
50644
|
50645
|
121825
