--- libgender/test.C 2004/10/03 04:00:51 1.9 +++ libgender/test.C 2004/10/06 05:27:19 1.36 @@ -4,25 +4,36 @@ #include #include "SDL.h" - #include "SDL_opengl.h" -/* Undefine this if you want a flat cube instead of a rainbow cube */ -#define SHADED_CUBE - -/* Define this to be the name of the logo image to use with -logo */ -#define LOGO_FILE "icon.bmp" - static SDL_Surface *global_image = NULL; static GLuint global_texture = 0; +#include "util.h" #include "entity.h" - #include "txtprt_import.h" +CGcontext cgc; +CGprogram vsh, fsh; +CGparameter mv, mvp, lightpos; +CGprofile vsh_profile, fsh_profile; + +static void CheckCgError(void) +{ + CGerror err = cgGetError(); + + if (err != CG_NO_ERROR) + { + printf("CG error: %s\n", cgGetErrorString(err)); + exit(1); + } +} + /**********************************************************************/ view camera; +vec3 camera_velocity; +float camera_velocity_factor = 20; void HotKey_ToggleFullScreen (void) @@ -91,15 +102,14 @@ break; case SDL_KEYDOWN: - - if (event->key.keysym.sym == SDLK_UP) - camera.p.z -= 1; - if (event->key.keysym.sym == SDLK_DOWN) - camera.p.z += 1; - if (event->key.keysym.sym == SDLK_LEFT) - camera.p.x -= 1; - if (event->key.keysym.sym == SDLK_RIGHT) - camera.p.x += 1; + if (event->key.keysym.sym == SDLK_UP) camera_velocity.z--; + if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z++; + if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x--; + if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity.x++; + if (event->key.keysym.sym == SDLK_a) camera_velocity.y--; + if (event->key.keysym.sym == SDLK_s) camera_velocity.y++; + if (event->key.keysym.sym == SDLK_v) camera_velocity_factor *= 1.5; + if (event->key.keysym.sym == SDLK_b) camera_velocity_factor /= 1.5; if (event->key.keysym.sym == SDLK_ESCAPE) done = 1; @@ -118,6 +128,15 @@ break; + case SDL_KEYUP: + if (event->key.keysym.sym == SDLK_UP) camera_velocity.z++; + if (event->key.keysym.sym == SDLK_DOWN) camera_velocity.z--; + if (event->key.keysym.sym == SDLK_LEFT) camera_velocity.x++; + if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity.x--; + if (event->key.keysym.sym == SDLK_a) camera_velocity.y++; + if (event->key.keysym.sym == SDLK_s) camera_velocity.y--; + break; + case SDL_QUIT: done = 1; break; @@ -263,6 +282,7 @@ rgb_size[2] = 8; break; } + SDL_GL_SetAttribute (SDL_GL_RED_SIZE, rgb_size[0]); SDL_GL_SetAttribute (SDL_GL_GREEN_SIZE, rgb_size[1]); SDL_GL_SetAttribute (SDL_GL_BLUE_SIZE, rgb_size[2]); @@ -311,12 +331,31 @@ } /* Set the window manager title bar */ - SDL_WM_SetCaption ("SDL GL test", "testgl"); + SDL_WM_SetCaption ("libgender rendering test", "gendertest"); /* Set the gamma for the window */ if (gamma != 0.0) SDL_SetGamma (gamma, gamma, gamma); + // load a entity + for (int i = 0; i < 7; i++) + { + txtprt_parser p; + entity_transform *f = new entity_transform; + entity *e; + try + { + e = p.read ("test.blasc"); + } catch (txtprt_i_exception & e) + { + cout << "ERR: " << e.msg << endl; + } + f->set (e); + f->update (matrix::translation (vec3 (0, -1, -i*5))); + f->show (); + } + + camera.orig.x = camera.orig.y = camera.orig.z = 0; camera.p = point (0, 0, 10); camera.d = vec3 (0, 0, -1); camera.u = vec3 (0, 1, 0); @@ -326,52 +365,78 @@ glMatrixMode (GL_MODELVIEW); glLoadIdentity (); + glEnable (GL_CULL_FACE); glEnable (GL_DEPTH_TEST); - glDepthFunc (GL_LESS); - glShadeModel (GL_SMOOTH); glEnable (GL_LIGHTING); - //GLfloat lightc[4] = { 1, 0.1, 0.1, 1 }; //glLightf (GL_LIGHT0, GL_QUADRATIC_ATTENUATION); //glLightfv (GL_LIGHT0, GL_DIFFUSE, lightc); glEnable (GL_LIGHT0); - glEnable (GL_COLOR_MATERIAL); + + cgc = cgCreateContext (); + + vsh_profile = CG_PROFILE_ARBVP1; + //if (cgGLIsProfileSupported (CG_PROFILE_VP30)) vsh_profile = CG_PROFILE_VP30; + //if (cgGLIsProfileSupported (CG_PROFILE_VP40)) vsh_profile = CG_PROFILE_VP40; + fsh_profile = CG_PROFILE_ARBFP1; + //if (cgGLIsProfileSupported (CG_PROFILE_FP30)) fsh_profile = CG_PROFILE_FP30; + //if (cgGLIsProfileSupported (CG_PROFILE_FP40)) fsh_profile = CG_PROFILE_FP40; + + vsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "vsh.cg", vsh_profile, 0, 0); + CheckCgError (); + cgGLLoadProgram (vsh); + CheckCgError (); + mv = cgGetNamedParameter (vsh, "WorldProj"); + mvp = cgGetNamedParameter (vsh, "WorldViewProj"); + lightpos = cgGetNamedParameter (vsh, "LightPos"); + CheckCgError (); + + fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0); + CheckCgError (); + cgGLLoadProgram (fsh); + CheckCgError (); + + cgGLBindProgram (vsh); + CheckCgError (); + cgGLBindProgram (fsh); + CheckCgError (); /* Loop until done. */ start_time = SDL_GetTicks (); frames = 0; + while (!done) { GLenum gl_error; char *sdl_error; SDL_Event event; - /* Do our drawing, too. */ - glClearColor (0.0, 0.0, 0.0, 1.0); glClear (GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); - GLfloat lightp[4]; - lightp[0] = camera.p.x; - lightp[1] = camera.p.y; - lightp[2] = camera.p.z; - lightp[3] = 1; - glLightfv (GL_LIGHT0, GL_POSITION, lightp); + camera.p.x += (camera_velocity_factor * camera_velocity.x) * timer.diff; + camera.p.y += (camera_velocity_factor * camera_velocity.y) * timer.diff; + camera.p.z += (camera_velocity_factor * camera_velocity.z) * timer.diff; + + cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); #if 0 static GLfloat ry; - ry += 0.03; - v.d.x = cos (ry); - v.d.z = sin (ry); + ry += 0.001; + camera.d.x = cos (ry); + camera.d.z = sin (ry); + //camera.d.y = sin (ry * 0.1); #endif - draw_context c; - c.mode = draw_context::LIGHTED; - camera.draw (c); + camera.begin (); + camera.pass (view::DEPTH); + camera.pass (view::LIGHTED); + camera.end (); SDL_GL_SwapBuffers (); + timer.frame (); /* Check for error conditions. */ gl_error = glGetError (); @@ -392,9 +457,9 @@ /* Check if there's a pending event. */ while (SDL_PollEvent (&event)) - { - done = HandleEvent (&event); - } + done = HandleEvent (&event); + + ++frames; } @@ -433,16 +498,6 @@ int noframe = 0; int fsaa = 0; - // load a entity - txtprt_parser p; - entity *e; - try { - e = p.read ("test.blasc"); - } catch (txtprt_i_exception & e) { - cout << "ERR: " << e.msg << endl; - } - e->show (); - logo = 0; slowly = 0; numtests = 1; @@ -480,9 +535,9 @@ exit (0); } } + for (i = 0; i < numtests; ++i) - { - RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa); - } + RunGLTest (argc, argv, logo, slowly, bpp, gamma, noframe, fsaa); + return 0; }