FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9,135 Commits 1 Branch 26 Tags
5c6c51c8873d7f91efd5f59d70261cfa418228ea
Commit Graph

2006 Commits

Author SHA1 Message Date
Robert Osfield
5c6c51c887 From Colin McDonald, " 
The bsp & mdl plugins have calls to atof() without including the
associated <stdlib.h> header.  This breaks the build on my Solaris setup.

Rather than adding the missing <stdlib.h> include, I have changed the
atof() calls to osg::asciiToDouble().  This is the same as was done
throughout the other plugins recently, for locale independance.

I've attached updates to the svn trunk, the fix is also appropriate for
the 2.8.* branch."
 2009-08-20 15:14:41 +00:00
Robert Osfield
2bed6a2dca From J.P. Delport, "attached a modified jpeg plugin that allows writing of grayscale images." 2009-07-17 07:50:06 +00:00
Robert Osfield
0029d8fc46 From Fabien Lavignotte, "When exporting some models to OpenFlight, i found a crash if the texture 
unit does not contain a TexEnv object.
Here's the small fix, just a test on the pointer."

Merged from svn trunk using:

svn merge -r 10490:10491 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight
 2009-07-16 12:11:18 +00:00
Robert Osfield
df14b9980a From Jason Daly, "These are some fixes to the mdl and bsp plugins to handle transparency and lighting better, plus a few other tweaks." 2009-07-16 11:42:08 +00:00
Robert Osfield
01b27a9fb2 From Paul Fotheringham, fixed linux build error when compiling dicom plugin against ITK by adding define VCL_CAN_STATIC_CONST_INIT_FLOAT to be zero. 
From Robert Osfield, general clean up of CMakeLists.txt under ITK side
 2009-07-03 19:08:55 +00:00
Robert Osfield
21f735d653 From Bryan Thrall, "The OpenFlight plugin doesn't handle unrecognized options or extra 
whitespace in all cases, causing it to crash."
 2009-07-01 15:39:48 +00:00
Robert Osfield
44da3958c3 From Mathias Froehlich, changes from atof to use osg::asciiToFloat() to avoid locale issues with atof 2009-06-25 14:06:29 +00:00
Robert Osfield
fb6e1d4d9f Fixed swap size error. 
Merged from svn/trunk using:

  svn merge -r 10386:10387 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/txp/
 2009-06-22 16:04:46 +00:00
Robert Osfield
a9c1dd1a4a Merged from svn/trunk fix to initGLNames() which addressed thread safety issue 2009-06-22 07:42:57 +00:00
Robert Osfield
371778e0e7 Merged from svn/trunk libcurl version checks to enable build against older versions of libcurl. 
svn merge -r 10221:10222 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/curl/
 2009-05-15 15:13:17 +00:00
Robert Osfield
029c114c4c Fixed name of POPPLER_LIBRARY_DIRS, merged from svn trunk using svn merge -r 10143:10144 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/pdf 2009-05-07 09:47:20 +00:00
Robert Osfield
bc7f1cf5ac Merged from svn/trunk support for searching for imagery in path relative to the .osg file being loaded. Merged using: 
svn merge -r 10100:10137 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/osgVolume
 2009-05-05 12:56:30 +00:00
Robert Osfield
aab533c046 From Jason Daly, "Currently, the .mdl plugin loads vertices in the native DirectX order, which is the reverse of OpenGL order. This means that the back faces are currently rendered as front faces, and vice versa. 
This fix reverses the vertex order and sets up proper OpenGL facing.  I didn't notice this problem until I started using the plug-in in my own code (osgviewer seems to not enable backface culling)."

merged from svn/trunk using:

svn merge -r 10092:10093 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/mdl/
 2009-04-24 10:56:45 +00:00
Robert Osfield
aa7b0becf7 Fix to handling of subsurface layers so that more appropriate PolygonOffset values are chosen. Merged from svn/trunk using: 
svn merge -r 10083:10084 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/OpenFlight/
 2009-04-23 11:08:36 +00:00
