FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,692 Commits 1 Branch 26 Tags 73 MiB
f3bee81e7a
Commit Graph

657 Commits

Author SHA1 Message Date
Robert Osfield
73c5896432 Removed DOFTransform. 2003-12-05 13:26:47 +00:00
Robert Osfield
4b63fde145 Added a cast (Array*) to get round VS.NET compiler error. 2003-12-05 09:22:03 +00:00
Robert Osfield
9c2f01fd61 Added support for expanding index'd attributes from within 
osgUtil:TriStripVisitor.
 2003-12-04 17:14:06 +00:00
Robert Osfield
db66abd6d6 Implemented duplicate removal code into TriStripVisitor and added an 
extra pass to doing tri stripping in the osgUtil::Optimzer.

Added validity checks into osg::TexEnvCombine to catch eronous enumarant values.

Improved the efficient of CullingSet's handling of new transforms.

Added a copy shared subgraphs and subdivision code into osgUtil::Optimizer.
 2003-12-03 21:45:32 +00:00
Robert Osfield
31c5528ffb Moved osg::DOFTransform to osgSim::DOFTransform. 
Fixed crash associated with .osg files which contain empty description fields.

From Sondra Inverson, added support to .ive plugin for osgSim::DOFTransform.
 2003-11-25 14:11:05 +00:00
Robert Osfield
92fc29a22c Fixed type of unrecognized 2003-11-25 11:06:39 +00:00
Robert Osfield
d82b3d0105 Added read(string,float,float,float,float) method 2003-11-25 10:56:12 +00:00
Robert Osfield
f28783e22b From Romano J M Silva, changed osg::Texture2D::copyTexImage2D so that it uses the 
_internalFormat for the texture format to read rather than default to GL_RGBA.

From Robert Osfield, changed the osg::Texture2D::copyTexImage2D and copyTexSubImage
code so that it set the _internalFormat to GL_RGBA if is is zero.
 2003-11-21 13:45:40 +00:00
Robert Osfield
62c955fa19 Added the missing insertChild(index,child) and insertChild(index,child,value) into 
osg::Switch.
 2003-11-20 12:03:51 +00:00
Robert Osfield
3f33163c47 Fixed setting of OSG_SPLIT_STEREO_AUTO_ADJUST_ASPECT_RATIO value. 2003-11-12 15:03:05 +00:00
Robert Osfield
54a8ea33ce Added support to slideshow3D for -s commandline option allow the size of 
the display to be specified.

Also implementaited some code for display position and speed info in
osgProducer::Viewer, not fully implemented yet.
 2003-11-04 16:38:10 +00:00
Robert Osfield
bc7622149d Updated to slideshow3D to support animation + pausing of animation. 
Updated associated osg/osgUtil classes that provide animation pausing.
 2003-11-03 23:13:31 +00:00
Robert Osfield
fd016af34b Added support for 565 textures to osgbluemarble. 
Added a osg::Image::scaleImage() version which allows the datatype to be varied.
 2003-10-29 23:10:11 +00:00
Robert Osfield
f1c4dc3b0d Updates for osgdem. Including new read/writeHeightField() methods. 2003-10-29 11:11:17 +00:00
Robert Osfield
eb4ee3afad *** empty log message *** 2003-10-27 16:07:21 +00:00
Robert Osfield
bce184e87c Added a check into osg::Sequence::traverse() against an empty sequence, so 
that a non existant child is not traversed.
 2003-10-27 10:29:52 +00:00
Robert Osfield
d55d8f941d Fixed error when handling mulltiple non per vertex vertex attributes during 
rendering.
 2003-10-22 13:39:16 +00:00
Robert Osfield
c199e74bfc Added support for generating compressed textures in osgbluemarble. 2003-10-17 15:26:30 +00:00
Robert Osfield
fad832425f Improvements to DatabasePager 2003-10-10 19:25:14 +00:00
Robert Osfield
5d35daa970 Udates to Drawable + IVE plugin with support for new ClusterCullingCallack. 
Improvement to osgbluemarble.
 2003-10-10 12:54:21 +00:00
