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

230 Commits

Author SHA1 Message Date
Robert Osfield
9a31b7652e Added mutex to lock of ReentrantMutex 2007-01-04 20:50:35 +00:00
Robert Osfield
d7e3ed3fb2 Updated wrappers 2006-12-27 23:19:37 +00:00
Robert Osfield
30cb8735d3 Added an osgDB::ReadWriteMutex to help manage the ability to have serialize 
write to objects but allow multiple threads to read at once in a read only way.
 2006-12-27 16:40:34 +00:00
Robert Osfield
3177494aa4 From Bryan Thrall, "Currently, the DatabasePager always loads requested Nodes using the 
default Registry Options object, but it would be useful to be able to
request loading with a different Options object. The attached files
allow you to do that (based off the OSG 1.2 source).

For example, I'm implementing a loader that requires context information
when it pages in subgraphs, which becomes significantly complicated when
multiple scenegraphs are requesting subgraph loads with different
contexts (the loader needs to know which context to use, and the
Registry Options needs to be carefully managed so the context settings
don't clobber each other, especially in multithreaded situations). Being
able to pass an Options instance along with the Node request resolves
this problem."
 2006-12-05 14:50:46 +00:00
Robert Osfield
530e9e08d4 Added better handling of writeNode operations that arn't successful. 2006-11-07 17:00:56 +00:00
Robert Osfield
553d017fd9 From Daniel Trstenjak, build fixes for Hpux 11.11, Irix 6.5, Solaris 8 and Aix 2006-08-02 10:43:26 +00:00
Robert Osfield
f1c2694c17 Updated copyright years. 2006-07-18 15:21:48 +00:00
Robert Osfield
4431b381d3 From Eric Wing, removed trailing commans from enum lists. 2006-05-15 11:56:59 +00:00
Robert Osfield
83add79c07 From Chris Hanson, added get methods for size of file request and data to compile lists. 2006-02-04 21:06:48 +00:00
Robert Osfield
f77b38ae9c Added DatabasePager::s/getDrawablePolicy() to allow the way that the display list/VBO settings 
are applied to loaded databases.
 2005-11-22 13:14:00 +00:00
Robert Osfield
9c93332c03 From Rodger James, changed the Win32 static library compilation support to use 
OSG_LIBRARY_STATIC to avoid problems with building libs when not required.
 2005-11-18 09:52:24 +00:00
Robert Osfield
35fcaf7bde Convert tabs to spaces. 2005-11-17 17:44:48 +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
9bbba5a052 From Don Tidrow, bug fix to setOutputTextureFiles(bool). 2005-10-26 20:30:15 +00:00
Robert Osfield
f26c3da074 From Chris Hanson, "The following files are drop-in replacements for the include/*/Export files to permit 
building statically linked osg libraries under Win32."
 2005-09-28 14:05:05 +00:00
Robert Osfield
d1108ea862 Added support for "-O OutputTextureFiles" options string in .osg plugin to 
allow texture files to be written out when writing out a .osg file.
 2005-09-19 14:07:44 +00:00
Don BURNS
5f27216e7e made removeExpiredSubgraphs virtual. 2005-08-25 18:18:27 +00:00
Robert Osfield
d154c2a4cd From Eric Sokolowsky, warning fixes for g++ 4.0 under Fedora Core 4. 2005-08-25 17:53:01 +00:00
Robert Osfield
51faa7e43a Various updates to support the new GraphicsThread class. 2005-08-18 20:17:51 +00:00
Robert Osfield
b9a74c87e1 From Jeremy Bell, 
"My patch is a slight refactoring of the mac specific code in
Registry.cpp and FileUtils.cpp, specifically around the library and
resource file path initilialization methods. This patch cleans up a
lot of the mac specific code by moving repeated code into separate
local functions in FileUtils.cpp that are only compiled on mac builds.
It also adds one function to the API,
appendPlatformSpecificResourceFilePaths in FileUtils. This function
will mirror the already existing
appendPlatformSpecificLibraryFilePaths except for resource file paths.
Currently this function is empty except when built on the mac, in
which case it will add the application bundle's internal Resources
folder and the bundle's parent folder. Previously this code was
implemented as a separate mac specific #ifdef block in Registry.cpp
around the initDataFilePathList method. However, it now is implemented
in appendPlatformSpecificResourceFilePaths in FileUtils.cpp and the
initDataFilePathList method is now the same on all platforms. This
patch should behave the same as before on non-mac platforms.

This patch already includes the fix that Eric mentioned earlier. This
patch is based off of the 0.99 release code. I have tested this patch
using the following testing scheme:

Make a proper bundled application.
While Run from the Finder:
   Test that it finds plugins in its internal plugins path.
   Test that it finds resources in its internal resources path.
   Test that it finds resources in the bundle's parent directory
   Test that it finds plugins in the user's Application Support Directory
   Test that it finds plugins in the system's Application Support Directory
   Test that it finds plugins in the Network Application Support Directory
   Check the plugin and resource path lists after they have been
initialized to see if they are in the correct order

While Run from the command line (both from it's parent directory and
from inside the /Contents/MacOS directory) and repeat the above tests.
Check that it also finds plugins and resources within the paths
defined by various environment variables.

Now, Make an application that is NOT bundled/command line only
   Test that it does NOT try to look in an internal bundle
plugin/resource directory for plugins or resources.
   Test that it finds plugins/resources in the paths defined by the
environment variables.
"
 2005-07-26 21:07:31 +00:00
Robert Osfield
44b8b0177c Added ability to toggle on/off the pre compile of OpenGL objects in the 
DatabasePager via the setDoPreCompile(bool) method or via the env var
OSG_DO_PRE_COMPILE=ON or OFF.
 2005-05-31 05:37:13 +00:00
Robert Osfield
cf06b40891 Added pragma to remove warnings under VS.8.0 2005-05-24 18:57:13 +00:00
Robert Osfield
10232cf81a Fixed method signatures. 2005-05-16 11:18:11 +00:00
Robert Osfield
668aada787 From Marco Jez, fixes to/and for osgIntrospection. 2005-05-15 20:32:10 +00:00
Robert Osfield
d1a1b1d95c Added more comprehensive releaseGLObjects(State*=0) throughout Nodes, 
Drawables,StateSet, and osgDB::Registry.

Added cleanup_frame() from to osgProducer::OsgCamerGroup to help with proper
clean of OpenGL objects before exit, and modified osgviewer, osghangglider,
osgwindows examples to do the extra frame call to cleanup_frame() before exit.
 2005-05-07 20:47:09 +00:00
Robert Osfield
648677ce44 Added next stage of support for osg::Uniform in .osg plugin 2005-04-18 12:34:28 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
8bb4649cd5 Added extra controls into osgDB::DatabasePager for customizing how 
much time is allocated to compiling and deleting OpenGL objects, also
added support into osgProducer::OsgSceneHandler.cpp for these new parameters.

The new cotrols are:

    DatabasePager::s/getTargetFrameRate(..)
    DatabasePager::s/getMinimumTimeAvailableForGLCompileAndDeletePerFrame()
    DatabasePager::s/getMaximumNumOfObjectsToCompilePerFrame()
 2005-03-17 19:32:09 +00:00
Robert Osfield
5684a130b7 From Alberto Farre, addition of ProxyNode, with support in .osg, .ive and .flt loaders 2005-03-07 14:06:09 +00:00
Robert Osfield
dd0c29d19b Added new utilities for handling different '/' and '\' entries. 2005-02-11 09:58:30 +00:00
Robert Osfield
95161cb301 From Tree, removed redundent "inline"s 2005-01-28 16:09:11 +00:00
Don BURNS
463b47f020 Fixes for SOlaris build 2004-11-29 03:05:27 +00:00
Don BURNS
c7e8386707 Fixes for IRIX build 2004-11-29 01:12:25 +00:00
Robert Osfield
c3fd271dc4 Addd high level introductory docs for all the libs 2004-11-26 16:01:04 +00:00
Robert Osfield
d9b9a6f1f8 Made read/write methods in ReaderWriter all const to facilate multi-threading 2004-11-23 15:29:52 +00:00
Robert Osfield
ffcd95b004 Tripped out experiemental threadSafe_ methods in ReaderWriter 2004-11-23 12:57:00 +00:00
Robert Osfield
ce07879e2e Moved plugins across to using ReaderWriter::Options* for search paths in addition 
to standard osgDB::DataFilePaths
 2004-11-22 23:54:45 +00:00
Robert Osfield
e54f46f630 Removed the cache hints from registery placing them wholly into ReaderWriter's responsibility. 2004-11-22 14:49:27 +00:00
Robert Osfield
a6369da4f4 Moved Registry::CacheHintOptions into ReaderWriter::Options 2004-11-22 14:10:12 +00:00
Robert Osfield
6fa4eecdd5 Changed ReaderWriter::Options to derive from osg::Object to add clone() 
ability.
 2004-11-20 13:35:49 +00:00
Robert Osfield
eff3482ec6 Removed the public open methods 2004-11-18 22:13:13 +00:00
Robert Osfield
8cc9d650a1 Added friend usage for inner classes to try and get round compile problems 
under Solaris.
 2004-11-18 12:07:28 +00:00
Robert Osfield
36661a33d3 Fixed writeImage. 2004-11-18 11:21:51 +00:00
Robert Osfield
70bb34af6a From Stephane Simon, compile fix for VS, change struct to class in forward declaration. 2004-11-18 09:09:22 +00:00
Robert Osfield
e9c403839d Made a few of the public methods virtual, and moved more of the class 
methods to protected scope.
 2004-11-17 14:25:17 +00:00
Robert Osfield
daaa9f3ba0 Fixed typo of ReadObjectFunctor. 2004-11-16 16:04:05 +00:00
Robert Osfield
e30a534ec9 Adde another friend to remove final VS6.0 compile problem. 2004-11-16 15:36:06 +00:00
Robert Osfield
f99dc8f051 Made the inner helper classes friend to try and get round VS6.0 problems 2004-11-16 14:10:30 +00:00
Robert Osfield
2b310c6926 Added support for serialization of calls to ReaderWriter plugins. 2004-11-15 19:46:10 +00:00
Robert Osfield
4094c3f058 Added osgDB::ReentrantMutex is prep for making osgDB::Registry single threaded. 2004-11-15 11:57:41 +00:00
Robert Osfield
39311cdee3 From Loic Dachary, added getFileName method 2004-11-14 21:08:10 +00:00
Robert Osfield
ddb0d6bd4f Added prelimarny support for reading archives via the .net plugin 2004-11-13 16:21:48 +00:00
Robert Osfield
f30146a9fe From Stephane Simon, added missing OSGDB_EXPORT to osgDB::openArchive functions 2004-11-11 22:26:07 +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
9fcda76143 Fixed uninitialized variable. 2004-11-10 22:11:28 +00:00
Robert Osfield
141c3cadbf Set the pos_type and size_type explictly to 8 byte types. 2004-11-10 21:52:30 +00:00
Robert Osfield
3523577235 Added check for endianess of .osga archives 2004-11-10 21:18:31 +00:00
Robert Osfield
4973824b1d Added new osga plugin for reading OSG native archives 2004-11-10 16:40:08 +00:00
Robert Osfield
2db9dc2e60 Moved the ReadFunctor to protected section. 2004-11-10 13:47:22 +00:00
Robert Osfield
4e19c03de1 Added support for master file and clean up Archive API. 2004-11-10 13:03:52 +00:00
Robert Osfield
564869487a Added support of archiving into osgTerrain::DataSet and osgdem. 2004-11-09 14:18:29 +00:00
Robert Osfield
72b7e08d93 From Stephane ???, fixes for VS.NET build 2004-11-08 16:39:32 +00:00
Robert Osfield
d26c8460dc Updates to osgDB::Archive support, and refactoring of implementation of 
reading files in Registry to faciliate the new archiving support.
 2004-11-08 16:11:07 +00:00
Robert Osfield
f84f8d87e0 Added support for openArchive into osgDB 2004-11-07 21:17:31 +00:00
Robert Osfield
f44ecb1f65 Fixed insertion of files into an existing archive 2004-11-07 12:13:56 +00:00
Robert Osfield
8d6aa8b405 Further work on osgDB::Archive 2004-11-06 21:18:19 +00:00
Robert Osfield
c691860b5c Improved handling of uflow and underflow() in proxy_streambuf, and change 
unsigned char* to char* to avoid stoooopid VS6.0 compile errors
 2004-11-02 21:04:14 +00:00
Robert Osfield
ffca165611 Added prelimanary prox stream buffer to fake the ending of file. 2004-11-02 17:05:15 +00:00
Robert Osfield
2b8140e125 Added support for listing contents of archive 2004-10-28 14:27:41 +00:00
Robert Osfield
90e5586777 Updates to osgDB::Archive, and IVE plugin to support usage via the Archive. 2004-10-28 12:16:47 +00:00
Robert Osfield
61b0f5d301 Added IndexBlock inner class to osgDB::Archive 2004-10-27 14:09:24 +00:00
Robert Osfield
676f204cdb Updates to osgDB::Archive 2004-10-26 18:29:27 +00:00
Robert Osfield
1f5b044c71 Made ReaderWriter::className const 2004-10-26 10:26:43 +00:00
Robert Osfield
66836ef3d0 Added new osgDB::Archive class, and osgarchive example. These are both 
very early beginnings so do not function yet.
 2004-10-25 19:16:38 +00:00
Robert Osfield
d734d6d532 Added osgDB::Archive 2004-10-24 14:24:15 +00:00
Robert Osfield
38a0e6bf4e Added support for parsing http:// names and mapping automatically to use 
the .net plugin
 2004-10-06 13:11:04 +00:00
Robert Osfield
7e4d34c57a Added : 
osg::PagedLOD::s/getDatabasePath() and support in PagedLOD::traverse().
    osgDB::ReaderWriter::Options::s/getDatabasePath()
    osgDB::Input::s/getOptions()
    setting of osgDB::Input::setOptions() in ReaderWriterOSG.cpp
    src/osgPlugins/ive/DataInputStream::s/getOptions()
    setting of src/osgPlugins/ive/DataInputStream::setOptions() in ReaderWriterIVE.cpp
 2004-10-06 09:31:34 +00:00
Robert Osfield
c0752beef4 From Tree, moved apply's from protected to public to support Java wrappers 2004-10-01 09:40:06 +00:00
Robert Osfield
5747773096 From Tree, changes to better support Java binding generation 2004-09-28 09:14:04 +00:00
Robert Osfield
0c24cf48b8 Added a mutex and _numFramesActive count to track multiview usages of 
the DatabasePager.
 2004-09-28 08:39:46 +00:00
Robert Osfield
22bb35f4f1 Fixed typo 2004-09-23 20:13:16 +00:00
Robert Osfield
1b31024cd5 Clean up of new DatabasePager code, and change of osgProducer so that 
DatabasePager support is now integrated into the OsgSceneHandler.
 2004-09-23 18:50:38 +00:00
Robert Osfield
54b45ce3bc Updated to DatabasePager support 2004-09-21 21:33:52 +00:00
Robert Osfield
0d884d66eb Various improvements to database paing. 2004-09-21 17:26:08 +00:00
Robert Osfield
0750a19aa6 Added clear(), setDatabasePagerThreadPause() and setAcceptNewDatabaseRequests() methods 
and new local implementation of cancel().
 2004-09-19 20:09:54 +00:00
Robert Osfield
8bce22343b Various improvements to the DatabasePager with the aim to achieve 
constant framerates and minimizing memory consumption.
 2004-09-18 19:28:45 +00:00
Robert Osfield
9dc35ce47a Added mutex to access to the Registry::_objectCache. 2004-09-06 18:20:38 +00:00
Robert Osfield
ac6d25a840 Added Don's new osgDB::makeDirectory() code FileUtils. 2004-09-01 14:49:18 +00:00
Robert Osfield
255c27d552 Added a new osgDB::appendPlatformSpecificLibraryFilePaths() method to FileUtils.cpp 
Includes a new OSX code from Eric Wing
 2004-08-27 16:14:21 +00:00
Robert Osfield
796e6bb50a Added docs for CacheObjectHints 2004-08-13 13:46:47 +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
6524fe1293 From Norman Vine, fixes for Mingw 2004-08-02 09:11:31 +00:00
Robert Osfield
aa833acfd3 Added support for releasing GLObjects, and renamed DisplayListVisitor the 
GLObjectVisitor to better fit its function, and added support for releasing
objects as well as compiling them.
 2004-07-20 05:37:59 +00:00
Robert Osfield
f8daf206ab Improved support for new double Vec* classes 2004-05-20 12:57:06 +00:00
Robert Osfield
f02c75f5ea Added Vec2d, Vec3d and Vec4d classes, and remapped Vec2, Vec3 and Vec4 to 
Vec2f, Vec3f an Vec4f respectively, with typedef's to the from Vec* to Vec*f.
 2004-05-20 10:15:48 +00:00
Robert Osfield
3d3199017e From Ken Sewel, added osgDB::fileType(filename) method and usage of this 
new function in osgdem to automatcally handle directories as part of the
regular -d and -t options.
 2004-05-08 06:35:32 +00:00
Robert Osfield
26f80f1341 From Marco Jez, replacement of local mutex lock/unlock with ScopedLock. 2004-05-07 19:55:12 +00:00
Robert Osfield
bdeb391a00 From Mike Weiblen, added new rot, scale and trans pseudo loaders. 2004-05-07 15:18:59 +00:00
Robert Osfield
aec98259a8 Added support for osgDB::ReaderWriter::ReadResult::FILE_LOADED_FROM_CACHE 2004-05-07 13:43:41 +00:00
Robert Osfield
7d5e44205d Fixed bogus read*Implementation calls in ReadFileCallback. 2004-04-13 16:03:18 +00:00