1
0
Fork 0
Commit graph

1011 commits

Author SHA1 Message Date
PSadrozinski
f2af9db3c8 ran uncrustify on Polygon Library files. Makes it much more readable.
ran a test with all tools (decode, genapts and construct) succesfuly.
2012-03-25 23:54:15 +02:00
PSadrozinski
9add3fdaae moving texparams header from genapt to poly library. Need it for new construct. 2012-03-25 23:54:15 +02:00
Christian Schmitt
18b2c8a51a Correctly position the PAPI lights around the center and enable
left/right-handed PAPI versions
2012-03-25 23:54:15 +02:00
PSadrozinski
b583e8d0f0 use polygon-offset effect to render linear features 2012-03-25 23:54:14 +02:00
PSadrozinski
deaebbeb4d conditionaly compile native clipper lib poly optimizations 2012-03-25 23:54:14 +02:00
Christian Schmitt
f77da29398 forgot to add length extend calculation to the new gen_wgs84_area
function. Also fixed the runway area functions accordingly.
2012-03-25 23:54:14 +02:00
Christian Schmitt
f7ca9005ce Double the char value in the signs parser to prevent an
out of bounds segfault.
2012-03-25 23:54:14 +02:00
Maxime Guillaud
fd597739ea Increase ARRAY_SIZE_1 (previous value was too low and genapts would crash processing ENAL).
Add some code to catch this issue and abort with a helpful error message next time.
2012-03-25 23:54:14 +02:00
PSadrozinski
881c4e131b fix for FIndAirport to handle heliports 2012-03-25 23:54:14 +02:00
Christian Schmitt
16ff1e89cc Add runway shoulders support.
This was harder than expected as the shoulders were often partially
covered by runway polygons. This was caused by inaccuracies introduced
by the calculation of dimensions from the runway center.

Now we create shoulders if set in apt.dat. If no shoulders are set,
a 1m broad stripe is added to concrete and asphalt runways to make
the blending runway-airport surface more visually appealing.
2012-03-25 23:54:14 +02:00
Christian Schmitt
09352611d5 Add a second gen_wgs84_area function as preparation for shoulders.
This function uses the 2 runway end points as supplied by apt.dat,
which eliminates some inaccuracies that occur when calculating with
only one center point.
2012-03-25 23:54:14 +02:00
PSadrozinski
b24bcbb1ee Remove OSG capabilities and libraries. 2012-03-25 23:54:10 +02:00
Christian Schmitt
a5a14e2330 Initialize variables and remove unused ones 2012-03-25 23:53:50 +02:00
PSadrozinski
dfb4ece77e fixed 2 crashes.
- experimental : I haven't seen that this change has any detrimental effectt, and it avoids a
   crash in triangle library if I don't split long edges before diffing the accumulator to
   generate base_poly.  Side effect could be t-junctions, but preliminary look at KATL seemed to give
   the same (poor) effect - sometimes there are vertical gaps between the airport base and the terrain.
 - Bad data on a few airports - Linear feature definition followed immediately by a
   termination node - can't have a single point for linear feature definition, so I discard it.