Robert Osfield
1a6dc82d32 Made the Drawable::*Callback derive from osg::Object so that they can be 
saved to .osg properly.

Added osg::ClusterCullingCallback to Drawable header/source.  Not complete yet,
but will enable drawables to culled is they are facing away from the eye point.
 2003-10-08 21:29:45 +00:00
Robert Osfield
9d6bf8d1b6 From Jason Ballenger, fix for ArgumentParser::getApplicationName() 2003-10-03 16:29:34 +00:00
Robert Osfield
4700b8902c Introduced new DisplaySettings::set/getDisplayType() and environemtal variables 
to and command line arguments to set it.

Added support for using the DisplaySettings::getDisplayType() to detect use
of a Head Mounted Display when doing stereo so that the asymtric frustum can
be switched off.
 2003-10-01 15:56:52 +00:00
Robert Osfield
c00a88f4a4 From Tree, added missing setTextureData method. 2003-10-01 09:18:24 +00:00
Robert Osfield
b57404d17e Fixed the Geometry::verifyBindings && computeCorrectBindingsAndArraySizes so they 
correctly check the indices and array elements.
 2003-09-29 14:07:46 +00:00
Robert Osfield
e693f148cb Made osg::Quat support either float or double internal representation, defaulting to double. 
Generalised the osgDB::Field so that its getFloat() method can be used with either doubles or
floats governed by the type passed in - this helps support either float/double
Quat and Matrix classes seemlessly.
 2003-09-29 13:35:02 +00:00
Robert Osfield
7d69f8e193 Added getPerspective() method to Matrix* and SceneView 2003-09-29 13:14:34 +00:00
Robert Osfield
f8df9991b2 Improves to CullStack. 
From M.Grngr. options support for f=switching off internal imagery in .ive files
 2003-09-26 11:20:43 +00:00
Robert Osfield
2812c50329 Improved the Geometry::verifyBinding() and computeCorrectBindingsAndArraySizes() 
methods to check all atributes and to report warnigns when errors are detected.

Added a CheckGeomtryVisitor to osgUtil::Optimizer to detect eroneous Geometry
before rendering.
 2003-09-24 15:54:22 +00:00
Robert Osfield
c2b02608d1 Renamed instance of variables called format to pixelFormat to make a 
clearer distinction between pixelFormat and internalTextureFormat.
 2003-09-22 09:13:22 +00:00
Robert Osfield
d45fcb5613 From Alberto Farre, added support for GL_EXT_blend_color, GL_ARB_multisample, 
GL_NV_multisample_filter_hint extension in the form of osg::BlendColor and
osg::Multisample state attribute classes.
 2003-09-17 12:04:48 +00:00
Robert Osfield
c91a2d3d3e Updated version numbers and ChangeLog for the release. 2003-09-16 21:25:25 +00:00
Robert Osfield
41a07127fe Added applyProjectionMatrix(0); & applyModelViewMatrix(0); into 
osg::State::popAllStateSets(), removed some debugging output.
 2003-09-10 23:18:52 +00:00
Robert Osfield
69c4e87bb7 Added osg::State::popAllStateSets() method to pop all remain StateSet's off 
the state stack, thus readying the state object to recieve a new frame.

Removed the state.reset() call in osgUtil::SceneView::cull() as this was
causing problems with stats producing inheritance of state when toggling
stats on.
 2003-09-10 21:22:47 +00:00
Robert Osfield
b165fc9b4d Cleaned up handling of vertex arrays in osg::Geometry. 
Added support for vertex attribute arrays in .osg and .ive.
 2003-09-09 22:18:35 +00:00
Robert Osfield
792bba05b9 Added new Matrixf and Matrixd implementations. 
Made Matrix be a typedef to either Matrixf or Matrixd.  Defaults to Matrixf.

Converted the osgGA::MatrixManipulators and osgProducer::Viewer/OsgCameraGroup
across to using exclusively Matrixd for internal computations and passing betwen
Manipulators, Producer and SceneView. Note, SceneView still uses Matrix internally
so will depend on what is set as the default in include/osg/Matrix.

Added the ability to osgProducer::setDone/getDone(), kept done() as the
method that the viewer main loop uses for detecting the exit condition.
 2003-09-05 22:35:34 +00:00
