fly/terragear
1
0
Fork 0
Code Activity
1114 commits 1 branch 0 tags 14 MiB
Commit graph

1011 commits

Author SHA1 Message Date
Christian Schmitt
da8003b1e3 Get rid of a system calls to gzip in demchop and gdalchop 2012-11-08 13:30:35 +01:00
Peter Sadrozinski
619bc7f1f7 a better fix for the boundary box fix 2012-11-07 21:55:58 -05:00
Peter Sadrozinski
c6d60ecd5b fix for the til matching issue created when converting from SGVec3d to SGGeod for bounding box 2012-11-06 19:32:17 -05:00
Christian Schmitt
bf7d86732d Remove the newmat dependency and bring in TNT templates as a substitute 2012-11-05 12:14:15 +01:00
Christian Schmitt
e77e5d43d5 Fix a bug in the water runway calculation: The area was made twice as long as needed. 2012-11-01 11:02:24 +01:00
Christian Schmitt
a5d1035717 Runway objects: do not add empty light objects that lead to a SG warning 2012-10-28 12:59:28 +01:00
Christian Schmitt
9587d6d292 Implement RAIL approach light system 2012-10-25 14:25:40 +02:00
Christian Schmitt
8896dbcba8 Implement omnidirectional REIL 2012-10-25 14:20:31 +02:00
Christian Schmitt
3155bbff0f Remove about 50% of the main light routine by using a loop 2012-10-25 13:42:14 +02:00
Christian Schmitt
cd436fcae9 Convert Calvert lights. This is the last part of the SGGeod/metric conversion. 
Also remove now-unneeded includes and old functions
 2012-10-24 15:40:00 +02:00
Christian Schmitt
2d9aa0bfa8 Convert gen_malsx to SGGeod 2012-10-24 15:40:00 +02:00
Christian Schmitt
368d290edc Convert gen_ssalx to SGGeod and metric system 2012-10-24 15:40:00 +02:00
Christian Schmitt
4dd1d5c2b1 Convert gen_alsf light function to SGGeod 2012-10-24 15:39:59 +02:00
Christian Schmitt
f86782119c Runway lights: correct the TDZ numbers and do some more cleanup 2012-10-24 15:32:13 +02:00
Christian Schmitt
1c8dbead04 Convert threshold lights to SGGeod and simplify the routine 2012-10-24 10:44:53 +02:00
Christian Schmitt
5e796d2dd5 Runway lights: convert ODALS to SGGeod 2012-10-24 10:40:32 +02:00
Peter Sadrozinski
9a78c73606 remove temporary simgear workaround 2012-10-22 17:56:44 -04:00
Peter Sadrozinski
7138b8509c some more very minor optimizations 2012-10-22 17:53:20 -04:00
Peter Sadrozinski
4f63c54d94 temporary workaround for read / write SGGeods to a gzip file. 
- I'll revert this once I get my merge request in simgear
 2012-10-21 15:54:29 -04:00
Peter Sadrozinski
fc304804ab Use the Accumulator in the Polygon Library, instead of passing one around. 
The accumulator in the polygon library has the bounding box hit test, so it's faster
My test run decreased 16 seconds from 71 to 54.
 2012-10-21 15:40:34 -04:00
Peter Sadrozinski
68640c4479 Convert OffsetPointBegin and OffsetPointEnd to SGGeod 
Convert beznode locations to SGGeod
Optimize the distance calculations in linearfeature and closedpoly
 2012-10-21 14:37:04 -04:00
Peter Sadrozinski
78a19db02d Convert OffsetPointMiddle to use GSGeod and SGVec3 in linear features 2012-10-20 14:51:50 -04:00
Peter Sadrozinski
ec750c6732 Start LinearFeature SGGeod conversion 2012-10-19 20:34:38 -04:00
Peter Sadrozinski
8698ab4e69 Use SGGeod as reference point in TGTexParams 2012-10-19 17:56:10 -04:00
Peter Sadrozinski
d629fa8215 remove unused texparams.hxx - it's in the Polygon Library, now 2012-10-19 17:56:10 -04:00
Christian Schmitt
7d7d4e41a6 Convert runway edge lights to SGGeod 2012-10-19 10:26:00 +02:00
Peter Sadrozinski
2dd32d2839 add --force option to hgtfit. 
This option will ignore when loading, and replace when writing the
.fit.gz files.  Very useful when experimenting with different levels of detail.
 2012-10-18 20:42:09 -04:00
