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
Peter Sadrozinski
6edeadd86e
removed tgshape - each area is now just a list of polys
...
fixed linear data texturing
fixed water area
spacial query adjustment - works just like linear query, now
2012-12-09 18:17:45 -05:00
Peter Sadrozinski
89e69a863f
refactor from TGPolygon and TGSuperPoly to tgPolygon
...
fix for missing texture coordinates. Need to kill, or shrink TGShape / clip ,asks, etc.
2012-12-09 18:13:48 -05:00
Peter Sadrozinski
c0555a1270
convert tg_nodes to SGGeod and SGVecd/f
2012-12-09 18:13:47 -05:00
Christian Schmitt
f157a33d76
Use capitals for new airport surface materials
2012-12-10 00:11:50 +01:00
Christian Schmitt
930a2c0512
Add missing surface definitions for airport areas
2012-12-09 22:33:52 +01:00
Christian Schmitt
965d639446
Add versioning to tg-construct, hgtchop and ogr-decode
2012-12-09 18:36:03 +01:00
Christian Schmitt
10c8041526
Bump version in master
2012-12-08 22:55:24 +01:00
Christian Schmitt
802b074d49
TGArray: convert to binary arr files, clean up memory leaks in terrafit
...
Binary array patch by James Turner
2012-12-06 10:16:25 +01:00
Christian Schmitt
08b5b77864
Genapts: add version number and tweak console output a little bit
2012-12-05 00:50:07 +01:00
Christian Schmitt
c9ab625a03
terrafit: another go at versioning
2012-12-05 00:07:01 +01:00
Christian Schmitt
0f2b36bb16
terrafix: disable versioning for now... :(
2012-12-04 22:58:47 +01:00
Christian Schmitt
ccec928116
Change the way versioning is done. I hope this will work under windows
2012-12-04 19:45:31 +01:00
Christian Schmitt
b61cfa500b
Terrafit: make use of the versioning, clean up and fix options
2012-12-04 12:43:07 +01:00
Christian Schmitt
755dc6465f
Remove Output lib and put the functionality into genapts, the only place where it is needed
2012-11-29 18:34:52 +01:00
Christian Schmitt
577f80482d
Output lib: remove unused functions, use SG_LOG and clean up
2012-11-29 10:40:04 +01:00
Christian Schmitt
ad9b2f70b5
Fix MSVC compilation, clean up a bit
2012-11-29 09:51:11 +01:00
Peter Sadrozinski
1929799b4b
multithreaded genapt850
2012-11-28 19:10:42 -05:00
Christian Schmitt
3dfe15559e
TGArray: memset allocates ~1,5 GB (!) of memory for empty elevation arrays.
...
Change this back to the old behaviour (3x3 columns instead of 20000x20000)
2012-11-27 00:43:08 +01:00
Christian Schmitt
00a0234686
Add a versioning infrastructure, remove old build files
2012-11-26 13:46:25 +01:00
Christian Schmitt
4708d72c0e
terrafit: MSVC compile fix for sleep(), remove unsigned warnings
...
SG's timestamp functions might be a (better) alternative, but they are much
bigger than a single line of code
2012-11-26 08:34:43 +01:00
Christian Schmitt
097abcb9a6
genapts elevation: remove unused function
2012-11-26 08:29:16 +01:00
James Turner
4504d4764c
Threaded terrafit.
...
Optional -j option specified number of threads to use for fitting. Defaults to 1, for the moment.
2012-11-25 22:37:28 +00:00
James Turner
d2b059c789
Use TerraGear getopt_long on Mac.
...
BSD getopt_long seems to differ in some key ways, and crashes (probably due to ambiguous externs). Use the TG local code on Mac to resolve this.
2012-11-25 21:39:37 +00:00
Christian Schmitt
be0ff2258c
tg_unique_*: make MSVC happy with the rounding
2012-11-24 23:05:00 +01:00
Peter Sadrozinski
05f46adacb
fix runway shoulder base and clearing calculation.
...
- instead of expanding for each poly - account for shoulders when expanding base and clearing when building the runway.
- instead of doing a union for each base / clearing poly - add them to a list to do just one clip operation at the end. This results in anoth 2-3% performance increase, and allows another 10 airports to build. just 4 don't build in addition to NZSP.
2012-11-24 08:46:04 -05:00
Peter Sadrozinski
b971c2b344
some more helipad cleanup - I'm not seeing the holes anymore
2012-11-24 08:44:50 -05:00
Peter Sadrozinski
31397acb85
fix some more of the texturing issues with non square helipads
...
- I can still get holes on helipads, but I think it's not a texturing
issue, as I can build the helipad, side extensions, or borders seperatly.
together, I can get holes.
2012-11-24 08:41:57 -05:00
