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

1609 Commits

Author SHA1 Message Date
Robert Osfield
56044e6cf7 Moved the delete of expired subgraphs to the database thread to improve 
the stability of the frame rate.
 2003-08-20 07:36:47 +00:00
Robert Osfield
5b7d480c0a Fixes to the database paging. 2003-08-19 19:46:18 +00:00
Robert Osfield
e2a72f7e72 Fixed typo of getNumMatrixManipulators(). 2003-08-19 14:05:53 +00:00
Robert Osfield
75e4d43026 Removed inappropriate static_cast<>. 2003-08-19 13:01:01 +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
8d5aa5644d Added X_INC into the Make/makedefs and changed the *GNUmakefile* to use it. 2003-08-18 10:58:30 +00:00
Robert Osfield
8c65920c1f Fixes for Java build. 2003-08-18 09:24:17 +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
Don BURNS
52819c3f25 Added check for byte swapping when writing RGB files so rgb files can be 
created on big endian machines
 2003-08-16 18:52:37 +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
7ed516e443 Fixed capitalization of QTtexture.h 2003-08-12 23:06:25 +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
8a737dd2ca Added support for clampping the near and far values in othrographic projection. 
Fixed the handling of anaglyphic/stereo state in SceneView::draw().
 2003-08-08 00:36:51 +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
dd90d924d2 From Romano Magacho. add osg:: to Referenced() calls for IRIX build. 2003-08-04 21:09:40 +00:00
Robert Osfield
372c5b636a Fixed VC6 for scoping problem in ive plugin. 2003-08-03 02:59:48 +00:00
Robert Osfield
5ec1458975 From Romano Magacho, fix for compile problem under IRIX. 2003-08-03 00:24:59 +00:00
Robert Osfield
79855cf669 Fixed warning in jpeg loader by replacing longjmp with throw/catch. 2003-07-26 18:57:12 +00:00
Robert Osfield
525cd9292d Fixed long jump warning. 
CV: ----------------------------------------------------------------------
 2003-07-26 14:15:24 +00:00
Robert Osfield
edeb32778c Fixed warnings. 2003-07-26 04:25:27 +00:00
Don BURNS
e96c0b735b Fixes to makedefs/makedirdefs ordering in some makefiles, and conditional 
build for osgslideshow on Sun
 2003-07-26 01:02:39 +00:00
Don BURNS
49a93076c1 Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the 
local makefiles.

Small change in txp loader for sun build
 2003-07-25 23:49:03 +00:00
Robert Osfield
acc200a6a2 Fixed warning, which was actually a bug, sometimes you've just gotta love 
pedantic warnings.
 2003-07-24 06:07:12 +00:00
Robert Osfield
1049ead980 Fix warnings. 2003-07-24 06:05:54 +00:00
Robert Osfield
c404bd09ed Removed all references to sleep/usleep. 2003-07-23 21:32:11 +00:00
Robert Osfield
70db0608a9 Moved t->testCancel() to end of loop. 
Changed a sleep() to a Yield.

Removed debugging messages.
 2003-07-23 21:18:04 +00:00
Robert Osfield
bf5add799d Added makefile. 2003-07-23 20:57:57 +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
52aa73b18a Fixes for Win32 build. 2003-07-23 18:32:52 +00:00
Robert Osfield
a7b7d6cefc Added support for PagedLOD node into .ive format and added support for 
Enabled texture object reuse by setting an expiry delay in the TextureObjectManager
of 10 seconds - done for both osgDB::DatabasePager and TXP plugin.
 2003-07-23 15:52:05 +00:00
Robert Osfield
ace3684d6a Fixed blending mode on stats output. 2003-07-23 14:59:27 +00:00
Robert Osfield
e95768417c From Gideon May, added support for osgSim into .osg file format. 2003-07-23 14:06:32 +00:00
Robert Osfield
0c662e596c Merged changes from Nicklov Trajce and Boris Bralo. 2003-07-23 13:34:48 +00:00
Robert Osfield
2ce08d8088 Warning fixes from Gideon May. 2003-07-23 11:45:37 +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
2bce4dda75 Made BlinkSequence subclass from osg::Object. 2003-07-22 12:48:31 +00:00
Robert Osfield
aa8b552ca6 From Marco, updates to osgDB and .osg plugin to better handle reading of 
objects of specified types.
 2003-07-21 18:36:47 +00:00
