Commit Graph

331 Commits

Author SHA1 Message Date
Robert Osfield
88609a5eee Updated version numbers for 1.1 release 2006-07-06 10:28:12 +00:00
Robert Osfield
8ca8adeafb From Jason Baverage, support for interpolating DEM data from GDAL to the positions
required for the current tile.
2006-05-26 15:19:14 +00:00
Robert Osfield
2e0865d0c9 From Jason Baverage, A
dded GeospatialExtents bounding box class which used doubles
in place of the original usage of osg::BoundingBox.

Added path for computing interpolation elevation data being read from GDAL.
2006-05-15 13:12:55 +00:00
Robert Osfield
9c350a49be Disabled the running of tristripping and smoothing from within the Simplifier. 2006-02-23 16:47:36 +00:00
Robert Osfield
72554ca27e From Jason Beverage, added option to control whether simplification of
tiles is done during osgdem builds.
2005-12-15 16:30:31 +00:00
Robert Osfield
b835ec9ee9 Changed s/getGdalDataset() methods to use void* to avoid introspeciton wrapping problems. 2005-12-08 10:03:39 +00:00
Robert Osfield
73cc97f0e1 From Antonoine Hue, a small modification to the osgTerrain::DataSet
to be able to pass an already opened GDAL Dataset to the
osgTerrain::DataSet::Source
2005-12-07 15:26:45 +00:00
Robert Osfield
0e16b64665 Coverted tabs to space in core libraries. 2005-11-17 13:35:53 +00:00
Robert Osfield
47fcfa4cc5 From Eric Wing, compile fixes. 2005-11-15 21:47:24 +00:00
Robert Osfield
cee8424c0f Compile fixes for VS6.0. 2005-11-10 17:24:41 +00:00
Robert Osfield
26c911acf3 Added a s/getState() to osgTerrain::DataSet to allow better integration with applications. 2005-11-09 20:24:47 +00:00
Robert Osfield
258425d649 Bumped the version numbers up to 1.0 in preparation for 1.0-rc1. 2005-11-09 10:49:56 +00:00
Robert Osfield
3e3d16a99d Changed debug message from NOTICE to INFO level of notification 2005-10-28 10:33:11 +00:00
Robert Osfield
d2487e73e5 Added support for tracking the directory of the output file whilst still maintaining
local file references within this directory.
2005-10-27 10:48:44 +00:00
Robert Osfield
e66fd1dc70 Changed the minimum tile image size to be 4x4 to avoid problems in mipmap generation
that was occuring at sizes of 2x2, seemingly somewhere in the OpenGL driver.
2005-10-26 20:00:10 +00:00
Robert Osfield
34986dedf0 Changed destinationRowDelta and destination_pixelSpace to int's, solving a
memory corruption crash under 64 bit build.
2005-09-15 20:55:35 +00:00
Robert Osfield
e404b95dc3 Added support in osgTerrain/osgdem for setting the image format to use when writing tiles out to disk 2005-09-04 06:36:52 +00:00
Robert Osfield
d35ea68f3e Renamed Byte2,3,4 and Short2,3,4 and UByte4 to use the Vec*b, Vec*s and Vec4ub form 2005-07-15 14:41:19 +00:00
Robert Osfield
fafbb43bf9 From Jason Beverage, fix to setting of grey band. 2005-07-08 19:45:18 +00:00
Robert Osfield
facb0e2638 From Pavel Moloshtan, Byte2,3,4 and Short2,3,4 classes and their Array counterparts.
With a few build tweaks and bug fixes by Robert Osfield.
2005-07-05 15:57:53 +00:00
Robert Osfield
72488d274f Added support for equalizing the normals along tile boundaries. 2005-07-02 08:11:55 +00:00
Robert Osfield
914b16c9e9 Moved the working createPagedLODScene() implemention into createScene()
method replacing the original flaky code.
2005-06-24 15:15:55 +00:00
Robert Osfield
486f5c1a30 Fixed with the reprojection so that it doesn't promote all source data to
RGBA, but only does this for RGB data.
2005-06-13 20:03:26 +00:00
Robert Osfield
1dd553ed0e Bumped version numbers to 0.9.9 in rediness for 0.9.9 release. 2005-05-16 17:17:53 +00:00
Robert Osfield
fa0f53e2d5 Workaround for Mipspro compiler bug. 2005-05-16 14:09:39 +00:00
Robert Osfield
10232cf81a Fixed method signatures. 2005-05-16 11:18:11 +00:00
Robert Osfield
8cbba9dc00 Improvements to the repojection code so that it can generate RGBA reprojected
data.
2005-05-02 19:42:13 +00:00
Robert Osfield
015c9a9765 Added support for generating RGBA, RGBA-16 and RGBA-compressed texture databases 2005-05-02 14:16:25 +00:00
Robert Osfield
991feca6cc Added support for reading from RGBA source textures 2005-05-02 13:00:17 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
7d24d9fdd5 Added #include <algorithm> 2005-04-08 12:22:03 +00:00
Robert Osfield
3c76c9fd60 Added io_utils include 2005-04-08 09:14:50 +00:00
Robert Osfield
83e21611f6 Fixed sort of sources so that the layer number is taken into account. 2005-04-07 10:55:17 +00:00
Robert Osfield
88d65263ec Fixed layer and levels handling in reprojection of source imagery. 2005-04-07 10:19:47 +00:00
Robert Osfield
cc439f11c7 Improvements to handling smoothing 2005-03-11 09:53:13 +00:00
Robert Osfield
537fa6c604 Added null pointer check to avoid crash 2005-03-10 11:11:57 +00:00
Robert Osfield
2d9a4d5fa7 Added support for writing base layer 0 texture into texture layer 1 and above
to use as a background.
2005-03-09 22:01:15 +00:00
Robert Osfield
929601f070 Improvements to MultiTextureControl and texture layer handling in osgTerrain::DataSet. 2005-03-09 20:40:31 +00:00
Robert Osfield
6a103aa413 Added osgFX::MultiTextureControl node for managing blending between
different texture layers.
2005-03-09 16:54:10 +00:00
Robert Osfield
8dc1be6707 Added basic multiple texture layer support into osgTerrain::DataSet. 2005-03-08 16:51:48 +00:00
Robert Osfield
21c8924d83 Added support for interpolating low res source data onto higher res destination tiles. 2005-02-21 17:02:44 +00:00
Don BURNS
1771cdbcc7 Update version numbers in files 2004-12-04 23:38:24 +00:00
Robert Osfield
1956fdfc1b cleaned up debug info 2004-11-24 21:39:28 +00:00
Robert Osfield
d8adf68ba8 Clean up of output 2004-11-24 19:41:36 +00:00
Robert Osfield
ffcd95b004 Tripped out experiemental threadSafe_ methods in ReaderWriter 2004-11-23 12:57:00 +00:00
Robert Osfield
2b310c6926 Added support for serialization of calls to ReaderWriter plugins. 2004-11-15 19:46:10 +00:00
Robert Osfield
b60304f8ad Improvements to support for archives 2004-11-12 08:55:11 +00:00
Robert Osfield
6f96cf4ad2 Moved the .osga implementation into the src/osgPlugins/osga plugin and made
osgDB::Archive a pure virtual base class.
2004-11-11 13:22:55 +00:00
Robert Osfield
3523577235 Added check for endianess of .osga archives 2004-11-10 21:18:31 +00:00
Robert Osfield
8f621d6ae1 Added explicit setting of the precision to allow .osg files to be used succsefully. 2004-11-09 16:50:02 +00:00
Robert Osfield
564869487a Added support of archiving into osgTerrain::DataSet and osgdem. 2004-11-09 14:18:29 +00:00
Robert Osfield
744315b65c Fixed the compute of PagedLOD ranges for non geocentric datasets 2004-11-08 20:44:16 +00:00
Robert Osfield
8c4ab92117 Added resolutionSensitivityScale of 0.9 into the DataSet::createDestinationGraph()
to prevent overly conservative subdivision of data.
2004-11-08 19:56:22 +00:00
Robert Osfield
ce3d785751 Fixed missing write of image tiles. 2004-11-02 14:05:37 +00:00
Robert Osfield
8dfea424c5 Removed gdal_priv.h from include/osgTerrain/DataSet to remove the external dependency on
GDAL.
2004-10-28 07:00:55 +00:00
Robert Osfield
93c439ba01 Generalised the osg::ClusterCullingCallback so that it coud be attached
to Node as well as Drawables.