Robert Osfield
a2834d74d2 Added set and get methods for Matrixd and Matrixf. 2003-09-05 20:52:36 +00:00
Robert Osfield
5b93250eb0 Added support for Matrixd and Matrixf implementations, with the default 
Matrix typedef's to either Matrixd or Matrixf.
 2003-09-05 20:48:42 +00:00
Robert Osfield
f8107a39b9 Build Fixes for IRIX. 2003-09-04 08:50:06 +00:00
Robert Osfield
bd44cfcfd8 Added a Matrix::value_type typedef'd trait into osg::Matrix, defaulting its 
value to float, and converted the internal code across to use value_type.  This
allows Matrix to be converted to use double's simply by change the definition
of value_type.  Added Matrix::glLoadlMatrix and Matrix::glMultMatrix() to
help encapsulate the changes between float and double matrix usage.

Updated code that uses Matrix so it doesn't assume float or double matrices.
 2003-09-03 10:47:25 +00:00
Robert Osfield
e530912744 Made Matrix a typedef to Matrixf, and converted the old Matrix to Matrixf, as 
part of prep for supporting both Matrixf (float) and Matrixd (double).

Added osg::Matrixf::glLoadMatrix() and osg::Matrixf::glMultiMatrix() methods
and changed corresponding usage of glLoad/MultMatrixf() calls across to use these
methods. Again prep for support Matrixd.

Fixes for VisualStudio 6.0 compile.
 2003-09-02 17:19:18 +00:00
Robert Osfield
0ebf005ac1 Added a call to disable all vertex attrib arrays when none are present 
on an osg::Geometry.
 2003-09-01 11:23:29 +00:00
Robert Osfield
4c62cfe6e5 Added experiment Tempated fast path implemenation, #if 0 out right now. 2003-08-31 22:08:22 +00:00
Robert Osfield
bd798a6c4e Added getInitialInverseViewMatrix() to osg::State. 2003-08-25 13:06:15 +00:00
Robert Osfield
02561a96c7 Compile/Warnings fixes. 2003-08-21 14:26:40 +00:00
Robert Osfield
1a68dd80d7 Added explicit calls cancel and wait until thread and no longer running to the 
DatabasePager and TXP pager.
 2003-08-20 12:52:33 +00:00
Robert Osfield
18abc3aff7 Renamed instances of Click to Tick for consistency. 2003-08-20 12:51:40 +00:00
Robert Osfield
1c3b2b2554 Standardised the culling flags between CullingSet and CullStack, and 
made ENABLE_ALL_CULLING enable all culling including the near and far plane.
DEFAULT_CULLING is now used for the default as uses the same original
values as ENABLE_ALL_CULLING once did - view frustum culling with near and
far culling. SceneView now uses DEFAULT_CULLING.
 2003-08-20 12:50:54 +00:00
Robert Osfield
bca7e4e73b Added osg::setGLExtensionDisableString && osg::getGLExtensionDisableString() 
functions the GLExtensions file, and made the isGLExtensionSupported() function
use the extension disable string when extension are querried.
 2003-08-20 10:38:54 +00:00
Robert Osfield
169eb0fd07 Changed applyTextParamaters() to set the wrap modes : 
GL_TEXTURE_WRAP_S for all texture targets.
	GL_TEXTURE_WRAP_T for all texture targets except GL_TEXRTURE_1D
	GL_TEXTURE_WRAP_R for only GL_TEXTURE_3D

And changed the defaults to OpenGL defaults of GL_REPEAT.
 2003-08-18 19:51:27 +00:00
Robert Osfield
0685c2a852 Added applyTexImage_subload() implemention into TextureRectangle class 
to provide automatic support for texture subloading.
 2003-08-18 19:36:50 +00:00
Robert Osfield
07f120fb1c Fixes to Cygwin/Mingw makedefs. 
Converted unix line endinges to dos line endings in various VS project files.
 2003-08-16 20:42:54 +00:00
