Commit Graph

1149 Commits

Author SHA1 Message Date
Robert Osfield
83d3f7639f Changed the default behavior to not writing out proxynode children. 2005-05-17 13:50:07 +00:00
Robert Osfield
f9bc0454f8 Improved the handling of writing out of proxy node files. 2005-05-17 13:47:13 +00:00
Robert Osfield
9c27121f77 From Daniel Sjölie, for the purpose of maintainability, made the load proxy nodes code the standard, remove the older
code that remained as part of #else #endif blocks, and remove the erroneous
implementation of caching of proxynodes.
2005-05-17 13:34:04 +00:00
Robert Osfield
cc7bb579b0 From Thom DeCarlo, build fixes for Cygwin. 2005-05-17 09:06:12 +00:00
Robert Osfield
3a4b09940b Refinement of includes to help IRIX build 2005-05-13 12:06:58 +00:00
Robert Osfield
ec2adb2477 Added #include "dxfBlock.h" 2005-05-13 09:52:17 +00:00
Robert Osfield
2dc54fc61d fixed warning. 2005-05-12 20:46:12 +00:00
Robert Osfield
a8550e6536 Fixed pairing of write and read of Matrixd 2005-05-12 20:03:55 +00:00
Robert Osfield
d44977490c From Alberto Farre,
"ConvertFromFLT::addMultiTexture makes ENDIAN conversion for SMultiTexture
 struct attributes.
 When an flt object is multi-instantiated y should be done just first time,
 because SMultiTexture struct is always the same, currently is being done for
 each instance.

 Attached file fix the problem but perhaps a more clean fix would be making
 ENDIAN conversion at writing attributes time instead of at reading time. "
2005-05-12 15:51:28 +00:00
Robert Osfield
54abc6f471 Added IO support for new intialBound and callbacks to .osg, and initialBound to .ive 2005-05-12 14:48:56 +00:00
Robert Osfield
bf4d63f6ea Added new Node/Drawable::s/getInitialBound and Node/Drawable::s/getComputeBoundCallback
methods and reimplement computeBound so that it passes back a bounding volume rather
than modifying the local one.
2005-05-12 14:03:22 +00:00
Robert Osfield
bdc7e8b4a9 From Don Tidrow, "I added some code to assign the archive pointer in TXPnode
with the archive that ReaderWriterTXP actually loads.  I also added a
function in TXPArchive to help in manipulating the lightpoints."
2005-05-11 19:34:03 +00:00
Robert Osfield
afb92b2372 Added .osg support for new ParticleEffect::s/getDefaultParticleTemplate. 2005-05-11 16:05:27 +00:00
Robert Osfield
4c613896ff Fixed compile warning. 2005-05-11 13:40:07 +00:00
Robert Osfield
aa6ea8c047 Completed GLSL support in .ive 2005-05-11 13:37:38 +00:00
Robert Osfield
8d31e75364 Further work on GLSL support in .ive 2005-05-11 11:42:09 +00:00
Robert Osfield
fb34b22e34 Cleaned up API of BindAttributeLocation, added deletion of shader objects. 2005-05-11 11:41:44 +00:00
Robert Osfield
d9c50ee7c4 Put in place the class to implement GLSL support in .ive 2005-05-10 20:20:20 +00:00
Robert Osfield
5e0a5b39e0 Added tab to space converted to .obj plugin 2005-05-10 16:13:37 +00:00
Robert Osfield
aa61f87abe From Farshid Lashkari, bumped IVE version number to 9, and added support in Texture for
_borderWidth
    _useHardwareMipMapGeneration
    _unrefImageDataAfterApply
    _clientStorageHint
    _resizeNonPowerOfTwoHint