Changed the osgTerrain::DataSet so that it moves the ClusterCullingCallback
up to the Node level.

Added support to the .ive plugin for attaching the ClusterCullingCallback to nodes.
2004-10-21 09:36:34 +00:00
Robert Osfield
3b8abfa875 Added ability to alter the verbosity of the notify messages with the
running of osgTerrain::DataSet via a static s/getNotifyOffset(int) method.
2004-10-05 15:08:54 +00:00
Robert Osfield
7e5c87de6a Changed the version strings to use OpenSceneGaph rather than "Open Scene Graph" 2004-09-27 12:07:34 +00:00
Robert Osfield
b664c20c74 Improved the handling of building/writing generated databases, and
the fixed transition distances on the lower levels of geocentric databases.
2004-09-13 13:53:45 +00:00
Robert Osfield
8536e5dbdf Added a deleteTextureObject after the creation of the compressed textures 2004-09-11 03:00:11 +00:00
Robert Osfield
e5ea972cff Added convinience methods. 2004-09-10 13:31:37 +00:00
Robert Osfield
4dd1c6688a Added protection to prevent crashes on calls when no data is set up 2004-08-23 08:44:47 +00:00
Robert Osfield
d565d92cc8 Removed computeMipMaps call 2004-08-17 06:15:54 +00:00
Robert Osfield
907f6361ca From Corbin Holtz, addition of support for reading imagery with color tables,
including code from Frank Warmerdam on the GDAL side, and integration/reworking
work form Robert Osfield.
2004-08-13 14:42:26 +00:00
Robert Osfield
ddb7423e46 Set version numbers for 0.9.7 release 2004-08-05 08:02:48 +00:00
Robert Osfield
7eb3f2646e From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin 2004-08-04 08:27:43 +00:00
Robert Osfield
cb31021ab0 From Corbin Holtz, addition of GDAL_INCLUDE and GDAL_LIB env vars for setting
a non standard location of GDAL
2004-07-28 12:29:15 +00:00
Robert Osfield
0fb5733f13 Added support for --tile-image-size <size>, --tile-terrain-size <size> and --comment <string>
command line options into osgTerrain::DataSet + osgdem.
2004-07-19 09:03:50 +00:00
Robert Osfield
3f4b8e9034 Fixed cluster culling. 2004-07-09 20:58:43 +00:00
Robert Osfield
9cb7bb0f4a Clean up of debugging information. 2004-07-09 12:14:25 +00:00
Robert Osfield
1634cc47c6 Added automatic setting of the verical scale when the destination coordinate
system is geographic (i.e. lats and longs.).
2004-07-07 11:28:21 +00:00
Robert Osfield
a3f7547cf7 Added support for automatically computing the local skirt orientation 2004-07-07 09:04:21 +00:00
Robert Osfield
d0aa593292 Changed the default mipmapping mode to record the mipmaps in the
images in the generated databases.
2004-07-06 12:14:52 +00:00
Robert Osfield
cce00c475b Added suppor for copying mipmaps of compressed textures 2004-07-05 21:09:30 +00:00
Robert Osfield
ae3b1454e8 Completed support for "--levels min max" option where the levels that a
source imager or DEM contributes to.
2004-06-30 14:37:06 +00:00
Robert Osfield
63aa9b857d Added first stage of support for "--levels min max" in osgdem/osgTerrain where
this option controls which levels that an associated imager or DEM contributes
to the final model.
2004-06-17 14:39:16 +00:00
Robert Osfield
84c66b7c2e Added proper mapping of format and coordinate system. 2004-06-09 15:06:19 +00:00
Robert Osfield
a8ce6b01d6 Added CoordinateSystem::s/getFormat(). 2004-06-09 15:00:03 +00:00
Robert Osfield
65d0293778 Added options for controlling mipmapping and aniso-tropic filtering. 2004-06-08 13:58:36 +00:00
Robert Osfield
e8a3ba8a9f Fixed spelling of Equivalent. 2004-06-03 20:06:17 +00:00
Robert Osfield
b5366cbda6 Added DataSet::s/getSkirtRatio() method to allow control of how deep to
make the skirts around tiles.
2004-06-02 14:15:08 +00:00
Robert Osfield
1a09763515 Removed Terrain.cpp and header from CVS repository.
Added support for setting the maximum visiable distance of top level
to osgTerrain::DataSet, and debugging code which insert a axes.osg
above each tile.
2004-05-06 10:59:08 +00:00
Robert Osfield
b88b9b83ea Compile fixes for that pitful excuse for a C++ compiler that is VS6.0 2004-05-05 14:54:16 +00:00
Robert Osfield
7905aa37b7 Increased the sampling of upper most tiles when doing a geocentric projection 2004-05-05 05:17:52 +00:00
Robert Osfield
ecaf3c1587 Improved the cluster culling computation so that it now accounts for
the local elevations.
2004-05-04 14:02:53 +00:00
Robert Osfield
9db6e84d3d Cleaned up osgTerrain, renaming the Terrain and Renderer class to
HeightFieldNode and HeightFieldRender to better reflect their function.
Removed the GeoMipMapRenderer.cpp stub as the implemention will be left
to a plugin.  Added Version functions.
2004-05-03 20:42:58 +00:00
Robert Osfield
04798b4e63 Fixed compile error 2004-05-03 07:42:30 +00:00
Robert Osfield
fced94fab3 Added support for decoration of the osgTerrain::DataSet generated databases
with a CoordinateSystemNode which reflect the coordinate system of the
database.

