1
0
Fork 0
Commit graph

223 commits

Author SHA1 Message Date
david
6e5f833cc3 ANSI C++ fixes; use SimGear logging instead of iostream. 2002-05-21 17:05:10 +00:00
curt
14a58f9bdf Changes to track updates in simgear. 2002-05-13 15:12:51 +00:00
david
58634b2dfc - use SG_LOG throughout instead of cout/cerr
- in main.cxx, make the default log level SG_INFO rather than SG_DEBUG
  (developers can easily change it back during testing)

- replace all instances of exit() with an exception throw, caught in
  main.cxx, so that the program can go on processing the rest of the
  airports; to restore the old behaviour, just add an exit() to the
  catch clause

(Unfortunately, this still does not guarantee a full processing run,
because triangle.c in the library can invoke exit() when it gets
hopelessly confused.)
2002-03-22 15:05:54 +00:00
david
f42cdc4578 Added --min-lat, --max-lat, --min-lon, and --max-lon arguments to
build airports for a limited area.
2002-03-20 22:52:26 +00:00
curt
82f409ba67 Oops, fixed some 'typo' type bugs I missed in the first go around. 2002-03-13 05:08:21 +00:00
curt
a22b83516b More incremental work towards automatically generating runway lights. 2002-03-13 03:51:39 +00:00
david
5c19f61da1 Fixed namespace bugs that kept G++ 3.0 from compiling (mostly improper
use of namespaces with cout/cerr/endl).
2002-02-28 15:34:12 +00:00
curt
750437b242 Extremely *alpha* start at generating sample runway lights. 2002-02-27 23:08:15 +00:00
curt
8f07f918ae Roughing in some initial structure to facilitate runway lighting. 2002-02-27 18:58:06 +00:00
curt
5cbacb4a7a Misc tweaks. 2002-02-27 18:53:10 +00:00
curt
645abd08c1 Minor tweaks from last round of photo inserting. 2002-02-27 18:52:40 +00:00
curt
c5f9e48267 Add a skirt around airport as a first line defense against pixel
wide border gaps.
2002-02-25 15:22:32 +00:00
curt
0c7c478ce2 Split 'close_enough() function into 2d and 3d versions. 2002-02-25 15:18:57 +00:00
curt
4346b42897 Add hole flag to output 2002-02-25 15:18:06 +00:00
curt
af24dc6d24 Did a bit of code restructuring. Hopefully to open things up to add
runway lighting.
2002-02-25 05:11:55 +00:00
david
90fe08a7c0 Cygwin patches from Dave Luff. 2002-01-30 14:10:00 +00:00
david
d2b2afc33d Cleaned up errors and warnings, mostly namespace problems with cout
and cerr, but also some SimGear linking problems.
2002-01-30 13:52:37 +00:00
david
bb4f7ffdfb Ignore more autogenerated files. 2001-12-30 02:24:10 +00:00
david
d3515ccc03 Bug fixes and improvements. 2001-12-30 02:22:11 +00:00
david
bc882d259d Added new area types Bog, Sand, Lava, FloodLand, IntermittentStream,
and PackIce, to support vmap0.
2001-12-30 02:21:23 +00:00
david
2b8ef0e7ae Removed autogenerated file from CVS. 2001-12-30 02:18:17 +00:00
david
a4e1215761 Ignore files for autogenerated files. 2001-12-30 02:16:03 +00:00
curt
c0b4508955 - fixes to support clamping to a small grid (improves triangulation)
(These are not yet enabled by default because we haven't addressed what
  happens when snapping a hole boundary, but not the original object to
  fit in the hole.)
2001-09-18 21:51:24 +00:00
curt
d1424d75c7 - add --height and --width options to build an area less than 10x10 2001-09-18 21:50:18 +00:00
curt
d8dc110d99 - don't clip against landmass (no longer suitable with new poly types)
- reduce the minimum area for a non-sliver by two orders of magnitude,
  to allow small road, river, and railroad segments
2001-09-18 21:50:06 +00:00
curt
bc0e84e259 - yet more bug-fixes to deal with padding IFO records to 80
characters; now works with DCW ponet files
- fixed another minor bug
- compatibility fixes
2001-09-18 21:28:47 +00:00
curt
e5028b5637 - added snap() function to snap a polygon to a grid 2001-09-18 21:27:54 +00:00
curt
afbe4fccbd - added Town area type for future use
- moved Town below Urban in priority list
- give freeways, roads, and railroads priority over lakes of various
  sorts
2001-09-18 21:27:33 +00:00
curt
c69d333d32 - added new program, tgvpf, to generate polygons from Vector Product
Format databases.
2001-09-18 21:24:14 +00:00
curt
3050aca5c7 - new library to support NIMA's Vector Product Format 2001-09-18 21:17:48 +00:00
curt
4e43a03fcb Shuffling. 2001-09-18 19:41:46 +00:00
curt
4f82e609e4 Rearranging tools. 2001-09-18 19:40:49 +00:00
curt
0bf8231029 Removed ... 2001-09-18 18:07:59 +00:00
curt
7a4bac978e Various Irix fixes. Thanks Erik! 2001-07-31 20:14:54 +00:00
curt
e03579349b Updated color scheme. 2001-07-31 20:14:36 +00:00
curt
f4d1b34776 Added support for tie down areas (width > 150 feet) and support for lakebed
taxiway types.
2001-07-31 20:13:56 +00:00
curt
fd2fc30ef5 - added support for points coverages -- can generate rectangular area
from points (i.e. villages)
2001-07-30 19:58:46 +00:00
curt
343dd022d0 - fixed bug that caused character-field (20-1) IFO fields to fail if they
straddled record boundaries; it appears the the E00 format expects
  all records to be right-padded with spaces to a length of 80 including
  the final newline (!!!)
