1
0
Fork 0
Commit graph

921 commits

Author SHA1 Message Date
Christian Schmitt
d6e7ac6b96 More CGAL cmake changes 2012-10-06 22:10:06 +02:00
Peter Sadrozinski
85ad4573ec - add the extra height nodes to the cgal triangulation
- enable cgal triangulation
2012-10-06 22:10:06 +02:00
Peter Sadrozinski
adfb4482e2 experimental - use cgal for triangulation
try breaking up construct_bucket into stages for better tile matching
2012-10-06 22:10:06 +02:00
Christian Schmitt
e719fa66d2 Rename fgfs-tools-server and fgfs-tools-client to tg-construct-server and tg-construct-client 2012-10-06 22:10:06 +02:00
Christian Schmitt
8f2c0f6cb9 rename fgfs-construct to tg-construct 2012-10-06 22:10:06 +02:00
Peter Sadrozinski
c1de74f4fa Some fixes
- genapt850 : some airports (LSMM) have multiple airport boundaries.
  This caused a lot of the airport to not get a smoothed base (so some landclass polys were not clipped against the airport).  Changed boundary from a single ClosedPolygon to a list.  Seems to work.
  Some misc warnings cleanup in scheduler, and parser

- Clipper using accumulator results in a significant speed boots - enable clipper and the accumulator by default.

- ogr-decode - most of the crashes I'm getting are due to non-continuous roads.  Within a line string, I create adjacent polys that snap correctly.  On the ends, I generate 90 degree angles.  Some linestrings should be consecutive.  As a workaround, I am now extending every start and end poly of linestrings by 0.1 meters.  It makes it better, but I need to do a better job of creating continuous roads.  This will require some preprocessing of the entire shapefile.  (Perhaps all line data shapefiles, to handle correct overpass / underpass logic)
2012-10-06 22:10:05 +02:00
Peter Sadrozinski
346ae44e14 - Fixed issues where an entire landclass poly wold no triangulate.
- Increase epsilon when looking for intermediate nodes
  (setup method for calling function to specify the bounding box and error
   epsilon in case this had adverse effects on genapts)
  This fixes many of the small vertical gaps (T-Junctions)
- Fix an issue with merge slivers.  The clip mask optimization broke
  merge slivers.  WHen merging the slivers with a poly segment, it also
  needs to be merged with the clip mask, so when the segments are
  seperated from the mask, they include the sliver.
- Added to the shapefile debug.
  --debug_shape=tileid:all generates shapefiles for every polygon in the tile
  This is usefull to setup individual debug polys on subsequent passes.
  Also added load, clip, and with_slivers and clean layers for debugging
2012-10-06 22:10:05 +02:00
Peter Sadrozinski
79bdae93fc forgot to include the shape id during tesselation 2012-10-06 22:10:05 +02:00
Peter Sadrozinski
5f83fe82c6 Implemented shape file debug capability via command line options:
--debug-dir=pathname points to the debug root directory.  each tile will create a sub directory in this existing directory. (default is '.')
--debug-shapes=tileid:shape1,shape2,etc..  lists the shapes to debug within a tile
example: if the tesselator crashes in shape id '123', you can rerun with --debug-shapes=2678440:337

implemented the same bounding box optimization from tesselate in FixTJunctions.  Also fixed a bounding box issue that could cause some
elevation points to be missed.

brought in the latest version of clipper - and moved the #define to the construct header

