Attachment #23437 for bug #23207

Line Link Here

(-)file_not_specified_in_diff (-54 / +321 lines)
0	-- glui_v2_1_beta.orig/algebra3.cpp	0	++ glui_v2_1_beta/algebra3.cpp
Lines 723-728 Link Here
723	{	723	{
724	int i, j;	724	int i, j;
725		725
		726	(void)file;
		727
726	fprintf( stderr, "%s:\n", name );	728	fprintf( stderr, "%s:\n", name );
727		729
728	for( i = 0; i < 3; i++ )	730	for( i = 0; i < 3; i++ )
Lines 846-851 Link Here
846	{	848	{
847	int i, j;	849	int i, j;
848		850
		851	(void)file;
849	fprintf( stderr, "%s:\n", name );	852	fprintf( stderr, "%s:\n", name );
850		853
851	for( i = 0; i < 4; i++ )	854	for( i = 0; i < 4; i++ )
852	-- glui_v2_1_beta.orig/arcball.cpp	855	++ glui_v2_1_beta/arcball.cpp
Lines 83-89 Link Here
83	float mag;	83	float mag;
84	vec2 v2 = (p - center) / radius;	84	vec2 v2 = (p - center) / radius;
85	vec3 v3( v2[0], v2[1], 0.0 );	85	vec3 v3( v2[0], v2[1], 0.0 );
86	vec3 axis;
87		86
88	mag = v2*v2;	87	mag = v2*v2;
89		88
Lines 138-143 Link Here
138		137
139	void Arcball::mouse_motion( int x, int y, int shift, int ctrl, int alt )	138	void Arcball::mouse_motion( int x, int y, int shift, int ctrl, int alt )
140	{	139	{
		140	(void)shift;
141	/* Set the X constraint if CONTROL key is pressed, Y if ALT key */	141	/* Set the X constraint if CONTROL key is pressed, Y if ALT key */
142	set_constraints( ctrl != 0, alt != 0 );	142	set_constraints( ctrl != 0, alt != 0 );
143		143
144	-- glui_v2_1_beta.orig/example1.cpp	144	++ glui_v2_1_beta/example1.cpp
Lines 85-91 Link Here
85		85
86	/************************************** main() ******************/	86	/************************************** main() ******************/
87		87
88	void main(int argc, char* argv[])	88	int main(int argc, char* argv[])
89	{	89	{
90	/****************************************/	90	/****************************************/
91	/* Initialize GLUT and create window */	91	/* Initialize GLUT and create window */
Lines 136-141 Link Here
136	GLUI_Master.set_glutIdleFunc( myGlutIdle );	136	GLUI_Master.set_glutIdleFunc( myGlutIdle );
137		137
138	glutMainLoop();	138	glutMainLoop();
		139
		140	return 0; /* never reached */
139	}	141	}
140		142
141		143
142	-- glui_v2_1_beta.orig/example2.cpp	144	++ glui_v2_1_beta/example2.cpp
Lines 181-187 Link Here
181		181
182	/************************************** main() ******************/	182	/************************************** main() ******************/
183		183
184	void main(int argc, char* argv[])	184	int main(int argc, char* argv[])
185	{	185	{
186	/****************************************/	186	/****************************************/
187	/* Initialize GLUT and create window */	187	/* Initialize GLUT and create window */
Lines 244-247 Link Here
244	GLUI_Master.set_glutIdleFunc( myGlutIdle );	244	GLUI_Master.set_glutIdleFunc( myGlutIdle );
245		245
246	glutMainLoop();	246	glutMainLoop();
		247
		248	return 0; /* not reached */
247	}	249	}
248	-- glui_v2_1_beta.orig/example3.cpp	250	++ glui_v2_1_beta/example3.cpp
Lines 263-269 Link Here
263		263
264	/************************************** main() ******************/	264	/************************************** main() ******************/
265		265
266	void main(int argc, char* argv[])	266	int main(int argc, char* argv[])
267	{	267	{
268	/****************************************/	268	/****************************************/
269	/* Initialize GLUT and create window */	269	/* Initialize GLUT and create window */
Lines 392-396 Link Here
392		392
393	/** Regular GLUT main loop **/	393	/** Regular GLUT main loop **/
394	glutMainLoop();	394	glutMainLoop();
		395
		396	return 0; /* not reached */
395	}	397	}
396		398
397	-- glui_v2_1_beta.orig/example4.cpp	399	++ glui_v2_1_beta/example4.cpp
Lines 253-259 Link Here
253		253
254	/************************************** main() ******************/	254	/************************************** main() ******************/
255		255
256	void main(int argc, char* argv[])	256	int main(int argc, char* argv[])
257	{	257	{
258	/****************************************/	258	/****************************************/
259	/* Initialize GLUT and create window */	259	/* Initialize GLUT and create window */
Lines 371-375 Link Here
371	/** Regular GLUT main loop **/	371	/** Regular GLUT main loop **/
372		372
373	glutMainLoop();	373	glutMainLoop();
		374
		375	return 0; /* not reached */
374	}	376	}
375		377
376	-- glui_v2_1_beta.orig/example5.cpp	378	++ glui_v2_1_beta/example5.cpp
Lines 310-316 Link Here
310		310
311	/************************************** main() ******************/	311	/************************************** main() ******************/
312		312
313	void main(int argc, char* argv[])	313	int main(int argc, char* argv[])
314	{	314	{
315	/****************************************/	315	/****************************************/
316	/* Initialize GLUT and create window */	316	/* Initialize GLUT and create window */
Lines 478-482 Link Here
478	/** Regular GLUT main loop **/	478	/** Regular GLUT main loop **/
479		479
480	glutMainLoop();	480	glutMainLoop();
		481
		482	return 0; /* not reached */
481	}	483	}
482		484
483	-- glui_v2_1_beta.orig/glui.cpp	485	++ glui_v2_1_beta/glui.cpp
Lines 107-112 Link Here
107		107
108	void GLUI_Main::create_subwindow( int parent_window, int window_alignment )	108	void GLUI_Main::create_subwindow( int parent_window, int window_alignment )
109	{	109	{
		110	(void)window_alignment;
110	glut_window_id = glutCreateSubWindow( parent_window, 0,0, 100, 100 );	111	glut_window_id = glutCreateSubWindow( parent_window, 0,0, 100, 100 );
111	glDisable( GL_DEPTH_TEST );	112	glDisable( GL_DEPTH_TEST );
112	glCullFace( GL_BACK );	113	glCullFace( GL_BACK );
Lines 605-610 Link Here
605	{	606	{
606	GLUI_Control *new_control;	607	GLUI_Control *new_control;
607		608
		609	(void)x;
		610	(void)y;
		611
608	curr_modifiers = glutGetModifiers();	612	curr_modifiers = glutGetModifiers();
609		613
610	/*** If it's a tab or shift tab, we don't pass it on to the controls.	614	/*** If it's a tab or shift tab, we don't pass it on to the controls.
Lines 646-651 Link Here
646	{	650	{
647	curr_modifiers = glutGetModifiers();	651	curr_modifiers = glutGetModifiers();
648		652
		653	(void)x;
		654	(void)y;
		655
649	/* Pass the keystroke onto the active control, if any */	656	/* Pass the keystroke onto the active control, if any */
650	if ( active_control != NULL )	657	if ( active_control != NULL )
651	active_control->special_handler( key, glutGetModifiers() );	658	active_control->special_handler( key, glutGetModifiers() );
Lines 787-792 Link Here
787		794
788	void GLUI_Main::entry(int state)	795	void GLUI_Main::entry(int state)
789	{	796	{
		797	(void)state;
790	/*if ( NOT active_control OR ( active_control AND ( active_control->type == GLUI_CONTROL_EDITTEXT	798	/*if ( NOT active_control OR ( active_control AND ( active_control->type == GLUI_CONTROL_EDITTEXT
791	OR active_control->type == GLUI_CONTROL_SPINNER) ) )*/	799	OR active_control->type == GLUI_CONTROL_SPINNER) ) )*/
792	glutSetCursor( GLUT_CURSOR_LEFT_ARROW );	800	glutSetCursor( GLUT_CURSOR_LEFT_ARROW );
Lines 797-802 Link Here
797		805
798	void GLUI_Main::visibility(int state)	806	void GLUI_Main::visibility(int state)
799	{	807	{
		808	(void)state;
800	}	809	}
801		810
802		811
803	-- glui_v2_1_beta.orig/glui.h	812	++ glui_v2_1_beta/glui.h
Lines 295-302 Link Here
295	parent_node= child_head = child_tail = next_sibling = prev_sibling = NULL;	295	parent_node= child_head = child_tail = next_sibling = prev_sibling = NULL;
296	};	296	};
297		297
298	friend GLUI_Rollout;	298	friend class GLUI_Rollout;
299	friend GLUI_Main;	299	friend class GLUI_Main;
300	};	300	};
301		301
302		302
Lines 559-569 Link Here
559		559
560	/******** Friend classes ***********/	560	/******** Friend classes ***********/
561		561
562	friend GLUI_Control;	562	friend class GLUI_Control;
563	friend GLUI_Rotation;	563	friend class GLUI_Rotation;
564	friend GLUI_Translation;	564	friend class GLUI_Translation;
565	friend GLUI;	565	friend class GLUI;
566	friend GLUI_Master_Object;	566	friend class GLUI_Master_Object;
567		567
568		568
569	/******** Misc functions ***********/	569	/******** Misc functions ***********/
Lines 713-735 Link Here
713	virtual void get_float_array_val( float *array_ptr );	713	virtual void get_float_array_val( float *array_ptr );
714		714
715	virtual int mouse_down_handler( int local_x, int local_y )	715	virtual int mouse_down_handler( int local_x, int local_y )
716	{ return false; };	716	{ (void)local_x; (void)local_y; return false; };
717	virtual int mouse_up_handler( int local_x, int local_y, int inside )	717	virtual int mouse_up_handler( int local_x, int local_y, int inside )
718	{ return false; };	718	{ (void)local_x; (void)local_y; (void)inside; return false; };
719	virtual int mouse_held_down_handler( int local_x, int local_y, int inside)	719	virtual int mouse_held_down_handler( int local_x, int local_y, int inside)
720	{ return false; };	720	{ (void)local_x; (void)local_y; (void)inside; return false; };
721	virtual int key_handler( unsigned char key, int modifiers )	721	virtual int key_handler( unsigned char key, int modifiers )
722	{ return false; };	722	{ (void)key; (void)modifiers; return false; };
723	virtual int special_handler( int key,int modifiers )	723	virtual int special_handler( int key,int modifiers )
724	{ return false; };	724	{ (void)key; (void)modifiers; return false; };
725		725
726	virtual void update_size( void ) { };	726	virtual void update_size( void ) { };
727	virtual void idle( void ) { };	727	virtual void idle( void ) { };
728	virtual int mouse_over( int state, int x, int y ) { return false; };	728	virtual int mouse_over( int state, int x, int y )
		729	{ (void)state; (void)x; (void)y; return false; };
729		730
730	virtual void enable( void );	731	virtual void enable( void );
731	virtual void disable( void );	732	virtual void disable( void );
732	virtual void activate( int how ) { active = true; };	733	virtual void activate( int how ) { (void)how; active = true; };
733	virtual void disactivate( void ) { active = false; };	734	virtual void disactivate( void ) { active = false; };
734		735
735	void hide_internal( int recurse );	736	void hide_internal( int recurse );
Lines 770-776 Link Here
770	void sync_live( int recurse, int draw ); /* Reads live variable */	771	void sync_live( int recurse, int draw ); /* Reads live variable */
771	void init_live( void );	772	void init_live( void );
772	void output_live( int update_main_gfx ); / Writes live variable /	773	void output_live( int update_main_gfx ); / Writes live variable /
773	virtual void set_text( char *t ) {};	774	virtual void set_text( char *t ) { (void)t; };
774	void execute_callback( void );	775	void execute_callback( void );
775	void get_this_column_dims( int col_x, int col_y,	776	void get_this_column_dims( int col_x, int col_y,
776	int col_w, int col_h,	777	int col_w, int col_h,
Lines 815-821 Link Here
815	float_array_val[i] = last_live_float_array[i] = 0.0;	816	float_array_val[i] = last_live_float_array[i] = 0.0;
816	};	817	};
817		818
818	~GLUI_Control();	819	virtual ~GLUI_Control(void);
819	};	820	};
820		821
821		822
Lines 1478-1484 Link Here
1478	glut_menu_id = -1;	1479	glut_menu_id = -1;
1479	};	1480	};
1480		1481
1481	~GLUI_Listbox();	1482	virtual ~GLUI_Listbox();
1482	};	1483	};
1483		1484
1484		1485
1485	-- glui_v2_1_beta.orig/glui_button.cpp	1486	++ glui_v2_1_beta/glui_button.cpp
Lines 26-31 Link Here
26	int_val = 1; /** A button always in unpressed before here, so	26	int_val = 1; /** A button always in unpressed before here, so
27	now we invariably set it to 'depressed' **/	27	now we invariably set it to 'depressed' **/
28		28
		29	(void)local_x;
		30	(void)local_y;
		31