Robert Osfield
40e38a1645 Added yield call to database paging main loop. 2003-07-21 15:51:43 +00:00
Robert Osfield
7e1fab5bc1 Removed old link. 2003-07-21 11:54:51 +00:00
Robert Osfield
2436d45bfc Added missing DatabasePager. 2003-07-21 10:39:07 +00:00
Robert Osfield
325dc0f6b7 Moved DatabasePager into from osgProducer into osgDB. This means that osgDB 
is now dependant on OpenThreads.
 2003-07-21 08:19:36 +00:00
Don BURNS
56a13abc05 Updated OSG to use OpenThreads. Moved any references to OpenThread to 
OpenThreads and removed any dependency on Producer threads, Mutexes, etc.
 2003-07-19 00:18:07 +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
1bf874ec1f From Ruben, added support for vertex program in .osg loader. 2003-07-16 22:26:17 +00:00
Robert Osfield
2a142c096a Added setProjectionMatrix*(), setViewMatrix*() and get*() methods to osgUtil::SceneView. 2003-07-16 22:15:28 +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
8e0e9d35d8 Rejigged the management of state in the stats and help drawing so that it used 
StateSet's rather than straight OpenGL calls.
 2003-07-16 13:17:11 +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
91cf776969 Added missing osg:: infront of Referenced() contructor. 2003-07-15 18:19:21 +00:00
Robert Osfield
c8e7f04200 Fix for compile oddities on an Octane with old zlib headers hanging around, 
change is non intrusive.
 2003-07-15 16:20:50 +00:00
Robert Osfield
1998bdef86 Moved osg::Statistics to osgUtil::Statistics and merged addition to it 
fro Pavel Moloshtan.
 2003-07-15 13:46:19 +00:00
Robert Osfield
deb26621c9 Changed the SceneView::setModelViewMatrix() methods across to being setViewMatrix(). 
The old RefMatrix methods for setModelViewMatrix() and setProjectMatrix() have
been removed to keep the API as minimal as possible.
 2003-07-15 11:49:56 +00:00
Robert Osfield
77c0366cb2 From Mike Weiblen's osgGL2 node kit which support the latest OpenGL 2.0 extensions. 2003-07-15 10:45:46 +00:00
Robert Osfield
b2e5e09c28 From Bart Gallet, updates to VisualStudo .dsp's to keep things compiling under Windows. 2003-07-15 09:39:45 +00:00
Robert Osfield
fc4b990a7a Compile fixes. 2003-07-15 07:53:25 +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
94d8e72ad3 warning fixes for IRIX. 2003-07-11 22:05:34 +00:00
Robert Osfield
c0953d2855 Added dataToMergeList into checks for active subgraphs. 2003-07-10 15:23:18 +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
5b75d7f525 From Michael Gronger, addition of ReaderWriter* Registry::getReaderWriterForExtension(const std::string& ext). 
Also removed copy constructor and = operator from Ouput as it was produce
spurious warnings under gcc 3.3.
 2003-07-10 13:35:19 +00:00
Robert Osfield
fa8b8c6a52 From Tree, fixes for text bounding box initialization. 2003-07-10 13:18:13 +00:00
Robert Osfield
9c5f84e99e From Eric Sokolosky, insertChild(). 2003-07-10 13:11:25 +00:00
Robert Osfield
c5c7a1b2ba Updates to the DatabasePager code to include support for compiling texture 
objects and display lists before merging loaded subgraphs with the main
scene graph.
 2003-07-10 11:10:39 +00:00
