[ViewVC] Diff of: cvs/libgender/test.C

Comparing libgender/test.C (file contents):
Revision 1.11 by root, Sun Oct 3 05:53:09 2004 UTC vs.
Revision 1.82 by root, Thu Nov 4 15:43:53 2004 UTC

…		…
1	#include <stdlib.h>	1	#include <stdlib.h>
2	#include <stdio.h>	2	#include <stdio.h>
3	#include <string.h>	3	#include <string.h>
4	#include <math.h>	4	#include <math.h>
5		5
		6	#include "opengl.h"
		7
6	#include "SDL.h"	8	#include "SDL.h"
7
8	#include "SDL_opengl.h"	9	#include "SDL_opengl.h"
9
10	/* Undefine this if you want a flat cube instead of a rainbow cube */
11	#define SHADED_CUBE
12
13	/* Define this to be the name of the logo image to use with -logo */
14	#define LOGO_FILE "icon.bmp"
15		10
16	static SDL_Surface *global_image = NULL;	11	static SDL_Surface *global_image = NULL;
17	static GLuint global_texture = 0;	12	static GLuint global_texture = 0;
18		13
		14	#include "util.h"
19	#include "entity.h"	15	#include "entity.h"
20
21	#include "txtprt_import.h"	16	#include "txtprt_import.h"
22		17
		18	#include "shader.h"
		19
23	/**********************************************************************/	20	/**********************************************************************/
24		21
25	view camera;	22	view camera;
		23	vec3 camera_velocity;
		24	float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
		25	float camera_velocity_factor = 80;
