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

Comparing libgender/test.C (file contents):
Revision 1.50 by root, Sat Oct 9 11:56:50 2004 UTC vs.
Revision 1.99 by root, Mon Feb 7 08:16:31 2005 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	#include <list>
		6
		7	#include "opengl.h"
5		8
6	#include "SDL.h"	9	#include "SDL.h"
7	#include "SDL_opengl.h"	10	#include "SDL_opengl.h"
8		11
9	static SDL_Surface *global_image = NULL;	12	static SDL_Surface *global_image = NULL;
10	static GLuint global_texture = 0;	13	static GLuint global_texture = 0;
11		14
12	#include "util.h"	15	#include "util.h"
13	#include "entity.h"	16	#include "entity.h"
14	#include "txtprt_import.h"	17	#include "txtprt_import.h"
		18	#include "randlvl.h"
15		19
16	CGcontext cgc;	20	bool doom3parse (const char *f);
17	CGprogram vsh, fsh;
18	CGparameter mv, mvp, lightpos;
19	CGprofile vsh_profile, fsh_profile;
20		21
21	static void CheckCgError (void)	22	#include "shader.h"
22	{
23	CGerror err = cgGetError ();
24
25	if (err != CG_NO_ERROR)
26	{
27	printf("CG error: %s\n", cgGetErrorString (err));
28	exit(1);
29	}
30	}
31		23
32	/**********************************************************************/	24	/**********************************************************************/
33		25
34	view camera;	26	view camera;
35	vec3 camera_velocity;	27	vec3 camera_velocity;
36	float camera_angle = 0, camera_velocity_angle;	28	float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2;
37	float camera_velocity_factor = 80;	29	float camera_velocity_factor = 80;
38		30
39	void	31	void
40	HotKey_ToggleFullScreen (void)	32	HotKey_ToggleFullScreen (void)
41	{	33	{
42	SDL_Surface *screen;	34	SDL_Surface *screen;
43		35
44	screen = SDL_GetVideoSurface ();	36	screen = SDL_GetVideoSurface ();
		37
45	if (SDL_WM_ToggleFullScreen (screen))	38	if (SDL_WM_ToggleFullScreen (screen))
46	printf ("Toggled fullscreen mode - now %s\n",	39	printf ("Toggled fullscreen mode - now %s\n",
47	(screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");	40	(screen->flags & SDL_FULLSCREEN) ? "fullscreen" : "windowed");
48	else	41	else
49	printf ("Unable to toggle fullscreen mode\n");	42	printf ("Unable to toggle fullscreen mode\n");
54	{	47	{
55	SDL_GrabMode mode;	48	SDL_GrabMode mode;
56		49
57	printf ("Ctrl-G: toggling input grab!\n");	50	printf ("Ctrl-G: toggling input grab!\n");
58	mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);	51	mode = SDL_WM_GrabInput (SDL_GRAB_QUERY);
		52
59	if (mode == SDL_GRAB_ON)	53	if (mode == SDL_GRAB_ON)
60	printf ("Grab was on\n");	54	printf ("Grab was on\n");
61	else	55	else
62	printf ("Grab was off\n");	56	printf ("Grab was off\n");
63		57
64	mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);	58	mode = SDL_WM_GrabInput (mode ? SDL_GRAB_OFF : SDL_GRAB_ON);
		59
65	if (mode == SDL_GRAB_ON)	60	if (mode == SDL_GRAB_ON)
66	printf ("Grab is now on\n");	61	printf ("Grab is now on\n");
67	else	62	else
68	printf ("Grab is now off\n");	63	printf ("Grab is now off\n");
69	}	64	}
…		…
79	HandleEvent (SDL_Event * event)	74	HandleEvent (SDL_Event * event)
80	{	75	{
81	int done;	76	int done;
82		77
83	done = 0;	78	done = 0;
		79
84	switch (event->type)	80	switch (event->type)
85	{	81	{
86	case SDL_ACTIVEEVENT:	82	case SDL_ACTIVEEVENT:
87	/* See what happened */	83	/* See what happened */
88	printf ("app %s ", event->active.gain ? "gained" : "lost");	84	printf ("app %s ", event->active.gain ? "gained" : "lost");
89	if (event->active.state & SDL_APPACTIVE)	85	if (event->active.state & SDL_APPACTIVE)
90	{
91	printf ("active ");	86	printf ("active ");
92	}
93	else if (event->active.state & SDL_APPMOUSEFOCUS)	87	else if (event->active.state & SDL_APPMOUSEFOCUS)
94	{
95	printf ("mouse ");	88	printf ("mouse ");
96	}
97	else if (event->active.state & SDL_APPINPUTFOCUS)	89	else if (event->active.state & SDL_APPINPUTFOCUS)
98	{
99	printf ("input ");	90	printf ("input ");
100	}
101		91
102	printf ("focus\n");	92	printf ("focus\n");
103	break;	93	break;
104		94
105	case SDL_KEYDOWN:	95	case SDL_KEYDOWN:
106	if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;	96	if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--;
107	if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;	97	if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++;
108	if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;	98	if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle++;
109	if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;	99	if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--;
		100	if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++;
		101	if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--;
110	if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;	102	if (event->key.keysym.sym == SDLK_e) camera_velocity.y--;
111	if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;	103	if (event->key.keysym.sym == SDLK_q) camera_velocity.y++;
112	if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5;	104	if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5;
113	if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;	105	if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5;
114		106
115	if (event->key.keysym.sym == SDLK_ESCAPE)	107	if (event->key.keysym.sym == SDLK_ESCAPE)
116	done = 1;	108	done = 1;
117		109
118	if ((event->key.keysym.sym == SDLK_g) &&	110	if ((event->key.keysym.sym == SDLK_g) &&
…		…
132	case SDL_KEYUP:	124	case SDL_KEYUP:
133	if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;	125	if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++;
134	if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;	126	if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--;
135	if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;	127	if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++;
136	if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;	128	if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--;
		129	if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--;
		130	if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++;
137	if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;	131	if (event->key.keysym.sym == SDLK_e) camera_velocity.y++;
138	if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;	132	if (event->key.keysym.sym == SDLK_q) camera_velocity.y--;
139	break;	133	break;
140		134
141	case SDL_QUIT:	135	case SDL_QUIT:
…		…
148		142
149	void draw_floor (int size, int dx, int dy, int dz)	143	void draw_floor (int size, int dx, int dy, int dz)
150	{	144	{
151	int x, z, ry;	145	int x, z, ry;
152		146
153	for (x = 0; x < 100; x++)	147	for (x = 0; x < 10; x++)
154	{	148	{
155	for (z = 0; z < 100; z++)	149	for (z = 0; z < 10; z++)
156	{	150	{
157	vector<vertex2d> pts;	151	vector<vertex_t2f_n3f_v3f> pts;
158	pts.push_back (vertex2d (point ( 0, 0, 0), vec3 (0, 1, 0), texc (0, 0)));	152	pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, 0), vec3 (0, 1, 0), tex2 (0, 0)));
159	pts.push_back (vertex2d (point ( 0, 0, size), vec3 (0, 1, 0), texc (0, 1)));	153	pts.push_back (vertex_t2f_n3f_v3f (point ( 0, 0, size), vec3 (0, 1, 0), tex2 (0, 1)));
160	pts.push_back (vertex2d (point (size, 0, size), vec3 (0, 1, 0), texc (1, 1)));	154	pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, size), vec3 (0, 1, 0), tex2 (1, 1)));
161	pts.push_back (vertex2d (point (size, 0, 0), vec3 (0, 1, 0), texc (1, 0)));	155	pts.push_back (vertex_t2f_n3f_v3f (point (size, 0, 0), vec3 (0, 1, 0), tex2 (1, 0)));
162		156
163	geometry_quads *q = new geometry_quads;	157	geometry_quads *q = new geometry_quads;
		158	//q->m = new simple_material;
164	q->set (pts);	159	q->set (pts);
165	entity *e = new entity (q);	160	entity *e = new entity (q);
166	e->move (vec3 (dx + x * size, dy, dz + z * size));	161	e->move (vec3 (dx + x * size, dy, dz + z * size));
167	e->show ();	162	e->show ();
168	}	163	}
169	}	164	}
170	}	165	}
171		166
172	void draw_test_nurb () {	167	void draw_test_nurb ()
		168	{
173	geometry_nurbs *q = new geometry_nurbs;	169	geometry_nurbs *q = new geometry_nurbs;
174	q->set ();	170	q->set ();
175	entity *e = new entity (q);	171	entity *e = new entity (q);
176	e->move (vec3 (10, 3, -4));	172	e->move (vec3 (10, 3, -4));
177	e->show ();	173	e->show ();
		174	}
		175
		176	void fisch (vec3 center, GLfloat radius, int depth)
		177	{
		178	entity *planet = new entity (new geometry_sphere (testmat, radius));
		179	planet->move (center);
		180	planet->show ();
		181
		182	if (--depth)
		183	{
		184	GLfloat r2 = radius * .1F;
		185	GLfloat r3 = radius + r2;
		186
		187	fisch (center + vec3 (r3, 0, 0), r2, depth);
		188	fisch (center + vec3 (0, 0, r3), r2, depth);
		189	fisch (center + vec3 (-r3, 0, 0), r2, depth);
		190	}
		191	}
		192
		193	extern void draw_level ();
		194
		195	std::list<entity_moveable *> moveables;
		196
		197	void perfom_moves ()
		198	{
		199	for (std::list<entity_moveable *>::iterator i = moveables.begin (); i != moveables.end (); ++i)
		200	{
		201	(*i)->perform_step (timer.diff);
		202	}
178	}	203	}
179		204
180	int	205	int
181	RunGLTest (int argc, char *argv[],	206	RunGLTest (int argc, char *argv[],
182	int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)	207	int logo, int slowly, int bpp, float gamma, int noframe, int fsaa)
…		…
185	int rgb_size[3];	210	int rgb_size[3];
186	int w = 640;	211	int w = 640;
187	int h = 480;	212	int h = 480;
188	int done = 0;	213	int done = 0;
189	int frames;	214	int frames;
190	Uint32 start_time, this_time;
191	Uint32 video_flags;	215	Uint32 video_flags;
192	int value;	216	int value;
193	GLenum gl_error;	217	GLenum gl_error;
194		218
195	if (SDL_Init (SDL_INIT_VIDEO) < 0)	219	if (SDL_Init (SDL_INIT_VIDEO) < 0)
…		…
240	}	264	}
241		265
242	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);	266	SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]);
243	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);	267	SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]);
244	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);	268	SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]);
245	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 16);	269	SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, 24);
246	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);	270	SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
247		271
248	if (fsaa)	272	if (fsaa)
249	{	273	{
250	SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);	274	SDL_GL_SetAttribute (SDL_GL_MULTISAMPLEBUFFERS, 1);
…		…
256	fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());	280	fprintf (stderr, "Couldn't set GL mode: %s\n", SDL_GetError ());
257	SDL_Quit ();	281	SDL_Quit ();
258	exit (1);	282	exit (1);
259	}	283	}
260		284
261	printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);	285	//printf ("Screen BPP: %d\n", SDL_GetVideoSurface ()->format->BitsPerPixel);
262	printf ("\n");	286	//printf ("\n");
263	printf ("Vendor : %s\n", glGetString (GL_VENDOR));	287	//printf ("Vendor : %s\n", glGetString (GL_VENDOR));
264	printf ("Renderer : %s\n", glGetString (GL_RENDERER));	288	//printf ("Renderer : %s\n", glGetString (GL_RENDERER));
265	printf ("Version : %s\n", glGetString (GL_VERSION));	289	//printf ("Version : %s\n", glGetString (GL_VERSION));
266	printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));	290	//printf ("Extensions : %s\n", glGetString (GL_EXTENSIONS));
267	printf ("\n");	291	printf ("\n");
268		292
269	SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);	293	SDL_GL_GetAttribute (SDL_GL_RED_SIZE, &value);
270	printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);	294	printf ("SDL_GL_RED_SIZE: requested %d, got %d\n", rgb_size[0], value);
271	SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);	295	SDL_GL_GetAttribute (SDL_GL_GREEN_SIZE, &value);
…		…
291		315
292	/* Set the gamma for the window */	316	/* Set the gamma for the window */
293	if (gamma != 0.0)	317	if (gamma != 0.0)
294	SDL_SetGamma (gamma, gamma, gamma);	318	SDL_SetGamma (gamma, gamma, gamma);
295		319
		320	testmat = new test_material;
		321	testmat2 = new test_material2;
		322
		323	entity_moveable *planet = new entity_moveable (new geometry_sphere (testmat, 10));
		324	planet->move (vec3 (0, 0, -20));
		325	planet->show ();
		326
		327	planet->v = vec3 (10, 0, 0);
		328	moveables.push_back (planet);
		329
		330	doom3parse ("test.proc");
		331