Robert Osfield
12c7526f87 From Bob Kuehne, Fixed typo. 2003-07-10 08:05:24 +00:00
Robert Osfield
809168d5f8 Further updates to the DatabasePager. 2003-07-09 19:48:04 +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
dcbaf59753 Added #include <unistd.h> to DatabasePager.cpp. 2003-07-09 07:41:53 +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
71eb715068 Added an osg:: infront of the Object() copy constructor call to AttrData. 2003-06-30 06:41:42 +00:00
Robert Osfield
1d73bb8bec Added support for chunking the point data clouds into 10,000 point chunks to 
better optimize the VBO and AGP needs.
 2003-06-29 21:53:38 +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
a632652507 Added #include <TextureRectangle> 2003-06-27 14:33:37 +00:00
Robert Osfield
258ba3d806 Added #include<TextureRectangle> 2003-06-27 14:33:13 +00:00
Robert Osfield
8d4ab4668e From Tree, updates to osgText and freetype plugin to support are kerning paramter. 2003-06-26 16:21:49 +00:00
Robert Osfield
3f23a430fb Fixed from Pavel for the stats in RenderBin.cpp 2003-06-25 10:39:11 +00:00
Robert Osfield
aca924113f From Julia Oritz Rojas, support for detail textures. 2003-06-25 10:12:50 +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
277b6cf24a Spotted by Norman Vine - fixed typo in intersect visitor. 2003-06-25 08:50:57 +00:00
Robert Osfield
367750997b Test of cvs. 2003-06-25 07:59:59 +00:00
Robert Osfield
9d6341b620 Added TessellationHints. 2003-06-25 07:50:19 +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
a12fd61266 Added missing std:: 2003-05-26 11:02:42 +00:00
Robert Osfield
f8ba149e19 Added 3dc plugin for reading Arias 3D point clouds. 2003-05-26 10:05:52 +00:00
Robert Osfield
7b657aed3a Adding support using istream and ostream with the reader writers. 2003-05-26 09:27:16 +00:00
Robert Osfield
289ae01420 From Geoff Michel, conversion from GeoSet to Geometry. 2003-05-25 16:08:57 +00:00
Robert Osfield
087944d343 Removed export macro. 2003-05-24 14:42:00 +00:00
Robert Osfield
5bfaf54292 Added missing std:: 2003-05-24 14:26:20 +00:00
Robert Osfield
5408077c3b Added ive reader/writer - from Rune Schmidt Jensen/Michael Gronager 2003-05-23 19:51:12 +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
058e4939fc Convert Performer plugin across to generate osg::Geometry directly. 2003-05-22 11:09:28 +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
72b86dee82 Removed the _state.reset() call as it was doing OpenGL calls outside of the 
thread with the graphics context.
 2003-05-21 16:33:53 +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
fcbbf12b75 Added usage of the InputRectangle into setting up of the EventAdapter. 2003-05-20 20:45:10 +00:00
Robert Osfield
eb3169634a Removed spurious editing file. 2003-05-20 19:48:07 +00:00
Robert Osfield
094e0f2e48 Fixes to the handling of mouse coords after changes in the default behavior 
of Producer.
 2003-05-20 13:21:05 +00:00
Robert Osfield
e2ec462fab Changed the fusion distance update code to use OsgCameraGroup::setDistanceDistance() 
rather than going through the SceneView's by hand. This should ensure that values
are kept consistent betwen OsgCameraGroup and SceneView's.
 2003-05-20 08:47:21 +00:00
Robert Osfield
ab1b199da8 Removed the now redundent osg::Camera. 2003-05-20 08:09:36 +00:00
Robert Osfield
00e94b86d8 Removed all KeySwitchCameraManipulator class, replacing it 
with the KeySwitchMatrixManipulator
 2003-05-19 20:18:37 +00:00