26		26
27	void	27	void
28	HotKey_ToggleFullScreen (void)	28	HotKey_ToggleFullScreen (void)
29	{	29	{
30	SDL_Surface *screen;	30	SDL_Surface *screen;
31		31
32	screen = SDL_GetVideoSurface ();	32	screen = SDL_GetVideoSurface ();
		33
33	if (SDL_WM_ToggleFullScreen (screen))	34	if (SDL_WM_ToggleFullScreen (screen))
34	printf ("Toggled fullscreen mode - now %s\n",	35	printf ("Toggled fullscreen mode - now %s\n",
35	(screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");	36	(screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
36	else	37	else
37	printf ("Unable to toggle fullscreen mode\n");	38	printf ("Unable to toggle fullscreen mode\n");
42	{	43	{
43	SDL_GrabMode mode;	44	SDL_GrabMode mode;
44		45
45	printf ("Ctrl-G: toggling input grab!\n");	46	printf ("Ctrl-G: toggling input grab!\n");
46	mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);	47	mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
		48
47	if (mode == SDL_GRAB_ON)	49	if (mode == SDL_GRAB_ON)
48	printf ("Grab was on\n");	50	printf ("Grab was on\n");
49	else	51	else
50	printf ("Grab was off\n");	52	printf ("Grab was off\n");
51		53
52	mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);	54	mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
		55
53	if (mode == SDL_GRAB_ON)	56	if (mode == SDL_GRAB_ON)
54	printf ("Grab is now on\n");	57	printf ("Grab is now on\n");
55	else	58	else
56	printf ("Grab is now off\n");	59	printf ("Grab is now off\n");
57	}	60	}
…		…
67	HandleEvent (SDL_Event * event)	70	HandleEvent (SDL_Event * event)
68	{	71	{
69	int done;	72	int done;
70		73
71	done = 0;	74	done = 0;
		75
72	switch (event->type)	76	switch (event->type)
73	{	77	{
74	case SDL_ACTIVEEVENT:	78	case SDL_ACTIVEEVENT:
75	/* See what happened */	79	/* See what happened */
76	printf ("app %s ", event->active.gain ? "gained" : "lost");	80	printf ("app %s ", event->active.gain ? "gained" : "lost");
77	if (event->active.state & SDL_APPACTIVE)	81	if (event->active.state & SDL_APPACTIVE)
78	{
79	printf ("active ");	82	printf ("active ");
80	}
81	else if (event->active.state & SDL_APPMOUSEFOCUS)	83	else if (event->active.state & SDL_APPMOUSEFOCUS)
82	{
83	printf ("mouse ");	84	printf ("mouse ");
84	}
85	else if (event->active.state & SDL_APPINPUTFOCUS)	85	else if (event->active.state & SDL_APPINPUTFOCUS)
86	{
87	printf ("input ");	86	printf ("input ");
88	}
89		87
90	printf ("focus\n");	88	printf ("focus\n");
91	break;	89	break;
92		90
93	case SDL_KEYDOWN:	91	case SDL_KEYDOWN:
94
95	if (event->key.keysym.sym == SDLK_UP)	92	if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
96	camera.p.z -= 1;
97	if (event->key.keysym.sym == SDLK_DOWN)	93	if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
98	camera.p.z += 1;
99	if (event->key.keysym.sym == SDLK_LEFT)
100	camera.p.x -= 1;
101	if (event->key.keysym.sym == SDLK_RIGHT)	94	if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
102	camera.p.x += 1;	95	if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;
		96	if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++;
		97	if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--;
		98	if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
		99	if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
		100	if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5;
		101	if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
103		102
104	if (event->key.keysym.sym == SDLK_ESCAPE)	103	if (event->key.keysym.sym == SDLK_ESCAPE)
105	done = 1;	104	done = 1;
106		105
107	if ((event->key.keysym.sym == SDLK_g) &&	106	if ((event->key.keysym.sym == SDLK_g) &&
…		…
116	(event->key.keysym.mod & KMOD_ALT))	115	(event->key.keysym.mod & KMOD_ALT))
117	HotKey_ToggleFullScreen ();	116	HotKey_ToggleFullScreen ();
118		117
119	break;	118	break;
120		119
		120	case SDL_KEYUP:
		121	if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
		122	if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
		123	if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
		124	if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;
		125	if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--;
		126	if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++;
		127	if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
		128	if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
		129	break;
		130
121	case SDL_QUIT:	131	case SDL_QUIT:
122	done = 1;	132	done = 1;
123	break;	133	break;
124	}	134	}
125		135
126	return (done);	136	return (done);
127	}	137	}
128		138
129	/* Quick utility function for texture creation */	139	void draw_floor (int size, int dx, int dy, int dz)
130	static int
131	power_of_two (int input)
132	{	140	{
133	int value = 1;	141	int x, z, ry;
134		142
135	while (value < input)	143	for (x = 0; x < 10; x++)
136	{
137	value <<= 1;
138	}	144	{
139	return value;	145	for (z = 0; z < 10; z++)
140	}	146	{
		147	vector<vertex_t2f_n3f_v3f> pts;
		148	pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
		149	pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
		150	pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
		151	pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
141		152
142	GLuint	153	geometry_quads *q = new geometry_quads;
143	SDL_GL_LoadTexture (SDL_Surface * surface, GLfloat * texcoord)	154	//q->m = new simple_material;
144	{	155	q->set (pts);
145	GLuint texture;	156	entity *e = new entity (q);
146	int w, h;	157	e->move (vec3 (dx + x * size, dy, dz + z * size));
147	SDL_Surface *image;	158	e->show ();
148	SDL_Rect area;	159	}
149	Uint32 saved_flags;
150	Uint8 saved_alpha;
151
152	/* Use the surface width and height expanded to powers of 2 */
153	w = power_of_two (surface->w);
154	h = power_of_two (surface->h);
155	texcoord[0] = 0.0f; /* Min X */
156	texcoord[1] = 0.0f; /* Min Y */
157	texcoord[2] = (GLfloat) surface->w / w; /* Max X */
158	texcoord[3] = (GLfloat) surface->h / h; /* Max Y */
159
160	image = SDL_CreateRGBSurface (SDL_SWSURFACE, w, h, 32,
161	#if SDL_BYTEORDER == SDL_LIL_ENDIAN /* OpenGL RGBA masks */
162	0x000000FF, 0x0000FF00, 0x00FF0000, 0xFF000000
163	#else
164	0xFF000000, 0x00FF0000, 0x0000FF00, 0x000000FF
165	#endif
166	);
167	if (image == NULL)
168	{	160	}
169	return 0;	161	}
		162
		163	void draw_test_nurb ()
		164	{
		165	geometry_nurbs *q = new geometry_nurbs;
		166	q->set ();
		167	entity *e = new entity (q);
		168	e->move (vec3 (10, 3, -4));
		169	e->show ();
		170	}
		171
		172	void fisch (vec3 center, GLfloat radius, int depth)
		173	{
		174	entity *planet = new entity (new geometry_sphere (testmat, radius));
		175	planet->move (center);
		176	planet->show ();
		177
		178	if (--depth)
170	}	179	{
		180	GLfloat r2 = radius * .1F;
		181	GLfloat r3 = radius + r2;
171		182
172	/* Save the alpha blending attributes */	183	fisch (center + vec3 (r3, 0, 0), r2, depth);
173	saved_flags = surface->flags & (SDL_SRCALPHA \| SDL_RLEACCELOK);	184	fisch (center + vec3 (0, 0, r3), r2, depth);
174	saved_alpha = surface->format->alpha;	185	fisch (center + vec3 (-r3, 0, 0), r2, depth);
175	if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
176	{	186	}
177	SDL_SetAlpha (surface, 0, 0);
178	}
179
180	/* Copy the surface into the GL texture image */
181	area.x = 0;
182	area.y = 0;
183	area.w = surface->w;
184	area.h = surface->h;
185	SDL_BlitSurface (surface, &area, image, &area);
186
187	/* Restore the alpha blending attributes */
188	if ((saved_flags & SDL_SRCALPHA) == SDL_SRCALPHA)
189	{
190	SDL_SetAlpha (surface, saved_flags, saved_alpha);
191	}
192
193	/* Create an OpenGL texture for the image */
194	glGenTextures (1, &texture);
195	glBindTexture (GL_TEXTURE_2D, texture);
196	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
197	glTexParameteri (GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
198	glTexImage2D (GL_TEXTURE_2D,
199	0,
200	GL_RGBA, w, h, 0, GL_RGBA, GL_UNSIGNED_BYTE, image->pixels);
201	SDL_FreeSurface (image); /* No longer needed */
202
203	return texture;
204	}	187	}
205		188
		189	extern void draw_level ();
206	int	190	int
207	RunGLTest (int argc, char *argv[],	191	RunGLTest (int argc, char *argv[],
208	int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)	192	int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
209	{	193	{
210	int i;	194	int i;
211	int rgb_size[3];	195	int rgb_size[3];
212	int w = 640;	196	int w = 640;
213	int h = 480;	197	int h = 480;
214	int done = 0;	198	int done = 0;
215	int frames;	199	int frames;
216	Uint32 start_time, this_time;
217	Uint32 video_flags;	200	Uint32 video_flags;
218	int value;	201	int value;
		202	GLenum gl_error;
219		203
220	if (SDL_Init (SDL_INIT_VIDEO) < 0)	204	if (SDL_Init (SDL_INIT_VIDEO) < 0)
221	{	205	{
222	fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());	206	fprintf (stderr, "Couldn't initialize SDL: %s\n", SDL_GetError ());
223	exit (1);	207	exit (1);
…		…
261	rgb_size[0] = 8;	245	rgb_size[0] = 8;
262	rgb_size[1] = 8;	246	rgb_size[1] = 8;
263	rgb_size[2] = 8;	247	rgb_size[2] = 8;
264	break;	248	break;
265	}	249	}
		250
266	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);	251	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
267	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);	252	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
268	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);	253	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
269	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	254	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
270	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	255	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
271		256
272	if (fsaa)	257	if (fsaa)
273	{	258	{
274	SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);	259	SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
…		…
280	fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());	265	fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
281	SDL_Quit ();	266	SDL_Quit ();
282	exit (1);	267	exit (1);
283	}	268	}
284		269
285	printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);	270	//printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
286	printf ("\n");	271	//printf ("\n");
287	printf ("Vendor : %s\n", glGetString (GL_VENDOR));	272	//printf ("Vendor : %s\n", glGetString (GL_VENDOR));
288	printf ("Renderer : %s\n", glGetString (GL_RENDERER));	273	//printf ("Renderer : %s\n", glGetString (GL_RENDERER));
289	printf ("Version : %s\n", glGetString (GL_VERSION));	274	//printf ("Version : %s\n", glGetString (GL_VERSION));
290	printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));	275	//printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
291	printf ("\n");	276	printf ("\n");
292		277
293	SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);	278	SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
294	printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);	279	printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
295	SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);	280	SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
…		…
309	printf ("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,	294	printf ("SDL_GL_MULTISAMPLESAMPLES: requested %d, got %d\n", fsaa,
310	value);	295	value);
311	}	296	}
312		297
313	/* Set the window manager title bar */	298	/* Set the window manager title bar */
314	SDL_WM_SetCaption ("SDL GL test", "testgl");	299	SDL_WM_SetCaption ("libgender rendering test", "gendertest");
315		300
316	/* Set the gamma for the window */	301	/* Set the gamma for the window */
317	if (gamma != 0.0)	302	if (gamma != 0.0)
318	SDL_SetGamma (gamma, gamma, gamma);	303	SDL_SetGamma (gamma, gamma, gamma);
319		304
		305	testmat = new test_material;
		306
		307	entity *planet = new entity (new geometry_sphere (testmat, 10));
		308	planet->move (vec3 (0, 0, -20));
		309	planet->show ();
		310
		311	for (int i = 0; i < 20; i++)
		312	{
		313	// load a entity
		314	txtprt_parser p;
		315	geometry *g;
		316	try
		317	{
		318	g = p.read ("test.blasc");
		319	}
		320	catch (txtprt_i_exception & e)
		321	{
		322	cout << "ERR: " << e.msg << endl;
		323	}
		324
		325	entity *e = new entity (g);
		326	e->move (vec3 (i5, -3, -i10));
		327	e->show ();
		328	}
		329
		330	{
		331	fisch (vec3 (0, 0, -2e9), 1e9, 8);
		332	//entity *planet = new entity (new geometry_sphere (1e9));
		333	//planet->move (vec3 (0, 0, -1.5e9));
		334	//planet->show ();
		335	}
		336
		337	{
		338	entity *planet = new entity (new geometry_sphere (testmat, 4e15));
		339	planet->move (vec3 (0, 0, 1e17));
		340	planet->show ();
		341	}
		342
		343	//draw_floor (10, -500, -10, -1000);
		344	draw_level ();
		345
		346
		347	{
		348	geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
		349	entity *e = new entity (hf);
		350	e->move (vec3 (-100000, -100000 * 0.01, -100000));
		351	e->show ();
		352	}
		353
		354	//draw_test_nurb ();
		355
		356	//camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
		357	camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