- added some comments in case anyone is ever foolish enough to try to
  extend this library
2001-07-30 19:58:32 +00:00
curt
8506a3f4d5 - modified landcover code to borrow a cover type from an adjoining
tile if it ends up as default -- this will help avoid resolution
  errors near rivers, urban areas, etc.
2001-07-30 19:58:10 +00:00
curt
f9a8370433 Tweak size of grass area surrounding taxiways. 2001-07-16 01:57:46 +00:00
curt
19d9392863 Renamed libgpc to libgenpolyclip to avoid a conflict with the gnu pascal
compiler.
2001-07-11 00:43:55 +00:00
curt
502b396259 Initial revision. 2001-06-23 02:14:37 +00:00
curt
9c9feac1e8 Tweaks to work with the .stg / .btg naming convention. 2001-06-22 19:29:59 +00:00
curt
5023d2e581 Added a general purpose int field for various uses. Currently used to
differentiate between runway and taxiway polygons so we can handle their
  texturing needs differently.
2001-06-22 19:29:32 +00:00
curt
a812248191 Modified to use the master .stg file standard.
Fixed a bug in triangulating that was potentially overwriting other
  memory when creating the hole list to pass to the triangulator.  This
  fixes a lot of glitches!
2001-06-22 19:28:29 +00:00
curt
6c28c81180 Add support for generating taxiways.
Airport area is no longer the convex hull, but is instead just the area that
surrounds the runway and taxiways.
2001-06-22 19:26:09 +00:00
curt
2272a29287 Minor tweaks to track changes in simgear. 2001-05-16 12:27:48 +00:00
curt
edd192597b Initial revision. 2001-05-15 02:03:19 +00:00
curt
abf4e0ad08 Tweaks for Photo inserter util. 2001-05-15 02:03:00 +00:00
curt
472ac57338 More work on photo inserter. 2001-05-03 22:20:38 +00:00
curt
b452149e06 Working on a utility for inserting some simple photo-real scenery into
terragear scenery.
2001-05-03 02:00:50 +00:00
curt
d517af9042 Initial revision. 2001-04-28 13:24:04 +00:00
curt
483708977a Various reshufflings of directory layout. 2001-04-25 18:55:19 +00:00
curt
587763000e Small tweaks. 2001-04-25 15:06:17 +00:00
curt
0283cdf05b Added support (contributed by David Luff) for UK OSBG36 coordinate systems as
it impacts texture coordinates.
2001-04-24 21:10:27 +00:00
curt
522bff9911 Initial revision. 2001-04-24 21:09:49 +00:00
curt
f6e553a1b6 SGD_PI. 2001-03-25 12:10:21 +00:00
curt
56745955f3 FG_ to SG_ changees. 2001-03-25 12:07:07 +00:00
curt
9acc48acce SG-ified logstream. 2001-03-24 05:06:35 +00:00
curt
f92570b07b SG_ namespace. 2001-03-24 03:56:19 +00:00
curt
0e8b7763b1 SG_ name space additions. 2001-03-24 03:34:04 +00:00
curt
29f155ae4a Teaks ... 2001-03-24 02:55:07 +00:00
curt
7ad217b1f1 FG_ to SG_ namespace changes. 2001-03-23 23:18:18 +00:00
curt
0b31b493d3 FG_ to SG_ namespace changes. 2001-03-23 21:59:33 +00:00
curt
17ca0ad2ea FG_HAVE_STD_INCLUDES -> SG_HAVE_STD_INCLUDES 2001-03-23 21:15:17 +00:00
curt
bafe3c969f Initial revision. 2001-02-03 01:02:46 +00:00
curt
528c12a682 These add a --min-angle options to fgfs-tools-client,
and make the E00 support a lot more robust.
2001-01-29 04:30:31 +00:00
curt
1190702047 Add libplibul support (plib >= 1.3.x) 2001-01-22 16:00:15 +00:00
curt
234e707b2d Tweaks to eliminate gaps between runway sections. 2001-01-13 22:41:09 +00:00
curt
9ceccae99c Tweaks. 2001-01-12 22:22:00 +00:00
curt
c702807a9b Tweaks for new SGBinObject interface. 2001-01-06 04:31:57 +00:00
curt
ff9e9d4783 Don't include scenery_version.hxx 2001-01-05 00:06:10 +00:00
curt
23c60b8b54 Write only the binary object. 2001-01-05 00:05:49 +00:00
curt
2b8f7a2135 Write out binary objects rather than ascii. 2001-01-05 00:05:02 +00:00
curt
8743f4591c Moved higher level output routines to simgear. Created a binary format. 2001-01-04 20:37:45 +00:00
curt
d794b0b117 Updated comments. 2001-01-04 20:36:36 +00:00
curt
f19229540c Removed some debugging output. 2001-01-04 20:36:18 +00:00
curt
688a82fc97 Added Lib/Output/ 2001-01-04 20:33:47 +00:00
curt
77ef53bd83 Initial revision. 2001-01-04 20:33:14 +00:00
curt
78368f7c38 Endianess tweaks. 2001-01-03 18:06:34 +00:00
curt
43f544d7df Tweaks/fixes for building airports. 2000-12-22 19:17:02 +00:00
curt
d44401402e Chasing down a bug in building the contour tree. Also tweaked the remove_dups()
routine in the process.
2000-12-22 02:33:37 +00:00
curt
583af21f9f Renamed FGBucket -> SGBucket. 2000-12-13 20:06:36 +00:00
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