Added support for reading and writing CoordianteSystemNode into the .osg
and .ive formats.
2004-05-02 21:50:15 +00:00
Robert Osfield
a709c0a474 Made the tri stripping of tile default to using a minimum tri strip length
of 3, thereby reducing the number of indivual primitives, but with the tradeoff
of more seperate triangles being used.
2004-05-02 15:45:36 +00:00
Robert Osfield
a34cc250e5 Added support for settings scale the elevation of geometry 2004-05-02 14:04:19 +00:00
Robert Osfield
4a6dd1d199 Temporary fix for handling grey scale images as texture source. 2004-05-02 13:35:19 +00:00
Robert Osfield
0ba2d26b1a Added Support for cluster culling.
Removed osgTerrain::CoordinateSystem which is now replaced by
osg::CoordinateSystemNode.
2004-04-29 22:22:22 +00:00
Robert Osfield
ed9501fea8 Added a guard on the simplification of already low res tiles so that they
won't be over simplified.
2004-04-22 21:51:57 +00:00
Robert Osfield
91516305d9 Added support for protecting points from being simplified.
Added back in support for generation of skirts in osgTerrain::DataSet.
2004-04-22 13:36:30 +00:00
Robert Osfield
b57bfb2271 Added back in tri stripping of tiles 2004-04-21 11:06:39 +00:00
Robert Osfield
061244056d Added support for using the error metric to guide the simplficiation process 2004-04-19 23:08:30 +00:00
Robert Osfield
a1caa14a61 Added osgsimplifier example. 2004-04-18 16:15:49 +00:00
Robert Osfield
9286df61ec Fixed typo in makefile 2004-04-14 11:56:59 +00:00
Robert Osfield
44943ed536 From Garret Potts, added -losgUtil to libs linked to osgTerrain 2004-04-14 08:58:53 +00:00
Robert Osfield
122a20f9e1 Commented out call to osgUtil::Simplifier as this utility is not yet functional 2004-04-12 21:30:23 +00:00
Robert Osfield
ceec7ae86d Changed the optimization of flat tiles so that it creates a flat 8x8 height
field rather than a flat 2x2 height field.  This allows geocentric warping
of the tiles without obvious flat regions.
2004-04-12 13:36:08 +00:00
Robert Osfield
51c8655630 Added beginning of new osgUtil::Simplifier 2004-04-08 11:27:01 +00:00
Robert Osfield
6e854d04c7 Fixes from Per Månsson for Win32 build 2004-04-06 16:01:05 +00:00
Robert Osfield
9f1fea791f Re-enabled normal generation on tiles. 2004-04-05 15:58:38 +00:00
Robert Osfield
68631ec3f0 Commented out scale setting when source DEM is in lat+longs. 2004-04-05 15:46:19 +00:00
Robert Osfield
01cbfd6715 Added local transform support. Fixed skirt generation to work during geocentric
transformations. Fixed output of image files so that compressed textures are
turned off when external image files are required.
2004-04-05 15:39:33 +00:00
Robert Osfield
398fa56bb4 Prelimary work on adding support for local tile transforms 2004-04-04 15:33:26 +00:00
Robert Osfield
3c239326a8 Added support for generating compressed textures 2004-04-02 15:55:06 +00:00
Robert Osfield
42b7df1503 Fixed computeImageResolution so that the computed num of columns and rows
of the destination image are clamped to the nearest power of two equal or
above the required resolution.
2004-04-02 15:23:56 +00:00
Robert Osfield
79e3b2fb85 Changed default cut of ratio to be smaller, to reduce the resolution of
tiles selected.
2004-04-01 15:00:22 +00:00
Robert Osfield
dbc3dbc5fa Added scaling of the PagedLOD range to be relative to the radius of children. 2004-04-01 13:09:05 +00:00
Robert Osfield
69ee8ff043 Cleaned up handling of geocentric coords 2004-04-01 11:02:23 +00:00
Robert Osfield
9d2002f3c4 Added preliminary support for converting datasets into geocentric coords 2004-03-31 22:31:46 +00:00
Robert Osfield
b67858f388 Added osgTerrain::EllipsodeTransform helper class for converting to and from
lat, long, height to geocentric X,Y,Z and back.
2004-03-31 15:50:30 +00:00
Robert Osfield
663801c0c8 Clean up freeing of no longer required tiles 2004-03-31 09:20:46 +00:00
Robert Osfield
d73824f0a1 Added back in tri stripping of geometry tiles 2004-03-30 22:06:01 +00:00
Robert Osfield
5bd4dd2010 Changed the writing out of tile imagery so that it only happens when the
destination file format is not .ive.