296	for (int i = 0; i < 1; i++)	332	for (int i = 0; i < 20; i++)
297	{	333	{
298	// load a entity	334	// load a entity
299	txtprt_parser p;	335	txtprt_parser p;
300	geometry *g;	336	geometry *g;
301	try	337	try
…		…
310	entity *e = new entity (g);	346	entity *e = new entity (g);
311	e->move (vec3 (i5, -3, -i10));	347	e->move (vec3 (i5, -3, -i10));
312	e->show ();	348	e->show ();
313	}	349	}
314		350
		351	{
		352	fisch (vec3 (0, 0, -2e9), 1e9, 8);
		353	//entity *planet = new entity (new geometry_sphere (1e9));
		354	//planet->move (vec3 (0, 0, -1.5e9));
		355	//planet->show ();
		356	}
		357
		358	{
		359	entity *planet = new entity (new geometry_sphere (testmat, 4e15));
		360	planet->move (vec3 (0, 0, 1e17));
		361	planet->show ();
		362	}
		363
		364	{
		365	RandomBuilding r;
		366	entity *randlvl = r.draw (1000, 1000, 200);
		367	randlvl->move (vec3 (0, 0, 0));
		368	randlvl->show ();
		369
		370	entity *randlvl2 = r.draw (1000, 10000, 1000);
		371	randlvl2->move (vec3 (-20000, 0, 0));
		372	randlvl2->show ();
		373
		374	entity *randlvl3 = r.draw (100, 30, 3);
		375	randlvl3->move (vec3 (-1000, 0, 0));
		376	randlvl3->show ();
		377
		378
		379	entity *randlvl4 = r.draw (100, 1000000, 100000);
		380	randlvl4->move (vec3 (0, -1001000, 0));
		381	randlvl4->show ();
		382	}
		383