some debug cleanup (especially in polygon loading)
2012-10-06 22:10:05 +02:00
Peter Sadrozinski
cf6d6f42b9 add bounding box calculations to optimize tesselation 2012-10-06 22:10:05 +02:00
Peter Sadrozinski
feeaf602b7 added seperate-segments option to ogr-decode.
- 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
2012-10-06 22:10:05 +02:00
Peter Sadrozinski
465fccc6a0 checkpoint - madeira builds fine with individual line segments 2012-10-06 22:10:05 +02:00
Christian Schmitt
df4e685c84 Remove fans/strips routines. We don't create fans anymore 2012-10-06 22:10:04 +02:00
Christian Schmitt
05e1670b56 Construct log output: some changes 2012-10-06 22:10:04 +02:00
Peter Sadrozinski
7e55efbb03 Optimize and cleanup
- fix really bad facelist generation.
- add a face area list in superpoly - each triangle area was calculated twice
- cleanup contruct_bucket - calls a function for each step.
  TODO : move groups of operations into their own files
         i.e. load, clip, elevation, shared edges, and output
2012-10-06 22:10:04 +02:00
Peter Sadrozinski
30573aa811 - Point nodes are now generated. Testing Madeira with tranisition shader enbled shows rocky cliffs, so I think thy are correct.
- some small optimizations made by storing triangle nodes in addition to triangle coordinates in TGSuperpoly.  More can be done, here.
- Brute force methos of generating alist of faces for each nodes that the face has is completely brute force.  Looking at original method, I think I can make it work, which should be a significant speedup.
2012-10-06 22:10:04 +02:00
Peter Sadrozinski
80ac1b38f5 - fixed malloc crash caused by - array index.
- fixed exception in find_point_inside.

NOTE: second fix can cause some gaps, as the polygon cleaning can result in a smaller poly than the original.  Need to clean polys after diff, before adding the result to the union.

I'm now able to build all of
adeira - and tile matchine looks good.  Some gaps visible when roads are cleaned incorrectly.
2012-10-06 22:10:04 +02:00
Peter Sadrozinski
22a8d28857 handle multiple tile construction in a single fgfs-construct run 2012-10-06 22:10:04 +02:00
Christian Schmitt
aa3abbe418 Some cosmetics for construct output 2012-10-06 22:10:04 +02:00
Peter Sadrozinski
7e1257ed8a - fixed t-junctions in roads - I was adding intermediate nodes after adding verticies from
neighboring tiles, but before adding the nodes from the result of clipping.
2012-10-06 22:10:04 +02:00
Peter Sadrozinski
ffc9db1b82 Checkpoint 2
- fixed tile matching using add_intermediate_nodes
- source code rearrangement phase 1 - remove a lot of libraries that are not used by other apps
- move some of the Buildtiles libraries that are used by other apps (and libs) into terragear lib directory
- debug message overhal - to show some progress.
TODO - not implemented yet
- caculate face nodes and save in superpoly (where the faces are stored)
- calculate node normals, and store in tg_nodes (where the nodes are stored)
TODO - bugs
- find_intermediate_nodes isn't working for a lot of roads - still many t-juntions making visible gaps
- flatten ocean nosed is also creating gaps
- there's a grey poly on madeira - need to investigate
2012-10-06 22:10:03 +02:00
Peter Sadrozinski
e6ac493395 checkpoint1
- all polys triangulated individually
- shared edge loading should be working, but there are still issues.
2012-10-06 22:04:44 +02:00
Christian Schmitt
3f996495c6 Issue 888: Fix for master branch: Correctly calculate the bucket center and radius.
The previous routine lead to offsets in the verts and thus to problems in the transition shaders.
2012-09-30 22:37:54 +02:00
Peter Morgan
4c975a0537 Doxygen and code documentation
Small patch to add some documentation
2012-09-26 18:11:36 +02:00
Christian Schmitt
fb6cee3bb0 Tweak PAPI/VASI object creation, add missing object types 2012-09-21 20:19:47 +02:00
Peter Sadrozinski
4cacaeb7f8 fix path construction when copying multiple objects in DoCustomObjects() 2012-09-21 10:23:56 -04:00
Christian Schmitt
133c0ef91b Improve buoys calculation for water runways 2012-09-19 10:53:28 +02:00
Christian Schmitt
42e4cefab3 Linear features: alternating green/amber lights were still missing.
Support for line light types is complete now.
2012-09-17 11:49:47 +02:00
Christian Schmitt
473992e684 Helipad shoulder support 2012-09-16 22:15:45 +02:00
Christian Schmitt
d81f2c36e1 Add an area around the helipad if the size is not square 2012-09-16 22:15:44 +02:00
Christian Schmitt
ccfde6914a Linear features: Yellow hold lights are unidirectional to the right of the line direction.
Implement this by creating a directional normal for these types.
2012-09-14 12:41:16 +02:00
Christian Schmitt
e8e1123db1 Helipads: correct light colour to yellow as in the spec, reduce amount
of circle lights and add edge lights with 5m spacing
2012-09-13 13:53:22 +02:00
Christian Schmitt
d83f1c265c Add textured lines to ogr-decode help output 2012-09-12 12:56:52 +02:00
Christian Schmitt
0957f0ccc8 Fix runway edge lights calculation. 2012-09-11 10:45:29 +02:00
Christian Schmitt
8f0d5130f5 Initialize variables 2012-09-07 15:03:31 +02:00
Christian Schmitt
356cdd17d4 Fix helipad generation and simplify the routine.
Add edge lights to the corners
2012-09-07 14:52:51 +02:00
Christian Schmitt
4808d2a2e5 Set default threads number to 1 and add switches to enable multithreading:
"--threads" enables autodetection of available cores
"--threads=x" sets a custom threads value