2012-03-25 23:53:49 +02:00
PSadrozinski
06d0d8bdd9 added support for --start-idx so I can restart after a failed airport. 2012-03-25 23:53:49 +02:00
Christian Schmitt
a377f11dad Fix a segfault related to water runways 2012-03-25 23:53:49 +02:00
Christian Schmitt
ea0fd7d9dd Do not error out on correct runway surface 2012-03-25 23:53:49 +02:00
Christian Schmitt
fcdeaae2fd Remove a duplicate function and fix a segfault when using the
--airport option.
2012-03-25 23:53:49 +02:00
PSadrozinski
595a190dd3 - min/max lat/lon command line options - can try to parse entire apt.dat
- lot's of cout -> SG_LOG changes so genapt produces minimal output
2012-03-25 23:53:49 +02:00
PSadrozinski
db1a734b19 Add an optimization to BuildBtg - the accumulator is kept in the native
clipping library format, so it doesn't have to be converted / reconverted
between clipping and TGPolygon types for each operation - shaves about
12 seconds from KATL build.
2012-03-25 23:53:49 +02:00
PSadrozinski
59b534616f Fix for using clipper library
- it doesn't fix my donut problem - still need to fix degenerate nodes.
2012-03-25 23:53:49 +02:00
Christian Schmitt
33d88b8c27 Write out the taxiway sign headings 2012-03-25 23:53:49 +02:00
Christian Schmitt
812dd638af Rework the runway designation code. All put into one function.
This does now support literal runway names like "07" instead of "7".
Also support upcoming "XX" designation which marks a runway as
non-numbered. Testing needed.
2012-03-25 23:53:49 +02:00
Christian Schmitt
10260917f8 adapt the help output a bit 2012-03-25 23:53:48 +02:00
PSadrozinski
2e07528da3 Added support for clipper library
- still some issues, but it 'mostly' works
   (change #define in src/lib/polygon to select clipper library)
 - added performance statistics
2012-03-25 23:53:48 +02:00
PSadrozinski
4fb1944964 Adding Clipper library (experimental) 2012-03-25 23:53:48 +02:00
Christian Schmitt
dc3449a860 Remove texture coordinates length calculations from certain places.
The width calculation is corrected now and should fix distorted
runway textures.
Hopefully we can get rid of this width mumbo-jumbo soon, too.
It has to stay for now as I found no solution.
2012-03-25 23:53:48 +02:00
PSadrozinski
1663620e35 command line option --airport working. Tested with full apt.dat 2012-03-25 23:53:48 +02:00
PSadrozinski
3ba27cd481 Added Airport boundary support.
- needs testing on lots of airports.  I'm uncomfortable with expanding
  concave polys by 20 meters.  I really need to find a safe polygon expander.
2012-03-25 23:53:48 +02:00
Christian Schmitt
33c92f60f6 Fix a boundary size bug. All boundaries with < 2 nodes are discarded now 2012-03-25 23:53:48 +02:00
Christian Schmitt
8ebbb39893 generate simple runway including threshold 2012-03-25 23:53:48 +02:00
Christian Schmitt
c551e81136 add water runways. The corresponding buoys will follow into fgdata :) 2012-03-25 23:53:48 +02:00
Christian Schmitt
ec6b862730 ...and also remove bug work-around scripts 2012-03-25 23:53:48 +02:00
Christian Schmitt
ec3aa2a623 Now that the important stuff is ported, remove old files
that are no longer needed
2012-03-25 23:53:48 +02:00
PSadrozinski
051497bede Added taxiway/runway sign link creation 2012-03-25 23:53:48 +02:00
Christian Schmitt
e9a266fdf1 Helipads are also back, including some light 2012-03-25 23:53:42 +02:00
Christian Schmitt
1990ce6806 The size of the runway base should depend on the runway width 2012-03-25 23:53:32 +02:00
Christian Schmitt
504f5ef46c Refactor the runway code and exclude some math functions
from the class for general use
2012-03-25 23:53:28 +02:00
PSadrozinski
fdb37b36c7 added linked objects for beacon and windsock support.
taxiway signs pending...
2012-03-25 23:53:18 +02:00
Christian Schmitt
b146149877 Port airport light objects support 2012-03-25 23:53:09 +02:00
Christian Schmitt
155d405ee2 Again, lower the light nodes above the terrain. This needs to be tested 2012-03-25 23:53:05 +02:00
PSadrozinski
81ec458cd7 lights are much better, but not perfect 2012-03-25 23:53:05 +02:00
PSadrozinski
39ea640499 cleanup airport.cxx and simple fix in linear features 2012-03-25 23:53:05 +02:00
PSadrozinski
4df32f7aed First stab at taxiway lights 2012-03-25 23:53:05 +02:00
Christian Schmitt
ce08e218f6 Port runway lights over to the new framework 2012-03-25 23:53:00 +02:00
Christian Schmitt
6a6052f2f5 Fix overrun generation, broken by last commit 2012-03-25 23:52:53 +02:00
Christian Schmitt
d573b38430 Simplify runway code a bit. 2012-03-25 23:52:53 +02:00
PSadrozinski
6f7df8da5e infrastructure for lights 2012-03-25 23:52:53 +02:00
PSadrozinski
5e1ed20e4d Fix Linear feature when angles is close to 180 or 0 degrees.
- it doesn't hang anymore, but it generates artifacts.  more study needed
2012-03-25 23:52:53 +02:00
Christian Schmitt
b0a1f38ccb Make runway textures work 2012-03-25 23:52:47 +02:00
Christian Schmitt
761a71ba7b Bring both 850 work (new taxiways and new runways) together. 2012-03-25 23:52:43 +02:00
PSadrozinski
ecbfc64b14 Added per linear feature width capability, so double lines are twice as wide, etc... 2012-03-25 23:52:43 +02:00
PSadrozinski
6dcf165438 linear features now have their own function to calc tex coords,
and the runway function scales.
Now, U should always be 1 width, and length is offset from minv.
This allows 1 polygons texture to start where the previous finished,
making it appear the texture flows continuously
2012-03-25 23:52:43 +02:00
PSadrozinski
c941c02c13 rams cp 2 - better, but not perfect 2012-03-25 23:52:43 +02:00
PSadrozinski
a547a9ba00 near feature checkpoint 1
- cut in to the terrain
- using asphalt texture, need a test texture to check texcoords
- need offset - it's hardcoded for pavement features, so centerlines are off
2012-03-25 23:52:43 +02:00
PSadrozinski
47b1b05ac7 Checkpoint : Linear features build their own superpoly_list on Finish() with
correct texture and heading for each quad.  Still need to clip them against
their own accum during build btg
2012-03-25 23:52:43 +02:00
PSadrozinski
7d729633c1 Texturing works 2012-03-25 23:52:43 +02:00
PSadrozinski
ef486df526 Adding initial genapts 850 support 2012-03-25 23:52:38 +02:00
Christian Schmitt
324e6fc30f Make size of runway base depend on its width 2012-03-25 23:52:31 +02:00
Christian Schmitt
6ce3e16d4b Take care of simple runways, too 2012-03-25 23:52:31 +02:00
Christian Schmitt
c43ebccb7a Lower the light nodes above the terrain. This needs to be tested 2012-03-25 23:52:31 +02:00
Christian Schmitt
b1264d5134 Support different runway edge light intensities 2012-03-25 23:52:31 +02:00
Christian Schmitt
dfd63f3fd8 water runway support 2012-03-25 23:52:31 +02:00
Christian Schmitt
d1aece0be3 Helipad lights support 2012-03-25 23:52:31 +02:00
Christian Schmitt
fa10efa1d0 Possibility to create runways without a designation (empty threshold) 2012-03-25 23:52:31 +02:00
Christian Schmitt
7c8b6781f3 Make helipads work 2012-03-25 23:52:27 +02:00
Christian Schmitt
b6c1b2c609 Add UK runway markings support. While at it, put most of the markings
logic into the markings function.
2012-03-25 23:52:10 +02:00
Christian Schmitt
ca7a097f9c clean up runway parameter calcs 2012-03-25 23:52:10 +02:00
Christian Schmitt
2eb8428a59 Read and create airport light objects like PAPIs and calculate their light vectors. 2012-03-25 23:52:10 +02:00
Christian Schmitt
785c4afcda Move the whole genapts over to the metric system.
Now we calculate with metric values internally, however, the
fixed feet values in the source will have to be converted or
be used with SG_FEET_TO_METER for now.
2012-03-25 23:52:10 +02:00
Christian Schmitt
2fff6d803e Work on supporting 850 light definitions.
This is still WIP, but lots of stuff already working.
2012-03-25 23:52:09 +02:00
Christian Schmitt
0bffde0f2d Make stopways work again, too 2012-03-25 23:52:09 +02:00
Christian Schmitt
66fc88c666 Implement individual runway markings for both ends.
Simplified code a lot, removed runway-specific files with
a lot of duplicate code. Put marking logic into
functions.
2012-03-25 23:52:09 +02:00
Christian Schmitt
8ac29ac8a8 Implement two runway end designations for precision runway 2012-03-25 23:52:00 +02:00
Christian Schmitt
0e83e180fc Introduce 2nd variable for other runway end designation.
Some cleanup, too.
2012-03-25 23:51:38 +02:00
Christian Schmitt
83144f66a3 get runway center calculation right 2012-03-25 23:51:38 +02:00
Christian Schmitt
0dddd26b91 first work on reading apt.dat 8.50 2012-03-25 23:50:22 +02:00
PSadrozinski
1eae25d17a removing automake files - just updating cmake build files from now 2012-03-25 23:37:26 +02:00
Maxime Guillaud
e37fc96f4d Proper handling of lowercase filenames by hgtchop. 2012-02-27 13:37:29 +01:00
Maxime Guillaud
e4c19fefee Increase buffer size for the client-server messages and consistently use MAXBUF. 2012-02-27 13:37:08 +01:00
Martin Spott
74ae44ed47 Adjust to process/materials 2011-11-22 15:37:43 +01:00
Martin Spott
ef2dbe235c Update to common practice 2011-11-22 15:24:47 +01:00
Frederic Bouvier
90ed31b46b Additionnal Win64 dependency 2011-11-10 20:07:37 +01:00
James Turner
7fb875b44b Fix release build issues with raw2ascii under cmake 2011-11-05 16:00:40 +00:00
James Turner
324ce8acd7 Fixes to config.h generation, detect rint() 2011-11-02 19:09:30 +00:00
James Turner
4914cb0645 Fix skipping of files when scanning polygons, to match previous behaviour. 2011-10-27 17:53:18 +01:00
Christian Schmitt
a7054d72b3 Better do not try to use btg.gz files as polygon source 2011-10-27 10:15:27 +02:00
Christian Schmitt
1c47d095b7 remove unused variables and functions 2011-10-27 09:04:08 +02:00
Frederic Bouvier
1a1e984577 Build fgfs-master and tgvpf under Windows 2011-10-26 22:48:14 +02:00
Frederic Bouvier
9a8635a4a3 Build poly2ogr under Windows 2011-10-26 22:22:23 +02:00
Frederic Bouvier
e8e4d885c5 Build under Windows 2011-10-26 22:19:01 +02:00
James Turner
afe4be595f Modernise the terrafit file handling code. 2011-10-26 20:29:59 +01:00
Christian Schmitt
17dbaffadd Remove all plib deps completely. TG is now plib-free :) 2011-10-25 16:20:31 +02:00
James Turner
881d83d245 Further de-PLIB-ification. 2011-10-25 12:03:04 +01:00
Christian Schmitt
d8d3be6fb1 Change SG linking order and add more tools to the cmake build system
that compile now. Also change .gitignore files to include some new
binary names
2011-10-25 01:11:31 +02:00
Christian Schmitt
89ca2ae1e4 Add cmake install targets 2011-10-24 18:07:35 +02:00
James Turner
17b15a1824 Use detected GDAL include path. 2011-10-24 13:46:15 +02:00
James Turner
e59d2d3e47 Use new SimGear helpers to simplify some code. 2011-10-24 13:46:15 +02:00
James Turner
99562cfde6 CMake support for GDAL / building OGR decode. 2011-10-24 13:46:15 +02:00
James Turner
4e39bff58a Linux fixes for Cmake support. 2011-10-24 13:46:15 +02:00
James Turner
83e6225460 CMake support for TerraGear, and PLIB/OSG/OpenGL removal. 2011-10-24 13:46:15 +02:00
Christian Schmitt
81244fb0fe clean up .gitignore files. Entries are applied recursively 2011-10-24 12:57:53 +02:00
Christian Schmitt
2186e2b89e remove all .cvsignore files 2011-10-24 12:57:53 +02:00
Maxime Guillaud
f20966c21c Increase RLIMIT_CPU to 12h (from 5mn) in fgfs-construct. I have never witnessed the infinite loop that this limit is supposed to catch - however complex tiles frequently require more than 5 minutes CPU. 2011-10-24 11:26:41 +02:00
Ralf Gerlich
f0a5c9ad45 Added gdalchop tool for chopping DEM data available in GDAL-supported raster files. 2011-10-14 22:27:11 +01:00
James Turner
5c5db25930 Build-fixes for Mac 2011-10-12 23:00:35 +01:00
Christian Schmitt
7c842403fe fix compilation against plain simgear 2011-10-12 19:01:22 +02:00
Christian Schmitt
6bb0c32ca1 Clean up old files 2011-10-07 17:31:48 +02:00
Christian Schmitt
b8750c2f55 fix some compiler warnings 2011-09-28 14:47:50 +02:00
Christian Schmitt
1707ec7fbf fix parallel build 2011-09-28 14:45:16 +02:00
Martin Spott
952e3c3489 Hans Janssen: Build fixes for GCC 4.6.1 on Fedora 2011-09-25 15:48:36 -07:00
Martin Spott
55e68f9eda Merge branch 'master' of mapserver.flightgear.org:git/terragear-cs 2011-09-25 13:36:12 -07:00
Martin Spott
92a4c3ae72 Merge branch 'master' of /home/martin/local_fixes 2011-09-25 13:24:40 -07:00
Martin Spott
f8084b5fdf No CVS in here any more .... 2011-09-25 11:45:07 -07:00
Martin Spott
e3f798ac74 Further land cover names cleanup. 2011-09-08 05:45:20 -07:00
Martin Spott
d3068322d2 Add asphalt type 2011-09-02 03:19:02 -07:00
Martin Spott
cebf1bfbdc Reflect changes in land cover name simplification as well as
diversification.
2011-09-02 11:37:41 +02:00
Durk Talsma
d3faa6dfe5 Merge branch 'master' of git://mapserver.flightgear.org/terragear-cs 2011-08-29 21:51:48 +02:00
Durk Talsma
72e6ce3c4a Just a tiny change to test the git mapserver url. 2011-08-28 21:25:39 +02:00
Durk Talsma
bed187faa5 Fix memory leaks in terrafit. 2011-08-24 19:47:18 +02:00
Ralf Gerlich
0fdbcaff63 Adapt to changes in simgear 2011-03-27 10:05:14 +02:00
Frederic Bouvier
68dc3066d4 Comment out a useless empty loop 2010-10-04 08:21:47 +02:00
Frederic Bouvier
bbae3a98a6 Better fix by Geoff McLane 2010-10-02 10:25:36 +02:00
Frederic Bouvier
b408b351d0 Fix index trashing 2010-10-02 10:06:34 +02:00
Ralf Gerlich
c09aeb328e Fahim Dalvi:
add SRTM-1 and SRTM-3 to the list of elevation directories
2010-07-31 19:23:03 +02:00
Ralf Gerlich
4e9a529b1f Adapt to the removal of Point3D from simgear. 2010-07-31 19:21:59 +02:00
Ralf Gerlich
f68f25e0c5 Add remaining WorldScenery processing scripts. 2010-07-17 17:30:51 +02:00
Ralf Gerlich
dc039f503c Update the ogr-decode process.sh script to include polar ice in landmass. 2010-07-17 17:17:15 +02:00
Ralf Gerlich
4f815e8703 Fahim Dalvi:
Allow setting the maximum runway slope on the command line.
2010-07-02 21:02:32 +02:00
Ralf Gerlich
868fa76d23 Jeff Taylor:
Fix "unable to open" messages on priorities/usgs files