315	draw_floor (10, -500, -10, -1000);	384	//draw_floor (10, -500, -10, -1000);
		385	draw_level ();
		386
		387	#if 0
		388	{
		389	geometry_heightfield *hf = new geometry_heightfield (100000., 100000.);
		390	entity *e = new entity (hf);
		391	e->move (vec3 (-100000, -100000 * 0.01, -100000));
		392	e->show ();
		393	}
		394	#endif
		395
316	draw_test_nurb ();	396	//draw_test_nurb ();
317		397
		398	//camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368;
318	camera.orig.x = camera.orig.y = camera.orig.z = 0;	399	camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0;
319	camera.p = point (0, 0, 10);	400	camera.p = point (0, 0, 10);
320	camera.d = vec3 (0, 0, -1);	401	camera.d = vec3 (0, 0, -1);
321	camera.u = vec3 (0, 1, 0);	402	camera.u = vec3 (0, 1, 0);
322	camera.w = w; camera.h = h;	403	camera.w = w; camera.h = h;
323	camera.fov = 35;	404	camera.fov = 40.;
324		405
325	glMatrixMode (GL_MODELVIEW);
326	glLoadIdentity ();
327
328	glEnable (GL_CULL_FACE);
329	glEnable (GL_DEPTH_TEST);	406	glDisable (GL_ALPHA_TEST);
330
331	glShadeModel (GL_SMOOTH);
332
333	glEnable (GL_LIGHTING);
334	glEnable (GL_LIGHT0);
335
336	cgc = cgCreateContext ();
337
338	vsh_profile = CG_PROFILE_ARBVP1;
339	//if (cgGLIsProfileSupported (CG_PROFILE_VP30)) vsh_profile = CG_PROFILE_VP30;
340	//if (cgGLIsProfileSupported (CG_PROFILE_VP40)) vsh_profile = CG_PROFILE_VP40;
341	fsh_profile = CG_PROFILE_ARBFP1;
342	//if (cgGLIsProfileSupported (CG_PROFILE_FP30)) fsh_profile = CG_PROFILE_FP30;
343	//if (cgGLIsProfileSupported (CG_PROFILE_FP40)) fsh_profile = CG_PROFILE_FP40;
344
345	vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", vsh_profile, 0, 0);
346	CheckCgError ();
347	cgGLLoadProgram (vsh);
348	CheckCgError ();
349	mv = cgGetNamedParameter (vsh, "WorldProj");
350	mvp = cgGetNamedParameter (vsh, "WorldViewProj");
351	lightpos = cgGetNamedParameter (vsh, "LightPos");
352	CheckCgError ();
353
354	CGparameter g_Texture; // the texture parameter
355
356
357	fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0);
358	Texture t("o.jpg");
359	g_Texture = cgGetNamedParameter(fsh, "Texture"); // the texture cg-warper ;)
360	cgGLSetTextureParameter(g_Texture, t.texture); // Bind the texture number 999 to g_Texture
361	CheckCgError ();
362	cgGLLoadProgram (fsh);
363	CheckCgError ();
364
365	cgGLBindProgram (vsh);
366	CheckCgError ();
367	cgGLBindProgram (fsh);
368	CheckCgError ();
369		407
370	/* Loop until done. */	408	/* Loop until done. */
371	start_time = SDL_GetTicks ();
372	frames = 0;	409	frames = 0;
		410
		411	linear_light mylight2;//mylight, mylight2;
		412
		413	// mylight.radius = 100000;
		414	// mylight.c = colour (1., 1, 1, 1.);
		415	// mylight.intensity = 1.F;
		416
		417	mylight2.radius = 100000;
		418	mylight2.c = colour (1., 1., 1., 1.);
		419	mylight2.intensity = 1.F;
		420	mylight2.orig.x = 0; mylight2.orig.y = 0; mylight2.orig.z = 0;
		421	mylight2.p.x = 0; mylight2.p.y = 0; mylight2.p.z = 0;
		422
		423	//pass_data pass_light (&mylight);
		424	pass_data pass_light2 (&mylight2);
