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

1334 Commits

Author SHA1 Message Date
Robert Osfield
44b38986d3 Fixed warnings in geo plugin 2005-11-14 12:49:05 +00:00
Robert Osfield
e8aeca1418 From Geoff Michel, geo plugin updated to for latest updates in .geo format. 2005-11-12 21:29:59 +00:00
Robert Osfield
35e50365da Added support for ConnectedParticleSystem. 2005-11-12 13:38:32 +00:00
Robert Osfield
ae75981e36 Added .osg support for osgParticle::SmokeTrailEffect 2005-11-12 13:27:49 +00:00
Robert Osfield
91f5b9b04e Fixes for VS6.0 build. 2005-11-11 12:45:59 +00:00
Robert Osfield
435e4b828c Fixes for dumb VS6.0 compiler 2005-11-10 19:32:37 +00:00
Robert Osfield
20d9c3c3c4 Compile fixes for VS7.1 2005-11-10 09:42:34 +00:00
Robert Osfield
6c70812928 Fixed warnings. 2005-11-09 10:41:52 +00:00
Robert Osfield
af83527622 Updated the bin number to be 100 for the logo overlay to force it to draw later. 2005-11-09 09:30:16 +00:00
Robert Osfield
a70768b6e9 Added .ive support for osg::Texture SourceFormat and SourceType 2005-11-08 16:41:34 +00:00
Robert Osfield
da7f5e7e60 Added support for SourceType and SourceFormat to .osg. 2005-11-08 16:22:33 +00:00
Robert Osfield
6ed9cb40cc From Colin McDonald, fixed image size calculation in getTotalSizeInBytesIncludingMipmaps(), 
added checks on success of opening files for writing in the .ive plugin.
 2005-11-08 13:51:28 +00:00
Robert Osfield
31ec432e06 From David Spilling, added "noRotation" ReaderWriter::Option into the .obj plugin 
to enable disabling of the automatic rotation from Y up coordinate frame to Z up coordinate frame.
 2005-11-07 14:42:36 +00:00
Robert Osfield
a3f42b480c From David Spilling, fix for typo of OVERRIDE. 2005-11-07 12:41:32 +00:00
Robert Osfield
efd96108fb From Gideon May, compile fixes for OSX. 2005-11-07 11:14:23 +00:00
Robert Osfield
2773d45f2a From Wang Lam,"The changes allow users of OpenSceneGraph to call a new function 
readFontStream() to load fonts from a std::istream, rather than from the
local filesystem by name.  Such a call may be used, for example, if the
user has a font fetched over a network, or a font available in memory
without a correspondng filename.

The changes implement the new function by following the corresponding code
for readFontFile().  readFontStream() reads a stream into memory, and
holds that memory for FreeType.

As a basic test, I mangled the osgtext example to use
readFontStream(std::ifstream("font")) in lieu of a readFontFile call, and
the modified example ran completely."
 2005-11-07 11:05:16 +00:00
Robert Osfield
4915259878 Improved support for texture subload/render to texture in various Texture classes 
and RenderStage.
 2005-11-04 12:08:16 +00:00
Robert Osfield
89b0ef09a8 Improvements to CameraNode IO support, now handles render to texture. 2005-11-03 21:35:45 +00:00
Robert Osfield
06e8ee3646 Changed the CameraNode read/write code to use Transform as its parent. 2005-11-03 19:20:04 +00:00
Robert Osfield
e7ac09153a Removed debugging message 2005-11-03 17:12:49 +00:00
Robert Osfield
40ef0bbdff Further work on osg::CameraNode support. 2005-11-03 17:08:40 +00:00
Robert Osfield
fb2d3ae108 Further work on added IO support from CameraNode. 2005-11-03 15:59:17 +00:00
Robert Osfield
9d9d6c5a12 Completed osg::CameraView support in .osg and .ive formats. 2005-11-03 12:25:25 +00:00
Robert Osfield
6562aa4f5f Added initial CameraNode and CameraView stups for the .ive loader 2005-11-03 10:16:38 +00:00
Robert Osfield
4c13328d98 Added CameraNode.cpp and CameraView.cpp 2005-11-03 09:03:46 +00:00
Robert Osfield
5dee96c14f Inital work on adding .osg support for CameraNode and CameraView. 2005-11-02 19:52:58 +00:00
Robert Osfield
df2299cb50 From Alan Ott, added support for palletted imagery. 2005-11-02 16:20:55 +00:00
Robert Osfield
781f6d3cec From Colin McDonald, "Fixes for some duplicate global symbol definitions in the plugins, 
which cause errors when creating a statically linked executable."
 2005-11-02 10:29:38 +00:00
