From 54f9aac53f01a1ed541b9e587b6d84960ba742ca Mon Sep 17 00:00:00 2001 From: curt Date: Sat, 2 Aug 1997 19:10:12 +0000 Subject: [PATCH] Incorporated mesh2GL.c into mesh.c --- Scenery/Makefile | 7 ++- Scenery/depend | 1 - Scenery/mesh.c | 133 +++++++++++++++++++++++++++++++++++++++++++++-- Scenery/mesh.h | 13 ++++- 4 files changed, 146 insertions(+), 8 deletions(-) diff --git a/Scenery/Makefile b/Scenery/Makefile index 1a7ee56f9..65feea860 100644 --- a/Scenery/Makefile +++ b/Scenery/Makefile @@ -27,7 +27,6 @@ TARGET = libScenery.a CFILES = chunkmgr.c common.c mesh.c scenery.c scanner.c parser.c geometry.c -HFILES = OFILES = $(CFILES:.c=.o) @@ -84,6 +83,9 @@ common.o: mesh.o: $(CC) $(CFLAGS) -c mesh.c -o $@ +mesh2GL.o: + $(CC) $(CFLAGS) -c mesh2GL.c -o $@ + scenery.o: $(CC) $(CFLAGS) -c scenery.c -o $@ @@ -92,6 +94,9 @@ geometry.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.18 1997/08/02 19:10:12 curt +# Incorporated mesh2GL.c into mesh.c +# # Revision 1.17 1997/07/23 21:52:23 curt # Put comments around the text after an #endif for increased portability. # diff --git a/Scenery/depend b/Scenery/depend index cb355c4fa..463f07901 100644 --- a/Scenery/depend +++ b/Scenery/depend @@ -1,4 +1,3 @@ -chunkmgr.o: chunkmgr.c chunkmgr.h mesh.h common.o: common.c common.h geometry.o: geometry.c geometry.h mesh.h mesh.o: mesh.c ../constants.h scenery.h mesh.h common.h diff --git a/Scenery/mesh.c b/Scenery/mesh.c index 61e436446..45de26ad7 100644 --- a/Scenery/mesh.c +++ b/Scenery/mesh.c @@ -39,9 +39,15 @@ #include #include "../constants.h" -#include "scenery.h" +#include "../types.h" +#include "../Math/fg_geodesy.h" +#include "../Math/fg_random.h" +#include "../Math/mat3.h" +#include "../Math/polar.h" + #include "mesh.h" #include "common.h" +#include "scenery.h" /* Temporary hack until we get the scenery management system running */ @@ -155,7 +161,7 @@ void mesh_set_option_value(struct mesh *m, char *value) { /* do whatever needs to be done with the mesh now that it's been loaded, such as generating the OpenGL call list. */ void mesh_do_it(struct mesh *m) { - mesh_hack = mesh2GL(m); + mesh_hack = mesh_to_OpenGL(m); } @@ -264,10 +270,129 @@ double mesh_altitude(double lon, double lat) { } +/* walk through mesh and make opengl calls */ +GLint mesh_to_OpenGL(struct mesh *m) { + GLint mesh; + /* static GLfloat color[4] = { 0.5, 0.4, 0.25, 1.0 }; */ /* dark desert */ + static GLfloat color[4] = { 0.5, 0.5, 0.25, 1.0 }; + double randx, randy; + + float x1, y1, x2, y2, z11, z12, z21, z22; + struct fgCartesianPoint p11, p12, p21, p22; + double gc_lon, gc_lat, sl_radius; + + MAT3vec v1, v2, normal; + int i, j, istep, jstep, iend, jend; + float temp; + + printf("In mesh2GL(), generating GL call list.\n"); + + /* Detail level. This is how big a step we take as we walk + * through the DEM data set. This value is initialized in + * .../Scenery/scenery.c:fgSceneryInit() */ + istep = jstep = cur_scenery_params.terrain_skip ; + + mesh = glGenLists(1); + glNewList(mesh, GL_COMPILE); + + glMaterialfv( GL_FRONT, GL_AMBIENT_AND_DIFFUSE, color ); + + iend = m->cols - 1; + jend = m->rows - 1; + + y1 = m->originy; + y2 = y1 + (m->col_step * istep); + + for ( i = 0; i < iend; i += istep ) { + x1 = m->originx; + x2 = x1 + (m->row_step * jstep); + + glBegin(GL_TRIANGLE_STRIP); + + for ( j = 0; j < jend; j += jstep ) { + z11 = m->mesh_data[i * m->cols + j ]; + z12 = m->mesh_data[(i+istep) * m->cols + j ]; + z21 = m->mesh_data[i * m->cols + (j+jstep)]; + z22 = m->mesh_data[(i+istep) * m->cols + (j+jstep)]; + + /* printf("A geodetic point is (%.2f, %.2f, %.2f)\n", + x1, y1, z11); */ + gc_lon = x1*ARCSEC_TO_RAD; + fgGeodToGeoc(y1*ARCSEC_TO_RAD, z11, &sl_radius, &gc_lat); + /* printf("A geocentric point is (%.2f, %.2f, %.2f)\n", gc_lon, + gc_lat, sl_radius+z11); */ + p11 = fgPolarToCart(gc_lon, gc_lat, sl_radius+z11); + /* printf("A cart point is (%.8f, %.8f, %.8f)\n", + p11.x, p11.y, p11.z); */ + + gc_lon = x1*ARCSEC_TO_RAD; + fgGeodToGeoc(y2*ARCSEC_TO_RAD, z12, &sl_radius, &gc_lat); + p12 = fgPolarToCart(gc_lon, gc_lat, sl_radius+z12); + + gc_lon = x2*ARCSEC_TO_RAD; + fgGeodToGeoc(y1*ARCSEC_TO_RAD, z21, &sl_radius, &gc_lat); + p21 = fgPolarToCart(gc_lon, gc_lat, sl_radius+z21); + + gc_lon = x2*ARCSEC_TO_RAD; + fgGeodToGeoc(y2*ARCSEC_TO_RAD, z22, &sl_radius, &gc_lat); + p22 = fgPolarToCart(gc_lon, gc_lat, sl_radius+z22); + + v1[0] = p22.y - p11.y; v1[1] = p22.z - p11.z; v1[2] = z22 - z11; + v2[0] = p12.y - p11.y; v2[1] = p12.z - p11.z; v2[2] = z12 - z11; + MAT3cross_product(normal, v1, v2); + MAT3_NORMALIZE_VEC(normal,temp); + glNormal3d(normal[0], normal[1], normal[2]); + /* printf("normal 1 = (%.2f %.2f %.2f\n", normal[0], normal[1], + normal[2]); */ + + if ( j == 0 ) { + /* first time through */ + glVertex3d(p12.x, p12.y, p12.z); + glVertex3d(p11.x, p11.y, p11.z); + } + + glVertex3d(p22.x, p22.y, p22.z); + + v2[0] = p21.y - p11.y; v2[1] = p21.z - p11.z; v2[2] = z21 - z11; + MAT3cross_product(normal, v2, v1); + MAT3_NORMALIZE_VEC(normal,temp); + glNormal3d(normal[0], normal[1], normal[2]); + /* printf("normal 2 = (%.2f %.2f %.2f\n", normal[0], normal[1], + normal[2]); */ + + glVertex3d(p21.x, p21.y, p21.z); + + x1 += m->row_step * jstep; + x2 += m->row_step * jstep; + } + glEnd(); + + y1 += m->col_step * istep; + y2 += m->col_step * istep; + } + + /* this will go, it's only here for testing/debugging */ + + for ( i = 0; i < 200; i++ ) { + randx = fg_random() * 3600.0; + randy = fg_random() * 3600.0; + + /* mesh_make_test_object(m->originx + randx, m->originy + randy); */ + } + + glEndList(); + + return(mesh); +} + + /* $Log$ -/* Revision 1.17 1997/07/18 23:41:26 curt -/* Tweaks for building with Cygnus Win32 compiler. +/* Revision 1.18 1997/08/02 19:10:14 curt +/* Incorporated mesh2GL.c into mesh.c /* + * Revision 1.17 1997/07/18 23:41:26 curt + * Tweaks for building with Cygnus Win32 compiler. + * * Revision 1.16 1997/07/16 20:04:51 curt * Minor tweaks to aid Win32 port. * diff --git a/Scenery/mesh.h b/Scenery/mesh.h index 4c34831bf..9b9d795e4 100644 --- a/Scenery/mesh.h +++ b/Scenery/mesh.h @@ -28,6 +28,9 @@ #define MESH_H +#include + + struct mesh { /* start coordinates (in arc seconds) */ double originx, originy; @@ -71,14 +74,20 @@ void mesh_do_it(struct mesh *m); * this to interpolate exact values, but for now this is good enough */ double mesh_altitude(double lon, double lat); +/* walk through mesh and make opengl calls */ +GLint mesh_to_OpenGL(struct mesh *m); + #endif /* MESH_H */ /* $Log$ -/* Revision 1.5 1997/07/23 21:52:25 curt -/* Put comments around the text after an #endif for increased portability. +/* Revision 1.6 1997/08/02 19:10:15 curt +/* Incorporated mesh2GL.c into mesh.c /* + * Revision 1.5 1997/07/23 21:52:25 curt + * Put comments around the text after an #endif for increased portability. + * * Revision 1.4 1997/07/08 18:20:14 curt * Working on establishing a hard ground. * -- 2.39.2