Christian Schmitt
165f7e2481 Convert REIL lights function 2012-10-18 16:45:00 +02:00
Christian Schmitt
3b13084218 Convert runway touchdown zone lights to SGGeod 2012-10-18 16:45:00 +02:00
Christian Schmitt
365a89f20b Convert runway center line lights to SGGeod 2012-10-18 16:45:00 +02:00
Christian Schmitt
7d827457b9 Keep on constructing if node id is not found (segfaults if not caught) 2012-10-18 16:43:48 +02:00
Christian Schmitt
e4e7d8bffd Convert remaining runway functions to SGGeod 2012-10-18 14:53:01 +02:00
Christian Schmitt
8d4495d470 Use a SGGeod bounding box instead of SGVec3 for geodetic coordinates 2012-10-18 08:40:28 +02:00
Peter Sadrozinski
c336c134bf Use binary gzip files to store intermediate and shared edge files 
Sort the nodelist to speedup node lookup after all nodes inserted
retrieve the node list just once in flatten elevation
 2012-10-17 19:33:13 -04:00
Christian Schmitt
b6a4dacf33 Convert runway light vector calculation to SGVec3 and SGQuat 2012-10-17 14:24:47 +02:00
Christian Schmitt
306b125044 Use a SGGeod bounding box for the scheduler 2012-10-17 14:13:13 +02:00
Christian Schmitt
8a12f010f5 Convert apt_math functions and runway polygon creation to SGGeod/SGVec3 2012-10-17 14:12:17 +02:00
Christian Schmitt
bda3ee3a91 Convert helipad routine to Vec3 2012-10-17 13:25:06 +02:00
Christian Schmitt
4d3f1efd30 Convert Rectangle function to SGGeod 2012-10-17 12:55:35 +02:00
Christian Schmitt
f3f6cd50f1 Convert airport normal calculation to SGVec3 2012-10-17 12:38:12 +02:00
Christian Schmitt
3e80fdb649 Convert linearfeatures normal calculation to SGVec3 2012-10-17 12:37:56 +02:00
Christian Schmitt
b5c9eb5154 Convert airport objects to SGGeod and SGVec3 2012-10-17 12:35:03 +02:00
Christian Schmitt
440ef1cfbb Store SGGeod values in Point3d as deg, not rad 2012-10-17 11:10:00 +02:00
Christian Schmitt
a1a331db7c Remove old libs and tools that have better counterparts in GDAL/GRASS nowdays. genapts810 has to go as well 2012-10-17 11:07:48 +02:00
Christian Schmitt
8a092947da Time to remove old PAPI/VASI code from the runway lights routine 2012-10-17 09:41:23 +02:00
Christian Schmitt
aead9a1f9d USGS map file is only needed when --cover is enabled. 
Also put the log output into the respective functions
 2012-10-15 22:15:16 +02:00
Christian Schmitt
d6c3a67caf Convert construct to use a bounding box for setting lat/lon values 
and thus make it consistent with genapts
 2012-10-15 15:10:21 +02:00
Christian Schmitt
e8896f891c Remove another point2d occurence from Demchop 2012-10-13 13:06:31 +02:00
a7b49565b3 - adding bounding box clip optimization to tgconstruct 
- revert some bad ogr-decode changes that caused too angular linear data
 2012-10-13 00:18:15 -04:00
5917cb62d1 and fix the CMake file for the polygon library - didn't do a clean build before commit 2012-10-11 21:36:45 -04:00
71ef172b8f revert mistakenly committed tgconstruct with find_slivers enabled. 
- I was using it to test the Point2d -> SGVec2d minimum angle calculations
 2012-10-11 21:04:31 -04:00
59e2f22050 no more Point2d - use SGVec2d. 2012-10-11 20:57:53 -04:00
531ec93b29 fix for segmentation fault on ocean tiles 
- don't save the intermediate data file when tile is ocean only
- don't do anything in later stages if intermediate file isn't found
 2012-10-11 19:20:12 -04:00
Christian Schmitt
1abe94feba Remove genapts850 point2d files 2012-10-11 10:07:13 +02:00
Peter Sadrozinski
040cb87873 - clipper fix for hole issue 
- some missed code cleanup
 2012-10-09 22:07:22 -04:00
Peter Sadrozinski
f0d8d37671 - fix shape debug after rebase. 
- improve the 32768 traingles per material workaround
 2012-10-09 18:30:03 -04:00
Christian Schmitt
abfea1cd2d Remove Osgb36 (UKgrid) support. Such conversions should be done with the proper tools. 2012-10-09 12:26:52 +02:00
Christian Schmitt
c1d0a92ea8 Add cliptst to gitignore 2012-10-07 21:35:21 +02:00
Christian Schmitt
15365a3acd CMake: the deps are no longer optional. It makes no sense to compile without GDAL 2012-10-07 00:24:18 +02:00
Christian Schmitt
e18c939f66 Speed up linear feature clipping. This makes the creation of airports much faster. 2012-10-06 22:10:10 +02:00
Christian Schmitt
edf8e8310f Convert get_bounding_box to SGVec3d 2012-10-06 22:10:10 +02:00
Christian Schmitt
eaec9905f7 Issue 888: Apply to newconstruct: 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-10-06 22:10:10 +02:00
Christian Schmitt
29e77c4c40 Fix cliptst install routine 2012-10-06 22:10:10 +02:00
Peter Sadrozinski
cc0d913712 - refactor construct.cxx into smaller files 
- remove Match - tile matching now handled in tgconstruct_shared.cxx
 2012-10-06 22:10:09 +02:00