Robert Osfield
030fe7d9ea From Steve Lunsford, "Attached is a copy of TXPNode.cpp with the repaired computeBounds call. I 
discovered that TXPNodes were being culled out prematurely because the
loaded sub-tiles resulted in a computed bounds that was smaller than the
extents indicated in the archive.  I think this fix should be fine.  I can't
think of any reason why we would want to use anything other than the archive
extents."
 2005-10-31 16:40:23 +00:00
Robert Osfield
280f50b3d9 From Don Tidrow, removed unncessary includes. 2005-10-25 09:43:37 +00:00
Robert Osfield
fe1536ebd6 Fixed compile warnings. 2005-10-24 13:46:31 +00:00
Robert Osfield
a76ae5e830 From Tony Horrobin: 
"This is a small fix for flt2osg.[cpp|h] that handles
    old style road segments ( from Multigen II w/road
    tools on IRIX ) in the same way as the newer road
    constructions. ie create a group and do a nested
    traversal.

    This makes roads appear in older format files where
    there was previously a gap.  This actually works
    properly with the paths which are marked as hidden in
    the openflight database."
 2005-10-24 11:37:03 +00:00
Robert Osfield
f7bd1fc456 From Don Tidrow, "I discovered that externally-referenced models in the TXP format didn't 
get positioned correctly when the TXP database was built using the
'tile-offset' mode.  I've included a tarball with what I believe are the
needed changes - they work for the sample databases I have available,
but not all conditions have been tested.  I've set things up such that
these changes shouldn't affect 'normal' txp databases."
 2005-10-24 11:34:12 +00:00
Robert Osfield
b5085b7799 Warning fixes for Win32 build. 2005-10-24 11:25:20 +00:00
Robert Osfield
34dd065d66 Added into CVS missing PolgonMode files. 2005-10-07 07:46:48 +00:00
Robert Osfield
808511468b From Brede Johansen, added support for PolygonMode into .ive format. 2005-10-06 15:43:29 +00:00
Robert Osfield
2092016c7b From Don Tidrow, Added support for locally referenced origins. 2005-09-27 14:48:09 +00:00
Don BURNS
e17ac7a8d9 Brede's changes for limited morphed vertex support. These changes allow 
a model with morphed vertecies to load correctly with LOD switches, but
does not implement the vertex morphing.
 2005-09-24 16:11:55 +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
Robert Osfield
8dc8dcb95f Added querry of video size during open() call and associated allocImage to 
ensure that the imagestream passed back is of a valid size.
 2005-09-12 19:42:36 +00:00
Robert Osfield
d2ae4d692d From Henrique Bucher, add check against null light entry in LightPool. 2005-09-11 19:12:54 +00:00
Robert Osfield
9eaaa55d05 converted hardware tabs to spaces. 2005-09-11 19:02:20 +00:00
Robert Osfield
f686395012 From Sonda Iverson, fix for repeated pause/unpause toggleing in Xine plugin 2005-09-11 19:00:57 +00:00
Don BURNS
77ab99e23c Added initial ESRIShape file loader. 
Untabbed and formated LOGO loader.  Removed extraneous noise from NET loader
 2005-09-09 20:26:50 +00:00
Robert Osfield
14980872a7 Standardised the Vec* class interfaces, and added num_components enum to aid 
generic programming.
 2005-09-04 11:17:00 +00:00
Robert Osfield
07c7e37426 From Colin McDonald, fix for big endian systems 2005-08-30 19:19:49 +00:00
Robert Osfield
16e777b69b From Farshid Lashkari, fixed warnings. 2005-08-26 08:48:54 +00:00
Robert Osfield
7e0781d0c8 From Farshid Lashkari, added istream support to JPEG plugin. 2005-08-25 19:23:58 +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
fb96298355 From Farshid Lashkari, Support for reading TIF images from stream, and support 
from reading and writing RGB image to/from stream.
 2005-08-25 14:37:21 +00:00
Robert Osfield
f4dd930376 From Gordon Tomlinson: 
"
This fixes some crashing issues I was having with certain FLT files that only had partial colour palettes

Which are typically found in older 14.x files and file converted through Polytrans or Deep exploration etc.

The code that grabs the color entries in ConvertFromFLT::visitColorPalette was assuming that there were full
palettes always coming in and stepping was out of bounds in certain cases (not all) and thus crashing with
access  violations etc,

Although the normal from Creator is to have 1024 or 512 entries , this is not a  really requirement of the format,  just the way Creator creates its default palettes etc.

Code changed to look at the number of entries and use just those and fills in any missing entries with a default white colour"
 2005-08-24 11:53:13 +00:00
