fly/terragear
1
0
Fork 0
Code Activity

added seperate-segments option to ogr-decode.

Browse source 
- generates an intermediate file for the whole linestring, but as seperate poly/texcoord pairs
- construct generates the union ofthe polys for the main clip routine
- intersection ot the original segment with the clipped mask gives the clipped segment
  This cuts ~75% of clipping time for really complex tiles.  8 tiles for Madeira went from
  4:45:00 to 1:04:00
This commit is contained in:
Peter Sadrozinski 2012-08-05 08:20:52 -04:00 committed by Christian Schmitt
parent 465fccc6a0
commit feeaf602b7
5 changed files with 607 additions and 441 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

836
src/BuildTiles/Main/construct.cxx
View file

File diff suppressed because it is too large Load diff

170
src/BuildTiles/Main/construct.hxx
View file

@ -48,39 +48,157 @@
#include <landcover/landcover.hxx>
// TO REMOVE
#include <Geometry/trieles.hxx>
#include <Geometry/trinodes.hxx>
#include <Geometry/trisegs.hxx>
// TO REMOVE
#include "priorities.hxx"
typedef std::vector < int_list > belongs_to_list;
typedef belongs_to_list::iterator belongs_to_list_iterator;
typedef belongs_to_list::const_iterator belongs_to_list_tripoly_iterator;
class TGPolyList
class TGShape
{
public:
superpoly_list superpolys[TG_MAX_AREA_TYPES];
texparams_list texparams[TG_MAX_AREA_TYPES];
TGPolygon safety_base;
TGPolygon clip_mask;
superpoly_list sps;
texparams_list tps;
void SetMask( TGPolygon mask )
{
clip_mask = mask;
}
void BuildMask( void )
{
TGPolygon poly;
clip_mask.erase();
for (unsigned int i=0; i<sps.size(); i++)
{
poly = sps[i].get_poly();
clip_mask = tgPolygonUnion( clip_mask, poly );
}
}
void IntersectPolys( void )
{
TGPolygon original, intersect;
for (unsigned int i=0; i<sps.size(); i++)
{
original = sps[i].get_poly();
intersect = tgPolygonInt( clip_mask, original );
sps[i].set_poly( intersect );
}
}
};
typedef std::vector < TGShape > shape_list;
typedef shape_list::iterator shape_list_iterator;
typedef shape_list::const_iterator const_shape_list_iterator;
class TGLandclass
{
public:
void clear(void)
{
int i;
for (i=0; i<TG_MAX_AREA_TYPES; i++) {
superpolys[i].clear();
shapes[i].clear();
}
for (i=0; i<TG_MAX_AREA_TYPES; i++) {
texparams[i].clear();
}
safety_base.erase();
}
inline unsigned int area_size( unsigned int area )
{
return shapes[area].size();
}
inline unsigned int shape_size( unsigned int area, unsigned int shape )
{
return shapes[area][shape].sps.size();
}
inline void add_shape( unsigned int area, TGShape shape )
{
shapes[area].push_back( shape );
}
inline TGShape& get_shape( unsigned int area, unsigned int shape )
{
return shapes[area][shape];
}
inline TGPolygon get_mask( unsigned int area, unsigned int shape )
{
return shapes[area][shape].clip_mask;
}
inline void set_mask( unsigned int area, unsigned int shape, TGPolygon mask )
{
shapes[area][shape].clip_mask = mask;
}
inline TGSuperPoly& get_superpoly( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment];
}
inline void set_superpoly( unsigned int area, unsigned int shape, unsigned int segment, TGSuperPoly sp )
{
shapes[area][shape].sps[segment] = sp;
}
inline TGPolygon get_poly( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment].get_poly();
}
inline void set_poly( unsigned int area, unsigned int shape, unsigned int segment, TGPolygon poly )
{
return shapes[area][shape].sps[segment].set_poly( poly );
}
inline TGPolygon get_tris( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment].get_tris();
}
inline void set_tris( unsigned int area, unsigned int shape, unsigned int segment, TGPolygon tris )
{
shapes[area][shape].sps[segment].set_tris( tris );
}
inline Point3D get_face_normal( unsigned int area, unsigned int shape, unsigned int segment, unsigned int tri )
{
return shapes[area][shape].sps[segment].get_face_normal( tri );
}
inline double get_face_area( unsigned int area, unsigned int shape, unsigned int segment, unsigned int tri )
{
return shapes[area][shape].sps[segment].get_face_area( tri );
}
inline std::string get_flag( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment].get_flag();
}
inline std::string get_material( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment].get_material();
}
inline TGPolygon get_texcoords( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment].get_texcoords();
}
inline void set_texcoords( unsigned int area, unsigned int shape, unsigned int segment, TGPolygon tcs )
{
return shapes[area][shape].sps[segment].set_texcoords( tcs );
}
inline TGPolyNodes get_tri_idxs( unsigned int area, unsigned int shape, unsigned int segment )
{
return shapes[area][shape].sps[segment].get_tri_idxs();
}
inline void set_tri_idxs( unsigned int area, unsigned int shape, unsigned int segment, TGPolyNodes tis )
{
return shapes[area][shape].sps[segment].set_tri_idxs( tis );
}
private:
shape_list shapes[TG_MAX_AREA_TYPES];
};
// forward declaration
@ -123,8 +241,8 @@ private:
TGArray array;
// land class polygons
TGPolyList polys_in;
TGPolyList polys_clipped;
TGLandclass polys_in;
TGLandclass polys_clipped;
// All Nodes
TGNodes nodes;
@ -145,7 +263,7 @@ private:
bool ClipLandclassPolys( void );
// Clip Helpers
void move_slivers( TGPolygon& in, TGPolygon& out );
void merge_slivers( TGPolyList& clipped, poly_list& slivers_list );
void merge_slivers( TGLandclass& clipped, poly_list& slivers_list );
// Shared edge Matching
void LoadSharedEdgeData( void );
@ -234,10 +352,6 @@ public:
// node list in geodetic coords (with fixed elevation)
inline point_list get_geod_nodes() const { return nodes.get_geod_nodes(); }
// face normal list (for flat shading)
// inline point_list get_face_normals() const { return face_normals; }
// inline void set_face_normals( point_list n ) { face_normals = n; }
// normal list (for each point) in cart coords (for smooth
// shading)
inline point_list get_point_normals() const { return nodes.get_normals(); }