2005-05-10 10:01:13 +00:00
Robert Osfield
4811adda0a From Farshid Lashkari, and non power of two resize hint support to .osg ascii 2005-05-10 08:07:37 +00:00
Robert Osfield
538ced579e Removed deprecated API in preparation for 0.9.9 release. 2005-05-09 13:09:07 +00:00
Robert Osfield
f8c855a576 Fix for Tiger build 2005-05-04 11:38:34 +00:00
Robert Osfield
56882a7413 From Alberto Farre, "Missed a FilepathList pop_back line from my last submission.
I have also commented out the option string set with FLT_VER because it
overwrites other option string and I found it redundant and not needed."
2005-05-03 21:53:25 +00:00
Robert Osfield
2bb2d9bb37 From Bob Kuehne, fixes for OSX 10.4 build. 2005-05-03 14:31:01 +00:00
Robert Osfield
a0ccaf5f95 Removed Impostor.cpp 2005-05-03 06:23:02 +00:00
Robert Osfield
ce902afa7c Fixed TIFF readers handling of interleaved data 2005-05-02 20:00:42 +00:00
Robert Osfield
4e67b2c989 Moved Impostor from osg to osgSim .osg plugin 2005-05-01 21:33:12 +00:00
Robert Osfield
03232ec667 Moved osg::Impostor to osgSim::Impostor, as Impostor isn't a core feature. 2005-05-01 19:48:49 +00:00
Robert Osfield
7de1265059 From Don Tidrow, spelling fixes 2005-05-01 10:34:48 +00:00
Robert Osfield
81f60233a9 From Geoff Michel :
ac3d loader - better sharing of states between objects and Roger James' bug fix for missing normals.

  Tesselator.cpp - faster processing of polygon tesselation for single triangles (which dont need to be tesselated)

  osgtesselate.cpp - added wrap for texture so that appearance is as originally. Default texture behaviour has changed to clamp."
2005-04-30 13:54:21 +00:00
Robert Osfield
84aef32552 Removed old LUMINANCE_ALPHA code pathways since they are no longer used. 2005-04-28 19:08:44 +00:00
Robert Osfield
10607dd690 Added proper handling of freeing of font implememtation either when unloading
the freetype plugin or deleting osgText::Font first.
2005-04-28 18:55:08 +00:00
Robert Osfield
968f54b5db From Ruben, fix for PIV executation by disabling MMXEXT selection. 2005-04-26 20:35:53 +00:00
Robert Osfield
b35ded6fb9 Improved handling of unsupported file formats. 2005-04-22 15:44:03 +00:00
Robert Osfield
bf317d9cea Removed ViewPoint.h and .cpp from the ive plugin 2005-04-22 13:47:54 +00:00
Robert Osfield
483242c9db Cleaned up the xine plugin to better handle unsupported video files. 2005-04-22 13:32:46 +00:00
Robert Osfield
8b4f9dce60 From Mike Weiblen, added support for samplers and mat4 to .osg 2005-04-22 07:13:50 +00:00
Robert Osfield
7f2ab883f5 Added initialize of version number 2005-04-21 21:07:27 +00:00
Robert Osfield
7182713dcf From Garrat Potts, fixed face memory leak in FreTypeFont destructor. 2005-04-21 21:05:48 +00:00
Robert Osfield
b699c8e9ab Further work on uniforms support in .osg 2005-04-18 13:36:10 +00:00
Robert Osfield
59ec503fc9 Added more complete support for writing out data of Uniforms 2005-04-18 13:29:59 +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
0a995f8093 Removed mpeg plugin from CVS, now moved to the Community section of
openscenegraph.org as a seperate project.
2005-04-18 09:17:56 +00:00
Robert Osfield
6a22af590a Fixed warnings. 2005-04-17 19:10:32 +00:00
Robert Osfield
20f26ee011 Fixed wrapping of text string to allow internal "" strings 2005-04-16 10:18:56 +00:00
Don BURNS
a676f67337 CHanged line 101 in PageLOD.cpp to read
if ( in->getVersion() >= VERSION_0006 ) {
              setDatabasePath(in->readString());
          }

instead of
              if ( in->getVersion() > VERSION_0006 ) {
              setDatabasePath(in->readString());
          }