Robert Osfield
e7c6a03bb2 From Farshid Lashari, added support for reading from std::istream's to the BMP, GIF, PNG and TGA image plugins 2005-08-24 10:48:24 +00:00
Robert Osfield
6e167c0db7 From Carlo Camporesi, fixed .ive handling of character height and aspect ratio. 2005-08-22 14:13:28 +00:00
Robert Osfield
8e3f4e4890 From Fabio Mierlo, 
"I add a new option in the HDR Reader.

The RAW option store the RGBE values into a Image, to use
this option you need to decode the RGBE value in the frag-
ment shader. Follow the cube map glsl decoder:

vec4 textureCubeRGBE( uniform samplerCube sampler, vec3 coords )
{
   ivec4 rgbe = textureCube( sampler, coords ) * 255. + 0.5;
   float e = rgbe.a - ( 128 + 8 );
   return vec4( rgbe.rgb * exp2( e ), 1.0 );
}

This option is usefull for who have a outdate hardware like
FX cards and want to do cool things.

Finally this patch is need by a new HDR Rendering example
that I will put on the Wiki."
 2005-08-22 13:54:43 +00:00
Robert Osfield
4745e2b79b Fix compile under x64_32. 2005-08-17 08:50:17 +00:00
Robert Osfield
b04e09c8b8 Disabled assembly code for x64_64 paths. 2005-08-17 07:27:51 +00:00
Robert Osfield
eca7fc210a From Fabio Mierlo, removed cast from float to RGB8, to allow native float imagery 
to be correctly importated from HDR files.

From Robert Osfield, tweaked the above to allow the original casting to RGB8 as an
options switched on by a osgDB::ReaderWriter::Options string with a value of "RGB8".
 2005-07-26 15:49:19 +00:00
Robert Osfield
47651d3c8d Added glSissor suppor via new osg::Scissor class. 
Added .osg support for osg::Scissor.
Added .ive support for osg::Viewport and osg::Scissor.
 2005-07-22 09:31:19 +00:00
Robert Osfield
1e9fb4ab03 From Marco Jez (with tweaks by Robert Osfield) : clean up of inheritance from std::vector<> classes 2005-07-20 19:42:59 +00:00
Robert Osfield
ac460a2dfb Added .osg suppot for new alignment modes 2005-07-15 16:26:45 +00:00
Robert Osfield
d35ea68f3e Renamed Byte2,3,4 and Short2,3,4 and UByte4 to use the Vec*b, Vec*s and Vec4ub form 2005-07-15 14:41:19 +00:00
Robert Osfield
70647b8801 Fixed bug in ProxyNode write out where non existant children were written out. 2005-07-15 09:56:36 +00:00
Robert Osfield
638c928e30 From Paul Martz, fix to memory leak of StateSet's 2005-07-09 09:56:49 +00:00
Robert Osfield
facb0e2638 From Pavel Moloshtan, Byte2,3,4 and Short2,3,4 classes and their Array counterparts. 
With a few build tweaks and bug fixes by Robert Osfield.
 2005-07-05 15:57:53 +00:00
Robert Osfield
ba5f3ce99a Changed notice to be an info message 2005-07-03 19:58:21 +00:00
Robert Osfield
1c8aca5a00 Added smoothing and tri strip pass. 2005-06-29 15:52:01 +00:00
Robert Osfield
cefa62097f Added support nesting the parameter specification within a [x,y,z] block and 
float parameters
 2005-06-29 10:23:34 +00:00
Robert Osfield
b6e2653d4f From Colin McDonald, build fix for Solaris 2005-06-29 10:21:49 +00:00
Robert Osfield
57eb631654 From Colin McDonald, 
"On fixing the pointer access I discovered that reading osga archives
    containing ive files went into a cpu loop.  This turned out to be a
    problem with proxy_streambuf on Solaris.  Public methods in the Solaris
    streambuf standard library implementation rely on the gptr() being set,
    which proxy_streambuf was not doing.  So I have modified
    proxy_streambuf to set the input sequence pointers, and have also
    aligned it more with the standard library streambuf implementation
    where all input is through underflow(), not uflow() which merely calls
    underflow() and advances the pointer."

From Robert Osfield, change from using pointer cast and assignment to using
    a templated _write and _read method to avoid pointer aliasing to 2/4/8
    byte boundaries that some computer system may produce.  These changes
    where inspried by Colin McDonalds change to using memcpy, these
    changes weren't merged as memcpy is not as clear in naming as _read,
    _write and memcpy will incurr a function call just for copy a
    uint.
 2005-06-24 19:50:14 +00:00
Robert Osfield
80a99a2559 From Ken Sewell, fixed for x86_64 build. 2005-06-13 11:14:42 +00:00
Robert Osfield
27c4c6a956 Moved the set/getName() support from osg::Node etc into the osg::Obejct 
base class
 2005-06-08 13:16:19 +00:00
