diff --git a/Scenery/Makefile b/Scenery/Makefile index 73cd2b84d..a74585110 100644 --- a/Scenery/Makefile +++ b/Scenery/Makefile @@ -27,7 +27,7 @@ TARGET = libScenery.a CFILES = astro.c common.c geometry.c mesh.c moon.c obj.c orbits.c planets.c \ - scenery.c stars.c sun.c + scenery.c sky.c stars.c sun.c OFILES = $(CFILES:.c=.o) @@ -99,6 +99,9 @@ geometry.o: #--------------------------------------------------------------------------- # $Log$ +# Revision 1.25 1997/12/17 23:13:45 curt +# Began working on rendering the sky. +# # Revision 1.24 1997/11/25 19:25:33 curt # Changes to integrate Durk's moon/sun code updates + clean up. # diff --git a/Scenery/astro.h b/Scenery/astro.h index a6b8ff2db..4fa5150a1 100644 --- a/Scenery/astro.h +++ b/Scenery/astro.h @@ -33,7 +33,7 @@ extern struct CelestialCoord moonPos; extern float xMoon, yMoon, zMoon, xSun, ySun, zSun; -extern GLint moon, sun; +/* extern GLint moon, sun; */ extern GLint stars[FG_STAR_LEVELS]; @@ -48,10 +48,13 @@ void fgAstroRender(); /* $Log$ -/* Revision 1.2 1997/12/11 04:43:56 curt -/* Fixed sun vector and lighting problems. I thing the moon is now lit -/* correctly. +/* Revision 1.3 1997/12/17 23:13:46 curt +/* Began working on rendering the sky. /* + * Revision 1.2 1997/12/11 04:43:56 curt + * Fixed sun vector and lighting problems. I thing the moon is now lit + * correctly. + * * Revision 1.1 1997/11/25 23:20:23 curt * Initial revision. * diff --git a/Scenery/obj.c b/Scenery/obj.c index 0a3e53ec0..54624d496 100644 --- a/Scenery/obj.c +++ b/Scenery/obj.c @@ -58,7 +58,7 @@ void calc_normal(float p1[3], float p2[3], float p3[3], double normal[3]) MAT3cross_product(normal, v1, v2); MAT3_NORMALIZE_VEC(normal,temp); - printf(" Normal = %.2f %.2f %.2f\n", normal[0], normal[1], normal[2]); + /* printf(" Normal = %.2f %.2f %.2f\n", normal[0], normal[1], normal[2]);*/ } @@ -325,10 +325,13 @@ GLint fgObjLoad(char *path) { /* $Log$ -/* Revision 1.11 1997/12/15 23:55:01 curt -/* Add xgl wrappers for debugging. -/* Generate terrain normals on the fly. +/* Revision 1.12 1997/12/17 23:13:47 curt +/* Began working on rendering the sky. /* + * Revision 1.11 1997/12/15 23:55:01 curt + * Add xgl wrappers for debugging. + * Generate terrain normals on the fly. + * * Revision 1.10 1997/12/12 21:41:28 curt * More light/material property tweaking ... still a ways off. *