Seems DatabasePath _is_ present in ive files of version 6.
2005-04-16 04:00:18 +00:00
Robert Osfield
f4be038d46 Moved Plane and Quat << operators into the io_utils headers 2005-04-15 20:59:24 +00:00
Robert Osfield
47a2b3aa23 From Paul de Repentinguy, DXF loader plugin. Ported to Linux by Robert Osfield. 2005-04-15 20:39:06 +00:00
Robert Osfield
e67ed01612 From Mike Weiblen, fix for Win32 build 2005-04-15 18:28:44 +00:00
Robert Osfield
78577e1aa6 In the ldexp(,) call removed the /256.0f by replacing it with a -8 on the exponent. 2005-04-15 09:56:28 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
25d1fa2e2c Changed uint for unsigned int. 2005-04-14 20:34:59 +00:00
Robert Osfield
16c55531da Preparation for moving osgGL2 out of the core OSG into its own seperate distribution. 2005-04-14 11:28:23 +00:00
Robert Osfield
6b86d2d70d From Joson Daly, fix for forward/backward/swing animation handling both 15.8 and
versions prior to 15.8, and...

" Here's another fix for OpenFlight.  The symptom was that ATTR files were
not being read correctly, and the TexEnv on a texture that should have
been set to DECAL was instead defaulting to MODULATE.  The cause is that
the ATTR reader cannot tell by itself what version it's reading (the
version information isn't present in the ATTR files), and instead relies
on the ReaderWriter::Options passed in to get the OpenFlight version.

My change clones the current ReaderWriter::Options and prepends the
appropriate FLT_VER option before the ReaderWriterATTR object is
called.  I also made the parsing of the FLT_VER string and value more
robust in the ReaderWriterATTR itself.  I think I commented things OK,
but let me know if you need me to explain anything."
2005-04-14 07:55:45 +00:00
Robert Osfield
9c55486746 Added inline to float convertComponent(,) 2005-04-12 08:59:33 +00:00
Robert Osfield
25f738a8ee From Olaf Flebbe, change from powf to ldexp. 2005-04-12 08:55:52 +00:00
Robert Osfield
d268cf46fa Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT 2005-04-11 17:14:17 +00:00
Robert Osfield
20882b6b4b From Olaf Flebbe, Fixed cross platform compile error 2005-04-11 07:51:43 +00:00
Don BURNS
e3091ac4bd Added check for _last_of for fileName and merged all definitions for socklen_t
to one line.
2005-04-08 19:39:05 +00:00
Robert Osfield
2ae269c447 From Olad Flebbe, compile fix for HP-UX. 2005-04-08 14:11:15 +00:00
Robert Osfield
b401b97bce From James French, fix to header guard 2005-04-08 14:09:32 +00:00
Robert Osfield
cd8634776d From Stephan Huber (contains Registry.cpp changes from David Guthrie):
"Attached is the new source for the Quicktime-Plugin which adds the
ability to write pictures in various formats (tested: jpg, png, tif,
psd) (24bit + 32bit only, 8bit not tested)

There are changes in the attached osgDB::Registry, which allows osg to
find resources/plugins in the right folders under OS X"