Robert Osfield
940ce67133 Removed remaining dependancies on osg::Camera. 2003-05-19 15:15:17 +00:00
Robert Osfield
4151312dc5 Removed redundent const 2003-05-17 13:15:54 +00:00
Robert Osfield
715ba6fb66 Renamed png pnm 2003-05-17 09:03:06 +00:00
Don BURNS
b6d6759337 Small operation precedence bug fixed in Text.cpp 2003-05-14 16:07:39 +00:00
Robert Osfield
57af40ee95 Updates to the handling of vertex attributes. 2003-05-09 13:07:06 +00:00
Robert Osfield
876e40802e Memory leak fixes from Joseph Steel. 2003-05-08 14:02:50 +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
ba8bf1e94c From Eric Sokolowsky, support for mouse scroll wheel in osgGA/osgProducer. 2003-05-07 11:13:49 +00:00
Robert Osfield
aa0d5fc52e Changed the CullVisitor::popProjection() so that it doesn't adjust orthorgraphic 
projection matrices.
 2003-05-07 09:35:43 +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
6c60fa233e Fixed accept(PrimitiveFunctor&) so it uses the transform coords correctly. 2003-05-05 14:30:12 +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
d2d9b97953 Added set/getNearFarRatio() to CullVisitor. 2003-05-01 19:56:02 +00:00
Robert Osfield
2d360c344c Remved exit(). 2003-05-01 08:51:03 +00:00
Robert Osfield
86254927b9 From Eric Sokolowsky - pnm (ppm, pgm, pbm) plugin 2003-04-30 15:40:57 +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
Don BURNS
e1468428e3 set glDrawBuffer( GL_BACK ) in SceneView::draw() when not drawing in 
stereo mode.  Without this, we end up drawing to the wrong buffer when
toggling stereo off.
 2003-04-29 00:55:12 +00:00
Robert Osfield
c1b1a091fa From Tree, addition of ; after MACRO_'s to help with Java port. 
From Tree + Robert, Addition of LEFT_BASE_LINE,RIGHT_BASE_LINE,CENTER_BASE_LINE
Alignment options in Text.
 2003-04-27 10:58:39 +00:00
Robert Osfield
89b1365b2b Added support for gather information on which vertices have been intersected with. 2003-04-25 13:47:33 +00:00
Robert Osfield
af1eae0418 cout -> notify. 2003-04-24 13:45:10 +00:00
Robert Osfield
341fa340ce Added check for camera's sharing the same RenderSurface, if so switches off 
multi-threading of cull and draw.
 2003-04-23 09:59:08 +00:00
Robert Osfield
a79fada938 Mannually computes the mipmap levels to ensure correct loading of dds 
images which arn't square.
 2003-04-19 06:57:07 +00:00
Robert Osfield
b6ee5445b7 Changed the ordering of the picking intersections. 2003-04-18 21:44:48 +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
Robert Osfield
bc8bd29646 Updated NEWS for the release. 
Fixed warnings.
 2003-04-18 15:59:34 +00:00
Robert Osfield
1c8db044f1 Removed various assert() instances since these were causing crashes. 
From Alberto, changed the use of the DynGeoSet to it was querried on demand
rather than used as a pointer which was originally being invalidate before
use.
 2003-04-18 10:10:14 +00:00
Robert Osfield
ba575396a4 Added setting of the RenderSurface name to the application name. 2003-04-17 15:57:05 +00:00
Robert Osfield
d0aac6e6f0 Added an alternate compile path for Windows in the toggle of fullscreen 
for the first time.
 2003-04-17 13:57:15 +00:00
Robert Osfield
67f5cc46c1 Changed the maxx initializiation to use (*points)[last_valid_index].x(); 2003-04-17 13:36:41 +00:00
Robert Osfield
fd262554ac Moved the managing of frame stamp from osgProducer::Viewer into 
osgProducer::OsgCamaraGroup.

Added setting of trackball in osgcameragroup so its starts in the
correct place for different models.
 2003-04-17 11:14:25 +00:00
Don BURNS
6fc19084ac Changed Rect('s to Rectangle('s 2003-04-16 21:16:23 +00:00
Robert Osfield
0b0c6c4e60 Added support for set/getColor to ShapeDrawable. 2003-04-16 20:02:15 +00:00