Peter Sadrozinski
c39e3e0542 elevation averaging and neighbor tile faces included in point normal calculation 2012-10-06 22:10:09 +02:00
Peter Sadrozinski
6a3a57f198 tile matching phase 1 
- 3 stage construct
- insert neighbor vertexes from all sides
 2012-10-06 22:10:09 +02:00
Peter Sadrozinski
779db9566b multistage coming along - need TGNodes derialization 2012-10-06 22:10:09 +02:00
Peter Sadrozinski
f52e3fef75 fix clipper usage to fix accumulator contours. 2012-10-06 22:10:09 +02:00
Peter Sadrozinski
b44c6c00d0 - some clipperfixes for tgconstruct. bring in clipper 4.8.9 
Hopefully, we can start another clc06 test with this fix
- add lots of debug, in case more clipper issues uncovered
  added --debug-areas= allows turning on debug for an area
  can dump the accumulator when using it.
- fixed the swirlies round 2 workaround on tile output, rather than
  stopping the load of polygons at arbitrary threshold.
  (hopefully, we'll have a fix for this in simgear soon)
- modified ogr-decode (when using --texture-lines) to insert triangles
  instead of self-intersecting trapezoids when the turn angle between
  segments is too steep (hit this issue when experimenting with cgal-clipping)
  we were adding a lot of self intersecting polys on line data
- needed to add gdal library to all executables that link against Polygon
  TODO - combne Geometry and Polygon libs - they are completely joined, now.
 2012-10-06 22:10:09 +02:00
Peter Sadrozinski
55bfcd80e7 fix for ogr-decode --line-width-column option. 
When combined with the --line-width option, if the field is present, but has
no value, gdal returns 0.  Use the value from --line-width in this case.
 2012-10-06 22:10:09 +02:00
Christian Schmitt
cd0ee283c0 Adapt helipad shoulder to newconstruct changes 2012-10-06 22:10:09 +02:00
Christian Schmitt
e367395813 Remove runway type check that always returns true 2012-10-06 22:10:09 +02:00
Christian Schmitt
eccb6d1388 Fix for a genapts810 segfault in conjunction with clipper use 2012-10-06 22:10:08 +02:00
Christian Schmitt
36c8cbbb15 genapts scheduler: improve info message 2012-10-06 22:10:08 +02:00
Christian Schmitt
c016041337 Remove TriangleJRS. All tesselation is now done by CGAL. 2012-10-06 22:10:08 +02:00
Christian Schmitt
65bcb00dee Switch old genapts to CGAL for tesselation 2012-10-06 22:10:08 +02:00
Christian Schmitt
e8936f773c genapts (old): removal of GPC introduced wrong runway polys in some cases. Add snap to fix this. 
Fix airport skirts as well
 2012-10-06 22:10:08 +02:00
Peter Sadrozinski
87df5b805e add help text for --share-dir 2012-10-06 22:10:08 +02:00
Peter Sadrozinski
3b2dfba225 - add --shared-dir option to get ready for new tile matching 
and make it easier to share work and data dirs on a server
 2012-10-06 22:10:08 +02:00
Christian Schmitt
916544f4fe Fix the wrong normals on the airport skirt, introduced by the GPC removal. 
Simply changing the order of upper and lower points does the trick.
Also fix indentation
 2012-10-06 22:10:08 +02:00
Christian Schmitt
28bc14e4cc Use CGAL for tesselation in genapts850 2012-10-06 22:10:07 +02:00
Christian Schmitt
3d800bbb77 Clean up includes in the CMake files 2012-10-06 22:10:07 +02:00
Christian Schmitt
7f532ce615 Add cgal helper function for tesselation 2012-10-06 22:10:07 +02:00
Christian Schmitt
771d65881e Only write out txt.gz files if debug is enabled 2012-10-06 22:10:07 +02:00
Christian Schmitt
3e068ed6dd Partially revert "fix some uninitialized data found with valgrind" 
Some unwanted changes sneaked in
 2012-10-06 22:10:07 +02:00
Peter Sadrozinski
e6d8d69c87 fix some uninitialized data found with valgrind 
remove the cpu limit - tgconstruct should be able to run for weeks, now.
 2012-10-06 22:10:07 +02:00
Peter Sadrozinski
f24699ca05 Fix a segfault caused by Ocean not being flagged correctly 2012-10-06 22:10:07 +02:00
Christian Schmitt
ca9a6dda13 Finally get rid of GPC 2012-10-06 22:10:07 +02:00
Christian Schmitt
1e64cfc974 Improve construct output. Lower some loglevels and make output more informative 2012-10-06 22:10:07 +02:00
Christian Schmitt
37d07e6526 add GPC includes only where needed. also add newmat includes 2012-10-06 22:10:06 +02:00
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