fly/flightgear
1
0
Fork 0
Code Activity

Updates from Bernie Bright.

Browse source
This commit is contained in:
curt 1998-09-08 21:40:42 +00:00
parent dbcfeaf766
commit b318fec021
2 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
Objects/fragment.cxx
View file

@ -99,7 +99,6 @@ int fgFRAGMENT::intersect( const fgPoint3d *end0,
fgPoint3d *result) const fgPoint3d *result) const
{ {
fgTILE *t; fgTILE *t;
fgFACE face;
MAT3vec v1, v2, n, center; MAT3vec v1, v2, n, center;
double p1[3], p2[3], p3[3]; double p1[3], p2[3], p3[3];
double x, y, z; // temporary holding spot for result double x, y, z; // temporary holding spot for result
@ -116,12 +115,9 @@ int fgFRAGMENT::intersect( const fgPoint3d *end0,
// printf("Intersecting\n"); // printf("Intersecting\n");
// traverse the face list for this fragment // traverse the face list for this fragment
const_iterator current = faces.begin();
const_iterator last = faces.end(); const_iterator last = faces.end();
while ( current != last ) { for ( const_iterator current = faces.begin(); current != last; ++current )
face = *current; {
current++;
// printf("."); // printf(".");
// get face vertex coordinates // get face vertex coordinates
@ -129,9 +125,9 @@ int fgFRAGMENT::intersect( const fgPoint3d *end0,
center[1] = t->center.y; center[1] = t->center.y;
center[2] = t->center.z; center[2] = t->center.z;
MAT3_ADD_VEC(p1, t->nodes[face.n1], center); MAT3_ADD_VEC(p1, t->nodes[(*current).n1], center);
MAT3_ADD_VEC(p2, t->nodes[face.n2], center); MAT3_ADD_VEC(p2, t->nodes[(*current).n2], center);
MAT3_ADD_VEC(p3, t->nodes[face.n3], center); MAT3_ADD_VEC(p3, t->nodes[(*current).n3], center);
// printf("point 1 = %.2f %.2f %.2f\n", p1[0], p1[1], p1[2]); // printf("point 1 = %.2f %.2f %.2f\n", p1[0], p1[1], p1[2]);
// printf("point 2 = %.2f %.2f %.2f\n", p2[0], p2[1], p2[2]); // printf("point 2 = %.2f %.2f %.2f\n", p2[0], p2[1], p2[2]);
@ -334,6 +330,9 @@ int fgFRAGMENT::intersect( const fgPoint3d *end0,
} }
// $Log$ // $Log$
// Revision 1.3 1998/09/08 21:40:42 curt
// Updates from Bernie Bright.
//
// Revision 1.2 1998/09/01 19:03:07 curt // Revision 1.2 1998/09/01 19:03:07 curt
// Changes contributed by Bernie Bright <bbright@c031.aone.net.au> // Changes contributed by Bernie Bright <bbright@c031.aone.net.au>
// - The new classes in libmisc.tgz define a stream interface into zlib. // - The new classes in libmisc.tgz define a stream interface into zlib.

13
Objects/fragment.hxx
View file

@ -46,7 +46,7 @@ extern "C" void *memmove(void *, const void *, size_t);
extern "C" void *memset(void *, int, size_t); extern "C" void *memset(void *, int, size_t);
#endif #endif
#include <list> // STL list #include <vector>
#include <Bucket/bucketutils.h> #include <Bucket/bucketutils.h>
#include <Include/fg_types.h> #include <Include/fg_types.h>
@ -116,7 +116,7 @@ public:
GLint display_list; GLint display_list;
// face list (this indexes into the master tile vertex list) // face list (this indexes into the master tile vertex list)
typedef list < fgFACE > container; typedef vector < fgFACE > container;
typedef container::iterator iterator; typedef container::iterator iterator;
typedef container::const_iterator const_iterator; typedef container::const_iterator const_iterator;
@ -142,7 +142,7 @@ public:
fgPoint3d *result) const; fgPoint3d *result) const;
// Constructors // Constructors
fgFRAGMENT () {} fgFRAGMENT () : num_faces(0) { /*faces.reserve(512);*/}
fgFRAGMENT ( const fgFRAGMENT &image ); fgFRAGMENT ( const fgFRAGMENT &image );
// Destructor // Destructor
@ -161,8 +161,8 @@ public:
num_faces = 0; num_faces = 0;
} }
void deleteDisplayList() { int deleteDisplayList() {
xglDeleteLists( display_list, 1 ); xglDeleteLists( display_list, 1 ); return 0;
} }
}; };
@ -178,6 +178,9 @@ operator == ( const fgFRAGMENT & lhs, const fgFRAGMENT & rhs ) {
// $Log$ // $Log$
// Revision 1.3 1998/09/08 21:40:44 curt
// Updates from Bernie Bright.
//
// Revision 1.2 1998/09/01 19:03:08 curt // Revision 1.2 1998/09/01 19:03:08 curt
// Changes contributed by Bernie Bright <bbright@c031.aone.net.au> // Changes contributed by Bernie Bright <bbright@c031.aone.net.au>
// - The new classes in libmisc.tgz define a stream interface into zlib. // - The new classes in libmisc.tgz define a stream interface into zlib.