Commit Graph

86 Commits

Author SHA1 Message Date
Robert Osfield
ee4e2afa76 From Philip Lowman, clean up of CMake files 2009-04-09 09:23:45 +00:00
Robert Osfield
02b456bcfa Converted plugins to use the new supportsExtension()/supportsOptions/supportsProtocl() methods
to help enable better querying of supported features
2008-07-13 22:18:59 +00:00
Robert Osfield
00e00f4e00 From Guillaume Millet, "Please find in attachment a small improvement to the pfb plugin
CmakeLists.txt and to the FindPerformer.cmake module.

Under Windows libs are: libpf.lib (we need to add the lib prefix) and
libpfdu-util.lib (libpfdu and libpfutil are compiled into one lib)
We need to add PFROOT to the search path for libs and includes (default
environment variable for Performer path)
And at last we need to put PFROOT/include and PFROOT/include/Performer
as include dir for compiling."
2007-09-07 10:15:39 +00:00
Robert Osfield
9e2fe92ef1 From Rudolf Wiedemann, "I need to link OpenSceneGraph statically to my application, so I
completed the new registration of the plugin-readerwriters
("REGISTER_OSGPLUGIN") according to your osgstaticviewer-example (see
attachment, based on today's svn)."
2007-07-06 13:54:26 +00:00
Robert Osfield
32236ab2a4 From Per Fahlberg, "To get the pfb (Performer) plugin to compile I had to remove some of the
libraries listed under TARGET_EXTERNAL_LIBRARIES.
The removed libraries are not needed when linking the plugin, they are
loaded during runtime by Performer.
The modified file is attached."
2007-06-07 12:05:09 +00:00
Robert Osfield
2ca67c0916 From Doug McCorkle, removed pfdb from link line 2007-05-11 12:12:55 +00:00
Robert Osfield
d59c884a79 Added extra external libs 2007-05-05 17:05:07 +00:00
Robert Osfield
b8841f211d Added preliminary Performer plugin support, note, still missing are a range of Performer database libs that will be required. 2007-05-05 16:24:07 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
0c91825ee6 From Laurens Voerman, "
osgPlugins\pfb\ConvertFromPerformer.cpp

Added support for
       PFSTATE_ALPHAFUNC
       PFSTATE_ALPHAREF
Improved handling of
       PFTR_NO_OCCLUDE

I have tested this with WIN32 performer 3.1 and 3.2.2
and linux OpenGL Performer 3.1.1"

------------------------------------------------
2006-08-10 13:12:47 +00:00
Robert Osfield
a0cdf7461c Added #define snprintf _snprintf for Win32 build 2006-07-27 11:22:01 +00:00
Robert Osfield
7d5c81bf5e From Ulrich Hertlein, spelling corrections and a few Doxgen comments. 2006-02-20 21:05:23 +00:00
Robert Osfield
d3541b96ed Replaced tabs with spaces. 2005-11-17 15:03:51 +00:00
Robert Osfield
4d960e9ecd From Tom Jolly, fixes to the mapping of the billboard rotate mode. 2005-05-31 05:46:41 +00:00
Robert Osfield
23ec051821 Moved the initPeformer to the constructor to avoid const issues when compiling 2004-11-24 06:57:34 +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
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
1f5b044c71 Made ReaderWriter::className const 2004-10-26 10:26:43 +00:00
Robert Osfield
5cfe2e2d91 From Don Tidrow, build fix for Peformer 2004-08-04 06:57:03 +00:00
Robert Osfield
ca96c9e731 From Michael Logan, build fix for Performer plugin 2004-06-28 13:18:31 +00:00
Robert Osfield
324437d1e5 From Don Tidrow, changed cerr usage to osg::notify() 2004-05-07 11:09:05 +00:00
Robert Osfield
e524092e1e Changed std::cout to osg::notify 2004-04-18 14:12:07 +00:00
Robert Osfield
b0a4e917c8 Aded FileUtils include. 2003-12-09 09:03:14 +00:00
Robert Osfield
83bf813e58 Moved the responsibility for finding file to load on to the ReaderWriter plugins,
instead of osgDB::Registry where it original lay.  This has been done to allow
fileName strings to be encode data rather than just file names, such as one
requires when using PagedLOD along with plugins for doing dynamic tesselation.
2003-12-08 11:24:43 +00:00
Robert Osfield
8af38347d1 From Tom Jolly, Fix to handling of triangle fans. 2003-11-13 15:45:31 +00:00
Robert Osfield
02274f0ea9 From Tom Jolly, fixed incorrect setTexCoordIndices to setColorIndices.
Added support for triangle fan primitives.
2003-11-11 16:30:35 +00:00
Robert Osfield
49cc9b85d5 From Tom Jolly, added support for TexEnv to pfb plugin. 2003-09-23 14:42:56 +00:00
Robert Osfield
058e4939fc Convert Performer plugin across to generate osg::Geometry directly. 2003-05-22 11:09:28 +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
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
878c545785 Fixes for the new osg::Image::setImage() parameter, from Ulrich Hertlein. 2003-03-03 11:04:15 +00:00
Robert Osfield
43d304c24e From Geoff Michel, updates to the Geo plugin.
Removed osg::uint reference form the pfb plugin.
2003-02-13 15:16:04 +00:00
Robert Osfield
442fa34aaa From Ulrich Hertlien, fix for new changes in osg::Switch interface.
Small clean to changes by Robert.
2002-12-10 20:26:56 +00:00
Robert Osfield
0980eeda1e Updated the plugins so they do the extension checking with a non
case sensitive comparison.
2002-11-14 09:03:31 +00:00
Robert Osfield
16d53271cc Compile fix from Duvan Cope. 2002-11-07 16:08:37 +00:00
Robert Osfield
a6eafa79e2 From Ulrich Hertlien, added ReaderWriter::Options to the osgconv and pfb plugin
so that all the pfi files can be converted to rgb be the plugin.
2002-11-04 09:08:50 +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
Don BURNS
2b10b4c3df Fixed 69 occurance of 'Seperate' misspelling (should be 'Separate') 2002-08-29 03:22:27 +00:00
Robert Osfield
83af5e7a95 Added osgtexture3D demo, renamed osgtexture demo to osgtexture2D, and have
added osgtexture1D demo which currently is simply copy of osgtexture2D. I
will be modifying it to do 1D texturing next.

Fixed a bug in osg::Texture3D relating to checking of existance of
texturing.

Merged some fixes to the pfb loader from Ulrich Hertlein.
2002-08-27 10:06:57 +00:00
Robert Osfield
8e75f531e3 Converted code dependant on osg::Texture across to its replacement osg::Texture2D. 2002-08-25 15:31:44 +00:00
Robert Osfield
bff72e1077 Fixes from Ulrich Hertlein to get the pfb plugin compiling with using
any deprecated API.
2002-08-16 10:56:20 +00:00
Robert Osfield
6a04fc3dee Integrated Ulrich Hertlien's osg::Sequence node, and osgsequence demo, and
support for osg::Sequence in the pfb loader.
2002-08-03 18:11:21 +00:00
Robert Osfield
7a8eeb3c92 Converted the osg::Material::set/getShininess option to use the standard
OpenGL range of 0.0 to 128.0 instead of the previous normalised shiniess
range. This brings it inline with the way the rest of the OSG uses a
1 to 1 mapping to OpenGL.

Converted the various loaders to use the new range, which is almost all
cases was simply removing the /128.0f which was required before!
2002-07-18 09:55:30 +00:00
Robert Osfield
8883f1d571 Fixed unused variable `osg::StateSet *osgStateSet' warning 2002-07-14 20:51:31 +00:00
Robert Osfield
6f392cdbfa Ported distribution across to use the new osg::MatrixTransform and osg::BlendFunc
class instead of osg::Transform and osg::Transparancy respectively.
2002-07-12 18:12:01 +00:00
Robert Osfield
8128265e09 Have added a #define USE_DEPRECATED_API to include/osg/Export, and
various
osg header and source files to optional compile in deprecated parts of
the
OSG API.

Have renamed osg::Transparency osg::BlendFunc to bring it in line with
the
rest of the OSG's StateAttribute classes which are named after their
OpenGL counterparts.  include/osg/Transparency still exists and is
simply
a typedef to BlendFunc and is enclosed in a #ifdef USE_DEPRECTATED_API
block.

The matrix methods in the osg::Transform class have been
moved/replicated in
a osg::MatrixTransform sublcass from osg::Transform.  The old matrix
functionality is still present in the osg::Transform class but is guard
by #ifdef USG_DEPRECATED_API blocks.  One should now think of
osg::Transform
as being a Transform Node base class.  MatrixTransform has all the
functionality of the original Transform class, so should be used
instead.
2002-07-12 14:25:10 +00:00
Robert Osfield
54c27e36bf Updates for new use of GLushort instead of osg::ushort in GeoSet index pointer. 2002-07-10 22:38:02 +00:00
Robert Osfield
c1fc3dcdb9 Ported all the demos and loaders across to use the new multitexturing API. 2002-07-10 11:22:24 +00:00
Robert Osfield
aca7f7b216 Fixes for IRIX build. 2002-07-09 10:23:48 +00:00
Robert Osfield
3700e7e2cd Reimplemted the osgUtil::SceneView::setCalcNearFar() functionality to bring
it inline with the CullStack/CullVisitor implementation.  Also added the
setSmallFeatureCullingPixelSize() method and wired them up inside
SceneView.cpp so they set the corresponding CullVisitor paramters.

Intergrated pfImage copying change in the Performer plugin, submission sent in by Ulrich Hertlein
2002-07-02 19:53:18 +00:00