Paul MARTZ
1163ebb25b
2.8 branch: Add up-to-date ffmpeg plugin. This commint merges the following revisions from trunk: 9910, 9912, 9933, 9948, 9960, 9965, 9968-9969, 9990, 10030, 10053, 10082, 10161, 10391-10392, 10408, 10414, 10422, 10538, 10809, 10851, 10892, 10925, 10961, 11165, and 11177.
2010-03-19 15:56:12 +00:00
Robert Osfield
c78d065d51
Added disabling of mipmapping for non power of two textures
2009-04-06 12:29:17 +00:00
Robert Osfield
171bc9da21
Merged from svn/trunk disabling of use of display lists and a extra check against NULL to prevent a crash when NULL colour layers are assigned
2009-04-06 11:27:28 +00:00
Robert Osfield
4ad20a413a
Fixed warnings
2008-12-18 11:06:57 +00:00
Robert Osfield
3ce53b56c7
Added support for a Terrain::s/getTerrainTechniquePrototype()
2008-12-15 22:18:40 +00:00
Robert Osfield
10186190f6
Introduced support for controlling mipmapping of osgTerrain::ImageLayer and compression of osgTerrain::HeightFieldLayer.
2008-10-20 08:43:25 +00:00
Robert Osfield
2be243deda
Added support for SwitchLayer into GeometryTechnique
2008-09-11 14:27:50 +00:00
Robert Osfield
d05236bfb4
Implemented intial KdTree triangle intersection code, but without culling implemented
2008-07-07 13:21:37 +00:00
Robert Osfield
c4e8d6ee42
Changed the DatabasePager so that it bypasses the Registry::readNode() method and calls
...
readNodeImplementation() directly to avoid calling the KdTreeBuilder.
Updated wrappers.
2008-07-06 18:27:10 +00:00
Robert Osfield
44d144997e
Added prelimnary KdTree data structure and automatic kdtree build support
...
into osgDB::Registry/osgTerrain so that newly created subgraphs can have
KdTree built on all osg::Geometry automatically on load/creation.
2008-07-04 15:57:48 +00:00
Robert Osfield
4d60d73eca
Reorginized the TerrainTile/TerrainTechnique dirty mechanism so that TerrainTile
...
now holds the dirty flag and enables/disables event traversal in response dirty
being set/unset. This allows terrain to be automatically updated in response
to Terrain scale and sample ratio changes.
2008-05-27 15:30:20 +00:00
Robert Osfield
1519d0d546
From John Vidar Larring, "Added vertical scale as a property of osgTerrain::Terrain. Lets you configure vertical scale when initializing the terrain model. E.g:
...
osgTerrain::Terrain* terrain = findTopMostNodeOfType<osgTerrain::Terrain>(model.get());
if (!terrain)
{
terrain = new osgTerrain::Terrain;
terrain->addChild(model.get());
terrain->setVerticalScale(2.0f);
model = terrain;
}
viewerWindow->setSceneData(model.get());
"
2008-05-27 13:11:47 +00:00
Robert Osfield
e70d44e6a5
Added cast to avoid warning
2008-04-25 08:34:54 +00:00
Robert Osfield
234bfeb648
Removed hardware down sampling hack from GeoemtryTechnique and replaced with Terrain::g/setSampleRatio()
...
usage.
2008-04-22 11:39:47 +00:00
Robert Osfield
960e0bd378
Set Texture::setMaxAnisotropy() to 16.0f for better quality terrain when looking at shallow angle.
2008-03-28 18:42:03 +00:00
Robert Osfield
6396a156a2
Renamed osgTerrain::TerrainSystem to osgTerrain::Terrain
2008-03-27 11:55:03 +00:00
Robert Osfield
35c5bd2c92
Renamed Terrain to TerrainTile
2008-03-27 10:55:39 +00:00
Robert Osfield
600dbf5470
Added sampling down to 32x32 mesh for 64x64 height fields as a workaround to
...
memory consumption issues with high res whole earth paged databases.
2008-03-24 18:06:40 +00:00
Robert Osfield
67f1503c7d
Refactored osgTerrain so that the interface for setting up layer is more straight forward, and added support into GeometryTechnique for handling multiple layers
2008-02-22 11:52:23 +00:00
Robert Osfield
6516bf4910
Added TextureUnit entry to osg::TransferFunction and osgTerrain::Layer
2008-02-20 12:34:13 +00:00
Robert Osfield
4163f173a0
Added missing checks for null pointers
2008-01-22 10:28:48 +00:00
Robert Osfield
5e9c708582
Added use of ref_ptr<> throughout geometry setup code to prevent memory leaks
2008-01-19 18:25:45 +00:00
Robert Osfield
574582f206
Added support for rendering skirts into osgTerrain::GeometryTechinque
2008-01-18 16:36:05 +00:00
Robert Osfield
bb7ba24f59
Commented out debug message
2008-01-17 22:26:29 +00:00
Robert Osfield
fc85978077
Added computation of skirt height for osgTerrain::Terrain height fields.
2008-01-17 22:25:41 +00:00
Robert Osfield
ae33e4a459
Changed the Texture clamp mode to CLAMP_TO_EDGE
2008-01-16 15:05:04 +00:00
Robert Osfield
a46eb79311
Indentation/bracket fixes and change of default size
2008-01-09 21:17:10 +00:00
Robert Osfield
f4afa427a7
From Roland Smeenk, "Attached you will find a large set of small typo fixes (mainly in the comments)."
2007-12-10 17:30:18 +00:00
Robert Osfield
8e7e6529be
From David Callu, warning fixes
2007-09-07 15:03:56 +00:00
Robert Osfield
f9ab446512
Changed debug comments to output to notify level and tweaked the handling of the .terrain file.
2007-08-24 19:16:35 +00:00
Robert Osfield
a981202953
Set the debug out to info notification level
2007-08-24 16:16:08 +00:00
Robert Osfield
3c82058c68
Updated wrappers
2007-08-16 15:29:50 +00:00
Robert Osfield
2f41234793
From Maria Ten, "I divide the init method of the
...
geometrytechnique in submethods to made more easy the inheritance
between the user and osg-class. This is a first step to add more
functions in osgTerrain. Maybe the subdivision of the method have to
be in the terraintechnique because is the base class of
GeometryTechnique. If Robert or anyone think that this is better i
change this class too."
2007-08-16 14:13:10 +00:00
Robert Osfield
1c6193ba78
Renamed osgTerrain::TerrainNode to osgTerrain::Terrain and introduced basic
...
.osg read support for osgTerrain::Terrain.
2007-08-07 19:53:57 +00:00
Robert Osfield
5ec2969330
Added setting of ThreadSafeRefUnref to true.
2007-07-18 16:48:25 +00:00
Robert Osfield
51e07f1e66
Added traverse method implementation into GeometryTechnique.
2007-07-17 17:36:44 +00:00
Robert Osfield
03749d5e34
Removed redundent TerrainGeometry classes, and adding double buffer of
...
internal data within GeometryTechinque in prep for support multi-threaded
set up and rendering of terrain.
2007-07-12 20:12:38 +00:00
Robert Osfield
601217025f
Improved the mapping of update and cull traversal
2007-07-05 18:30:20 +00:00
Robert Osfield
9f72c9392e
Added code of support for contouring shaders
2007-06-20 12:00:29 +00:00
Robert Osfield
d4309ce69a
Added use of GLSL filters
2007-06-18 12:10:46 +00:00
Robert Osfield
b97d8c0fe0
Added TerrainNode::init() and s/getTreatBoundariesToValidDataAsDefaultValue flag.
2007-05-13 09:54:51 +00:00
Robert Osfield
acb2ed177c
Added ValidDataOperator base class and NoDataValue and ValidRange subclasses, and
...
support for it in osgTerrain::Layer and GeometryTechniqnue.
2007-05-11 18:25:06 +00:00
Robert Osfield
3fd26eec28
Added automatic detection of alpha values, switching on blending when alpah!=1.0
2007-05-10 12:49:09 +00:00
Robert Osfield
65811d0233
Added virtual orientationOpenGL() method into osgTerrain::Locator.
2007-05-03 11:11:03 +00:00
Robert Osfield
80c42a7cf7
Introduced new tesslation technique that adjusts the triangulation so that the
...
diagonal goes between the corners with least vertical deviation.
2007-05-02 13:58:38 +00:00
Robert Osfield
efb52dfab9
Added TerrainNode::setColorFilter(layerNum,Filter) to allow developers to set
...
what type of texture filter to use, either LINEAER and NEAREST.
2007-04-30 09:47:35 +00:00
Robert Osfield
aa56bddefc
Added a MatrixTransform set up to provide a local origin for better precision.
2007-04-29 20:10:43 +00:00
Robert Osfield
921eb0fdd0
Further work on new VertexBufferObject/ElementsBufferObject support
2007-04-29 08:12:29 +00:00
Robert Osfield
47598ce1a9
Added back in osg::Geometry path
2007-04-27 17:03:06 +00:00
Robert Osfield
835e315494
Implement basic TerrainGeometry code
2007-04-16 19:34:25 +00:00
