1
0
Fork 0
Commit graph

1273 commits

Author SHA1 Message Date
Martin Spott
efc4386423 Merge VMap0 procedures into a single file 2013-08-24 07:04:14 -07:00
Martin Spott
f6dca14b0d Don't rename *and* update files on the same commit .... 2013-08-22 08:40:13 -07:00
Martin Spott
08b628e647 Commit before re-write .... 2013-08-21 15:34:09 -07:00
Christian Schmitt
7d13ac32b0 Fix underlinking (newer binutils exhibits it) 2013-08-17 19:43:30 +02:00
Peter Sadrozinski
d71aacde76 finally fixed the crazy valleys / ridges
- issue is caused by very long edges.  osm_coastline has lots of them.
- split_long_edges info was getting lost in many cases, as clipper
  'optimizes' the output.  To work around this, I would gather the
  nodes before a clip, then add them back after.  Unfortunately, I was
  only getting one of the polygons nodes
  ( sometimes, just a bucket - 4 nodes )
2013-08-17 10:52:31 -04:00
Peter Sadrozinski
9d4f65f766 hookup --debug to shapefile generation in ogrdecode 2013-07-23 20:54:53 -04:00
Martin Spott
23aa8a8ef3 Bump required SG version number 2013-07-13 08:57:22 -07:00
Peter Sadrozinski
4e16bb7bb6 fixed the crazy texturing issue.
I think we're ready for another world scenery test.
2013-07-13 11:15:46 -04:00
Peter Sadrozinski
dc6e420abf conditional compile the new edits from last known good terragear for
debugging the messed up texture coordinates
2013-07-06 14:44:56 -04:00
Peter Sadrozinski
a6098f3c4a - fix ogr-decode missing landclass
sometimes, sgBucketSpan returned an extra row ( a sliver )
  chop would pick this and save it as the landclass output - instead of the full bucket poly.
  construct wouldn't have any poly for the area, and mark it as ocean
2013-04-15 19:41:21 -04:00
Christian Schmitt
d42b7269cf Genapts850: Add a version 810 check. This version is unsupported. 2013-04-02 03:00:02 +02:00
Peter Sadrozinski
4f29c32c18 - fixes to get full world vmap0 working
- use exact construction when triangulating in CGAL
2013-03-26 19:20:53 -04:00
Christian Schmitt
5132fa61d1 genapts: proper fix for LFPG segfault 2013-03-20 18:41:34 +01:00
Christian Schmitt
73f07b7506 Reset state machine to "simple" after closing a bezier curve.
Fixes a segfault at LFPG.
2013-03-20 12:57:33 +01:00
Christian Schmitt
b1dd1d9e36 Genapts: fix memory leaks 2013-03-20 12:57:25 +01:00
Christian Schmitt
a61df8aec0 Fix memory access beyond vector bounds. Reported by valgrind 2013-03-20 00:42:55 +01:00
Peter Sadrozinski
a74edcd91b fix ogr-decode double save issue
- added some experimental (and unused) iterative tests
2013-03-11 09:12:42 -04:00
Peter Sadrozinski
08f5c17221 Fixes from full world parsing tests
- Use new SimGear API in construct to gather all tiles within a bounding box
- Bring in new clipper lib, which seems to fix more orientation issues
- Various debug cleanup
- Fix Find/Merge slivers - but leave it turned off
- New OffsetPoints for small speedup in GenApts - currently disabled
2013-03-10 09:42:07 -04:00
Christian Schmitt
0d0d1d36c9 Adapt logging function to SG logstream changes and enable multithreaded output again 2013-02-08 11:31:45 +01:00
Christian Schmitt
5c44d450d4 Bump minimum SG version. Make TG compile again. Own multithread logging is disabled for now. 2013-02-07 20:30:17 +01:00
Christian Schmitt
d469bc04a9 minor ogr-decode fixes 2013-02-03 17:22:36 +01:00
Christian Schmitt
5c83e4e5b5 tg_chopper.cxx: do not exit the process completely if we encounter the same amount of nodes after clipping as before.
Instead, only return and keep processing.
2013-01-10 16:19:04 +01:00
Christian Schmitt
e0cceae841 ogr-decode: be more verbose about the currently processed shapefile 2013-01-08 13:54:00 +01:00
Christian Schmitt
70ae2ecdfe tg_chopper.cxx: Fix typo that only became apparent on sphere (older boost version...) 2013-01-08 00:43:51 +01:00
Christian Schmitt
3732f63117 Bump minimum required SG version to be sure we have the threads changes from there available 2013-01-07 22:56:11 +01:00
Frederic Bouvier
d6e753014d Suppress warnings under Windows. The level of code duplication is remarkable. Maybe a template could fit 2013-01-06 00:22:11 +01:00
Frederic Bouvier
29e10a7314 Fix a namespace collision under Windows 2013-01-06 00:20:00 +01:00
Christian Schmitt
75519f886a tg-construct: fix windows build 2013-01-02 17:09:12 +01:00
Christian Schmitt
18bd2aa4e0 gdalchop: Remove automatic void removal. This is better done in an extra step before invoking the chop process 2013-01-02 15:37:33 +01:00
Peter Sadrozinski
5b9375f102 - fixed multithreaded construct memory leak in TGArray usage ( need to clear corner and fitted lists ).
- reworked priorities.hxx/.cxx to make valgrind happy.  It also allows us to add more features per area (like smoothing).
- remove TG_MAX_AREA_TYPES - we had a merge request for this, but this does essentially the same thing with the refactoring.
- fixed some edge matching introduced in multithreaded construct.
- tgconstruct objects now live for an entire stage.  1 for each thread - this introduced the memory leaks, and some issues.
  interesting side effect is that we do less alloc / free, since we use std::vectors which when cleared, don't actually free
  memory, so by the end, we've allocated enough entries for the largest tile.
