FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,222 Commits 1 Branch 26 Tags
151bd467caee34732c347c65258c2ea95403b686
Commit Graph

83 Commits

Author SHA1 Message Date
Robert Osfield
151bd467ca Changed a couple of int64's back to int32. 2003-09-15 22:13:26 +00:00
Robert Osfield
516db08681 Fixes for warnings under VS.NET from Marco Jez. 2003-09-15 10:12:04 +00:00
Robert Osfield
df8b9ab26b Changed std::size_t to unsigned int to attempt to fix IRIX build problem. 2003-09-12 21:15:13 +00:00
Robert Osfield
a01903ac41 Added -losgText into txp plugin's GNUmakefile for OSX build. 2003-09-10 12:26:54 +00:00
Robert Osfield
cf1fe8edc2 From Boris Bralo, addition of support for osgSim::LightPoint's into TXP 
plugin.
 2003-09-07 14:18:22 +00:00
Robert Osfield
da6f7ebeef Fixes for IRIX build + to_unix on txp plugin files. 2003-09-02 10:27:57 +00:00
Robert Osfield
e46d1cf941 Moved OpenThreads::Threads::Yield() calls across to new 
OpenThreads::Threads::YieldCurrentThread() naming.
 2003-08-21 09:52:12 +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
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
75e4d43026 Removed inappropriate static_cast<>. 2003-08-19 13:01:01 +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
edeb32778c Fixed warnings. 2003-07-26 04:25:27 +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
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
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
0c662e596c Merged changes from Nicklov Trajce and Boris Bralo. 2003-07-23 13:34:48 +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
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
af1eae0418 cout -> notify. 2003-04-24 13:45:10 +00:00
Robert Osfield
bc8bd29646 Updated NEWS for the release. 
Fixed warnings.
 2003-04-18 15:59:34 +00:00
Robert Osfield
8a3b81f00d Fixed handling of pixel and internal images formats. 2003-04-06 10:07:44 +00:00
Don BURNS
3786683636 Removed the building of the osgTXP library so the build system builds only 
the plugin.  Building both the plugin and the library causes a race condition
during parallel makes.
 2003-03-14 02:29:34 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*. 
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
 2003-03-12 10:39:43 +00:00
Robert Osfield
b32c8c65f3 Added osg::Image::AllocationMode enum and associated set/get methods. 
osg::Image::setImage has also been modified to require the AllocationMode
mode to be passed to it so that it knows how to delete the data once the
image goes out of scope.

Port the image plugins across to specify the new AllocationMode, and converted
them across to using new/delete in place of malloc/free.
 2003-02-25 11:56:18 +00:00
Robert Osfield
0e8154d3d3 From Norman Vine, updates to TXP plugin so that the Cygwin build uses pthreads. 2003-02-12 12:02:25 +00:00
Robert Osfield
9aaf5a560b Changed the implementation of the texture objects and display list to delete 
caches so that they use a std::vector<> swap on the internal data structures
when ready to delete to minimize the amount of time that a race condition
condition can happen.
 2003-01-22 23:34:18 +00:00
Robert Osfield
87973523ad Added gaurds around alpha function value to catch erroneous values before they 
are passed on to the OSG.
 2003-01-21 16:02:29 +00:00
Robert Osfield
2261b1cc86 From Joseph Steel, addition of texture filter modes to txp plugin. 2003-01-21 09:09:48 +00:00
Robert Osfield
5960307703 Patch from Joseph Steel, added missing check for the mipmap usage. 2003-01-15 11:33:33 +00:00
Robert Osfield
3365634a01 Submission from Joseph Stell, added LoadModels to TerrapageNode. 2003-01-14 14:00:09 +00:00
Robert Osfield
53204898f3 Fixes for Irix64 build. 2003-01-06 23:19:42 +00:00
Robert Osfield
6ee563ad55 Updates the terrapage to try and make it thread "safer" when used with the OSG. 2002-12-21 19:41:27 +00:00
Robert Osfield
e9287afd5e Turned display lists off in the osg::Geomety created by the terrapage loader, 
this is done because terrapage will dynamic page in and out geometry so we
don't want to keep creating and deleting display lists.
 2002-12-21 11:30:54 +00:00
Robert Osfield
adf5c91808 Renamed all instance of AppCallback/AppVisitor to UpdateCallback/UpdateVisitor 
inline with the decision to rename the "app phase" the "update phase".
 2002-12-19 15:55:40 +00:00
Robert Osfield
eb42926ab1 Changed the remaining #include <> to #include "" to get things compiling under VS. 2002-12-19 10:32:02 +00:00
Robert Osfield
30a665288e Removed the osg:: from the front of the Group::computeBound() method to keep 
things compiling under Windows.
 2002-12-18 10:17:52 +00:00
Robert Osfield
677764bed9 Changed the <*.h> to "*.h> in the terrapage plugin to get it compile under Windows. 2002-12-18 09:50:36 +00:00
Robert Osfield
c82927293e Moved the include/osgTXP back into src/osgPlugins/txp as a seperate include directory is no longer required. 
Removed the osgtxp demo as it is no longer required.
 2002-12-17 16:07:59 +00:00
Robert Osfield
ee3348afc9 Added txp::TerrapageNode to the txp plugin, and implemented the node so that it 
automatically assign handles the updates of eye points and database merges.
 2002-12-17 15:41:05 +00:00
Don BURNS
25b333b05b Move TrPageViewer.cpp to src/Demos/osgtxp 2002-12-13 20:28:58 +00:00
Don BURNS
97ec694e21 Fixes to txp loader 2002-11-29 16:14:03 +00:00
Don BURNS
12e922bc3c Added Paging TerraPage loader and osgTXP library. 2002-11-24 21:36:05 +00:00
Robert Osfield
70861ef70e Converted osg::LOD from used n+1 successive ranges to n min/max ranges, 
one min/max pair per child. Converted the rest of the OSG to use the new
osg::LOD node.
 2002-10-06 20:33:13 +00:00
Robert Osfield
0a5ed26940 Moved the new osg::IndexedGeometry class over the top of the the existing 
osg::Geometry class, and removed the temporary IndexedGeometry.  Port the rest
of the OSG across to account for the change in method calls -
osg::Geometry::addPrimitive(..) becomes osg::addPrimitiveSet(..)
 2002-10-02 13:12:16 +00:00
Robert Osfield
55215651d7 Renamed osg::Primitive to osg::PrimitiveSet which better reflect what it 
encapsulates.

Added new osg::IndexGeometry implemention, *not* complete yet.

Changed the rest of the OSG to handle the renaming og Primitive to PrimitiveSet.
 2002-09-20 14:51:59 +00:00
Don BURNS
76959d5648 Blast it, Don... You should rebuild before you check things in! 2002-08-29 03:49:23 +00:00