320	camera.p = point (0, 0, 10);	358	camera.p = point (0, 0, 10);
321	camera.d = vec3 (0, 0, -1);	359	camera.d = vec3 (0, 0, -1);
322	camera.u = vec3 (0, 1, 0);	360	camera.u = vec3 (0, 1, 0);
323	camera.w = w; camera.h = h;	361	camera.w = w; camera.h = h;
324	camera.fov = 90;	362	camera.fov = 40.;
325		363
326	glMatrixMode (GL_MODELVIEW);	364	glEnable (GL_CULL_FACE);
327	glLoadIdentity ();
328
329	glEnable (GL_DEPTH_TEST);	365	glDisable (GL_ALPHA_TEST);
330		366	glDisable (GL_BLEND);
331	glDepthFunc (GL_LESS);
332
333	glShadeModel (GL_SMOOTH);
334
335	glEnable (GL_LIGHTING);
336
337	//GLfloat lightc[4] = { 1, 0.1, 0.1, 1 };
338	//glLightf (GL_LIGHT0, GL_QUADRATIC_ATTENUATION);
339	//glLightfv (GL_LIGHT0, GL_DIFFUSE, lightc);
340	glEnable (GL_LIGHT0);
341	glEnable (GL_COLOR_MATERIAL);
342		367
343	/* Loop until done. */	368	/* Loop until done. */
344	start_time = SDL_GetTicks ();
345	frames = 0;	369	frames = 0;
		370
		371	linear_light mylight;
		372	mylight.radius = 100000;
		373	mylight.c = colour (1., 1, 1, 1.);
		374	mylight.intensity = 1.F;
		375
		376	pass pass_light (&mylight);
		377