Update help test and remove duplicate dem option
2012-09-05 11:26:11 +02:00
Christian Schmitt
d80a4c2df5 activate external threshold light bar function and clean up 2012-09-02 12:52:35 +02:00
Christian Schmitt
7df8533e8e Remove individual threshold bar lights routines from the ALS functions 2012-09-02 12:52:35 +02:00
Christian Schmitt
e118d8ec3b Adapt threshold lights routine to displaced threshold generation
move threshold bar creation here and make the routine generic for
all ALS that use threshold bars
2012-09-02 12:52:30 +02:00
Christian Schmitt
25d93d37eb Create centerlines lights over the reciprocal displaced thresholds, too 2012-09-01 12:00:01 +02:00
Christian Schmitt
b0bb0ab9a0 Change edge lights routine to work with displaced thresholds as well 2012-09-01 11:57:28 +02:00
Christian Schmitt
7774de4939 Adapt to SG changes 2012-08-26 22:22:40 +02:00
Christian Schmitt
a35008f061 Use gen_corners function for the vector calculation as well 2012-08-16 13:03:51 +02:00
Christian Schmitt
90795f9d05 Fix the runway centerline, threshold and edge lights. They still used calculations in ft,
which were no longer compatible and led to wrong results.
Also, apply some more of the FAA specs on the edge lights now.
2012-08-15 21:22:13 +02:00
Christian Schmitt
84e88858b1 Further tweak the displaced threshold routine for short variants.
Explicitly fixes EDCJ but many more, too
2012-08-12 12:44:15 +02:00
Christian Schmitt
9918956c45 Fix displaced threshold calculation and convert measurements to meters 2012-08-12 09:52:54 +02:00
Christian Schmitt
9604ec8fad genapts850: fix a bug that can lead to the parser reading beyond one airport definition
and thus create another airport instead.
2012-08-09 18:31:47 +02:00
Christian Schmitt
4293c00b73 genapts850: make sure we do not hang forever in a parse loop
when there are actually no airports to parse within the bounding box
2012-08-06 19:41:36 +02:00
Christian Schmitt
abece63b5d Put default max_slope value for airports back to 2%. We have a command line option to increase this, if necessary 2012-08-06 12:58:11 +02:00
Christian Schmitt
c7a18cb501 Cleanup the genapts850 lights routine and move duplicate code into
a seperate function
2012-08-01 11:08:31 +02:00
Christian Schmitt
3f91f11115 genapts scheduler: fix a buffer overflow. 512 bytes should be enough for everyone :) 2012-07-09 13:03:53 +02:00
Christian Schmitt
7d919e2329 bug #792: second try to fix the windows copy issue 2012-07-09 11:05:17 +02:00
Christian Schmitt
2a7c1bc7fe Bugfix: issue #792 should be fixed by this (hopefully) 2012-07-08 18:32:32 +02:00
Peter Sadrozinski
a9d810d447 remove hard coded work directory in multicore api 2012-07-01 04:33:52 -04:00
Frederic Bouvier
107f5cefd6 Fix windows build 2012-06-28 08:43:09 +02:00
Christian Schmitt
0f690ff621 runway/taxiway: add dry lakebed texture 2012-06-24 17:49:22 +02:00
Christian Schmitt
c31247f51a Add POCO dep to the cmake files 2012-06-17 10:51:58 +02:00
Christian Schmitt
5da5dc29be Add signs size support to the STG files 2012-06-17 10:47:45 +02:00
Peter Sadrozinski
83f6532af0 Add multicore support for genapt850.
- fix launch