Added back in support for freeing un-needed tiles.
2004-03-30 22:02:50 +00:00
Robert Osfield
2f2030aba4 Fixed the boundary equalization 2004-03-30 21:13:08 +00:00
Robert Osfield
82b02fdceb Added debugging for detecting problems in boundary equalization 2004-03-30 19:15:03 +00:00
Robert Osfield
a1b46de936 Added normal generation in polygonal tile generation, and add --wtk option
for setting coord systems in osgdem
2004-03-29 22:26:51 +00:00
Robert Osfield
7bea5842fa Added support for generating polygonal tiles 2004-03-29 14:40:03 +00:00
Robert Osfield
cad1e2a075 Groundwork for adding support for polygonal tiles 2004-03-29 10:45:58 +00:00
Robert Osfield
ec1fd733b8 Added TextureType and GeometryType parameters to DataSet. These will be used
to control what type of database is generated.
2004-03-21 12:17:44 +00:00
Robert Osfield
88bbdb325d Implemented support for overriding the coordinate system and geo transform
using in generate of databases.
2004-03-20 18:32:49 +00:00
Robert Osfield
fa86c5845d Added defaults for the geotransform when none exists. 2004-03-18 21:39:53 +00:00
Robert Osfield
acf5a36c06 Added support for writing out to .ive 2004-03-17 20:04:44 +00:00
Robert Osfield
e2e779bed7 Added support for generation of PagedLOD databases in osgTerrain::DataSet 2004-03-16 16:54:08 +00:00
Robert Osfield
84562208d0 Added support for controlling the type of destiation database to create into
osgTerrain::DataSet.
2004-03-15 15:47:22 +00:00
Robert Osfield
f929455f30 Added the setting of the source data type in the reproject function, and
disabled the automatic build of overviews.
2004-03-12 16:54:43 +00:00
Robert Osfield
e082008d8a Moved osgTerrain::DataSet from the osgdem example into osgTerrain. Added
various improvements.
2004-03-11 16:14:25 +00:00
Robert Osfield
023d2254ab Early development work on osgTerrain. 2003-11-25 19:42:35 +00:00