346	while (!done)	378	while (!done)
347	{	379	{
348	GLenum gl_error;
349	char *sdl_error;	380	char *sdl_error;
350	SDL_Event event;	381	SDL_Event event;
351		382
352	/* Do our drawing, too. */	383	camera_angle += 180 * camera_velocity_angle * timer.diff;
353	glClearColor (0.0, 0.0, 0.0, 1.0);	384	camera_angle2 += 180 * camera_velocity_angle2 * timer.diff;
354	glClear (GL_COLOR_BUFFER_BIT \| GL_DEPTH_BUFFER_BIT);
355		385
356	GLfloat lightp[4];	386	vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
		387	vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
		388
		389	camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
		390	camera.u = cross (camera.d, right);
		391
		392	camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
		393	camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
		394
		395	mylight.orig = camera.orig;
357	lightp[0] = camera.p.x;	396	mylight.p = camera.p;
358	lightp[1] = camera.p.y;	397
359	lightp[2] = camera.p.z;	398	//mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
360	lightp[3] = 1;	399
361	glLightfv (GL_LIGHT0, GL_POSITION, lightp);	400	camera.begin ();
		401	camera.render (view::DEPTH, pass_depth);
		402	camera.render (view::POSTDEPTH, pass_depth);
		403	camera.render (view::LIGHTED, pass_light);
		404	camera.end ();
		405
		406	SDL_GL_SwapBuffers ();
		407	timer.frame ();
362		408
363	#if 0	409	#if 0
364	static GLfloat ry;
365	ry += 0.03;
366	v.d.x = cos (ry);
367	v.d.z = sin (ry);
368	#endif
369
370	draw_context c;
371	c.mode = draw_context::LIGHTED;
372	camera.draw (c);
373
374	SDL_GL_SwapBuffers ();
375
376	/* Check for error conditions. */	410	/* Check for error conditions. */
377	gl_error = glGetError ();	411	gl_error = glGetError ();
378		412
379	if (gl_error != GL_NO_ERROR)
380	fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);	413	if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
381		414
382	sdl_error = SDL_GetError ();	415	sdl_error = SDL_GetError ();
383		416
384	if (sdl_error[0] != '\0')	417	if (sdl_error[0] != '\0')
385	{	418	{
386	fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);	419	fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
387	SDL_ClearError ();	420	SDL_ClearError ();
388	}	421	}
389		422
390	/* Allow the user to see what's happening */	423	/* Allow the user to see what's happening */
391	//SDL_Delay (20);	424	//SDL_Delay (40);
		425	#endif