Note, from Robert Osfield, changed the FilePathList* filepath + delete to a
FilePathList filepath to avoid possible memory leaks when expections are thrown/
make it more maintainable.  Also didn't merge the automatic playing of movies.
2005-04-08 13:52:03 +00:00
Robert Osfield
d31cd3dce6 From Mike Weiblen, updates to GL Shadler Language support 2005-04-08 13:10:44 +00:00
Robert Osfield
dd3db860a2 From Carlo Camporesi, add support for text into .ive plugin, tweak by
Robert Osfield to allow font names to be exported correctly with extension
2005-04-08 13:06:14 +00:00
Robert Osfield
7d24d9fdd5 Added #include <algorithm> 2005-04-08 12:22:03 +00:00
Robert Osfield
a8d4da8163 Added #include <osg/io_utils> 2005-04-08 09:36:42 +00:00
Robert Osfield
cc47a520ae Added #include <osg/io_utils> 2005-04-08 09:18:15 +00:00
Robert Osfield
fcab21f9cc Added osg/io_utils include 2005-04-08 09:13:07 +00:00
Robert Osfield
84e8338be1 From Mike Weiblen, "adds sourcefiles for beginnings of .osg fileformat i/o support
> - enhancemens to core GLSL classes to support file i/o"
2005-04-07 20:23:58 +00:00
Robert Osfield
923048fdb6 Warning fixes by Mike Weiblen + Robert Osfield 2005-04-07 20:08:54 +00:00
Robert Osfield
7a27a0bef7 From Marco Jez, improvements to osgIntrospection, and new automatically generated
osgWrappers/osg set.
2005-04-07 20:00:17 +00:00
Don BURNS
af3ac699aa Rolled in Olaf's changes for HP-UX build 2005-04-05 19:08:48 +00:00
Robert Osfield
56787b4195 Fixed output of MultiTextureControl. 2005-04-04 16:06:28 +00:00
Robert Osfield
816df3a1d0 Fixes for VS6.0 build 2005-04-04 12:24:18 +00:00
Robert Osfield
ed0200162c From Alberto Farre, nested files bug fix. 2005-04-04 11:22:43 +00:00
Robert Osfield
d9828731d8 From Alberto Farre:
"Here there are fixes for several flt loader problems.

First one was an small bug when root database was an empty string we got a database path "/" instead of "./".
Second one is more complex. Flt loader works in two passes, first one reads flt database and second one builds osg scenegraph. Special care must be taken for properly tracking database path as nested files are entered. Because textures are loaded in second pass, mentioned care should be taken once again. I wrote time ago a piece of code and I placed it in both files fltFile.cpp and flt2osg.cpp. After a long period offline I have seen the portion of code at flt2osg was missing, I just made some tests and I could see it is still required.

Finally, I have seen that pool.cpp always try to make IMAGE cache instead of reading what Options says.

