--- libgender/test.C 2004/10/06 17:55:40 1.45 +++ libgender/test.C 2004/10/10 19:50:37 1.58 @@ -13,28 +13,12 @@ #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_angle = 0, camera_velocity_angle; -float camera_velocity_factor = 20; +float camera_angle, camera_angle2, camera_velocity_angle, camera_velocity_angle2; +float camera_velocity_factor = 80; void HotKey_ToggleFullScreen (void) @@ -103,16 +87,16 @@ break; case SDL_KEYDOWN: - 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_e) camera_velocity_angle++; - if (event->key.keysym.sym == SDLK_q) camera_velocity_angle--; + 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_RIGHT) camera_velocity_angle++; + if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle--; + if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2++; + if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2--; + if (event->key.keysym.sym == SDLK_e) camera_velocity.y--; + if (event->key.keysym.sym == SDLK_q) 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; @@ -134,12 +118,12 @@ 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--; - if (event->key.keysym.sym == SDLK_e) camera_velocity_angle--; - if (event->key.keysym.sym == SDLK_q) camera_velocity_angle++; + if (event->key.keysym.sym == SDLK_LEFT) camera_velocity_angle++; + if (event->key.keysym.sym == SDLK_RIGHT) camera_velocity_angle--; + if (event->key.keysym.sym == SDLK_PAGEUP) camera_velocity_angle2--; + if (event->key.keysym.sym == SDLK_PAGEDOWN) camera_velocity_angle2++; + if (event->key.keysym.sym == SDLK_e) camera_velocity.y++; + if (event->key.keysym.sym == SDLK_q) camera_velocity.y--; break; case SDL_QUIT: @@ -150,6 +134,40 @@ return (done); } +void draw_floor (int size, int dx, int dy, int dz) +{ + int x, z, ry; + + for (x = 0; x < 100; x++) + { + for (z = 0; z < 100; z++) + { + vector pts; + pts.push_back (vertex2d (point ( 0, 0, 0), vec3 (0, 1, 0), texc (0, 0))); + pts.push_back (vertex2d (point ( 0, 0, size), vec3 (0, 1, 0), texc (0, 1))); + pts.push_back (vertex2d (point (size, 0, size), vec3 (0, 1, 0), texc (1, 1))); + pts.push_back (vertex2d (point (size, 0, 0), vec3 (0, 1, 0), texc (1, 0))); + + geometry_quads *q = new geometry_quads; + q->m = new simple_material; + q->set (pts); + entity *e = new entity (q); + e->move (vec3 (dx + x * size, dy, dz + z * size)); + e->show (); + } + } +} + +void draw_test_nurb () +{ + geometry_nurbs *q = new geometry_nurbs; + q->set (); + entity *e = new entity (q); + e->move (vec3 (10, 3, -4)); + e->show (); +} + +extern void draw_level (); int RunGLTest (int argc, char *argv[], int logo, int slowly, int bpp, float gamma, int noframe, int fsaa) @@ -266,32 +284,37 @@ if (gamma != 0.0) SDL_SetGamma (gamma, gamma, gamma); - for (int i = 0; i < 70; i++) + for (int i = 0; i < 20; i++) { // load a entity txtprt_parser p; - entity *e; + geometry *g; try { - e = p.read ("test.blasc"); + g = p.read ("test.blasc"); } catch (txtprt_i_exception & e) { cout << "ERR: " << e.msg << endl; } - entity_transform *f = new entity_transform; - f->set (e); - f->update (matrix::translation (vec3 (i*5, -3, -i*10))); - f->show (); + entity *e = new entity (g); + e->move (vec3 (i*5, -3, -i*10)); + e->show (); } - draw_some_random_funky_floor_dance_music (10, -500, -10, -1000); - camera.orig.x = camera.orig.y = camera.orig.z = 0; + + draw_floor (10, -500, -10, -1000); + draw_level (); + draw_test_nurb (); + + //camera.orig.x = 108; camera.orig.y = 0; camera.orig.z = -368; + camera.orig.x = 0; camera.orig.y = 0; camera.orig.z = 0; camera.p = point (0, 0, 10); camera.d = vec3 (0, 0, -1); camera.u = vec3 (0, 1, 0); camera.w = w; camera.h = h; - camera.fov = 80; + camera.fov = 35; + camera.z_near = 1.; glMatrixMode (GL_MODELVIEW); glLoadIdentity (); @@ -304,39 +327,7 @@ glEnable (GL_LIGHTING); glEnable (GL_LIGHT0); - 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 (); - - CGparameter g_Texture; // the texture parameter - - - fsh = cgCreateProgramFromFile (cgc, CG_SOURCE, "fsh.cg", fsh_profile, 0, 0); - Texture t("o.jpg"); - g_Texture = cgGetNamedParameter(fsh, "Texture"); // the texture cg-warper ;) - cgGLSetTextureParameter(g_Texture, t.texture); // Bind the texture number 999 to g_Texture - CheckCgError (); - cgGLLoadProgram (fsh); - CheckCgError (); - - cgGLBindProgram (vsh); - CheckCgError (); - cgGLBindProgram (fsh); - CheckCgError (); + init_shaders (); /* Loop until done. */ start_time = SDL_GetTicks (); @@ -347,18 +338,18 @@ char *sdl_error; SDL_Event event; - 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; - - camera_angle += camera_velocity_factor * camera_velocity_angle * timer.diff; - camera.d.z = -cos (camera_angle * 12 / 180.); - camera.d.x = sin (camera_angle * 12 / 180.); + camera_angle += 180 * camera_velocity_angle * timer.diff; + camera_angle2 += 180 * camera_velocity_angle2 * timer.diff; + + vec3 geradeaus = matrix::rotation (-camera_angle, vec3 (0, 1, 0)) * vec3 (0, 0, -1); + vec3 right = matrix::rotation (90., vec3 (0, 1, 0)) * geradeaus; - cgGLSetParameter4f (lightpos, camera.p.x, camera.p.y, camera.p.z, 1); + camera.d = matrix::rotation (camera_angle2, right) * geradeaus; + camera.u = cross (camera.d, right); + + camera.p = camera.p - camera.d * (camera_velocity_factor * timer.diff) * camera_velocity.z; + camera.p = camera.p - camera.u * (camera_velocity_factor * timer.diff) * camera_velocity.y; - glBindTexture (GL_TEXTURE_2D, t.texture); - cgGLEnableTextureParameter (g_Texture); // Enable the texture parameter #if 0 static GLfloat ry; @@ -390,7 +381,7 @@ } /* Allow the user to see what's happening */ - //SDL_Delay (20); + //SDL_Delay (40); /* Check if there's a pending event. */ while (SDL_PollEvent (&event)) @@ -423,7 +414,6 @@ SDL_Quit (); return (0); } - int main (int argc, char *argv[]) {