Robert Osfield
e0cf176590 From Mike Weiblen, added GLSL datatypes mat2 and mat3 to osg::Uniform, with .osg and .ive support 2005-06-08 10:36:56 +00:00
Robert Osfield
f87d09b64d From Mike Weiblen, "modified .rot pseudoloader plugin so rotation order actually matches the embedded documentation" 2005-06-08 08:33:59 +00:00
Robert Osfield
6fc00a2613 From Mathia Walker: bug fix to LOD ranges in TXP plugin to avoid cracks: 
"I took a closer look at the conditional code in
SeamFinder::seamReplacement().

Because _info.minRange is a double and lod->getMinRange(0) is a float,
the difference will be calculated with double precision. If
_info.minRange is cast as a float it is exactly the same value as
lod->getMinRange(0) and the difference is exactly zero.

So if you change


 if((fabs(_info.minRange-lod->getMinRange(0))<0.001)&&(fabs(_info.lod0Range-lod->getMaxRange(0))<0.001))

to


 if((fabs((float)_info.minRange-lod->getMinRange(0))<0.001)&&(fabs((float)_info.lod0Range-lod->getMaxRange(0))<0.001))

it works a lot better."
 2005-06-06 10:18:33 +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
55ba67ab76 From James French, fix for multiple definitionwhen compiling osg + plugins into monolithic dll. 2005-05-26 13:56:23 +00:00
Robert Osfield
6385630407 From Blake Williams, fix for VS8.0 build 2005-05-25 17:19:47 +00:00
Robert Osfield
24849f3c70 Renamed ExplosionDebriEffect to ExplosionDebrisEffect 2005-05-25 16:42:36 +00:00
Robert Osfield
3ba6ce887b Added re-entrent mutex to serialize access to OpenFlight plugin to prevent 
any multi-threaded issues.
 2005-05-24 10:37:18 +00:00
Robert Osfield
f609185e03 Updated wrappers. 2005-05-20 21:12:57 +00:00
Robert Osfield
b23d3965df Removed long unused and out of date DX writer plugin from distribution, will now 
be placed on the wiki just in case its needed.
 2005-05-20 11:33:22 +00:00
Robert Osfield
b71472e592 From Alberto Farre, added support for caching of ProxyNode children. 2005-05-19 09:22:45 +00:00
Robert Osfield
955cc1ec2a Added s/getClearMask() support to osg::ClearNode, osgUtil::SceneView and the 
.osg plugin.
 2005-05-18 19:55:14 +00:00
Robert Osfield
a83f7a245d From Joakim Simonsson, DOFTransform multiplication order support added to .ive format. 
With tweak from Robert Osfield to wrap new read and write with a new version number
     to allow old files contain DOFTransforms to continue to work.
 2005-05-18 19:04:35 +00:00
Robert Osfield
2ad67b1727 From Joakim Simonsson: 
"DOFAnimation's default state could now be controlled by the RW option.

    The option string is "dofAnimation"

    If the option string is omitted the default animation state is off."
 2005-05-18 18:43:03 +00:00
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
Robert Osfield
8dd892259d Removed debug info as it was causing VS6.0 compile problem 2004-11-16 14:21:02 +00:00
Robert Osfield
7a933ebf72 From David Spilling, fix for VS6.0 build. 2004-11-16 14:20:39 +00:00
Robert Osfield
8254be2962 Added using namespace osgDB to try and resolve some of the VS6.0 problems. 2004-11-16 12:40:45 +00:00
Robert Osfield
2b310c6926 Added support for serialization of calls to ReaderWriter plugins. 2004-11-15 19:46:10 +00:00
Robert Osfield
98a1108696 Added support for opening an istream archive 2004-11-13 21:39:29 +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
de4dc63ca7 Fixed openArchive so that it only enforces the checking of the archive's existance 
when in READ mode.
 2004-11-13 10:24:07 +00:00
Robert Osfield
fb631059fe Remove unistd.h include 2004-11-12 21:07:17 +00:00
Robert Osfield
43f528fd41 From Ulrich Heirtlein, added STL plugin 2004-11-12 14:49:22 +00:00
Robert Osfield
b60304f8ad Improvements to support for archives 2004-11-12 08:55:11 +00:00
Robert Osfield
a0eb4c72a1 Added write to ostream to ReaderWriterDDS 2004-11-11 16:05:55 +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
Don BURNS
67aa3792e5 More cleanups for CYGWIN from Norman Vine 2004-11-10 16:56:58 +00:00
Robert Osfield
4973824b1d Added new osga plugin for reading OSG native archives 2004-11-10 16:40:08 +00:00
Robert Osfield
bb3d651453 Fixed tabbing 2004-11-09 16:49:29 +00:00