- fix taxiway debug uninitialized variable

- fixed issue when child crashes, not timed out - detect the error
when we get notified that the socket has data, but no line is received
2012-06-16 09:09:55 -04:00
Christian Schmitt
873fff2afc Fix FSF address in headers and add a proper header to GenAirports850/main.cxx 2012-05-05 12:20:21 +02:00
Christian Schmitt
09d7be09c5 Do not print out terrafit help text two times 2012-04-25 21:10:07 +02:00
Christian Schmitt
16a0a104c3 Some output cosmetics 2012-04-16 10:41:00 +02:00
Peter Sadrozinski
7c70cb8da7 Add support for legacy taxiway '10' 2012-04-14 17:08:52 -04:00
Christian Schmitt
5a80fe638b Partially revert commit b7ec098859
The heading calculation was right. I was unaware of stg using
counter-clockwise notation :(
2012-04-12 23:21:44 +02:00
Christian Schmitt
b7ec098859 -Fix taxisign heading calculation leading to wrong values in certain cases
-Unify space between yellow lights
2012-04-12 12:49:00 +02:00
Peter Sadrozinski
a7e6f7fa1b - Build runway shoulders at the same time as runway segments
- hook up --dump-rwy=x to shapefile generation for debugging runway
and shoulder polys using qgis
2012-04-11 18:35:27 -04:00
Christian Schmitt
a83bf32c2c Fix Windows-build linking issue and unify CMake files a bit 2012-04-07 14:57:22 +02:00
Christian Schmitt
451e63f84e Test for contour parts of zero size and ignore them,
which otherwise leads to a segfault.
2012-04-06 13:54:26 +02:00
Christian Schmitt
ab931442d0 Small log cosmetics :) 2012-04-04 22:05:10 +02:00
Peter Sadrozinski
b159a39d59 take the fgfs-construct default log level down a notch 2012-04-01 11:03:05 -04:00
Peter Sadrozinski
cf5bb76ee8 Use SGTimestamp for statistics gathering.
Use time(0) and standard C++ <ctime> for date / time
2012-03-31 22:09:18 -04:00
Peter Sadrozinski
7777fc4bc2 one more boneheaded fix - don't access the timevals if they aren't included 2012-03-31 11:50:30 -04:00
Peter Sadrozinski
b0a7b60502 remove time statistics from windows build
will investigate porting gettimeofday later
2012-03-31 11:43:45 -04:00
Peter Sadrozinski
dabe2c131e better fix for sys/time.h windows problem in genapt850 2012-03-31 11:22:48 -04:00
Peter Sadrozinski
daf7994c1c fix for time.h on Windows 2012-03-31 11:15:47 -04:00
Peter Sadrozinski
c1c9923892 fix duplicate point test, and casts for fmod() - should fix windows build 2012-03-31 11:00:05 -04:00
Peter Sadrozinski
512693f001 hopefully fix windows build 2012-03-31 10:31:37 -04:00
Christian Schmitt
01814b3e3e Set RWY_YELLOW_PULSE_LIGHTS as name for blinking hold-short lights.
Support for this is coming in SG and fgdata
2012-03-30 19:23:30 +02:00
Christian Schmitt
7424139772 Fix the stopway texturing. Cleanup a bit.
This needs negative pct values.
2012-03-29 21:08:40 +02:00
Christian Schmitt
449720c858 Start fixing Windows build issues 2012-03-29 21:08:08 +02:00
Christian Schmitt
6b2826050b Make sure the runways are long enough for desired markings.
This prevents texture glitches on too short runways where
there is simply not enough space for all the needed runway parts.
2012-03-26 10:07:34 +02:00
Peter Sadrozinski
59d30a34e8 A fix for LFPG problem in expand poly. If there are dups when expanding,
the resultant poly was huge, and I could run out of memory.
For closed polys, remove_dups() after snapping.