Aditonally, I recently wrote an osg change, now it has external references "a la flt" what is called osg::ProxyNode. As part of the change now flt loader builds external references as ProxyNodes. I made the same mistake like pool.cpp and always made ARCHIVE cache instead of see what Options says, it has also been fixed."
2005-04-04 11:18:02 +00:00
Robert Osfield
22e446dbc9 Improved ParticleEffects 2005-04-04 07:54:52 +00:00
Robert Osfield
e4580f2028 From Farshid Laskari, addiition of FrontFace support to .ive 2005-03-26 10:04:31 +00:00
Robert Osfield
0123cdbe8f From Waltice (don't have full name at time of submission), added support for 16bit tiff files 2005-03-25 11:17:33 +00:00
Robert Osfield
7951be9573 Added support for handling transparent geometries and textures. 2005-03-18 11:21:01 +00:00
Robert Osfield
667ecd91f1 From Alberto Farre, fixes to ProxyNode. 2005-03-18 10:00:16 +00:00
Robert Osfield
d801593d35 Improvements to the handling of textures and texture coords. 2005-03-18 02:45:54 +00:00
Robert Osfield
8c7f71ef39 Added osgGL2 to .ive list of dependencies 2005-03-13 17:26:52 +00:00
Robert Osfield
6a103aa413 Added osgFX::MultiTextureControl node for managing blending between
different texture layers.
2005-03-09 16:54:10 +00:00
Robert Osfield
b3aba84d54 Added ProxyNode.h 2005-03-07 14:27:34 +00:00
Robert Osfield
c59b28ac3f Added support for event callbacks 2005-03-07 14:16:15 +00:00
Robert Osfield
238341b0da From Sebastien Grignard, added support for reading and writing callbacks 2005-03-07 14:14:35 +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
f7f61627a8 Fixed tabbing. 2005-03-07 12:32:58 +00:00
Robert Osfield
8993190ec7 From Marco Jez, "Current version of the LWO plugin creates one Geode with a single Geometry
for each Lighwave surface, in order to keep surface names (geometries can't
have names). The attached fix adds a plugin option named "COMBINE_GEODES"
that allows to place all geometries under a single Geode whenever possible,
thus offering better chances of further optimization through
osgUtil::Optimizer. The downside is that surface names are no longer stored
in the scene graph when using this option."
2005-03-07 12:14:24 +00:00
Robert Osfield
f4b864f37b Added looping 2005-03-07 11:58:41 +00:00
Robert Osfield
dd30c457bd Added checking for video file via normal file path checking and handling of
.xine extension as a special case for XINE style filenames.
2005-03-03 12:40:15 +00:00
Robert Osfield
79833fa704 Added pause, rewind and play support into xine plugin. 2005-02-24 17:07:37 +00:00
Robert Osfield
e2f6dc5bf4 Removed the default play() in the MPEG, QuickTime and Xine plugins, moving
it into the osgmovie application, and into readNodeFile method where
--movie is now available for detecting movie code.
2005-02-22 20:56:56 +00:00
Robert Osfield
1223e4c8ca From Alberto Farre, fix to nested OpenFlight file problem. 2005-02-14 15:17:20 +00:00
Robert Osfield
1b805f7bdb Made conversion use BGRA. 2005-02-13 18:10:05 +00:00
Robert Osfield
912cb9386e Added usage of the new xine_register_plugins() call. 2005-02-13 16:35:52 +00:00
Robert Osfield
5aa2f1e7e7 Disable the MMX usage 2005-02-13 15:07:41 +00:00
Robert Osfield
0420222ce5 From Sebastien Grignard, fixed memory leak where header and databuffers
wern't deleted.
2005-02-11 10:09:06 +00:00
Robert Osfield
192daa0408 Added support into passing the ReaderWriter::Options structure onto readImageFile 2005-02-11 10:00:50 +00:00
Robert Osfield
d706e9e795 From Igor Kravtchenko, new HDR plugin. 2005-02-10 20:38:50 +00:00
Robert Osfield
eb803a420e Fixed the pixelFormat to be RGBA. 2005-02-10 15:53:19 +00:00
Robert Osfield
3ce382fd45 Changed the mpeg plugin to read movies the original way up rather than the
OpenGL way up to keep them consistent with the xine and quicktime movie codes
2005-02-09 16:18:44 +00:00
Robert Osfield
e5e2cf2d30 Created local XineImageStream class to ensure xine streams are cleaned up correctly. 2005-02-09 15:31:33 +00:00
Robert Osfield
c842dce38c Added setting of the filename 2005-02-09 14:27:54 +00:00
Robert Osfield
58120d0bc9 Added getenv OSG_XINE_AUDIO_DRIVER to xine plugin to allow users to
set what the default audio to use
2005-02-09 13:22:23 +00:00
Robert Osfield
021440b9a4 Commented out the debug messages, added back in the audio into the xine plugin 2005-02-09 12:29:09 +00:00
Robert Osfield
117c791a3b Added osg::BufferObject and a made a number associated to accomodate this
new class. osg::BufferObject wraps up OpenGL pixel and array buffer objects.
Currently implementation is work in progress.
2005-02-09 10:39:45 +00:00
Robert Osfield
802940aec7 Temporarily added xine video_out_rgb xine-plugin inline to the OSG's xine plugin 2005-02-07 15:00:02 +00:00
Robert Osfield
9b7678138f Changed the LightSource::setReferenceFrame() read code so that it doesn't
enable the culling active flag if its was already set to false.
2005-02-06 10:14:26 +00:00
Robert Osfield
3054a612bd Added prototype xine movie plugin. 2005-02-04 19:34:46 +00:00
Don BURNS
7573cc6036 Added Viewport State Attribute to .osg reader/writer 2005-02-02 22:13:07 +00:00
Robert Osfield
e668acce27 Added support for internalTextureMode 2005-02-01 10:38:08 +00:00
Robert Osfield
049d2055a5 Moved the template function into the global namespace. 2005-01-27 20:26:51 +00:00
Robert Osfield
384e647f56 Fixes for Win32 build 2005-01-27 15:54:10 +00:00
Robert Osfield
a086a6d01b Changed Font::setSize to Font::setFontResolution 2005-01-27 11:10:50 +00:00
Robert Osfield
67a5a020bf From Donn Mielcarek, change of long and unsigned long to int32 and uint32 to
avoid 32bit vs 64bit issues.
2005-01-25 22:15:40 +00:00
Robert Osfield
bcbd5c7786 From Kevin Moiule, rewrote PNM plugin to handle grayscale PNM images. 2005-01-21 19:33:56 +00:00
Robert Osfield
f7166c4541 Fixed the input/output handling of ReferenceFrame values to be RELATIVE and ABSOLUTE
rather than long original names.
2005-01-21 19:21:01 +00:00
Robert Osfield
8ac0211b81 From Tugkan Calapoglu, bugfix to prevents reloading already loaded images. 2005-01-21 19:15:13 +00:00
Robert Osfield
e41f24ff80 From Fredrick Mammond, fix to 64 bit build. 2005-01-12 10:32:36 +00:00
Robert Osfield
80a6b54ddc From Per Fahlberg, support for 16bit imagery. 2005-01-07 20:36:04 +00:00
Robert Osfield
48ef6136f2 From Kevin Moule, fix to memory overwrite error. 2005-01-07 20:24:36 +00:00
Robert Osfield
4955343c76 From Marco Jez, fixed handling of loading of relative file paths. 2005-01-03 13:49:35 +00:00
Robert Osfield
89b8a8a921 Added stripping of trailing spaces to readline call to fix problems associated
with eroneous spaces hanging around at ends of lines causing string matching
problems
2005-01-03 12:27:58 +00:00
Robert Osfield
8c5842115f Added check against ac as extension. 2005-01-03 11:20:21 +00:00
Robert Osfield
a0ba625cb0 Property API clean to smooth the task of generating wrappers. 2004-12-17 01:06:33 +00:00
Robert Osfield
66396e9452 Teaks to API to make it easier to generate wrappers automatically 2004-12-13 01:07:24 +00:00
Don BURNS
fd403f9476 Update of IVe version files 2004-12-08 19:45:07 +00:00
Don BURNS
ebdff5aefe Memory leak spotted and fixed by Sebastien Grignard 2004-12-02 17:44:50 +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
Don BURNS
860bc59f8e Changes for IRIX build 2004-11-28 23:49:01 +00:00
Don BURNS
0558fb024c Fixed osgDB:: prefix for Windows build 2004-11-27 20:35:19 +00:00
Don BURNS
81ff3e16d6 Added Marco's fix for data path for the .ive plugin 2004-11-27 19:23:41 +00:00
Don BURNS
03b9ebe56a Fixed bug in .net loader. Added hostname to file fetch. 2004-11-27 19:20:32 +00:00
Robert Osfield
1b488d6757 Fixed typo in acceptsExtension 2004-11-24 15:41:36 +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
4a1e494eb5 From John Shue, reordering of tiffio.h to avoid compile error. 2004-11-23 16:52:59 +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
5c5ceef90d Added support for local relative paths 2004-11-23 10:46:37 +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
a6369da4f4 Moved Registry::CacheHintOptions into ReaderWriter::Options 2004-11-22 14:10:12 +00:00
Robert Osfield
8d44f7b15e Fixed indentation. 2004-11-20 11:48:01 +00:00
Robert Osfield
3b092690ff From Johan Nouvel, added support for range mode 2004-11-20 11:45:14 +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
7b543a5009 Added check for extension. 2004-11-18 11:53:51 +00:00
Robert Osfield
595dda6fe4 From Vivek Rajan, fixes to Solaris build. 2004-11-18 10:08:29 +00:00