fly/flightgear
1
0
Fork 0
Code Activity

Tweaked texture parameter calculations to keep the number smaller. This

Browse source 
avoids the "swimming" problem.
Type-ified fgTIME and fgVIEW.
This commit is contained in:
curt 1998-04-28 01:21:42 +00:00
parent 7352183ad9
commit 96525339ed
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Scenery/obj.c
View file

@ -74,7 +74,9 @@ void calc_normal(double p1[3], double p2[3], double p3[3], double normal[3])
float calc_lon(double x, double y, double z) { float calc_lon(double x, double y, double z) {
float tmp; float tmp;
tmp = (RAD_TO_DEG*atan2(y, x)) * FG_TEX_CONSTANT; tmp = fmod(
(RAD_TO_DEG*atan2(y, x)) * FG_TEX_CONSTANT,
10.0);
// printf("lon = %.2f\n", (float)tmp); // printf("lon = %.2f\n", (float)tmp);
return (float)tmp; return (float)tmp;
@ -84,7 +86,10 @@ float calc_lon(double x, double y, double z) {
float calc_lat(double x, double y, double z) { float calc_lat(double x, double y, double z) {
float tmp; float tmp;
tmp = (90.0 - RAD_TO_DEG*atan2( sqrt(x*x + y*y), z )) * FG_TEX_CONSTANT; tmp = fmod(
(90.0 - RAD_TO_DEG *
atan2( sqrt(x*x + y*y), z )) * FG_TEX_CONSTANT,
10.0);
// printf("lat = %.2f\n", (float)tmp); // printf("lat = %.2f\n", (float)tmp);
return (float)tmp; return (float)tmp;
@ -472,9 +477,14 @@ GLint fgObjLoad(char *path, struct fgCartesianPoint *ref, double *radius) {
/* $Log$ /* $Log$
/* Revision 1.33 1998/04/27 15:58:15 curt /* Revision 1.34 1998/04/28 01:21:42 curt
/* Screwing around with texture coordinate generation ... still needs work. /* Tweaked texture parameter calculations to keep the number smaller. This
/* avoids the "swimming" problem.
/* Type-ified fgTIME and fgVIEW.
/* /*
* Revision 1.33 1998/04/27 15:58:15 curt
* Screwing around with texture coordinate generation ... still needs work.
*
* Revision 1.32 1998/04/27 03:30:13 curt * Revision 1.32 1998/04/27 03:30:13 curt
* Minor transformation adjustments to try to keep scenery tiles closer to * Minor transformation adjustments to try to keep scenery tiles closer to
* (0, 0, 0) GLfloats run out of precision at the distances we need to model * (0, 0, 0) GLfloats run out of precision at the distances we need to model

11
Scenery/tilecache.cxx
View file

@ -144,7 +144,7 @@ void fgTileCacheEntryInfo( int index, GLint *display_list,
/* Return index of next available slot in tile cache */ /* Return index of next available slot in tile cache */
int fgTileCacheNextAvail( void ) { int fgTileCacheNextAvail( void ) {
struct fgVIEW *v; fgVIEW *v;
int i; int i;
float dx, dy, dz, max, med, min, tmp; float dx, dy, dz, max, med, min, tmp;
float dist, max_dist; float dist, max_dist;
@ -200,9 +200,14 @@ int fgTileCacheNextAvail( void ) {
/* $Log$ /* $Log$
/* Revision 1.3 1998/04/25 22:06:32 curt /* Revision 1.4 1998/04/28 01:21:43 curt
/* Edited cvs log messages in source files ... bad bad bad! /* Tweaked texture parameter calculations to keep the number smaller. This
/* avoids the "swimming" problem.
/* Type-ified fgTIME and fgVIEW.
/* /*
* Revision 1.3 1998/04/25 22:06:32 curt
* Edited cvs log messages in source files ... bad bad bad!
*
* Revision 1.2 1998/04/24 00:51:08 curt * Revision 1.2 1998/04/24 00:51:08 curt
* Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H" * Wrapped "#include <config.h>" in "#ifdef HAVE_CONFIG_H"
* Tweaked the scenery file extentions to be "file.obj" (uncompressed) * Tweaked the scenery file extentions to be "file.obj" (uncompressed)