Also cleaned up the dump_xxx debug command line switches.
- now 1 based, not 0.
- debug_cp directory is the datasource name, so the directory need
  not exist before running genapt850.
2012-03-25 23:54:18 +02:00
Peter Sadrozinski
225e3e1491 - modified grid size from 1 cm to 1 mm
- snap runway and pavement polys to grid after adding slivers.
2012-03-25 23:54:18 +02:00
Peter Sadrozinski
0544854dc9 update clipper to 7.3 release 2012-03-25 23:54:17 +02:00
Peter Sadrozinski
cbea4335f4 Instead of snapping whenever clipper converts a poly, just snap before clipping,
and after  intermediate nodes are added.
If we snap before intermediate nodes are added, we generate extra slivers, as
the proximity for node insertion may fail when the extra node is snapped away
from the line we are checking
2012-03-25 23:54:17 +02:00
Peter Sadrozinski
effbefde41 onvert cout to SG_LOG in lights.cxx.
remove unused dead code in airport.cxx
2012-03-25 23:54:17 +02:00
Peter Sadrozinski
474c126a0c Remove unused convex_hull.hxx / .cxx, now that we can expand polys
using the clipper library
2012-03-25 23:54:17 +02:00
Peter Sadrozinski
97aac36c39 Add material_prefix to runway class, so we don't have to pass it around so much 2012-03-25 23:54:17 +02:00
Peter Sadrozinski
d0d30fbd52 More consolidation for runway generation
- remove gen_overrun, and the 'generic' gen_tex functions.
- removed rwy_common.cxx

NOTE: now, helipads don't share the same generate function as runway sections.
Maybe later they can be remerged...
2012-03-25 23:54:17 +02:00
Peter Sadrozinski
f5e1084eb8 Remove gen_runway_marking(). Trying to minimize the number of functions needed to generate a runway,
which should make it easier to understand the code.  If there are parts that can be generalized, I'll
pull these out.  gen_runway_marking was only called from one place however...
2012-03-25 23:54:17 +02:00
Peter Sadrozinski
051e73da6a Removing alt_m from all the BuildBTG functions. It isn't used byt SimGear
int the geo_direct_wgs_84() calls.
2012-03-25 23:54:17 +02:00
Peter Sadrozinski
f0a7f39e7b A bit of a re-work (again) but looks to be worth it.
Instead of cleaning polys after clipping, to get good triangulation, try to
clean them before clipping, snap the verticies to 1 1cm x 1cm grid, and
merge any resultant slivers back into adjacent polys.
This is very similar to how fgfs-construct worked.

Although the previous methos only failed on 3 airports, the results weren't
very good.  There were lots of cracks, and mmissing triangles, as the polys were
cleaned.

New methos freezes on two airports during base triangulation, and crashes on four.
I think the quality of the generated airports overcomes the slight regression.

I also added some debug switches so I don't have to keep rebuilding from source
to debug crashes.  --dump-rwy=xxx --dump-pvmt=xxx, --dump-feat=xxx and --dum-base=1
can be used to create shapefiles to debug the particular polys before clipping.
Currently, there needs to be a cp_debug directory to place the shapefiles into.
Probably need better debug infrastructure going forward...