Robert Osfield
282eb39ec5 Changed cout's to notufy(INFO). 2003-08-15 09:38:36 +00:00
Robert Osfield
4b7bde1440 Removed the deprecated NodeVisitor::getLocalToWorld/WorldToLocal methods as 
this are replaced by the osg::computeLocalToWorld/WorldToLocal() functions
found in osg/Transform.

Made the ReleaseTextureAndDisplayListsVisitor a public nested class of
osgDB::DatabasePager to allow it to be used in the TXP plugin, and added
usage of this visitor to the TXP plugin to make sure that textures and
display lists are released during the update thread.
 2003-08-14 00:05:34 +00:00
Robert Osfield
1de167cd37 Fixed DrawVertex/DrawColors access of null arrays errors. 2003-08-12 10:15:59 +00:00
Robert Osfield
ef4535a2a4 Added s/getFastPathHint(). 2003-08-09 00:46:48 +00:00
Robert Osfield
a11395feec Added missing copy ops in the copy constructor. 
Added computeInternalOptimziedGeometry() and associated methods to Geometry
to support alternate versions of a geometry to be used to optimize rendering,
such as flattening indexed attributes to straight attribute arrays.
 2003-08-08 00:21:30 +00:00
Robert Osfield
f4d093df36 Fixed computeFastPathsUsed() so that it includes a check for the presence 
of _vertexIndices and disables fast paths in this case.
 2003-08-04 22:03:55 +00:00
Robert Osfield
2f47ab559a Made the fine grained checking of GL errors off by default. 2003-07-23 20:55:26 +00:00
Robert Osfield
8bd3e9f1b2 From Romano José Magacho da Silva, extension checking for NV_occlusion_query extension. 2003-07-23 20:53:53 +00:00
Robert Osfield
cc529aebe0 Bumped up version numbers in preperation for the 0.9.5 release. 2003-07-23 08:54:29 +00:00
Robert Osfield
a36d45e68b Added check to allocateImage() so that if the pixel size wouldn't be computed 
unless valid _data already existed on the object.
 2003-07-23 08:18:19 +00:00
Robert Osfield
ee30f2e30c Added support for osg::State::s/getInitialViewMatrix(); 
Added slideshow3D examples to the runexamples.bat.

Fixed DatabasePager to work with the latest OpenThreads.
 2003-07-22 21:03:59 +00:00
Robert Osfield
23fc1900ce From Romano Jose Magacho da Silva, added osg:FragmentProgram. 
From Robert, add .osg support for FragmentProgram.
 2003-07-17 06:43:15 +00:00
Robert Osfield
a4b29996fd Added osg::Matrix::getOtho,getFrustum and getLookAt() methods. 
Added test for new matrix methods into unit tests example, but these really
should go in their own lib...
 2003-07-16 20:14:48 +00:00
Robert Osfield
a0d0803f1f Improvements to the handling of deletion of OpenGL rendering objets such as 
display lists and textures object such that they can be deleted according
to an available amount of time given to do deletes.
 2003-07-16 09:52:43 +00:00
Robert Osfield
82008d5ecd Updates to the flush rendering objects function calls to allow for 
managment of amount of time available to do gl delete's.  This control is
required for constant frame rate applications.
 2003-07-15 21:19:03 +00:00
Robert Osfield
1b9d7d458a Added support for texture object manager, which provides an automatic mechansim 
for reusing deleted textures.
 2003-07-14 14:42:10 +00:00
Robert Osfield
606daca904 Added default constructor implemention to LOD and PagedLOD. 
Added verbose messages to DatabasePager.
 2003-07-10 14:53:07 +00:00
Robert Osfield
9c5f84e99e From Eric Sokolosky, insertChild(). 2003-07-10 13:11:25 +00:00
Robert Osfield
12c7526f87 From Bob Kuehne, Fixed typo. 2003-07-10 08:05:24 +00:00
Robert Osfield
5aa47a77c2 Improvements to the DatabasePager and PagedLOD class adding support for 
deleting expuired children in the database thread.
 2003-07-09 14:55:39 +00:00
Robert Osfield
c2eabe1d4b Added osg::PagedLOD and osgProducer::DatabasePager class, and linked up osgProducer::Viewer 
to manage the pager.
 2003-07-08 14:44:00 +00:00