Robert Osfield
e383ef95bc From Bob Kuehne, "fix for failing collada builds on osx due to not being able to stringstreamify osg::Vec3 without io_utils included." 2009-04-22 13:09:45 +00:00
Robert Osfield
8631eaaf40 From Michael Platings, fixed memory leak 2009-03-23 16:26:27 +00:00
Robert Osfield
d843de261e From Neil Hughes, changed the handling of opacity maps so that when they are used blending in enabled. Merged from svn/trunk using: 
svn merge -r 9905:9906 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/3ds/ReaderWriter3DS.cpp
 2009-03-11 13:31:17 +00:00
Robert Osfield
8297d8f0cb From Humar Carmona, "When reading a DXF file, the reader breaks at a debug assertion at vector (it breaks on release version). Inspecting the code show that the cause could be in dxfEntity.cpp. 
It seems that the problem is an offending "short" used in a for loop, where it should be "int" or "long". It causes an index out of range error. "

Merged from svn trunk using:
svn merge -r 9803:9804 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/dxf/dxfEntity.cpp
 2009-02-20 11:41:30 +00:00
Robert Osfield
439c3a866b Fixed bug in checking of return values. Fix merged in from svn/trunk using: 
svn merge -r 9800:9801  http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk/src/osgPlugins/hdr/hdrloader.cpp
 2009-02-19 17:40:55 +00:00
Robert Osfield
f963397726 From Riccardo Corsi, "in attach you'll find a patch to cleanup a little bit the (de)initialization code of QuickTime? environment from the quickTime pluging. 
It basically removes the static init() and exit() functions,and move them inside the observer class (the one that cleans everything up when the last media is unloaded).

It also add an extra check to clean up on exit if the QuickTime? env is initialized, but no media is succesfully loaded / written (it might happens with streaming resources).

I tested it under WinXP with zero, one and multiple videos. "

Merged from svn/trunk using:

svn merge -r 9768:9769 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk
 2009-02-11 17:42:17 +00:00
Robert Osfield
db00cb1613 From Roland Smeenk, "Attached are two small fixes: 
-I changed the SET of COLLADA_BOOST_INCLUDE_DIR to use findpath, so users may override this setting if they choose not to build against to precompiled boost libraries delivered with the Collada DOM.

-Changed daeRMaterials.cpp to prevent a compiler warning about a potentially uninitialized variable."
 2009-02-11 09:16:58 +00:00
Robert Osfield
1420393b00 Warning fix 2009-02-10 20:28:29 +00:00
Robert Osfield
07bccafd05 Merged from svn/trunk changes for better Collada build support from Roland Smeenk, Roger James and Robert Osfield, merge commands. 
svn merge -r 9740:9741 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk
svn merge -r 9750:9751 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk
 2009-02-10 20:15:54 +00:00
Robert Osfield
aef27c4387 From Pierre Haritchabalet, "In IO_FluidProgram.cpp, FluidProgram_readLocalData() function is wrong. When density parameter is read, the function "setFluidViscosity()" is called instead of "setFluidDensity()". 
This patch fixes osg plug'in FluidProgram_readLocalData."

merged from svn/trunk using:

  svn diff -r 9748:9749 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk
 2009-02-10 18:59:22 +00:00
Robert Osfield
4adc16bcdd From Jason Beverage, "I've added a small change to the CURL plugin that allows support for HTTP redirects." 
Merged from svn/trunk:

   svn merge -r 9743:9744 http://www.openscenegraph.org/svn/osg/OpenSceneGraph/trunk
 2009-02-10 13:58:07 +00:00
Robert Osfield
ea3b08526d From Bryan Thrall, "The .osg plugin doesn't seem to support an option to write shader files 
separately, so it always inlines them in the .osg file (as far as I can
tell). This change adds that ability. "

Merged from svn/trunk.
 2009-02-09 21:53:18 +00:00
Robert Osfield
f29ddb0e05 Fixed data copy bug 2009-02-06 12:12:40 +00:00
Robert Osfield
fde95d5ccf From Alberto Luaces, "here are some minor fixes to notify warnings were the std::hex modifier was 
used but never restored to the decimal notation. That made OSG print messages
like the following after some notifications:

Warning: detected OpenGL error 'invalid value' after RenderBin::draw(,)
RenderStage::drawInner(,) FBO status= 0x8cd5
[...]
Scaling image 'brick_side.JPG' from (1b4,24f) to (200,200) <--- Values in hex
because of previous error.
[...]"
 2009-02-06 10:35:18 +00:00
Robert Osfield
a571574a1c Added suppression of strict-alaising warning emitted by gecko headers 2009-02-05 14:34:15 +00:00
Robert Osfield
223c603a8c Disabled deprecated warning 2009-02-05 14:16:04 +00:00
Robert Osfield
91716f6e06 Fixed tabs 2009-02-05 12:45:02 +00:00
Robert Osfield
b8345534c5 Added initializer to fix warning 2009-02-05 12:43:22 +00:00
Robert Osfield
3a34e2869b From Jean-Sebastien Guay, warning fixes. 2009-02-04 19:22:25 +00:00
Robert Osfield
734463fcc7 Warning fixes 2009-02-03 15:28:53 +00:00
Robert Osfield
630f5087dc From Stephan Huber, build fix for OSX XCode build 2009-02-02 16:56:46 +00:00
Robert Osfield
fa727038a4 From Cedric Pinson, "Here an update of the osgAnimation ReaderWriter, it add other NodeCallback that could be attached to a node with Bone." 2009-02-02 14:51:51 +00:00
Robert Osfield
3d1c38f5e8 From Pierre Haritchablaet, "The wind vector of osgParticle::FluidFrictionOperator has not been written and read in IO_FluidFrictionOperator. This patch fixes osg plug'in FluidFrictionOperator_readLocalData and FluidFrictionOperator_writeLocalData." 2009-02-02 14:50:19 +00:00
Robert Osfield
2d55740b3e Refactored osg::TransferFunction1D to use an std::map internally which is kept in sync with the actual osg::Image that is passed to the GPU. 
Added .osg support for osg::TransferFunction1D.

Updated wrappers
 2009-02-02 14:43:27 +00:00
Robert Osfield
d6b0cd64f1 Ground work for full .osg support for osg::TransferFunction* 2009-02-01 12:38:55 +00:00
Robert Osfield
b514b435f4 Added initial placeholder for .osg support for osgVolume::TransferFunctionProperty 2009-01-31 21:46:16 +00:00
Robert Osfield
eae23b01c3 From Lionel Lagarde, "this correct how the ParticleEffect are serialized : 
- the texture file name is taken from the TextFileName field
- the texture file name is written using writeString
"
 2009-01-30 14:54:22 +00:00
Robert Osfield
6710fbc78a Added support for osgVolume::ProperyAdjustmentCallback 2009-01-29 20:40:56 +00:00
Robert Osfield
51403143bd Added support for osgVolume::Property classes 2009-01-29 20:34:22 +00:00
Robert Osfield
4c75313ced Fixed handling of files with event callbacks on them. 2009-01-29 17:19:47 +00:00
Robert Osfield
d62c34efe8 From Jason Daly, "Somehow, one of the shaders in the bsp plugin started behaving incorrectly between the original submission and now. I suspect it has to do with a typo in the setup of the shader that was fixed at some point, or it happened during the recent warnings purge. In any case, I had to invert the usage of a parameter in the shader to make it behave properly again. 
The vtf plugin wasn't working in Windows due to OS differences in the byte-packing of the header structure (on Windows, the big block read was causing a buffer overrun).  I fixed this by reading the structure from the file field by field.  It's now happy on both Linux and Windows."
 2009-01-29 11:18:03 +00:00
Robert Osfield
2bf68cab53 Fixed warning 2009-01-29 11:03:38 +00:00
Robert Osfield
5ac339d7b2 Replaced -1 with ~0u to fix warning due to being written to a UInt field. Note, OpenFlight spec says -1, which is clearly an error in the spec, so we've had to guess at ~0u being an appropriate value. 2009-01-29 09:27:23 +00:00
Robert Osfield
ca1f1e5abe Fixed warnings 2009-01-28 12:51:47 +00:00
Robert Osfield
065b1d4978 Fixed warnings 2009-01-28 12:28:04 +00:00
Robert Osfield
998582e945 Added back in intializers for RenderSurface. 2009-01-28 09:06:46 +00:00