1
0
Fork 0
Commit graph

251 commits

Author SHA1 Message Date
david
20dc0cf8a0 Ignore generated files. 2003-08-25 19:35:50 +00:00
curt
e93197d1b5 David Luff:
Attached are patches to Terragear to enable it to compile out of the box on
Cygwin (once all the relavent libraries have been compiled).  Specifically
they fix a conflict with another version of min/max somewhere on the
system.
2003-08-25 19:12:20 +00:00
david
ced60ae2e2 Remove IOSTREAMH macro -- it turned out to be something specific to
SGI headers, rather than a program-specific compilation macro.  Always
assume that the iostream library is present.
2003-08-25 18:18:58 +00:00
ehofman
4516c4a9d6 Make it somewhat IRIX/MipsPro compliant again. We still need to resolve the IOSTREAMH declaration issue 2003-08-25 17:52:42 +00:00
david
631c9ab968 Fixed to compile and install using an ANSI C++ compiler like G++ 3.3.
Some conditionals may be required to build with other compilers.
2003-08-25 17:11:43 +00:00
ehofman
8c6c0c480c Satisfy a dependency 2003-08-24 18:55:21 +00:00
ehofman
4e1da3cedf Compiler fix 2003-08-24 18:48:18 +00:00
david
fafab4a3a0 Ignore another app. 2003-08-20 12:25:14 +00:00
curt
0b4b91c90f Unraise the verbosity level. 2003-08-19 02:27:08 +00:00
curt
b2d808f214 Tweak an output message. 2003-08-19 02:26:43 +00:00
curt
d0f17a2cd7 Fix for properly handling SRTM voids ... terrafit.py rescales the data range
so that all the values are positive this make things a little trickier inside
terra.
2003-08-16 16:28:55 +00:00
curt
9ab16521f4 Minor tweaks for better debugging/monitoring 2003-08-16 15:39:59 +00:00
curt
ad75df026d Ignore SRTM "void" values. 2003-08-16 14:53:00 +00:00
curt
a20d85ac0d Picky, picky :-) 2003-08-16 02:09:06 +00:00
curt
eb04a8771d Initial revision. 2003-08-16 01:59:37 +00:00
curt
bf32c9e447 Fix a compile error. 2003-08-16 01:58:15 +00:00
curt
df54cff836 The TerraGear version of Michael Garland's "Terra" program now supports
minnodes directly, so I have slightly tweaked the python wrapper script
in light of this.
2003-08-16 01:57:28 +00:00
curt
9e38f10dc6 Add src/Prep/Terra and src/Prep/TerraFit 2003-08-16 01:48:38 +00:00
curt
37d4e6f738 - Various tweaks to make the code build with gcc-2.95 under linux.
- added a -n <num> option to specify a minimum number of nodes to emit
  irregardless of the error threshold.
2003-08-16 01:38:22 +00:00
curt
1a3c24506b Original version of Michael Garlands terra program version 0.7 (public domain) 2003-08-16 01:35:54 +00:00
curt
d309a52bee Intial revision. 2003-08-16 01:18:39 +00:00
curt
170783ea73 The terrafit stuff is getting a much deserved and belated promotion ... 2003-08-16 01:18:01 +00:00
curt
533db6e82d Initial revision. 2003-06-12 20:05:01 +00:00
curt
c148689adc Fixes to match changes in SimGear-0.3.3 2003-06-12 20:02:08 +00:00
curt
07d17d2536 Initial revision of a scipt that leverages the "terra" utility to
impliment essentially the same thing as "ArrayFit".   Requires the terra
program, but the terrafit.py script should take care of the pre/post
processing.
2003-03-31 20:10:27 +00:00
david
51d5fe00ea Install arrayfit along with the other utilities. 2003-03-20 14:50:54 +00:00
curt
0cbbe80488 Changes to track libArray api tweaks. 2003-03-19 22:52:04 +00:00
curt
bab9af52b3 Just ignore "void" data points when doing the surface fit. I think this
is probably better than guessing at a value and fitting to the guessed value.

For corner points (where we *need* a value to do the fit) use the elevation
of the "closest" euclidean-wise valid point.
2003-03-19 22:51:26 +00:00
curt
869f0412a3 Updates to match libArray api changes. 2003-03-19 22:49:13 +00:00
david
a0b4097f5d Fix iterator assignment. 2003-03-19 00:30:42 +00:00
david
077f32fc60 Ignore generated files. 2003-03-19 00:28:49 +00:00
curt
119d46058b I wrote arrayfit and it worked.
Then I needed to modify libArray code so that other portions of the code
could use the pre-computed fit data.
Today I discovered that arrayfit was messed up.  That is now fixed.
2003-03-17 17:25:11 +00:00
curt
06985ebabd Changes corresponding to API changes in libArray.a 2003-03-17 04:50:40 +00:00
curt
b019a7d44a Initial revision of utility to fit a much reduced size terrain surface
to a higher res data set, attempting to preserve the most important
features in the original data set.  The user can specify a min and max
number of output nodes as well as a maximum error tolerance that should
not be exceeded (between the original and simplified surfaces.)
2003-03-17 04:48:50 +00:00
curt
cde416c9f3 Initial revision of a tool that uses Michael Garland's algorithm to fit
a simpler TIN surface to a regular array of height values.  The algorithm
is described here:

    http://graphics.cs.uiuc.edu/~garland/software/terra.html