29	currently_inside = true;	32	currently_inside = true;
30		33
31	draw_pressed();	34	draw_pressed();
Lines 38-43 Link Here
38		41
39	int GLUI_Button::mouse_up_handler( int local_x, int local_y, int inside )	42	int GLUI_Button::mouse_up_handler( int local_x, int local_y, int inside )
40	{	43	{
		44	(void)local_x;
		45	(void)local_y;
		46
41	set_int_val( 0 ); / A button always turns off after you press it /	47	set_int_val( 0 ); / A button always turns off after you press it /
42		48
43	draw_unpressed();	49	draw_unpressed();
Lines 62-67 Link Here
62	int GLUI_Button::mouse_held_down_handler( int local_x, int local_y,	68	int GLUI_Button::mouse_held_down_handler( int local_x, int local_y,
63	int new_inside)	69	int new_inside)
64	{	70	{
		71	(void)local_x;
		72	(void)local_y;
		73
65	if ( NOT new_inside AND currently_inside == true ) {	74	if ( NOT new_inside AND currently_inside == true ) {
66	draw_unpressed();	75	draw_unpressed();
67	}	76	}
Lines 79-84 Link Here
79		88
80	int GLUI_Button::key_handler( unsigned char key,int modifiers )	89	int GLUI_Button::key_handler( unsigned char key,int modifiers )
81	{	90	{
		91	(void)key;
		92	(void)modifiers;
		93
82	return false;	94	return false;
83	}	95	}
84		96
Lines 135-140 Link Here
135		147
136	void GLUI_Button::draw( int x, int y )	148	void GLUI_Button::draw( int x, int y )
137	{	149	{
		150	(void)x;
		151	(void)y;
		152
138	if ( NOT can_draw() )	153	if ( NOT can_draw() )
139	return;	154	return;
140		155
141	-- glui_v2_1_beta.orig/glui_checkbox.cpp	156	++ glui_v2_1_beta/glui_checkbox.cpp
Lines 25-30 Link Here
25	{	25	{
26	orig_value = int_val;	26	orig_value = int_val;
27		27
		28	(void)local_x;
		29	(void)local_y;
		30
28	TOGGLE_BOOL( int_val );	31	TOGGLE_BOOL( int_val );
29		32
30	currently_inside = true;	33	currently_inside = true;
Lines 42-47 Link Here
42		45
43	int GLUI_Checkbox::mouse_up_handler( int local_x, int local_y, int inside )	46	int GLUI_Checkbox::mouse_up_handler( int local_x, int local_y, int inside )
44	{	47	{
		48	(void)local_x;
		49	(void)local_y;
		50
45	if ( NOT inside ) {	51	if ( NOT inside ) {
46	int_val = orig_value;	52	int_val = orig_value;
47	}	53	}
Lines 66-71 Link Here
66	int GLUI_Checkbox::mouse_held_down_handler( int local_x, int local_y,	72	int GLUI_Checkbox::mouse_held_down_handler( int local_x, int local_y,
67	int inside)	73	int inside)
68	{	74	{
		75	(void)local_x;
		76	(void)local_y;
		77	(void)inside;
		78
69	/********** Toggle checked and unchecked bitmap if we're entering or	79	/********** Toggle checked and unchecked bitmap if we're entering or
70	leaving the checkbox area **********/	80	leaving the checkbox area **********/
71		81
Lines 93-98 Link Here
93		103
94	int GLUI_Checkbox::key_handler( unsigned char key,int modifiers )	104	int GLUI_Checkbox::key_handler( unsigned char key,int modifiers )
95	{	105	{
		106	(void)key;
		107	(void)modifiers;
		108
96	return false;	109	return false;
97	}	110	}
98		111
Lines 103-108 Link Here
103	{	116	{
104	int orig;	117	int orig;
105		118
		119	(void)x;
		120	(void)y;
		121
106	if ( NOT can_draw() )	122	if ( NOT can_draw() )
107	return;	123	return;
108		124
109	-- glui_v2_1_beta.orig/glui_column.cpp	125	++ glui_v2_1_beta/glui_column.cpp
Lines 27-32 Link Here
27	int panel_x, panel_y, panel_w, panel_h, panel_x_off, panel_y_off;	27	int panel_x, panel_y, panel_w, panel_h, panel_x_off, panel_y_off;
28	int y_diff;	28	int y_diff;
29		29
		30	(void)x;
		31	(void)y;
		32
30	if ( NOT can_draw() )	33	if ( NOT can_draw() )
31	return;	34	return;
32		35
33	-- glui_v2_1_beta.orig/glui_control.cpp	36	++ glui_v2_1_beta/glui_control.cpp
Lines 184-189 Link Here
184	{	184	{
185	GLUI_Control *node;	185	GLUI_Control *node;
186		186
		187	(void)x;
		188	(void)y;
		189
187	/* printf( "%s %d\n", this->name.string, this->hidden );*/	190	/* printf( "%s %d\n", this->name.string, this->hidden );*/
188	if ( NOT can_draw() )	191	if ( NOT can_draw() )
189	return;	192	return;
190	-- glui_v2_1_beta.orig/glui_edittext.cpp	193	++ glui_v2_1_beta/glui_edittext.cpp
Lines 51-56 Link Here
51		51
52	int GLUI_EditText::mouse_up_handler( int local_x, int local_y, int inside )	52	int GLUI_EditText::mouse_up_handler( int local_x, int local_y, int inside )
53	{	53	{
		54	(void)local_x;
		55	(void)local_y;
		56	(void)inside;
		57
54	return false;	58	return false;
55	}	59	}
56		60
Lines 224-230 Link Here
224	}	228	}
225		229
226	/****** check whether we have space ****/	230	/****** check whether we have space ****/
227	if ( (int)strlen( text ) + 2 >= sizeof( GLUI_String ))	231	if ( strlen( text ) + 2 >= sizeof( GLUI_String ))
228	return false;	232	return false;
229		233
230	/****** We insert the character into the string */	234	/****** We insert the character into the string */
Lines 364-369 Link Here
364	int orig;	368	int orig;
365	int name_x;	369	int name_x;
366		370
		371	(void)x;
		372	(void)y;
		373
367	if ( NOT can_draw() )	374	if ( NOT can_draw() )
368	return;	375	return;
369		376
Lines 484-489 Link Here
484	int text_x, i, sel_lo, sel_hi;	491	int text_x, i, sel_lo, sel_hi;
485	int orig;	492	int orig;
486		493
		494	(void)x;
		495	(void)y;
		496
487	if ( NOT can_draw() )	497	if ( NOT can_draw() )
488	return;	498	return;
489		499
Lines 584-589 Link Here
584	{	594	{
585	int curr_x, i;	595	int curr_x, i;
586		596
		597	(void)y;
		598
587	/* See if we clicked outside box */	599	/* See if we clicked outside box */
588	if ( x < this->x_abs + text_x_offset )	600	if ( x < this->x_abs + text_x_offset )
589	return -1;	601	return -1;
Lines 1032-1037 Link Here
1032		1044
1033	int GLUI_EditText::mouse_over( int state, int x, int y )	1045	int GLUI_EditText::mouse_over( int state, int x, int y )
1034	{	1046	{
		1047	(void)x;
		1048	(void)y;
		1049
1035	if ( state ) {	1050	if ( state ) {
1036	/* curr_cursor = GLUT_CURSOR_TEXT; */	1051	/* curr_cursor = GLUT_CURSOR_TEXT; */
1037	glutSetCursor( GLUT_CURSOR_TEXT );	1052	glutSetCursor( GLUT_CURSOR_TEXT );
1038	-- glui_v2_1_beta.orig/glui_listbox.cpp	1053	++ glui_v2_1_beta/glui_listbox.cpp
Lines 23-28 Link Here
23		23
24	int GLUI_Listbox::mouse_down_handler( int local_x, int local_y )	24	int GLUI_Listbox::mouse_down_handler( int local_x, int local_y )
25	{	25	{
		26	(void)local_x;
		27	(void)local_y;
		28
26	return false;	29	return false;
27	}	30	}
28		31
Lines 31-36 Link Here
31		34
32	int GLUI_Listbox::mouse_up_handler( int local_x, int local_y, int inside )	35	int GLUI_Listbox::mouse_up_handler( int local_x, int local_y, int inside )
33	{	36	{
		37	(void)local_x;
		38	(void)local_y;
		39	(void)inside;
34		40
35	return false;	41	return false;
36	}	42	}
Lines 41-46 Link Here
41	int GLUI_Listbox::mouse_held_down_handler( int local_x, int local_y,	47	int GLUI_Listbox::mouse_held_down_handler( int local_x, int local_y,
42	int inside)	48	int inside)
43	{	49	{
		50	(void)local_x;
		51	(void)local_y;
		52	(void)inside;
44		53
45	return false;	54	return false;
46	}	55	}
Lines 50-55 Link Here
50		59
51	int GLUI_Listbox::key_handler( unsigned char key,int modifiers )	60	int GLUI_Listbox::key_handler( unsigned char key,int modifiers )
52	{	61	{
		62	(void)key;
		63	(void)modifiers;
		64
53	return false;	65	return false;
54	}	66	}
55		67
Lines 60-65 Link Here
60	{	72	{
61	int orig, name_x;	73	int orig, name_x;
62		74
		75	(void)x;
		76	(void)y;
		77
63	if ( NOT can_draw() )	78	if ( NOT can_draw() )
64	return;	79	return;
65		80
Lines 324-329 Link Here
324	{	339	{
325	GLUI_Listbox_Item *item;	340	GLUI_Listbox_Item *item;
326		341
		342	(void)y;
		343
327	/* printf( "x/y: %d/%d\n", x, y ); */	344	/* printf( "x/y: %d/%d\n", x, y ); */
328		345
329	if ( state AND enabled AND x > x_abs + text_x_offset) {	346	if ( state AND enabled AND x > x_abs + text_x_offset) {
Lines 412-417 Link Here
412	{	429	{
413	GLUI_Listbox_Item node, new_node;	430	GLUI_Listbox_Item node, new_node;
414		431
		432	(void)modifiers;
		433
415	node = get_item_ptr( int_val );	434	node = get_item_ptr( int_val );
416	new_node = NULL;	435	new_node = NULL;
417		436
418	-- glui_v2_1_beta.orig/glui_mouse_iaction.cpp	437	++ glui_v2_1_beta/glui_mouse_iaction.cpp
Lines 23-29 Link Here
23		23
24	int GLUI_Mouse_Interaction::mouse_down_handler( int local_x, int local_y )	24	int GLUI_Mouse_Interaction::mouse_down_handler( int local_x, int local_y )
25	{	25	{
		26	#if 0
26	int win_h = glutGet( GLUT_WINDOW_HEIGHT );	27	int win_h = glutGet( GLUT_WINDOW_HEIGHT );
		28	#endif
27		29
28	/* iaction_mouse_down_handler( local_x, local_y ); */	30	/* iaction_mouse_down_handler( local_x, local_y ); */
29	iaction_mouse_down_handler( local_x-x_abs, local_y-y_abs );	31	iaction_mouse_down_handler( local_x-x_abs, local_y-y_abs );
Lines 70-75 Link Here
70	int text_width = string_width( this->name );	72	int text_width = string_width( this->name );
71	int x_left = this->w/2 - text_width/2;	73	int x_left = this->w/2 - text_width/2;
72		74
		75	(void)x;
		76	(void)y;
		77
73	if ( NOT glui )	78	if ( NOT glui )
74	return;	79	return;
75		80
Lines 112-117 Link Here
112	int center_x, center_y;	117	int center_x, center_y;
113	int drag_x, drag_y;	118	int drag_x, drag_y;
114		119
		120	(void)modifiers;
		121
115	center_x = w/2;	122	center_x = w/2;
116	center_y = (h-18)/2;	123	center_y = (h-18)/2;
117	drag_x = 0;	124	drag_x = 0;
118	-- glui_v2_1_beta.orig/glui_panel.cpp	125	++ glui_v2_1_beta/glui_panel.cpp
Lines 25-30 Link Here
25	{	25	{
26	int top, orig;	26	int top, orig;
27		27
		28	(void)x;
		29	(void)y;
		30
28	if ( NOT can_draw() )	31	if ( NOT can_draw() )
29	return;	32	return;
30		33
31	-- glui_v2_1_beta.orig/glui_radio.cpp	34	++ glui_v2_1_beta/glui_radio.cpp
Lines 23-28 Link Here
23		23
24	void GLUI_RadioGroup::draw( int x, int y )	24	void GLUI_RadioGroup::draw( int x, int y )
25	{	25	{
		26	(void)x;
		27	(void)y;
		28
26	if ( NOT can_draw() )	29	if ( NOT can_draw() )
27	return;	30	return;
28		31
Lines 116-121 Link Here
116		119
117	int GLUI_RadioButton::mouse_down_handler( int local_x, int local_y )	120	int GLUI_RadioButton::mouse_down_handler( int local_x, int local_y )
118	{	121	{
		122	(void)local_x;
		123	(void)local_y;
		124
119	if ( NOT group )	125	if ( NOT group )
120	return false;	126	return false;
121		127
Lines 135-140 Link Here
135	int GLUI_RadioButton::mouse_up_handler( int local_x, int local_y,	141	int GLUI_RadioButton::mouse_up_handler( int local_x, int local_y,
136	int inside )	142	int inside )
137	{	143	{
		144	(void)local_x;
		145	(void)local_y;
		146
138	if ( NOT group )	147	if ( NOT group )
139	return false;	148	return false;
140		149
Lines 168-173 Link Here
168	int GLUI_RadioButton::mouse_held_down_handler( int local_x, int local_y,	177	int GLUI_RadioButton::mouse_held_down_handler( int local_x, int local_y,
169	int inside)	178	int inside)
170	{	179	{
		180	(void)local_x;
		181	(void)local_y;
		182
171	if ( NOT inside AND currently_inside == true ) {	183	if ( NOT inside AND currently_inside == true ) {
172	group->set_selected( orig_value );	184	group->set_selected( orig_value );
173	group->draw_group( true );	185	group->draw_group( true );
Lines 189-194 Link Here
189	{	201	{
190	int orig;	202	int orig;
191		203
		204	(void)x;
		205	(void)y;
		206
192	orig = set_to_glut_window();	207	orig = set_to_glut_window();
193		208
194	if ( NOT group OR NOT can_draw() )	209	if ( NOT group OR NOT can_draw() )
195	-- glui_v2_1_beta.orig/glui_rollout.cpp	210	++ glui_v2_1_beta/glui_rollout.cpp
Lines 90-95 Link Here
90		90
91	int GLUI_Rollout::mouse_down_handler( int local_x, int local_y )	91	int GLUI_Rollout::mouse_down_handler( int local_x, int local_y )
92	{	92	{
		93	(void)local_x;
		94
93	if ( local_y - y_abs > 18 ) {	95	if ( local_y - y_abs > 18 ) {
94	initially_inside = currently_inside = false;	96	initially_inside = currently_inside = false;
95	return false;	97	return false;
Lines 108-113 Link Here
108		110
109	int GLUI_Rollout::mouse_up_handler( int local_x, int local_y, int inside )	111	int GLUI_Rollout::mouse_up_handler( int local_x, int local_y, int inside )
110	{	112	{
		113	(void)local_x;
		114	(void)local_y;
		115	(void)inside;
		116
111	draw_unpressed();	117	draw_unpressed();
112		118
113	if ( currently_inside ) {	119	if ( currently_inside ) {
Lines 129-134 Link Here
129	{	135	{
130	int orig, left, right, top, bottom;	136	int orig, left, right, top, bottom;
131		137
		138	(void)x;
		139	(void)y;
		140
132	if ( NOT can_draw() )	141	if ( NOT can_draw() )
133	return;	142	return;
134		143
Lines 267-272 Link Here
267	int local_x, int local_y,	276	int local_x, int local_y,
268	int new_inside )	277	int new_inside )
269	{	278	{
		279	(void)local_x;
		280
270	if ( NOT initially_inside )	281	if ( NOT initially_inside )
271	return false;	282	return false;
272		283
273	-- glui_v2_1_beta.orig/glui_rotation.cpp	284	++ glui_v2_1_beta/glui_rotation.cpp
Lines 28-34 Link Here
28		28
29	init_ball();	29	init_ball();
30		30
31	local_y = 2.0 * ball->center[1] - local_y;	31	local_y = static_cast<int>(2.0 * ball->center[1] - local_y);
32		32
33	ball->mouse_down( local_x, local_y );	33	ball->mouse_down( local_x, local_y );
34		34
Lines 47-52 Link Here
47	int GLUI_Rotation::iaction_mouse_up_handler( int local_x, int local_y,	47	int GLUI_Rotation::iaction_mouse_up_handler( int local_x, int local_y,
48	int inside )	48	int inside )
49	{	49	{
		50	(void)local_x;
		51	(void)local_y;
		52	(void)inside;
		53
50	copy_float_array_to_ball();	54	copy_float_array_to_ball();
51		55
52	ball->mouse_up();	56	ball->mouse_up();
Lines 60-71 Link Here
60	int GLUI_Rotation::iaction_mouse_held_down_handler( int local_x, int local_y,	64	int GLUI_Rotation::iaction_mouse_held_down_handler( int local_x, int local_y,
61	int inside)	65	int inside)
62	{	66	{
		67	(void)inside;
		68
63	if ( NOT glui )	69	if ( NOT glui )
64	return 0;	70	return 0;
65		71
66	copy_float_array_to_ball();	72	copy_float_array_to_ball();
67		73
68	local_y = 2.0 * ball->center[1] - local_y;	74	local_y = static_cast<int>(2.0 * ball->center[1] - local_y);
69		75
70	/* printf( "%d %d\n", local_x, local_y ); */	76	/* printf( "%d %d\n", local_x, local_y ); */
71		77
Lines 159-164 Link Here
159		165
160	void GLUI_Rotation::iaction_dump( FILE *output )	166	void GLUI_Rotation::iaction_dump( FILE *output )
161	{	167	{
		168	(void)output;
162	}	169	}
163		170
164		171
Lines 166-171 Link Here
166		173
167	int GLUI_Rotation::iaction_special_handler( int key,int modifiers )	174	int GLUI_Rotation::iaction_special_handler( int key,int modifiers )
168	{	175	{
		176	(void)key;
		177	(void)modifiers;
169		178
170	return false;	179	return false;
171	}	180	}
172	-- glui_v2_1_beta.orig/glui_separator.cpp	181	++ glui_v2_1_beta/glui_separator.cpp
Lines 26-31 Link Here
26	int width, indent, orig;	26	int width, indent, orig;
27	int cont_x, cont_y, cont_w, cont_h, cont_x_off, cont_y_off;	27	int cont_x, cont_y, cont_w, cont_h, cont_x_off, cont_y_off;
28		28
		29	(void)x;
		30	(void)y;
		31
29	if ( NOT can_draw() )	32	if ( NOT can_draw() )
30	return;	33	return;
31		34
Lines 41-47 Link Here
41	width = this->w;	44	width = this->w;
42	}	45	}
43		46
44	indent = width * .05;	47	indent = static_cast<int>(width * .05);
45		48
46	glLineWidth( 1.0 );	49	glLineWidth( 1.0 );
47	glBegin( GL_LINES );	50	glBegin( GL_LINES );
48	-- glui_v2_1_beta.orig/glui_spinner.cpp	51	++ glui_v2_1_beta/glui_spinner.cpp
Lines 93-98 Link Here
93		93
94	int GLUI_Spinner::mouse_up_handler( int local_x, int local_y, int inside )	94	int GLUI_Spinner::mouse_up_handler( int local_x, int local_y, int inside )
95	{	95	{
		96	(void)local_x;
		97	(void)local_y;
		98	(void)inside;
		99
96	state = GLUI_SPINNER_STATE_NONE;	100	state = GLUI_SPINNER_STATE_NONE;
97		101
98	/* printf("spinner: mouse up : %d/%d inside: %d\n",local_x,local_y,inside); */	102	/* printf("spinner: mouse up : %d/%d inside: %d\n",local_x,local_y,inside); */
Lines 174-180 Link Here
174		178
175	int GLUI_Spinner::key_handler( unsigned char key,int modifiers )	179	int GLUI_Spinner::key_handler( unsigned char key,int modifiers )
176	{	180	{
177		181	(void)key;
		182	(void)modifiers;
178		183
179	return true;	184	return true;
180	}	185	}
Lines 186-191 Link Here
186	{	191	{
187	int orig;	192	int orig;
188		193
		194	(void)x;
		195	(void)y;
		196
189	if ( NOT can_draw() )	197	if ( NOT can_draw() )
190	return;	198	return;
191		199
Lines 252-257 Link Here
252		260
253	int GLUI_Spinner::special_handler( int key,int modifiers )	261	int GLUI_Spinner::special_handler( int key,int modifiers )
254	{	262	{
		263	(void)modifiers;
		264
255	if ( key == GLUT_KEY_UP ) { / Simulate a click in the up arrow /	265	if ( key == GLUT_KEY_UP ) { / Simulate a click in the up arrow /
256	mouse_down_handler( x_abs + w - GLUI_SPINNER_ARROW_WIDTH + 1,	266	mouse_down_handler( x_abs + w - GLUI_SPINNER_ARROW_WIDTH + 1,
257	y_abs + GLUI_SPINNER_ARROW_Y+1 );	267	y_abs + GLUI_SPINNER_ARROW_Y+1 );
258	-- glui_v2_1_beta.orig/glui_statictext.cpp	268	++ glui_v2_1_beta/glui_statictext.cpp
Lines 25-30 Link Here
25	{	25	{
26	int orig;	26	int orig;
27		27
		28	(void)x;
		29	(void)y;
		30
28	if ( NOT can_draw() )	31	if ( NOT can_draw() )
29	return;	32	return;
30		33
31	-- glui_v2_1_beta.orig/glui_translation.cpp	34	++ glui_v2_1_beta/glui_translation.cpp
Lines 83-88 Link Here
83	trans_mouse_code = GLUI_TRANSLATION_MOUSE_NONE;	83	trans_mouse_code = GLUI_TRANSLATION_MOUSE_NONE;
84	locked = GLUI_TRANSLATION_LOCK_NONE;	84	locked = GLUI_TRANSLATION_LOCK_NONE;
85		85
		86	(void)local_x;
		87	(void)local_y;
		88	(void)inside;
		89
86	translate_and_draw_front();	90	translate_and_draw_front();
87		91
88	return false;	92	return false;
Lines 97-102 Link Here
97	float x_off, y_off;	101	float x_off, y_off;
98	float off_array[2];	102	float off_array[2];
99		103
		104	(void)inside;
		105
100	x_off = scale_factor * (float)(local_x - down_x);	106	x_off = scale_factor * (float)(local_x - down_x);
101	y_off = -scale_factor * (float)(local_y - down_y);	107	y_off = -scale_factor * (float)(local_y - down_y);
102		108
Lines 181-186 Link Here
181		187
182	void GLUI_Translation::iaction_dump( FILE *output )	188	void GLUI_Translation::iaction_dump( FILE *output )
183	{	189	{
		190	(void)output;
184	}	191	}
185		192
186		193
Lines 188-193 Link Here
188		195
189	int GLUI_Translation::iaction_special_handler( int key,int modifiers )	196	int GLUI_Translation::iaction_special_handler( int key,int modifiers )
190	{	197	{
		198	(void)key;
		199	(void)modifiers;
191		200
192	return false;	201	return false;
193	}	202	}
Lines 301-309 Link Here
301	{	310	{
302	float x1 = .2, x2 = .4, y1 = .54, y2 = .94, y0;	311	float x1 = .2, x2 = .4, y1 = .54, y2 = .94, y0;
303	float x1a, x1b;	312	float x1a, x1b;
		313	#if 0
304	vec3 col1( 0.0, 0.0, 0.0 ), col2( .45, .45, .45 ),	314	vec3 col1( 0.0, 0.0, 0.0 ), col2( .45, .45, .45 ),
305	col3( .7, .7, .7 ), col4( 1.0, 1.0, 1.0 );	315	col3( .7, .7, .7 ), col4( 1.0, 1.0, 1.0 );
306	vec3 c1, c2, c3, c4, c5, c6;	316	vec3 c1, c2, c3, c4, c5, c6;
		317	#endif
307	vec3 white(1.0,1.0,1.0), black(0.0,0.0,0.0), gray(.45,.45,.45),	318	vec3 white(1.0,1.0,1.0), black(0.0,0.0,0.0), gray(.45,.45,.45),
308	bkgd(.7,.7,.7);	319	bkgd(.7,.7,.7);
309	int c_off; /* color index offset */	320	int c_off; /* color index offset */
310	-- glui_v2_1_beta.orig/quaternion.cpp	321	++ glui_v2_1_beta/quaternion.cpp
Lines 110-116 Link Here
110	mat4 quat::to_mat4( void )	110	mat4 quat::to_mat4( void )
111	{	111	{
112	float t, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;	112	float t, xs, ys, zs, wx, wy, wz, xx, xy, xz, yy, yz, zz;
		113	#if 0
113	vec3 a, c, b, d;	114	vec3 a, c, b, d;
		115	#endif
114		116
115	t = 2.0 / (vv + ss);	117	t = 2.0 / (vv + ss);
116		118
117	-- glui_v2_1_beta.orig/Makefile	119	++ glui_v2_1_beta/Makefile
Line 0 Link Here
		1	VERSION = 2.1
		2	MAJOR = 2
		3	LIBNAME = libglui
		4	SONAME = $(LIBNAME).so.$(MAJOR)
		5
		6	#CC = cc
		7	#CXX = c++
		8
		9	CPPFLAGS = $(INCS)
		10	#CFLAGS =
		11	#CXXFLAGS =
		12	#LDFLAGS =
		13	LDLIBS = $(LIBS)
		14
		15	GLLIBS = -lGL -lGLU -lglut
		16	INCS =
		17	LIBS = $(GLLIBS) -lm
		18
		19	LIBGLUI = -L. -lglui
		20
		21	GLUI = $(LIBNAME).a
		22	SO_GLUI = $(LIBNAME).so
		23
		24	EXAMPLES = bin/example1 bin/example2 bin/example3 bin/example4 bin/example5
		25
		26	all: static shared examples
		27	static: $(GLUI)
		28	shared: $(SO_GLUI)
		29	examples: $(EXAMPLES)
		30
		31	GLUI_SRCS = algebra3.cpp arcball.cpp $(wildcard glui*.cpp) quaternion.cpp
		32	GLUI_OBJS = $(GLUI_SRCS:.cpp=.o)
		33
		34	$(GLUI): $(GLUI_OBJS)
		35	@echo "Creating library"
		36	# test -d $(dir $@) \|\| mkdir -p $(dir $@)
		37	ar -r $@ $^
		38
		39	$(SO_GLUI): $(GLUI_OBJS)
		40	@echo "Creating shared library"
		41	$(CXX) -o $(SO_GLUI).$(VERSION) -shared -Wl,-soname,$(SONAME) $^ $(LDLIBS)
		42	ln -sf $(SO_GLUI).$(VERSION) $(SONAME)
		43	ln -sf $(SO_GLUI).$(VERSION) $@
		44
		45	bin/example%: example%.o $(GLUI)
		46	@echo Linking $(notdir $@)
		47	test -d $(dir $@) \|\| mkdir -p $(dir $@)
		48	$(CXX) $(LDFLAGS) $(LDLIBS) $< $(LIBGLUI) -o $@
		49
		50	.cpp.o:
		51	$(CXX) -c $(CXXFLAGS) $(CPPFLAGS) $(INCS) $<
		52
		53	.c.o:
		54	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $<
		55
		56	clean:
		57	$(RM) *.o
		58	$(RM) -r bin libs
		59	$(RM) tags *~
		60
		61	.SUFFIXES: .cpp
		62	.PHONY: all static shared examples
		63
		64	algebra3.o: algebra3.h
65	arcball.o: arcball.h algebra3.h quaternion.h
66	example1.o: glui.h
67	example2.o: glui.h
68	example3.o: glui.h
69	example4.o: glui.h
70	glui.o: glui.h
71	glui_add_controls.o: glui.h
72	glui_bitmap_img_data.o: glui_img_checkbox_0.c glui_img_checkbox_1.c
73	glui_bitmap_img_data.o: glui_img_radiobutton_0.c glui_img_radiobutton_1.c
74	glui_bitmap_img_data.o: glui_img_uparrow.c glui_img_downarrow.c
75	glui_bitmap_img_data.o: glui_img_leftarrow.c glui_img_rightarrow.c
76	glui_bitmap_img_data.o: glui_img_spinup_1.c glui_img_spinup_0.c
77	glui_bitmap_img_data.o: glui_img_spindown_1.c glui_img_spindown_0.c
78	glui_bitmap_img_data.o: glui_img_checkbox_0_dis.c glui_img_checkbox_1_dis.c
79	glui_bitmap_img_data.o: glui_img_radiobutton_0_dis.c
80	glui_bitmap_img_data.o: glui_img_radiobutton_1_dis.c glui_img_spinup_dis.c
81	glui_bitmap_img_data.o: glui_img_spindown_dis.c
82	glui_bitmaps.o: glui.h
83	glui_button.o: glui.h
84	glui_checkbox.o: glui.h
85	glui_column.o: glui.h
86	glui_control.o: glui.h
87	glui_edittext.o: glui.h
88	glui_node.o: glui.h
89	glui_panel.o: glui.h
90	glui_radio.o: glui.h
91	glui_separator.o: glui.h
92	glui_spinner.o: glui.h
93	glui_statictext.o: glui.h
94	quaternion.o: quaternion.h algebra3.h
95	glui_translation.o: glui.h
96	glui_rotation.o: glui.h
97	glui_mouse_iaction.o: glui.h
98	glui_listbox.o: glui.h
99	glui_rollout.o: glui.h





.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 





.SUFFIXES: .cpp

WALK=/unc/walk
CFLAGS = 


#for sgi   -- comment out the lines below to use on HP
CC=CC -g0 -o32
ARCH=sgi_irix
CPPFLAGS=-I${WALK}/include -w 
GLLIBS=-L${WALK}/lib/${ARCH} -lglut -lGL -lGLU
LPATH=${GLUTPATH} 
INCS= 


#for hp   -- uncomment the lines below to use on HP
#CC=g++
#ARCH=hp700_hpux
#CPPFLAGS=-I${WALK}/include -w
#GLLIBS=-L/unc/walk/lib/hp700_hpux -lglut -L/unc/walk/lib/hp700_hpux/mesa -lGLU -lGL     
#LPATH= ${GLUTPATH} -L/usr/local/lib/X11
#INCS=-I/unc/walk/include/mesa -I/unc/walk/include -I. 



libs =     ${GLLIBS}  -lXmu -lXext -lX11 -lm -lmalloc 

LIBGLUI= -Llib -lglui

All: lib/libglui.a bin/example1 bin/example2 bin/example3 bin/example4

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

example1: $(GLUI_OBJS) example1.o
	@echo "Linking example1"
	$(CC)  $(CFLAG) $(CPPFLAGS) $(LPATH) example1.o $(LIBGLUI) $(libs) -o bin/example1

example2: $(GLUI_OBJS) example2.o
	@echo "Linking example2"
	$(CC)  $(CFLAG) $(CPPFLAGS) $(LPATH) example2.o $(LIBGLUI) $(libs) -o bin/example2

example3: $(GLUI_OBJS) example3.o
	@echo "Linking example3"
	$(CC)  $(CFLAG) $(CPPFLAGS) $(LPATH) example3.o $(LIBGLUI) $(libs) -o bin/example3

example4: $(GLUI_OBJS) example4.o
	@echo "Linking example4"
	$(CC)  $(CFLAG) $(CPPFLAGS) $(LPATH) example4.o $(LIBGLUI) $(libs) -o bin/example4

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


# DO NOT DELETE THIS LINE -- make depend depends on it.

algebra3.o: /usr/include/math.h /usr/include/sgidefs.h
algebra3.o: /usr/include/standards.h algebra3.h /usr/include/stdio.h
algebra3.o: /usr/include/stdlib.h /usr/include/ctype.h
arcball.o: arcball.h algebra3.h /usr/include/math.h /usr/include/sgidefs.h
arcball.o: /usr/include/standards.h /usr/include/stdio.h
arcball.o: /usr/include/stdlib.h quaternion.h stdinc.h
example1.o: /usr/include/string.h /usr/include/standards.h glui.h
example1.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
example2.o: /usr/include/string.h /usr/include/standards.h glui.h
example2.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
example3.o: /usr/include/string.h /usr/include/standards.h glui.h
example3.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
example4.o: /usr/include/string.h /usr/include/standards.h glui.h
example4.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
glui.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui.o: /usr/include/sgidefs.h /usr/include/stdio.h /usr/include/string.h
glui.o: stdinc.h /usr/include/math.h
glui_add_controls.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_add_controls.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_add_controls.o: /usr/include/string.h stdinc.h /usr/include/math.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 /usr/include/stdlib.h /usr/include/standards.h
glui_bitmaps.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_bitmaps.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_button.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_button.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_button.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_checkbox.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_checkbox.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_checkbox.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_column.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_column.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_column.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_control.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_control.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_control.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_edittext.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_edittext.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_edittext.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_node.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_node.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_node.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_panel.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_panel.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_panel.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_radio.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_radio.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_radio.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_separator.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_separator.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_separator.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_spinner.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_spinner.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_spinner.o: /usr/include/string.h stdinc.h /usr/include/math.h
glui_statictext.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
glui_statictext.o: /usr/include/sgidefs.h /usr/include/stdio.h
glui_statictext.o: /usr/include/string.h stdinc.h /usr/include/math.h
ppm2array.o: /usr/include/stdio.h /usr/include/standards.h
ppm2array.o: /usr/include/sgidefs.h
quaternion.o: quaternion.h algebra3.h /usr/include/math.h
quaternion.o: /usr/include/sgidefs.h /usr/include/standards.h
quaternion.o: /usr/include/stdio.h /usr/include/stdlib.h stdinc.h

Return to bug 23207

Lines 0-100 Link Here

(-)glui_v2_1_beta.orig/makefile (-101 lines)
0
1	.SUFFIXES: .cpp
2
3
4	#Change the following two lines to reflect the locations
5	# of the GLUT library (.a) and includes on your system
6
7	GLUT_LIB_LOCATION=/unc/walk/lib/sgi_irix
8	GLUT_INC_LOCATION=/unc/walk/include
9
10	CFLAGS =
11
12
13	#for sgi -- comment out the lines below to use on HP
14	CC=CC -g0 -o32
15	#CC=gcc
16	#CC=g++ -O3
17	CPPFLAGS=-I${GLUT_INC_LOCATION} #-w
18	GLLIBS=-L${GLUT_LIB_LOCATION} -lglut -lGL -lGLU
19	LPATH=${GLUTPATH}
20	INCS=
21
22
23	libs = ${GLLIBS} -lXmu -lXext -lX11 -lXi -lm #-lmalloc
24
25	LIBGLUI= -Llib -lglui
26
27	All: lib/libglui.a bin/example1 bin/example2 bin/example3 bin/example4 bin/example5
28
29	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
30
31	bin/example1: $(GLUI_OBJS) example1.o lib/libglui.a
32	@echo "Linking example1"
33	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example1.o $(LIBGLUI) $(libs) -o bin/example1
34
35	bin/example2: $(GLUI_OBJS) example2.o lib/libglui.a
36	@echo "Linking example2"
37	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example2.o $(LIBGLUI) $(libs) -o bin/example2
38
39	bin/example3: $(GLUI_OBJS) example3.o lib/libglui.a
40	@echo "Linking example3"
41	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example3.o $(LIBGLUI) $(libs) -o bin/example3
42
43	bin/example4: $(GLUI_OBJS) example4.o lib/libglui.a
44	@echo "Linking example4"
45	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example4.o $(LIBGLUI) $(libs) -o bin/example4
46
47	bin/example5: $(GLUI_OBJS) example5.o lib/libglui.a
48	@echo "Linking example5"
49	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example5.o $(LIBGLUI) $(libs) -o bin/example5
50
51	lib/libglui.a: $(GLUI_OBJS)
52	@echo "Creating library"
53	ar -r lib/libglui.a $(GLUI_OBJS)
54
55	.cpp.o:
56	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $*.cpp
57
58	.c.o:
59	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $*.c
60	clean:
61	/bin/rm *.o
62
63
64
65	algebra3.o: algebra3.h
66	arcball.o: arcball.h algebra3.h quaternion.h stdinc.h
67	example1.o: glui.h
68	example2.o: glui.h
69	example3.o: glui.h
70	example4.o: glui.h
71	glui.o: glui.h stdinc.h
72	glui_add_controls.o: glui.h stdinc.h
73	glui_bitmap_img_data.o: glui_img_checkbox_0.c glui_img_checkbox_1.c
74	glui_bitmap_img_data.o: glui_img_radiobutton_0.c glui_img_radiobutton_1.c
75	glui_bitmap_img_data.o: glui_img_uparrow.c glui_img_downarrow.c
76	glui_bitmap_img_data.o: glui_img_leftarrow.c glui_img_rightarrow.c
77	glui_bitmap_img_data.o: glui_img_spinup_1.c glui_img_spinup_0.c
78	glui_bitmap_img_data.o: glui_img_spindown_1.c glui_img_spindown_0.c
79	glui_bitmap_img_data.o: glui_img_checkbox_0_dis.c glui_img_checkbox_1_dis.c
80	glui_bitmap_img_data.o: glui_img_radiobutton_0_dis.c
81	glui_bitmap_img_data.o: glui_img_radiobutton_1_dis.c glui_img_spinup_dis.c
82	glui_bitmap_img_data.o: glui_img_spindown_dis.c
83	glui_bitmaps.o: glui.h stdinc.h
84	glui_button.o: glui.h stdinc.h
85	glui_checkbox.o: glui.h stdinc.h
86	glui_column.o: glui.h stdinc.h
87	glui_control.o: glui.h stdinc.h
88	glui_edittext.o: glui.h stdinc.h
89	glui_node.o: glui.h stdinc.h
90	glui_panel.o: glui.h stdinc.h
91	glui_radio.o: glui.h stdinc.h
92	glui_separator.o: glui.h stdinc.h
93	glui_spinner.o: glui.h stdinc.h
94	glui_statictext.o: glui.h stdinc.h
95	quaternion.o: quaternion.h algebra3.h stdinc.h
96	glui_translation.o: glui.h stdinc.h
97	glui_rotation.o: glui.h stdinc.h
98	glui_mouse_iaction.o: glui.h stdinc.h
99	glui_listbox.o: glui.h stdinc.h
100	glui_rollout.o: glui.h stdinc.h

Lines 0-135 Link Here

(-)glui_v2_1_beta.orig/makefile.bak (-136 lines)
0
1	.SUFFIXES: .cpp
2
3	WALK=/unc/walk
4	CFLAGS =
5
6
7	#for sgi -- comment out the lines below to use on HP
8	CC=CC -g0 -o32
9	ARCH=sgi_irix
10	CPPFLAGS=-I${WALK}/include -w
11	GLLIBS=-L${WALK}/lib/${ARCH} -lglut -lGL -lGLU
12	LPATH=${GLUTPATH}
13	INCS=
14
15
16	#for hp -- uncomment the lines below to use on HP
17	#CC=g++
18	#ARCH=hp700_hpux
19	#CPPFLAGS=-I${WALK}/include -w
20	#GLLIBS=-L/unc/walk/lib/hp700_hpux -lglut -L/unc/walk/lib/hp700_hpux/mesa -lGLU -lGL
21	#LPATH= ${GLUTPATH} -L/usr/local/lib/X11
22	#INCS=-I/unc/walk/include/mesa -I/unc/walk/include -I.
23
24
25
26	libs = ${GLLIBS} -lXmu -lXext -lX11 -lm -lmalloc
27
28	LIBGLUI= -Llib -lglui
29
30	All: lib/libglui.a bin/example1 bin/example2 bin/example3 bin/example4
31
32	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
33
34	example1: $(GLUI_OBJS) example1.o
35	@echo "Linking example1"
36	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example1.o $(LIBGLUI) $(libs) -o bin/example1
37
38	example2: $(GLUI_OBJS) example2.o
39	@echo "Linking example2"
40	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example2.o $(LIBGLUI) $(libs) -o bin/example2
41
42	example3: $(GLUI_OBJS) example3.o
43	@echo "Linking example3"
44	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example3.o $(LIBGLUI) $(libs) -o bin/example3
45
46	example4: $(GLUI_OBJS) example4.o
47	@echo "Linking example4"
48	$(CC) $(CFLAG) $(CPPFLAGS) $(LPATH) example4.o $(LIBGLUI) $(libs) -o bin/example4
49
50	lib/libglui.a: $(GLUI_OBJS)
51	@echo "Creating library"
52	ar -r lib/libglui.a $(GLUI_OBJS)
53
54	.cpp.o:
55	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $*.cpp
56
57	.c.o:
58	$(CC) -c $(CFLAGS) $(CPPFLAGS) $(INCS) $*.c
59	clean:
60	/bin/rm *.o
61
62
63	# DO NOT DELETE THIS LINE -- make depend depends on it.
64
65	algebra3.o: /usr/include/math.h /usr/include/sgidefs.h
66	algebra3.o: /usr/include/standards.h algebra3.h /usr/include/stdio.h
67	algebra3.o: /usr/include/stdlib.h /usr/include/ctype.h
68	arcball.o: arcball.h algebra3.h /usr/include/math.h /usr/include/sgidefs.h
69	arcball.o: /usr/include/standards.h /usr/include/stdio.h
70	arcball.o: /usr/include/stdlib.h quaternion.h stdinc.h
71	example1.o: /usr/include/string.h /usr/include/standards.h glui.h
72	example1.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
73	example2.o: /usr/include/string.h /usr/include/standards.h glui.h
74	example2.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
75	example3.o: /usr/include/string.h /usr/include/standards.h glui.h
76	example3.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
77	example4.o: /usr/include/string.h /usr/include/standards.h glui.h
78	example4.o: /usr/include/stdlib.h /usr/include/sgidefs.h /usr/include/stdio.h
79	glui.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
80	glui.o: /usr/include/sgidefs.h /usr/include/stdio.h /usr/include/string.h
81	glui.o: stdinc.h /usr/include/math.h
82	glui_add_controls.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
83	glui_add_controls.o: /usr/include/sgidefs.h /usr/include/stdio.h
84	glui_add_controls.o: /usr/include/string.h stdinc.h /usr/include/math.h
85	glui_bitmap_img_data.o: glui_img_checkbox_0.c glui_img_checkbox_1.c
86	glui_bitmap_img_data.o: glui_img_radiobutton_0.c glui_img_radiobutton_1.c
87	glui_bitmap_img_data.o: glui_img_uparrow.c glui_img_downarrow.c
88	glui_bitmap_img_data.o: glui_img_leftarrow.c glui_img_rightarrow.c
89	glui_bitmap_img_data.o: glui_img_spinup_1.c glui_img_spinup_0.c
90	glui_bitmap_img_data.o: glui_img_spindown_1.c glui_img_spindown_0.c
91	glui_bitmap_img_data.o: glui_img_checkbox_0_dis.c glui_img_checkbox_1_dis.c
92	glui_bitmap_img_data.o: glui_img_radiobutton_0_dis.c
93	glui_bitmap_img_data.o: glui_img_radiobutton_1_dis.c glui_img_spinup_dis.c
94	glui_bitmap_img_data.o: glui_img_spindown_dis.c
95	glui_bitmaps.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
96	glui_bitmaps.o: /usr/include/sgidefs.h /usr/include/stdio.h
97	glui_bitmaps.o: /usr/include/string.h stdinc.h /usr/include/math.h
98	glui_button.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
99	glui_button.o: /usr/include/sgidefs.h /usr/include/stdio.h
100	glui_button.o: /usr/include/string.h stdinc.h /usr/include/math.h
101	glui_checkbox.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
102	glui_checkbox.o: /usr/include/sgidefs.h /usr/include/stdio.h
103	glui_checkbox.o: /usr/include/string.h stdinc.h /usr/include/math.h
104	glui_column.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
105	glui_column.o: /usr/include/sgidefs.h /usr/include/stdio.h
106	glui_column.o: /usr/include/string.h stdinc.h /usr/include/math.h
107	glui_control.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
108	glui_control.o: /usr/include/sgidefs.h /usr/include/stdio.h
109	glui_control.o: /usr/include/string.h stdinc.h /usr/include/math.h
110	glui_edittext.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
111	glui_edittext.o: /usr/include/sgidefs.h /usr/include/stdio.h
112	glui_edittext.o: /usr/include/string.h stdinc.h /usr/include/math.h
113	glui_node.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
114	glui_node.o: /usr/include/sgidefs.h /usr/include/stdio.h
115	glui_node.o: /usr/include/string.h stdinc.h /usr/include/math.h
116	glui_panel.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
117	glui_panel.o: /usr/include/sgidefs.h /usr/include/stdio.h
118	glui_panel.o: /usr/include/string.h stdinc.h /usr/include/math.h
119	glui_radio.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
120	glui_radio.o: /usr/include/sgidefs.h /usr/include/stdio.h
121	glui_radio.o: /usr/include/string.h stdinc.h /usr/include/math.h
122	glui_separator.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
123	glui_separator.o: /usr/include/sgidefs.h /usr/include/stdio.h
124	glui_separator.o: /usr/include/string.h stdinc.h /usr/include/math.h
125	glui_spinner.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
126	glui_spinner.o: /usr/include/sgidefs.h /usr/include/stdio.h
127	glui_spinner.o: /usr/include/string.h stdinc.h /usr/include/math.h
128	glui_statictext.o: glui.h /usr/include/stdlib.h /usr/include/standards.h
129	glui_statictext.o: /usr/include/sgidefs.h /usr/include/stdio.h
130	glui_statictext.o: /usr/include/string.h stdinc.h /usr/include/math.h
131	ppm2array.o: /usr/include/stdio.h /usr/include/standards.h
132	ppm2array.o: /usr/include/sgidefs.h
133	quaternion.o: quaternion.h algebra3.h /usr/include/math.h
134	quaternion.o: /usr/include/sgidefs.h /usr/include/standards.h
135	quaternion.o: /usr/include/stdio.h /usr/include/stdlib.h stdinc.h