FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,396 Commits 1 Branch 26 Tags 73 MiB
74e5d44538
Commit Graph

215 Commits

Author SHA1 Message Date
Robert Osfield
811d0e465a Added better handling of colour layer/elevation layer/transfer function combinations and 
use of 16bit luminance format for colour layers used as input to transfer functions
 2007-04-05 14:56:30 +00:00
Robert Osfield
86e20e1659 Added assignment of hieghts texture coords 2007-04-03 19:18:20 +00:00
Robert Osfield
31d9f40a2f Preliminary work on TransferFunction support 2007-04-03 15:39:05 +00:00
Robert Osfield
826be748e8 Added support for texture layer. 2007-04-01 11:19:46 +00:00
Robert Osfield
d434ee0db8 Added support for reading values from an ImageLayer, and building of the 
elevation data in GeometryTechnique.
 2007-03-30 14:57:57 +00:00
Robert Osfield
a2ecb93c2b Converted osg::HeightField across to using a osg::FloatArray internally to enable 
it to be assigned as a vertex attribute array to an osg::Geometry.

Removed the osgTerrain::ArrayLayer as its no longer required thanks to the above change
which makes the osgTerrain::HeightFieldLayer more flexible.  

Updated wrappers
 2007-03-29 19:42:07 +00:00
Robert Osfield
0c44e9ac19 Added creation of basic geoemtry to test Locator and extents 2007-03-29 14:45:35 +00:00
Robert Osfield
e2e0897a1b Added missing return value 2007-03-29 10:13:36 +00:00
Robert Osfield
cb811aa7cd Added support for compute the extents on local NDC coordiantes of the 
elevation and colour layers
 2007-03-28 16:28:20 +00:00
Robert Osfield
78ed8f9219 Add computeBound support to TerrainNode and Layer. 2007-03-27 19:27:36 +00:00
Robert Osfield
4688d5ae8e Rearranged the traversal and initialization of TerrainTechnique 2007-03-27 16:01:01 +00:00
Robert Osfield
e76e4e82db Added EllipsoidLocator. 2007-03-27 11:23:57 +00:00
Robert Osfield
b419fa93ef From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY, 
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
 2007-03-26 13:02:38 +00:00
Robert Osfield
56a1808794 Added ImageLayer, ArrayLayer and HeightFieldLayer classes 2007-03-21 17:18:53 +00:00
Robert Osfield
541c3f13e9 Added GeometryTechinque to osgTerrain. Added usage of GeometryTechnique into osgterrain example 
Added --width and --height command line options to osgdistortion to allow users
to control the window size.
 2007-03-21 16:34:04 +00:00
Robert Osfield
c66252ca3a Further work on TerrainNode 2007-03-19 11:25:41 +00:00
Robert Osfield
32166ca631 Build fixes 2007-03-19 10:54:39 +00:00
Robert Osfield
7f2586d9db Name fixes 2007-03-14 12:59:06 +00:00
Robert Osfield
2fae221f2d Added class shells for osgTerrain::Locator and osgTerrain::Layer classes 2007-03-14 12:00:54 +00:00
Robert Osfield
c489b0af2c Renamed HeightFieldNode and HeightFieldRenderer to TerrainNode and TerrainTechnique respectively 2007-03-14 11:24:04 +00:00
Robert Osfield
e9ad68c926 Removed GDAL references 2007-03-12 12:13:52 +00:00
Robert Osfield
5fdeaeaaa2 Fixed osgTerrain CMakeLists.txt so it didn't include DataSet or GDAL references 2007-03-12 11:48:35 +00:00
Robert Osfield
db6f07f1d6 Ran dos2unx of CMakeLists.txt files 2007-03-08 15:31:36 +00:00
Robert Osfield
f50ed9667a From Eric Wing and others, first cut of CMake build support 2007-03-04 13:05:33 +00:00
Robert Osfield
b00cbe5a17 Moved include/osgTerrain/DataSet/.cpp, gdal plugin and osgdem out into the VirtualPlaneBuilder project. 
Updated examples to remove DataSet/GDAL dependency.

Updated wrappers
 2007-02-27 21:12:48 +00:00
Robert Osfield
db163de91c From Luigi Calori, "In order to effectively use --image-ext and to add -O "plugin options", 
some fix to osgdem.cpp and osgTerrain/DataSet.cpp

These mods should allow to build terrains controlling  jpeg compressed
imagery embedded in ive files,  using something like:

osgdemd  --image-ext jpeg --RGB_24 -O "JPEG_QUALITY 20
compressImageData" ......."
 2006-12-07 10:16:43 +00:00
Robert Osfield
bae46a0fbd From Jason Beverage, "I ran though the sample data that Gert provided earlier today and tracked down the problem. The xoffset in readHeightField and readImage were being applied even in projected coordinate systems. This patch should fix the issue." 2006-11-14 12:55:00 +00:00
Robert Osfield
5c1b0f1bbd Added support for imagery and DEM's that wrap around the dateline, this required 
two passes over the copying of imagery and DEM's to the destination graphs, once for
the original position, and once for the wrap around 360 degrees on or before.

Also fixed the GeospationExtents constructor that was setting the _max to DBL_MIN rather
than -DBL_MAX.  This bug causesd the y axis to be computed incorrectly.
 2006-09-04 20:43:07 +00:00
Robert Osfield
87a221445e Updated version numbers of the up comming 1.2 release 2006-08-31 20:54:28 +00:00
Robert Osfield
132f9ead45 Updated version number for 1.1.1 release 2006-08-12 08:29:16 +00:00
Robert Osfield
5c4446dd5e From Jason Beverage, 
"I've attached fixes to DataSet that should fix the problems that Maya was seeing yesterday.  The issue was that the new interpolation code I submitted didn't use the SourceData's georef, it was assuming that the GDALDataSet had a proper geo-ref.  I've made the getInterpolatedValue method a member of SourceData and now it uses the georef the SourceData's georef.

I also forward declared the GDALRasterBand class in the DataSet header."
 2006-07-31 20:56:22 +00:00
Robert Osfield
f5b5f7f527 From Jason Beverage, "This patch should fix Gert's problem that he posted on osg-users. I downloaded the sample he posted, reproduced the error, and added an additional check to make sure the GDAL window size was valid. Now his example works fine. Changes made against current CVS. 
"
 2006-07-27 16:41:22 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
ad18b88848 From Antoine Hue, 
"There was a typo in "int setNotifyOffset()", appear to be a getter =>
"int getNotifyOffset()".

Then I have added a switch to create GDALTermProgress only when the
current notify level + local offset permit message display. In fact, if
the offset is set to 0 and the notify level is at the default, DataSet
is quiet but for the GDALTermProgress. That is quite disturbing since
you think the progress is related to the complete processing but it is
actually only related to the GDAL Warp."
 2006-07-11 10:34:41 +00:00
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