Systems without write access to priorities or USGS files could not run
fgfs-construct.
This patch fixes that, so that write access to config files is no
longer required.
2010-06-25 11:04:26 +02:00
Frederic Bouvier
32b564ffaf Use Windows data types to make possible a Win64 build 2010-02-07 22:27:45 +01:00
Frederic Bouvier
4b6c9dbc85 Add a return type to Terra main 2010-02-06 19:07:45 +01:00
Ralf Gerlich
95f595d730 Do not generate region points for hole areas in triangulation. 2010-01-24 00:02:41 -08:00
Ralf Gerlich
1ad2b2e0e9 Write the last_apt file into the workdir instead of the directory where genapts is started from (closes #12) 2010-01-24 09:01:36 +01:00
Ralf Gerlich
450f22f2d7 Yves Sablonier: Terra/greedy.cc needs <cstdio> for EOF constant. 2010-01-24 08:36:12 +01:00
Ralf Gerlich
7af2208824 Teach poly2ogr to convert .btg and .btg.gz files, converting strips and fans to proper triangles. 2010-01-23 09:51:37 +01:00
Ralf Gerlich
84cb4efe79 Add an option to fgfs-construct to disable landmass processing (closes #9). 2010-01-19 20:00:34 +01:00
Ralf Gerlich
3a83772a09 The island mask should actually contain islands, not water. 2010-01-19 19:39:28 +01:00
Ralf Gerlich
69eb4be737 Ron Jensen: Fix stopway length and order and create proper stopway texture.
Thanks, Ron.
2010-01-11 20:25:52 +01:00
Ralf Gerlich
61ac48f3e5 Read the priorities for materials from a data file (closes #5) 2009-12-20 12:41:25 +01:00
Ralf Gerlich
824d734eb4 Load USGS-to-TerraGear translation from external file (closes #10) 2009-12-20 12:11:08 +01:00
Ralf Gerlich
3bee1edab4 Added --clear-dem-path and --dem-path= options to genapts cmdline to allow custom paths for the DEM data (closes #4) 2009-12-18 21:33:02 +01:00
Ralf Gerlich
1daeb0f99e Added stopways to runways (closes #2) 2009-12-18 20:56:17 +01:00
Ralf Gerlich
02ec141e6c Fix compilation errors due to simgear header reorganisation 2009-12-18 19:22:27 +01:00
Ralf Gerlich
f16756b9fe Merge branch 'cvs.terragear' 2009-12-15 21:24:04 +01:00
Ralf Gerlich
7b08557191 John Holden:
Fix runway markings for center runways.

http://www.mail-archive.com/flightgear-devel@lists.sourceforge.net/msg24634.html
2009-11-10 10:11:31 +01:00
Ralf Gerlich
255a094091 Maxime Guillaud:
Fix uncaught near-parallel lines in getIntersection()
2009-09-24 09:46:27 +02:00
Ralf Gerlich
b0a47dfa0e Ron Jensen:
Dirt and grass runways are generated by GenAirports/rwy_simple.cxx.
The runways are divided into two halves, "A" and "B" each consisting of
two triangles.
Runway half "A" is good.
Runway half "B"'s first triangle UV coordinates are a very short line,
and its second triangle's UV coordinates are a point.

[...]

[T]his patch does the Right Thing.  It simply changes the reference
point so the UV coords for the B runway are positive.  They were coming
out negative and getting clipped in build.cxx.
2009-09-24 09:46:27 +02:00
Frederic Bouvier
72cbcac816 Fix warnings under MSVC 2009-06-14 23:36:54 +02:00
Ralf Gerlich
1e8375a7e6 Adapt fgfs_tools_server to new relative paths on fgfs-construct commandline. 2009-06-07 20:40:57 +02:00
Ralf Gerlich
4ef15f03da Added flag to fg-construct to use the shared data of the constructed tile in addition to its neighbours'. Useful for rebuilding part of the scenery to fit the neighbours. 2009-06-05 21:49:59 +02:00
Ralf Gerlich
d72116c6ab Added a flag to protect Shared directory. Useful for rebuilding part of the scenery to fit with the rest. 2009-06-05 21:36:25 +02:00
Ralf Gerlich
2f87423796 Adapt to changes in SimGear 2009-06-05 18:27:10 +02:00
geoff mclane
4f9e7294c2 Install testarray tool
Now that the UI is considerably enhanced,
make this tool installable...
2009-05-02 10:19:30 +02:00
Frederic Bouvier
c366f25021 Geoff McLane: Enhance testarray UI 2009-04-18 17:53:58 +02:00
Geoff McLane
5768581c10 Allow non-integer steps\n\nFor ASCII DEM with say 0.75 step 2009-04-17 20:21:43 +02:00
Frederic Bouvier
af505d2f0f Geoff McLane: allow limits, max/min lat/lon to be added to raw2ascii
Frederic Bouvier: _set_output_format is only available in VS2005 and later
2009-03-28 14:42:41 +01:00
Frederic Bouvier
2c2bc8b551 Remove unneeded code 2009-03-22 16:08:25 +01:00
Frederic Bouvier
4d59fad336 Honour --work-dir option and use portable code to iterate through directories 2009-03-21 11:28:15 +01:00
Frederic Bouvier
fa542403b9 Compile shputils.c 2009-03-14 21:36:25 +01:00
Frederic Bouvier
379f629611 Don't crash when area type is unknown 2009-03-14 21:36:24 +01:00
Frederic Bouvier
d5da7c56f6 Upgrade shapelib to 1.2.10 2009-03-14 21:36:24 +01:00
Ralf Gerlich
ba5a9b363e Fred Bouvier:
Fix genapts crash in remove_dups due to duplicate points being reduced to an empty polygon.
2009-03-14 11:55:01 +01:00
Frederic Bouvier
beadd0123a Compile srtmchop under Linux 2009-03-05 12:35:23 +01:00
Frederic Bouvier
814007e06c Implement a portable way to use ZIP files 2009-03-05 12:35:23 +01:00
Frederic Bouvier
00b8658b99 Add a tool to chop CGIAR (http://srtm.csi.cgiar.org/) srtm improved files 2009-03-05 12:35:23 +01:00
Frederic Bouvier
1bca4c11e2 More portable way to deal with ZIP files 2009-03-05 12:35:23 +01:00
Frederic Bouvier
0166015c4d Line endings changes 2009-03-05 12:35:23 +01:00
Frederic Bouvier
1cd0506c3c Add poly2ogr to the MSVC 7.1 solution 2009-02-15 15:35:50 +01:00
Frederic Bouvier
29a9fbdad2 Add ogr-decode to the MSVC 7.1 solution 2009-02-15 15:35:49 +01:00
Ralf Gerlich
642c711289 Ensure that TerraGear builds under Linux with Fred's changes. 2009-02-02 10:10:32 +01:00
Frederic Bouvier
6256ee184e TerraFit compiled with MSVC 7.1 2009-02-02 10:01:35 +01:00
Frederic
0038e2153f Fix Linux generation after change made to compile with MSVC 7.1 2009-01-27 08:16:14 +01:00
Frederic Bouvier
50b1465421 MSVC 7.1 project files - Tile client 2009-01-27 08:16:14 +01:00
Frederic Bouvier
91e1f82e54 MSVC 7.1 project files - Tile server 2009-01-27 08:16:14 +01:00
Frederic Bouvier
7676da87a7 MSVC 7.1 project files - Build Tiles 2009-01-27 08:16:14 +01:00
Frederic Bouvier
26a787d847 MSVC 7.1 project files - Release build 2009-01-27 08:16:14 +01:00
Frederic Bouvier
8050d209b4 MSVC 7.1 project files and use simgear to create directories 2009-01-27 08:16:13 +01:00
Frederic Bouvier
781c8eda1b MSVC 7.1 project files and use simgear to create directories 2009-01-27 08:16:13 +01:00
unknown
f1da2794f5 MSVC 7.1 project files and use simgear to create directories 2009-01-27 08:16:13 +01:00
curt
a99cf1d758 Updates to disk layout scripts. 2008-12-02 14:53:08 +00:00
Ralf Gerlich
3e38283da3 Fixed "missing tile" issue in tgChopNormalPolygon and tgChopBigSimplePolygon 2008-10-21 16:45:44 +02:00
Ralf Gerlich
deb55d36cb Revert "Workaround for point-in-polygon-calculation: Make "sure" that the point is sufficiently far away from the polygon border so that JRSTriangle can actually detect it is inside of the respective triangle."
This reverts commit 6ef69feb81995139b386046c9ec5d8972a5880c5.
2008-09-11 12:31:15 +02:00
Ralf Gerlich
c9cd0b1758 Revert "Sign bug in calc_point_inside()"
This reverts commit 4797373664b97ca48caa5f0eeaa448225545aa1c.
2008-09-11 12:31:15 +02:00
Ralf Gerlich
aa03c7c2f5 Revert "Minor style fixup of calc_points_inside()."
This reverts commit 28c2bb1971894be175a51232e0502882683fc3e8.
2008-09-11 12:31:15 +02:00
Ralf Gerlich
fe3f38c662 Moved Point3DOrdering to SimGear. 2008-09-11 12:30:40 +02:00
Ralf Gerlich
521f9e2fc9 Removed remaining "using"-declarations from header-files. 2008-08-08 12:48:08 +02:00
Ralf Gerlich
e4ac5911ae Made sure that any #include-instruction comes before the first "using"-declaration, so that we can spot buggy header-files more easily. 2008-08-08 12:31:02 +02:00
Ralf Gerlich
4a35fedf64 Adapt to changes in simgear/compiler.h (removal of STL_* and SG_USING_STD() macros). 2008-08-08 12:17:43 +02:00
Ralf Gerlich
e6d15f9a83 Minor style fixup of calc_points_inside(). 2008-08-06 17:16:24 +02:00
Ralf Gerlich
4d1fafa2b6 Sign bug in calc_point_inside() 2008-08-06 15:21:59 +02:00
Ralf Gerlich
8e0e2b6cef Workaround for point-in-polygon-calculation: Make "sure" that the point is sufficiently far away from the polygon border so that JRSTriangle can actually detect it is inside of the respective triangle. 2008-08-06 12:29:27 +02:00
Ralf Gerlich
e813c093fc Adapt to current SimGear version (<iostream> include changes by fredb) 2008-06-17 11:06:35 +02:00
Ralf Gerlich
4a96ed8af2 Revert "Fixed taxiway drawing order. genapts wants them from top to bottom, not from bottom to top, as it was previously fed."
This reverts commit 5a6697b4e0b6e59a727868a912bff4c1fd8c91da.

Not genapts was at fault but the new TaxiDraw version (CVS HEAD). Robin Peel confirmed that the objects in apt.dat are listed top-down, i.e. the topmost element comes first.
2008-04-14 09:18:07 +02:00
Ralf Gerlich
101cae53ad Fixed taxiway drawing order. genapts wants them from top to bottom, not from bottom to top, as it was previously fed. 2008-03-29 13:04:37 +01:00
Ralf Gerlich
53efe44bfd Implemented reading point layers to poly2ogr (was used for debugging calc_point_inside()-stuff) 2008-03-29 13:04:25 +01:00
Ralf Gerlich
f01a1daa7b Fixed criterion for removal of small degenerate polygons. 2008-02-08 22:24:53 +01:00
Ralf Gerlich
e29bdcfe59 Removed test printouts. 2008-02-08 13:52:12 +01:00
Ralf Gerlich
74d80cdcd7 Fixed calc_point_inside().
Very small sliver contours were irritating the contour tree builder, so that contours ended up as children of nodes in which they were not contained.
2008-02-08 13:52:11 +01:00
Ralf Gerlich
cd90019bbf Intermediate fix for calc_point_inside 2008-02-08 13:52:10 +01:00
Ralf Gerlich
fe7f626265 Fixed file overflow in TerraFit 2008-01-14 22:30:07 +01:00
Ralf Gerlich
2a00d8092b Got rid of the last gts-dependency-leftovers. The gts-checks have been commented out for quite some time already and ArrayFit hasn't been used for years. 2008-01-10 20:31:18 +01:00
Ralf Gerlich
f7e8317f44 Made calc_points_inside() much more robust. 2008-01-09 14:37:54 +01:00
Ralf Gerlich
2b93966193 Got rid of the unused parts of the old calc_points_inside()-code. 2008-01-09 14:15:48 +01:00
Ralf Gerlich
f4b4a7dc3c Revert "Do not load shared data of own tile."
The original commit did not solve the problem, as also neighbouring tiles were used multiple times due to an inconsistency in the tile grid calculations.
2008-01-08 03:07:31 -08:00
Ralf Gerlich
4f0ee5178f Stow the logfile away if a tile failed in fgfs-tools-client. 2008-01-08 12:03:50 +01:00
Ralf Gerlich
8c09d9a48c Avoid use of sg_bucket_span(). 2008-01-08 12:03:50 +01:00
Ralf Gerlich
bb5882e977 Added printing of the nudge value in fgfs-construct. 2008-01-08 02:46:30 -08:00
Ralf Gerlich
327d8d1139 Added --nudge option to fgfs-construct 2008-01-05 20:47:15 +01:00
Ralf Gerlich
a8f76d3efc Fixed another special case in the calc_point_inside() algorithm 2008-01-05 20:19:33 +01:00
Ralf Gerlich
56fb5065b1 Do not load shared data of own tile.
When we want to rebuild a tile we do not want it to read the output of the previous build of the same tile.
2008-01-05 19:51:02 +01:00
Ralf Gerlich
a8e451c2c2 Typo fix in terrafit, which led to bad artefacts in the fitted elevation data. 2008-01-04 11:38:31 +01:00
Ralf Gerlich
05b9e47aba Replaced the fopen("MASTER_ON","r") in fgfs-tools-server by a simple access()-call. We only need to know whether it's there, not what's in there. 2008-01-03 10:08:34 -08:00
Ralf Gerlich
d8539d5412 calc_point_inside():
- Fixed one-off bug.
	- Take care of the border-case where the line exactly overlaps a node.
2008-01-03 15:56:10 +01:00
Ralf Gerlich
c5410c336d Now using a much simpler method for finding a point in a polygon (taken from GRASS GIS) 2008-01-03 13:39:44 +01:00
Ralf Gerlich
4ff56cacf3 Merge commit 'hypersphere-rgerlich/master' 2008-01-03 13:25:03 +01:00
Ralf Gerlich
8fd6c9d6fa Revert "Minor nudging of polygons to avoid gpc failures"
This reverts commit ebc5d20e5a74320a6a9a4fc94f3e289279e63df7.
2008-01-03 13:21:49 +01:00
Ralf Gerlich
2bc393827c Revert "Moved the point nudging for fgfs-construct from the generic polygon routines to the clipper."
This reverts commit 53159ed658bc206e96ef90e67f5bc6e3f5e439fc.
2008-01-03 13:21:22 +01:00
Ralf Gerlich
1a4b3a1d98 Fixed filedescriptor overflow in fgfs-tools-client which led the client to think that the MASTER_ON file did not exist. 2008-01-03 00:22:13 -08:00
Ralf Gerlich
0a32b5f3bc Avoid SIGSEGV in fgfs-tools-client when the results file is not found. 2008-01-02 23:55:13 -08:00
Ralf Gerlich
cf04dd3135 Fixed select()-call in fgfs-tools-{client,server} which occasionally led to lockup. 2008-01-02 11:23:39 -08:00
Ralf Gerlich
14403c2d8d Made ogr-decode and genapts use their own poly_counter-files in their own directories. 2008-01-01 16:27:46 +01:00
Ralf Gerlich
09c7327a80 Moved the point nudging for fgfs-construct from the generic polygon routines to the clipper. 2007-12-21 19:21:09 +01:00
Ralf Gerlich
b48ba44594 Merge branch 'master' into make_client 2007-12-20 19:08:09 +01:00
Ralf Gerlich
ac8c3d2ac8 Merge branch 'poly2ogr' 2007-12-20 19:07:37 +01:00
Ralf Gerlich
cbade0853d Minor nudging of polygons to avoid gpc failures 2007-12-20 19:07:01 +01:00
Ralf Gerlich
21824171fd Revert "Fixed output bug in terrafit"
This reverts commit b7f834290624ab7df7d3df00e81a9fea4933a7fc.
2007-12-20 18:59:37 +01:00
Ralf Gerlich
50e591df63 Implemented poly2ogr, a tool which converts polygons in working directories to layers in any format writable using the OGR library. 2007-12-20 18:59:21 +01:00
Ralf Gerlich
5eff254dc9 Enhanced fgfs-tools-client to eliminate some cases in which a tile does not
have to be rebuilt.
2007-12-19 14:22:25 +01:00
Ralf Gerlich
e62ee35e9b Fixed parsing of the no-overwrite flag (would have been a no-op otherwise!)
Made the client more verbose, so that we see when it skips files.
2007-12-19 02:19:06 -08:00
Ralf Gerlich
226c1bebcd Merge commit 'hypersphere-rgerlich/master' 2007-12-19 11:00:12 +01:00
Ralf Gerlich
9732d97416 Further fixes to process.sh (scrub vs. shrub, ordering of arguments) 2007-12-19 01:58:56 -08:00
Ralf Gerlich
e78a1aef88 Fixed output bug in terrafit 2007-12-19 09:35:51 +01:00
Ralf Gerlich
b6db722ead Fixed output bug in terrafit 2007-12-19 09:34:24 +01:00
Ralf Gerlich
bb608ad0ef Now using SG_LOG properly for outputs 2007-12-19 09:29:54 +01:00
Ralf Gerlich
f99c623a98 Added binary files to .gitignore 2007-12-19 09:29:20 +01:00
Ralf Gerlich
19bc5f179e Fixed the short-option parsing in terrafit.cc 2007-12-18 18:20:19 +01:00
Ralf Gerlich
37b49da152 Added a flag to fgfs-tools-client that allows enforcing only generation of missing buckets. 2007-12-18 18:19:47 +01:00
Ralf Gerlich
dbd3348762 Added benchmark information to terrafit 2007-12-16 12:02:55 +01:00
Ralf Gerlich
26e01ebe90 Added commandline parser to terrafit.cc 2007-12-16 10:12:14 +01:00
Ralf Gerlich
61a8fece72 Added C++ implementation of terrafit, which is about 6x faster!!!
Had to move parts of Terra into a library and into its own namespace, due to conflicts with SimGear definitions.
2007-12-15 13:38:44 +01:00
Ralf Gerlich
98c218e22a Fixed the process.sh for ogr-decode (note to self: never commit before testing! ;-) ) 2007-12-13 13:47:49 +01:00
Ralf Gerlich
0fc0b38242 Added a process.sh file using ogr-decode 2007-12-12 21:54:06 +01:00
Ralf Gerlich
217c111155 Workaround for a buggy apt.dat-file: 00-records start showing up which seem to represent Center-frequencies. 2007-12-12 12:33:33 -08:00
Ralf Gerlich
6933f75b11 Cleaned up the autoconf GDAL/OGR detection. 2007-11-22 17:45:17 +01:00
Ralf Gerlich
01f5b80457 Added ogrdecode, which decodes all OGR-supported vector input formats to TerraGear polygons. Might replace shape-decode one day. 2007-11-22 17:45:17 +01:00
Ralf Gerlich
54e72714c4 Remove the previous static list of material identifiers and replaced them by material names. Only the clipper still has a static list for identifying priorities. 2007-11-22 17:44:29 +01:00
Ralf Gerlich
ba50776472 added possibility to specify the end record in shape-decode 2007-11-22 17:44:29 +01:00
Ralf Gerlich
d7d3f53442 Optimised access to point lists for triangle segments and triangle nodes. 2007-11-22 17:44:29 +01:00
Ralf Gerlich
46b662bf83 Cleaned up leftovers from nurbs++ patches.
Integrated am2dsp.pl for convenience.
2007-11-22 17:44:12 +01:00
Ralf Gerlich
1ed948c409 Made terrafit.py installable as a script, properly referring to the bindir of the main configuration. 2007-11-08 22:29:04 +01:00
Ralf Gerlich
27dd0a41d8 Fixed the genapts apt.dat parser:
- The VASI GS angle is properly parsed
- Don't assume given column numbers but properly split the lines at whitespaces
- actually make use of the order of taxiways as specified in the apt.dat
- make the min/max lat/lon work (patch provided by Torsten Dreyer on terragear-devel [1])

[1] http://mail.flightgear.org/pipermail/terragear-devel/2007-January/001389.html
2007-11-08 22:27:02 +01:00
Ralf Gerlich
fcb9e6c8ba Fixed the build system 2007-11-08 22:14:02 +01:00
curt
10a0bdc073 Add some debugging infrastructure that is mostly disabled by default. 2007-11-05 21:58:59 +00:00
curt
ffa70e41f7 Expose the calc_angle() function as tgPolygonCalcAngle() 2007-11-05 14:02:21 +00:00
curt
cc5e739297 Wrap with #ifdef's so it can be included from more than one source. 2007-11-05 14:01:37 +00:00
curt
fbdbcb076b Support creation of polygon lines with non-integer widths. For instance,
road line markings in the USA typically are 4 inches wide (about 10cm).
2007-11-05 14:00:23 +00:00
curt
594c1ffa64 Add white and yellow line types. 2007-10-31 15:05:13 +00:00
curt
0cae653c46 Use a local definition of the point2d class since this was removed from SimGear. 2007-08-15 14:36:52 +00:00
curt
d39de0b665 simple 2d point class definition was removed from SimGear so use a TerraGear
local version.
2007-08-15 14:35:36 +00:00
curt
40e74181e2 Add a simple class definition here that was removed from SimGear. 2007-08-15 14:34:29 +00:00
curt
51a49e5ed1 Remove extra qualifier. 2007-04-04 15:44:06 +00:00
curt
01ba584d2e OVERVIEW:
For the time being of VMap0-data in FlightGear Scenery, there have been
two cases of simplification, where different types of landcover usage
have been stuffed into the same TerraGear work directories:

1.) VMap0 "Glacier" and VMap0 "Polar Ice" have been accumulated in the
    'LandCover/Glacier' directory,
2.) VMap0 "Wet Sand" and VMap0 "Marsh" have been mapped together in
    'VPF-LandCover/Marsh'.

These have been defined in the 'TGVPF/process.sh' for a long time and
we simply ported the identical mapping over to 'ShapeFile/process.sh',
in order to provide an exact image of what had been done previously
with the TGVPF reader, when we did all those funny ShapeFile thingies.

When I started storing all the landcover data in a PostGIS DB, one goal
I had in mind was to understand and clean up the structure of all those
different layers.

Now, after many hours of reading VMap specs and dealing with this data,
I have come to the point where we could merge VMap1 data into the VMap0
stuff where VMap1 is available and I'd like to have those duplicates
cleaned up before we're getting into an even bigger mess.

This means, and this is what the patch implements, that we're going to
handle "Polar Ice" landcover data separately from "Glacier" as well as
"Wet Sand" (which apparently means "Littoral" in our case) separately
from "Marsh" - in TerraGear. In order to let FlightGear behave the same
as previously, the two mentione mappings are now implemented by
respective additional "name" entries in the 'materials.xml' file. I
already committed these entries.

I'd like to progress with the task of adding improvements to our
landcover data set because I consider it as one of the vital goals of
further development to add more and more diversity to The Scenery. So
I'm eager to see these really small but significant issues resolved.
2006-11-29 22:19:33 +00:00
curt
3911a656b5 Version 0.2 of airspace program. Note the CHANGES file. 2006-04-14 16:09:10 +00:00
cvs
81656fd423 Remove handle ( and memory ) leak 2006-03-25 14:16:56 +00:00
curt
0ffcbd97aa Initial revision. 2006-01-27 20:28:55 +00:00
curt
a94577bd35 Updates to demo/example processing script. 2006-01-24 19:40:26 +00:00
curt
33df5799d8 Updates to the paths I use. 2006-01-24 19:39:48 +00:00
curt
cf1b289fa2 Updates to suggested/example paths. 2006-01-24 19:39:16 +00:00
curt
964a4c18ef Yikes! How about commenting out the debugging output, not the actual line
of code!  (See, once in a while I can spot my own stupidity.) :-)
2005-12-31 19:29:26 +00:00
curt
7d4a36db97 Fix a bug recently introduced where the code got overly aggressive with
"bad node" removal and could remove desired nodes.
2005-12-31 19:02:00 +00:00
fredb
4ee00f1084 Removed unneeded files from the terra build 2005-12-22 16:46:58 +00:00
curt
35c35d479e Don't build xterra by default. 2005-12-22 15:35:54 +00:00
curt
10558113e8 Cygwin patches from Frederic Bouvier. 2005-12-19 16:51:25 +00:00
curt
f8a6310993 Set default LogLevel = SG_INFO. 2005-12-19 15:56:11 +00:00
curt
c1bec7b6c2 Activate some additional debugging output for LogLevel = SG_DEBUG. 2005-12-19 15:55:47 +00:00
curt
e444f54d6d Prevent date line wrap around due to creating an expanded polygon from a
line that might touch the dateline.
2005-12-19 15:54:58 +00:00
curt
99f280eb08 Updated default command line options. 2005-12-19 15:53:47 +00:00
curt
99da0c21b0 Change SRTM directory names to reflect SRTM v2.0 2005-12-19 15:53:21 +00:00
curt
9ff8e4367d fix typos in comments/debugging output. 2005-12-19 15:52:50 +00:00
curt
0367a7ed38 Another patch ... 2005-11-12 00:23:21 +00:00
curt
a417092df1 I extended shape-decode even further based on Ralf's line feature patch. With
my patch it is possible to store line width as an attribute in the shape file
itself. This comes especially handy with rivers which can gradually broaden
that way.
2005-11-12 00:17:58 +00:00
curt
dde5a64a75 A couple updates to the FGArray API. 2005-11-10 16:26:59 +00:00
curt
4e20e26d04 Use a consistent __sun #definen symbol. 2005-11-08 16:51:18 +00:00
curt
b51914707d Initial revision. This is a little util that can fill SRTM voids with data
from another DEM source.
2005-11-08 16:30:10 +00:00
curt
ed22267dd9 Ralf Gerlich:
This patch for TerraGear extends the shape-decode and noaa-decode tools to also handle shapefiles containing point- and line-data.
2005-11-08 16:27:36 +00:00
curt
507e78357b Handle another possible case of degenerate output from our polygon clipping
code.
2005-10-31 18:53:13 +00:00
curt
b78684b6dd Add an important build note. 2005-10-31 18:47:46 +00:00
curt
13cf4600c7 One small additional bit of sanity checking and cleanup. 2005-10-31 18:45:19 +00:00
curt
a00eb22170 Make the course grid a bit finer. 2005-10-31 18:43:27 +00:00
curt
13e1be6c06 Fix a bug with possible missing skirt nodes. 2005-10-31 18:43:02 +00:00
curt
a42d16fb01 Fix some small bugs. 2005-10-31 18:42:37 +00:00
curt
e78b14e052 Fix glide slope angle parsing for newest x-plane data. 2005-09-28 17:27:07 +00:00
curt
b6b0033859 Remove gts dependency but save the code for algorithmic reference. 2005-09-28 17:24:35 +00:00
curt
75e7fabecb Fix debugging output error. 2005-09-28 17:24:09 +00:00
curt
23aa8a468f Add Win32 directory to the distribution. 2005-09-28 17:23:51 +00:00
curt
f120c59bf8 Remove dependency on gts. 2005-09-28 17:22:06 +00:00
curt
02de050a9b Add a small bit of structure to assist in debugging two crashes near the poles. 2005-09-28 16:44:05 +00:00
curt
8524cf7e76 - Fix a bug in the tile chopper that could lead to infinite recursion for
polygons near the poles.
- Fix a bug in the code that would insert dividing nodes in a long seam which
  could lead to infinite recursion for lines on the poles.
- Change airport area clipping semantics to reduce cracks in scenery.
2005-09-28 16:43:18 +00:00
curt
a63f0cfbdf Update the layers used to build scenery (my defaults.) 2005-09-28 16:41:11 +00:00