392		426
393	/* Check if there's a pending event. */	427	/* Check if there's a pending event. */
394	while (SDL_PollEvent (&event))	428	while (SDL_PollEvent (&event))
395	{
396	done = HandleEvent (&event);	429	done = HandleEvent (&event);
397	}	430
398	++frames;	431	++frames;
399	}
400
401	/* Print out the frames per second */
402	this_time = SDL_GetTicks ();
403	if (this_time != start_time)
404	{
405	printf ("%2.2f FPS\n",
406	((float) frames / (this_time - start_time)) * 1000.0);
407	}	432	}
408		433
409	if (global_image)	434	if (global_image)
410	{	435	{
411	SDL_FreeSurface (global_image);	436	SDL_FreeSurface (global_image);
412	global_image = NULL;	437	global_image = NULL;
413	}	438	}
		439
414	if (global_texture)	440	if (global_texture)
415	{	441	{
416	glDeleteTextures (1, &global_texture);	442	glDeleteTextures (1, &global_texture);
417	global_texture = 0;	443	global_texture = 0;
418	}	444	}
419		445
420	/* Destroy our GL context, etc. */	446	/* Destroy our GL context, etc. */
421	SDL_Quit ();	447	SDL_Quit ();
422	return (0);	448	return (0);
423	}	449	}
424
425	int	450	int
426	main (int argc, char *argv[])	451	main (int argc, char *argv[])
427	{	452	{
428	int i, logo;	453	int i, logo;
429	int numtests;	454	int numtests;
…		…
431	int slowly;	456	int slowly;
432	float gamma = 0.0;	457	float gamma = 0.0;
433	int noframe = 0;	458	int noframe = 0;
434	int fsaa = 0;	459	int fsaa = 0;
435		460
436	// load a entity
437	txtprt_parser p;
438	entity *e;
439	try {
440	e = p.read ("test.blasc");
441	} catch (txtprt_i_exception & e) {
442	cout << "ERR: " << e.msg << endl;
443	}
444	e->show ();
445
446	logo = 0;	461	logo = 0;
447	slowly = 0;	462	slowly = 0;
448	numtests = 1;	463	numtests = 1;
449	for (i = 1; argv[i]; ++i)	464	for (i = 1; argv[i]; ++i)
450	{	465	{
…		…
478	("Usage: %s [-twice] [-logo] [-slow] [-bpp n] [-gamma n] [-noframe] [-fsaa]\n",	493	("Usage: %s [-twice] [-logo] [-slow] [-bpp n] [-gamma n] [-noframe] [-fsaa]\n",
479	argv[0]);	494	argv[0]);
480	exit (0);	495	exit (0);
481	}	496	}
482	}	497	}
		498
483	for (i = 0; i < numtests; ++i)	499	for (i = 0; i < numtests; ++i)
484	{
485	RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa);	500	RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa);
486	}	501
487	return 0;	502	return 0;
488	}	503	}

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing libgender/test.C (file contents): Revision 1.11 by root, Sun Oct 3 05:53:09 2004 UTC vs. Revision 1.82 by root, Thu Nov 4 15:43:53 2004 UTC

Diff Legend

Comparing libgender/test.C (file contents):
Revision 1.11 by root, Sun Oct 3 05:53:09 2004 UTC vs.
Revision 1.82 by root, Thu Nov 4 15:43:53 2004 UTC