373		425
374	while (!done)	426	while (!done)
375	{	427	{
376	char *sdl_error;	428	char *sdl_error;
377	SDL_Event event;	429	SDL_Event event;
378		430
		431	camera_angle += 90 * camera_velocity_angle * timer.diff;
		432	camera_angle2 += 90 * camera_velocity_angle2 * timer.diff;
		433
		434	vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1);
		435	vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus;
		436
		437	camera.d = matrix::rotation (camera_angle2, right) * geradeaus;
		438	camera.u = cross (camera.d, right);
		439
379	camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;	440	camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z;
380	camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;	441	camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y;
381	camera_angle += 30 * camera_velocity_angle * timer.diff;
382	camera.d.z = -cos (camera_angle * 12 / 180.);
383	camera.d.x = sin (camera_angle * 12 / 180.);
384		442
385	cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1);	443	//mylight.orig = camera.orig;
		444	//mylight.p = camera.p;
386		445
387	glBindTexture (GL_TEXTURE_2D, t.texture);	446	mylight2.orig = camera.orig;
388	cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter	447	mylight2.p = vec3 (sin (timer.now / 2) * 100000, 1, cos (timer.now / 2) * 100000);
389		448
390	#if 0	449	//mylight.intensity = max (sinf (timer.now) + 1.2F, 0.2F);
391	static GLfloat ry;	450
392	ry += 0.001;
393	camera.d.x = cos (ry);
394	camera.d.z = sin (ry);
395	//camera.d.y = sin (ry * 0.1);
396	#endif
397
398	camera.begin ();	451	camera.begin ();
399	camera.pass (view::DEPTH);	452	camera.render (pass_depth);
400	camera.pass (view::LIGHTED);	453	camera.render (pass_postdepth);
		454	camera.render (pass_light2);
		455	//camera.render (view::LIGHTED, pass_light2);