2
src/Lib/Geometry/tg_nodes.cxx
View file

@ -172,7 +172,7 @@ void TGNodes::Dump( void ) {
if ( node.GetFaces().size() ) {
TGFaceList faces = node.GetFaces();
for (unsigned int j=0; j<faces.size(); j++) {
SG_LOG(SG_GENERAL, SG_ALERT, "\tface " << faces[j].area << "," << faces[j].poly << "," << faces[j].tri );
SG_LOG(SG_GENERAL, SG_ALERT, "\tface " << faces[j].area << "," << faces[j].shape << "," << faces[j].seg << "," << faces[j].tri );
}
}
}

12
src/Lib/Geometry/tg_nodes.hxx
View file

@ -17,7 +17,8 @@
// is a member of.
struct TGFaceLookup {
unsigned int area;
unsigned int poly;
unsigned int shape;
unsigned int seg;
unsigned int tri;
};
typedef std::vector < TGFaceLookup > TGFaceList;
@ -49,11 +50,12 @@ public:
wgs84 = SGVec3d::fromGeod(geod);
}
inline void AddFace( unsigned int area, unsigned int poly, unsigned int tri )
inline void AddFace( unsigned int area, unsigned int shape, unsigned int segment, unsigned int tri )
{
TGFaceLookup face;
face.area = area;
face.poly = poly;
face.shape = shape;
face.seg = segment;
face.tri = tri;
faces.push_back( face );
@ -158,9 +160,9 @@ public:
// return the ith point
inline TGNode get_node( int i ) const { return tg_node_list[i]; }
inline void AddFace( int i, unsigned int area, unsigned int poly, unsigned int tri )
inline void AddFace( int i, unsigned int area, unsigned int shape, unsigned int segment, unsigned int tri )
{
tg_node_list[i].AddFace( area, poly, tri );
tg_node_list[i].AddFace( area, shape, segment, tri );
}
// return the size of the node list

28
src/Prep/OGRDecode/ogr-decode.cxx
View file

@ -58,6 +58,7 @@ string area_type="Default";
string area_type_col;
int continue_on_errors=0;
int texture_lines = 0;
int seperate_segments = 0;
int max_segment_length=0; // ==0 => don't split
int start_record=0;
bool use_attribute_query=false;
@ -175,16 +176,7 @@ void processLineStringWithMask(OGRLineString* poGeometry,
// make a plygons from the line segments
tg::makePolygons(line,width,segments);
#if 1
for ( i = 0; i < (int)segments.size(); ++i ) {
segment = segments[i];
tgChopNormalPolygon(work_dir, area_type, segment, false);
}
#else
tgChopNormalPolygonsWithMask(work_dir, area_type, segments, false);
#endif
}
void processLineStringWithTextureInfo(OGRLineString* poGeometry,
@ -482,8 +474,10 @@ void processLayer(OGRLayer* poLayer,
}
if (texture_lines) {
processLineStringWithTextureInfo((OGRLineString*)poGeometry,work_dir,area_type_name,width);
} else {
} else if (seperate_segments) {
processLineStringWithMask((OGRLineString*)poGeometry,work_dir,area_type_name,width);
} else {
processLineString((OGRLineString*)poGeometry,work_dir,area_type_name,width);
}
break;
}
@ -497,8 +491,10 @@ void processLayer(OGRLayer* poLayer,
for (int i=0;i<multils->getNumGeometries();i++) {
if (texture_lines) {
processLineStringWithTextureInfo((OGRLineString*)poGeometry,work_dir,area_type_name,width);
} else {
} else if (seperate_segments) {
processLineStringWithMask((OGRLineString*)poGeometry,work_dir,area_type_name,width);
} else {
processLineString((OGRLineString*)poGeometry,work_dir,area_type_name,width);
}
}
break;
@ -611,10 +607,14 @@ int main( int argc, char **argv ) {
argv+=2;
argc-=2;
} else if (!strcmp(argv[1],"--texture-lines")) {
argv++;
argc--;
argv++;
argc--;
texture_lines=1;
} else if (!strcmp(argv[1],"--continue-on-errors")) {
} else if (!strcmp(argv[1],"--seperate-segments")) {
argv++;
argc--;
seperate_segments=1;
} else if (!strcmp(argv[1],"--continue-on-errors")) {
argv++;
argc--;
continue_on_errors=1;