Robert Osfield
9239173019 Tweaked osg::Geometry's VBO code so that it should not call 
VBO when the extension is not supported.
 2003-07-07 08:01:09 +00:00
Robert Osfield
639fc547d5 Added missing setUseVertexBufferObject(). 2003-07-05 19:49:06 +00:00
Robert Osfield
4c576770fb Integrated various fixes from users. 2003-07-05 19:08:30 +00:00
Don BURNS
092c094752 Fixed glBindBufferARB to extensions->glBindBuffer() 2003-07-02 01:56:12 +00:00
Robert Osfield
b5442ac835 Added support for the ARB_vertex_buffer_object into osg::Geometry. 2003-06-29 21:41:57 +00:00
Robert Osfield
258ba3d806 Added #include<TextureRectangle> 2003-06-27 14:33:13 +00:00
Robert Osfield
46c5eec0d0 From Ulrich Hertlein, added support for TextureRectangle to .osg format. 2003-06-25 08:58:48 +00:00
Robert Osfield
d70ab592ed Additions since the CVS back up was made. 2003-06-24 21:57:13 +00:00
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
b444cc1ab3 Added support for scaling the projection in vertical and horizontal split stereo 
modes.
 2003-05-27 11:03:49 +00:00
Robert Osfield
4a804ebf32 Reverted recent changes so the set(Matrix&) method. 2003-05-27 11:02:45 +00:00
Robert Osfield
b17d2abc87 Adjustments to the horizontal and vertical split stereo code for better 
handling of aspect ratio.
 2003-05-26 15:00:38 +00:00
Robert Osfield
efa16a34c5 Fixes to the Optimizer's handling of merging of osg::Geometry 2003-05-22 15:29:20 +00:00
Robert Osfield
fb55f6ffbc Improved the handling of scaled matrices in the Quat::set(Matrix&) method. 2003-05-21 21:32:56 +00:00
Robert Osfield
4a6bdad3e1 Removed osg::GeoSet for core osg lib and osgPlugin. 
Commented out OpenDX plugin as its still based on GeoSet.

Added support for loading and converting GeoSet into the osgconv example.
 2003-05-21 12:15:45 +00:00
Robert Osfield
ab1b199da8 Removed the now redundent osg::Camera. 2003-05-20 08:09:36 +00:00
Robert Osfield
940ce67133 Removed remaining dependancies on osg::Camera. 2003-05-19 15:15:17 +00:00
Robert Osfield
57af40ee95 Updates to the handling of vertex attributes. 2003-05-09 13:07:06 +00:00
Robert Osfield
cda2c90315 From Romano José Magacho da Silva, support for vertex attributes in vertex program. 2003-05-07 13:13:13 +00:00
Robert Osfield
fa0333b6fe Aded extra constructors to BlendFunc and Depth to help set them up convieniently. 
Added a background quad to osghud.
 2003-05-06 18:04:27 +00:00
Robert Osfield
06054d9520 Added support for multibuffering of tex coordinates. 2003-05-06 13:13:31 +00:00
Robert Osfield
ee550382c8 Fixed build. 2003-05-02 18:24:56 +00:00
Robert Osfield
895a722842 Addd support for maximum screen text size into osgText when auto scale to 
screen is active.

Added osgautotransform demo.
 2003-05-01 21:06:18 +00:00
Robert Osfield
2d360c344c Remved exit(). 2003-05-01 08:51:03 +00:00
Robert Osfield
0ab467483f Added support for automatic scaling of text to screen coords. Optimized 
the text implementation to provide better speed, especially by using the
alignement to screen option.

Deprecated the Text::setFontSize(,) method, which is now being replaced
by setFontResolution(,)

Fixed typos in Texture*.cpp.

Removed old deprecated methods from osg headers.
 2003-04-30 11:40:17 +00:00
Robert Osfield
821313d102 From Ben, promoted floats to doubles to produce better stability in the 
invert method.
 2003-04-29 14:24:11 +00:00
Robert Osfield
1cf0be9963 Fixes to BlendFunc - adding missing ZERO handling. 
Improved handling of alpha values in DXT1 compression.
 2003-04-18 19:46:46 +00:00