2003-03-16 21:52:10 +00:00
curt
ba3114a8b5 Fixed a compile warning. 2003-03-13 20:23:15 +00:00
curt
c5ab6678f2 Added support for including height information in the intermediate polygon
format.  The big trick was that the polygon clipper is completely 2d.  So
I needed to add code to preserve the elevations in the clipped output and
fill in plausible elevations for any new points created as a result of the
clipping.
2003-03-12 21:25:35 +00:00
curt
9c85f16b5f Working towards the ability to specify elevations for a polygon in it's
intermediate mode.  The goal then is that these elevations would be
preserved throughout the tile construction process and the surrounding
geometry would fill in without gaps.  This has potential applications for
airports and runways of course as well as roads, rivers, streams, railroads,
or any other object where we might want to control the final elevation in
advance.
2003-03-12 18:23:31 +00:00
curt
af89a8a205 Add a utility to reassemble all the array files for a 1x1 degree area and
write them out in a dumb ascii array format.
2003-03-11 20:22:16 +00:00
curt
e7d08d90d1 A couple minor changes to this helper script. 2003-03-08 01:44:28 +00:00
curt
d11e7c7b3f First crack at a Prep utility to process SRTM "hgt" data into TerraGear's
intermediate format.
2003-02-26 21:39:27 +00:00
curt
bd1b254506 Rename: FGPolygon to TGPolygon 2003-02-26 20:59:34 +00:00
curt
61445e9af6 Renaming:
- FGContourNode -> TGContourNode
 - FGTriNodes    -> TGTriNodes
 - FGTriSeg      -> TGTriSeg
 - FGTriSegments -> TGTriSegments
2003-02-26 20:25:29 +00:00
curt
d2206e9214 Rename: FGDem -> TGDem 2003-02-26 20:04:12 +00:00
curt
0a1108e494 Rename: FGArray -> TGArray 2003-02-26 19:59:25 +00:00
curt
f56af62248 Various pre-0.0.5 release tweaks. 2003-02-25 17:58:40 +00:00
curt
927540c8b1 One more Irix tweak. 2003-01-08 16:29:04 +00:00
curt
8b269dc000 Erik Hofman:
A big honkin' set of minor tweaks to bring TerraGear into Irix compliance.
2003-01-07 22:46:51 +00:00
david
374bca92c7 Replaced strtof with ANSI C strtod as suggested by Frederic Bouvier. 2002-08-31 17:40:00 +00:00
david
ee66876d21 Patch from Julian Foad to reduce debugging output. 2002-08-31 17:31:16 +00:00
curt
8c35817530 Clean up some old remnants of HAVE_ZLIB_H 2002-08-30 03:00:21 +00:00
curt
65d6f9c623 Tweaks to bring the automake/conf scripts into compliance. 2002-08-29 22:12:43 +00:00
david
fe95a6aab4 Moved the Rectangle and Line classes and the geometry utility
functions into the "tg" namespace to avoid conflicts with Windows
headers.
2002-08-14 15:41:54 +00:00
david
232d51333c Make min/max area work more reliably. 2002-08-03 14:10:35 +00:00
david
8ab0a45ad7 Renamed the --area option to --material.
Added --min-area and --max-area options to specify the minimum and
maximum area of a polygon's bounding rectangle in meters square.  This
option will make it possible to use different textures for big lakes
and small ponds, or for large cities and smaller towns.
2002-08-03 14:01:48 +00:00
david
f37bdfd43d Corrected error in the sample. 2002-07-23 14:38:49 +00:00
david
7f957c2269 Added tguserdef, a utility for adding user-defined points, lines, and
polygons to scenery.  It uses the regular XML property format, which
users can create easily in a text editor.  See
src/Prep/UserDef/sample.xml for examples.
2002-07-23 14:33:53 +00:00
david
0349ab6241 Removed more duplicate code. 2002-07-23 14:32:52 +00:00
david
881fc4ad73 Removed duplicate code and use the new classes and functions in
Lib/Geometry instead.
2002-07-23 01:33:10 +00:00
david
f30ffc0d1f Added new independent classes for a bounding rectangle and a
multi-segment line, then pulled some local code out of tgvpf into
util.[ch]xx so that it can be used by other modules.
2002-07-22 22:01: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
645abd08c1 Minor tweaks from last round of photo inserting. 2002-02-27 18:52:40 +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
d3515ccc03 Bug fixes and improvements. 2001-12-30 02:22:11 +00:00
david
a4e1215761 Ignore files for autogenerated files. 2001-12-30 02:16:03 +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
7a4bac978e Various Irix fixes. Thanks Erik! 2001-07-31 20:14:54 +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
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
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
483708977a Various reshufflings of directory layout. 2001-04-25 18:55:19 +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
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
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
d794b0b117 Updated comments. 2001-01-04 20:36:36 +00:00
curt
78368f7c38 Endianess tweaks. 2001-01-03 18:06:34 +00:00
curt
583af21f9f Renamed FGBucket -> SGBucket. 2000-12-13 20:06:36 +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
6767777246 Avoid a warning. 2000-11-15 20:23:54 +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
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
c54e5e8adc MSVC5 combatibility tweaks contributed by Bruce Finney. 2000-05-30 21:11:15 +00:00
curt
34db12893e Added support for GSHHS lakes, islands, and ponds. 2000-05-06 20:01:58 +00:00
curt
13cbdf7ecc More reorg. 2000-02-16 22:01:47 +00:00
curt
c687e7563b Restructuring directories/layout. 2000-02-14 17:38:44 +00:00
curt
b20be51d65 Initial revision 2000-02-09 19:51:45 +00:00