- fixed linear feature issue in genapts850 - the refactor caused some of the old clean functions to remove too many polys!
  with cgal, we need far less cleaning - just do what construct does, and we can still parse all airports, and lines are back.
2012-12-29 21:05:39 -05:00
Peter Sadrozinski
b007979a38 - multithreaded tgconstruct 2012-12-22 09:16:51 -05:00
Christian Schmitt
6d72319a68 gdalchop: improve speed, especially when using a high number of datasets.
We only pass images to gdal now, if they intersect in any way with the current bucket.
2012-12-21 17:31:46 +01:00
Christian Schmitt
76e7d8fcbe Set minimum required GDAL version 2012-12-20 22:15:31 +01:00
Christian Schmitt
5b6329e5ad The previous commit brought up some issues with certain source formats.
We now create a copy of the original dataset and use that for processing,
as GDAL needs to write some changes.
2012-12-20 20:21:44 +01:00
Christian Schmitt
6d50ec366c gdalchop: interpolate nodata pixels before processing.
This yields much nicer scenery tiles as terrafit does not have to work
with these missing data fields. Tested at LOWI.
2012-12-20 13:37:20 +01:00
Christian Schmitt
20751dd50b gdalchop: support automatic detection of arcsecs in source elevation files 2012-12-20 11:28:57 +01:00
Peter Sadrozinski
cb6ef16f5a fix resource leak - close gzfile after polygons read 2012-12-19 19:36:43 -05:00
Peter Sadrozinski
9f34a0c036 - fix airport area texturing
- fix ocean texturing for tiles with a coastline
2012-12-16 12:54:44 -05:00
Peter Sadrozinski
10db5bfbff - renamed Polygon library to terragear
- split the new implementation into respective class files
  (tg_misc is a catch all...)
2012-12-16 10:46:25 -05:00
Peter Sadrozinski
b1012cd5e9 - Point3D removed
- Moved AptSurface to the Polygon library - and made it more generic for
  possible future use in construct
2012-12-15 21:14:39 -05:00
Peter Sadrozinski
91b28879d4 no more TGPolygon or TGTriNodes 2012-12-15 11:20:46 -05:00
Christian Schmitt
1e62b55664 Another compile fix (missing include) 2012-12-15 13:27:35 +01:00
Christian Schmitt
d10991cbb0 TNT header files were missing. They are templates and don't have to be in the makefile 2012-12-15 11:25:32 +01:00
Peter Sadrozinski
ce1f89f832 library reorg step 1
- no more Geometry
- delete unused files
2012-12-14 22:47:35 -05:00
Peter Sadrozinski
4b97381559 multi-threaded ogrdecode
- use --all-threads to use all available CPUs
- use --threads x to use x threads
2012-12-14 20:44:26 -05:00
Peter Sadrozinski
cd3a1d647e - Use the tgPolygon SaveToGzFile / LoadFromGzFile functions to store the
results of OGRDecode, instead of ascii, completely different format
- move Utility functions to generate polys from line data into tgPolygon
  ( use this for both GenApts850 linear features, and OGRDecode )
- kill off old superpoly, and texparams
- add tgChopper which queues chopped polygons per bucket.
  When saved, result is less files (each tile has 1 file per shapefile decoded)
  Both genapt and ogrdecode now use tgChopper instead of Geometry/Util.cxx functions
- tgChooper acquires a global file name lock, so we can safely run genapts in
  paralell with ogrdecode.
  (this was dangerous before, as both could try to open the index file as write,
   the loser would segfault, later )
2012-12-14 10:23:13 -05:00
Christian Schmitt
720353d920 Make GDAL work again. Create same output as hgtchop does, convert to binary array format 2012-12-14 16:14:28 +01:00
Frederic Bouvier
1438b48b8b Fix Windows build against Boost 2012-12-14 09:11:18 +01:00
Christian Schmitt
902d4d83bc Set needed boost components and link tg-construct against them 2012-12-11 14:12:58 +01:00
Peter Sadrozinski
257339abcb - remove extra debug 2012-12-09 18:18:21 -05:00