1
0
Fork 0
Commit graph

145 commits

Author SHA1 Message Date
curt
698ca7b1a6 Fixed a problem with dividing the tile up into land use areas (original scheme
left really tiny slivers on the edges.)
2000-11-29 20:17:27 +00:00
curt
ebd254dae0 Contributions from David Megginson: Added a new option, --cover, to
fgfs-construct and fgfs-tools-client.  The option takes an argument giving
the location of the land-cover raster file; if it is not specified,
land-cover is not built.

Curt tweaked the code that divides up the tile into land use squares but there
are still a couple slightly fishy things going on there.Z
2000-11-28 20:45:10 +00:00
curt
c8cc7e2a61 Contributed by Bruce Finney:
The following files have been changed to enable the latest Terragear CVS
to compile with MSVC++ 5.0

.\construct\clipper\clipper.cxx
        for( int i - lots of places

.\construct\genoutput\genobj.cxx
        fix directory logic for windows, line 320 and following

.\construct\main\main.cxx
        windows does not have an opendir function
        added code for windows directory functions
        disabled the mem allocation limit code - windows does not
        have similar functions
        for ( int i - several places

.\construct\match\match.cxx
        moved the definition of file and command outside of the ifdef line 420

.\lib\e00\e00.cxx
        for( int i  - several places

.\lib\e00\e00.cxx
        use simgear/compiler.h constructs

.\lib\geometry\contour_tree.hxx
        removed a cout statement

.\lib\geometry\poly_support.cxx
        added float.h  changed 1.0e+999 to DBL_MAX, windows doesn't go that big
        lots of for ( int i changes
        lines 193 and 208 no != operator defined - changed logic
        line 801 flag should be int, not bool, get_hole_flag returns int

.\lib\landcover\landcover.cxx
.\lib\landcover\landcover.hxx
        add include simgear/compiler.h
        see comments

.\lib\optimize\genfans.cxx
        function canonify added return at end, windows complains
        added using std  for cout and endl

.\lib\optimize\genstrips.cxx
        function tgGenStrips no return value, moved by_node into outer scope
        fix for ( int i ...

.\lib\poly2tri\construct.c
        added include <memory.h> for windows
        remove unused variables lines 435 & 437

.\lib\poly2tri\misc.c
        added HAVE_SYS_TIME_H logic for sys/time.h include file
        added logic to uses windows functions for time and rand

.\lib\poly2tri\monotone.c
        added include <memory.h> for windows
        lines 286-288 remove unused variables

.\lib\poly2tri\tri.c
        remove sys/time.h - no time functions called
        added include <memory.h> for windows

.\lib\polygon\polygon.cxx
        function polygon_to_tristrip will not compile I don't think the
        logic is complete, no returned data  added if else endif around
        function and polygon_to_tristrip_old, renamed _old function.
        Search of code reveals that function is not called by anyone.

.\lib\polygon\superpoly.cxx
        changed include <superpoly.hxx> to "superpoly.hxx"

.\lib\polygon\superpoly.hxx
        add include <windows.h> for windows before include <gl.h>
        needed for definitions used in Microsoft version of opengl

.\lib\shapelib\dbfopen.c
        added include files for windows
        lines 195-197 271-272 515-517 removed unused variables

.\lib\shapelib\shpopen.c
        added #include <stdlib.h> for malloc() and friends
        added include files for windows
        line 279 527 813 1127 removed unused variables
        line 827 cast result to int

.\lib\win32\mkdir.cpp
        documented function, remove debug lines

.\prep\demraw2ascii\main.c
        lines 46-50 remove unused variables

.\prep\demraw2ascii\rawdem.c
        line 47 changed logic to compile with MSVC
        line 244-256 set real constants to float, windows complains with
                double constants

.\prep\genairports\build.cxx
        lots of for ( int i  changes

.\prep\genairports\main.cxx
        fix mkdir logic for windows

.\prep\genairports\output.cxx
        added  using std  cout endl
        lots of for ( int i  changes
        fix mkdir logic for windows

.\prep\genairports\runway.cxx
        for ( int i  changes
        lines 117-118 161-162  remove default values for function parameters

.\prep\gshhs\main.cxx
        added using std cout

.\prep\shapefile\noaa_decode.cxx
.\prep\shapefile\shape_decode.cxx
        added using std  for cout
        lines 45-49 moved unused variables inside #if 0 block
2000-11-25 19:39:46 +00:00
curt
e08b755290 Contributions from David Megginson.
- increased maximum areas to 128 (for future growth), and added Road
  and Railroad areas
- changed the method of calculating the triangle centre in
  poly_support.hxx
- added a has_holes() method to polygon.hxx
- added a new library, e00, for reading ArcInfo e00 files (i.e. the
  free online ones from DCW and GeoGratis); it needs more work
- added a new prep utility, e00lines, for creating textured polygons
  out of e00 line data (with user-specified width and area type); this
  is useful for roads, railroads, rivers, and utility lines
2000-11-22 22:19:44 +00:00
curt
8a82c389ec Initial revision. 2000-11-22 22:17:58 +00:00
curt
a115f756c7 Added a routine to calculate triangle area.
Cleaned up some debugging output.
2000-11-22 20:42:18 +00:00
curt
59a35fbe8a Cleaned up some debugging output.
Added adjacent triangle area weighting for calculating vertices of nodes.
Check for super small or degenerate triangles which could blow up our face
  normal calculations.
2000-11-22 20:41:22 +00:00
curt
80062e205e Oops, fixed a typo in match.cxx. 2000-11-20 21:28:08 +00:00
curt
41733cf6cc This code does a lot of malloc()'ing of space, and in some cases blindly
expects the results to be zero'd out, even though this may not be gauranteed.
So I (Curt Olson, curt@flightgear.org) have added some code here
to explicitely zero out the space after it is malloc()'ed.
2000-11-20 17:01:13 +00:00
curt
e189a03b47 Added a test program for the triangulator. 2000-11-20 16:56:03 +00:00
curt
71ec8159a5 Added a print_tri_data() routine to dump complete triangulator data
structure to screen.
Added a zero_triangulateio() routine to zero a struct before use.
2000-11-20 16:55:23 +00:00
curt
b524989da4 Debugging tweak. 2000-11-20 16:53:52 +00:00
curt
4d530656ed Cleanups relating to how we prepair the data to pass to the Shewchuk
triangulator.
2000-11-20 16:53:32 +00:00
curt
5e5f43e0eb Fixed a bug with corner matching when an airport hole sits on top of a corner.
Then fixed a follow up bug in corner handling that was introduced by the
first fix.
2000-11-20 16:44:29 +00:00
curt
f90cffd10d In the process of trying to track down bugs in the construct process I
redid slightly how the land cover squares are calculated.
2000-11-20 16:43:30 +00:00
curt
97a83fb03c Fixed a bug that occured when an airport was located on a tile corner. The
first tile to build that corner gets to define the shared point, but since
it was clipped out by the airport hole, the value defaulted to randomness.
This was then propogated on to adjacent tiles.  I now calculate the corner
value in advance so the code is not dependent on finding the corner in the
resulting point set.
2000-11-16 16:09:05 +00:00
curt
231af62823 Cleaned up a bit of debugging trash. 2000-11-15 23:10:11 +00:00
curt
1388ea146f Changes to try to track down some "point in a contour" bugs. The terrain
was stressing this code more that airports (which was where the code was
developed.)
2000-11-15 22:36:40 +00:00
curt
6767777246 Avoid a warning. 2000-11-15 20:23:54 +00:00
curt
fdd4bd6864 Tweak area names and orders. 2000-11-15 20:23:32 +00:00
curt
d280af2cea Change method of calculating a triangle center point. 2000-11-15 20:23:10 +00:00
curt
e7930a49fe Fix a comment. 2000-11-15 20:22:40 +00:00
curt
8d99adeda2 Up max node count to 4000
Temporarily disable land cover for testing purposes.
2000-11-15 20:22:22 +00:00
curt
84e7866b35 Minor tweaks to clipping rules. 2000-11-15 20:21:47 +00:00
curt
5982e567fd Initial revision. 2000-11-13 19:15:09 +00:00
curt
9162b789f5 Landcover/landuse changes by david megginson to group like chunks together into a single polygon.
Additional degeneracy and bad polygon screening.
Updates to ShapeDecode to handle NOAA landuse/cover shape files.
2000-11-13 15:19:39 +00:00
curt
48b8c986bb Moved simple split over to Lib/Polygon. 2000-11-10 19:39:57 +00:00
curt
0e3238d24a Initial revision. 2000-11-08 15:28:46 +00:00
curt
687af305b8 Cygwin changes.
Attempt to use new point inside poly routine.
2000-11-06 18:02:46 +00:00
curt
5619a6b473 Updates from David Megginson to support the USGS global land use/cover raster
data.
2000-11-02 21:21:49 +00:00
curt
25034ea180 Tweaks to track some minor naming changes in simgear. 2000-10-13 16:33:27 +00:00
curt
1f57a4bd06 Changed builddir -> srcdir for out of source tree builds. 2000-09-20 21:45:25 +00:00
curt
79d86a25ac Many changes to support airport modeling approach. 2000-09-20 21:44:59 +00:00
curt
08166715b3 Command line interface tweaks. 2000-09-20 21:44:16 +00:00
curt
6282096168 Added a check for the proper version of simgear. 2000-09-20 21:43:27 +00:00
curt
683325ae42 Switched how textures were applied a bit (rotated by 90 degrees) since this
is a more sensible alignment.
2000-09-13 01:28:04 +00:00
curt
c1c1b59fae Updated runway texture layout in designator block. 2000-09-11 00:36:59 +00:00
curt
5606d93796 Fixed "rest" texture application. 2000-09-11 00:35:59 +00:00
curt
c9930e784e Whups, write out the AirportArea that has been segmented so it fits the
airport to go in the hole.
2000-08-30 14:04:34 +00:00
curt
3802a0385f Updates ... 2000-08-29 21:16:54 +00:00
curt
ef22db9c3a More tweaks as I work through the airport database. 2000-08-27 16:22:26 +00:00
curt
a72efe39c6 More updates and tweaks to make the genairport tools more robust. 2000-08-27 04:47:12 +00:00
curt
373ed3990d Ironing out bugs ... 2000-08-26 01:23:58 +00:00
curt
b6fc19c0bc Handle too-short visual runways for now by converting them to simple runways. 2000-08-26 01:19:13 +00:00
curt
e2ab3bff48 Ahh, there is a runway type "G" ... 2000-08-26 01:02:30 +00:00
curt
de4f235115 Tweaked to handle concrete textures as well as turf and dirt runways. 2000-08-26 00:52:07 +00:00
curt
4a68b387df Does proper runway designators now. 2000-08-25 21:55:30 +00:00
curt
11a577a079 Added non-precision and visual runway markings as well. 2000-08-24 22:15:25 +00:00
curt
05dd9aa7b3 Added more precision runway sections. 2000-08-24 16:09:49 +00:00
curt
33ea616de8 Added debugging output ... on the hunt of a T intersection problem. 2000-08-24 13:15:15 +00:00