NOTE: I turned off runway shoulder generation in this build.  Polygon snapping for runways,
helipads, and shoulders not implemented yet.  This may help on the failing airports.
This is next on my todo list.
2012-03-25 23:54:17 +02:00
Christian Schmitt
0788bf0fcb Runway VASI support 2012-03-25 23:54:17 +02:00
Christian Schmitt
9f57a49382 Correctly output the numbers of built features 2012-03-25 23:54:17 +02:00
Christian Schmitt
5fabae1dab Bring some order into runway approach lights code 2012-03-25 23:54:16 +02:00
Christian Schmitt
2d490d7230 Fix Calvert approach lights only being created for the
reciprocal side of a runway.
2012-03-25 23:54:16 +02:00
Peter Sadrozinski
071d98b3bc Lot's pf success on the quest to a full file parse.
Just three airports crashed, and no hangs.  One of the crashes is still NZSP
I don't know if I'll fix this soon.  It's the south pole problem with stuff
crossing the IDL.
- Added dome debug support for generating shapefiles from TGPolygon.
  This allows directly creating shapefiles instead of chopping a poly, then
  having to run poly2ogr on it.  The API is flexible, allowing multiple
  datafiles, and layers open simutaneously, and the features in the shapefiles
  have a description field that can be set.
- Added a restart-id= which allows a bash script to check the exit value of genapts,
  and automatically restart on the airport after the one that crashed.
  I've included an example script I have used.
- Stability fixes:
  1) actually, this is both stability, and graphical fix.  Some airport linear
     features and polygon contours were using bezier nodes for straight lines.
     When the control point lies just outside the line, the parser would attempt to
     draw a 'hook'  unfortunately, some of my calcs return NAN, and sometimes you just
     get crazy looking polys to attempt to clip - not good.
     Fix is to check cubic and quadratic nodes to see if they should really be linear.
     Substitute linear segments where apropriate.
  2) Along the same line as 1, There are some really short bezier segments, that were
     getting subdivided into the hard coded 8 segments.  Now, if the approximately linear
     distance of the curve is less than 4 meters, the curve is broken into 1/2 meter segments.
     Likewise, if the curve is greater than 800 meters, the curve is broken into 100 meter
     segments.
  3) Sometimes, during clipping, degenerate ontours are created.  Although these are cleaned
     before triangulation, there were still issues with generating the accumulation poly with
     the union operator, causing a crash.  I now simplify, and reduce degeneracy on all polys
     before clipping against the accumulator.
- Extra special bonus - successful completeion of an airport is printed in green :)
2012-03-25 23:54:16 +02:00
Christian Schmitt
a40b72b15b Only generate helipad lights if the apt.dat entry says so 2012-03-25 23:54:16 +02:00
Peter Sadrozinski
2dac4a87e5 stability check
- ran through the last commit, and only 10 airports crashed / locked up.
- EICL, SSPK, and LFBT fix was to simplify the base polygon during cleaning
  reduce_degeneracy() could also be used to fix the issue
  2 polygons clipped against each other shared a vertex.  This causes the
  resulting contour to have a duplicate point with different line segments.
  Luckily, clipper's polygon simplification cleans this up by adding a
  hole contour.  In the above airports, triangulation suceeded, but I'm
  not 100% convinced it will work for all cases.  reduce_degeneracy() will,
  at the expense of modified geometry (very noticible)
- EGLW and SWCH (I think - can't read my own writing) were fixed by expanding
  the user defined boundary by 2 meters for the base, and 5 meters for the
  clearing.  These 2 airports had the user defined boundary touching the exact
  airport layout.  When the base was diffed with the accumulation buffer, the
  resulting polygon was NIL.
  Starting a whole new stability test from the beginning to check for
  regressions.  Down to 5 airports with isses left.
2012-03-25 23:54:16 +02:00