401	camera.end ();	456	camera.end ();
		457
		458	perfom_moves ();
402		459
403	SDL_GL_SwapBuffers ();	460	SDL_GL_SwapBuffers ();
404	timer.frame ();	461	timer.frame ();
405		462
		463	#if 0
406	/* Check for error conditions. */	464	/* Check for error conditions. */
407	gl_error = glGetError ();	465	gl_error = glGetError ();
408		466
409	if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);	467	if (gl_error != GL_NO_ERROR) fprintf (stderr, "testgl: OpenGL error: %d\n", gl_error);
410		468
…		…
415	fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);	473	fprintf (stderr, "testgl: SDL error '%s'\n", sdl_error);
416	SDL_ClearError ();	474	SDL_ClearError ();
417	}	475	}
418		476
419	/* Allow the user to see what's happening */	477	/* Allow the user to see what's happening */
420	//SDL_Delay (20);	478	//SDL_Delay (40);
		479	#endif
421		480
422	/* Check if there's a pending event. */	481	/* Check if there's a pending event. */
423	while (SDL_PollEvent (&event))	482	while (SDL_PollEvent (&event))
424	done = HandleEvent (&event);	483	done = HandleEvent (&event);
425		484
426
427	++frames;	485	++frames;
428	}
429
430	/* Print out the frames per second */
431	this_time = SDL_GetTicks ();
432	if (this_time != start_time)
433	{
434	printf ("%2.2f FPS\n",
435	((float) frames / (this_time - start_time)) * 1000.0);
436	}	486	}
437		487
438	if (global_image)	488	if (global_image)
439	{	489	{
440	SDL_FreeSurface (global_image);	490	SDL_FreeSurface (global_image);
441	global_image = NULL;	491	global_image = NULL;
442	}	492	}
		493
443	if (global_texture)	494	if (global_texture)
444	{	495	{
445	glDeleteTextures (1, &global_texture);	496	glDeleteTextures (1, &global_texture);
446	global_texture = 0;	497	global_texture = 0;
447	}	498	}
448		499
449	/* Destroy our GL context, etc. */	500	/* Destroy our GL context, etc. */
450	SDL_Quit ();	501	SDL_Quit ();
451	return (0);	502	return (0);
452	}	503	}
453
454	int	504	int
455	main (int argc, char *argv[])	505	main (int argc, char *argv[])
456	{	506	{
457	int i, logo;	507	int i, logo;
458	int numtests;	508	int numtests;

Diff Legend

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

Comparing libgender/test.C (file contents): Revision 1.50 by root, Sat Oct 9 11:56:50 2004 UTC vs. Revision 1.99 by root, Mon Feb 7 08:16:31 2005 UTC

Diff Legend

Comparing libgender/test.C (file contents):
Revision 1.50 by root, Sat Oct 9 11:56:50 2004 UTC vs.
Revision 1.99 by root, Mon Feb 7 08:16:31 2005 UTC