Commit Graph

2704 Commits

Author SHA1 Message Date
Robert Osfield
25d1fa2e2c Changed uint for unsigned int. 2005-04-14 20:34:59 +00:00
Robert Osfield
086efcdff1 Removed setProgram from osg::StateSet as Program works just fine right now
as a standard osg::StateAttribute and set in a StateSet with setAttribute.
2005-04-14 15:53:28 +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
d6d764a729 From Terry Welsh, added copy texture support to TextureRectangle 2005-04-13 18:19:38 +00:00
Robert Osfield
789cb7dea7 Added applying of all parents uniforms 2005-04-13 14:31:25 +00:00
Robert Osfield
0015a31de8 Added basic support for applying uniforms to programs, non lazy state updating
is yet applied though.
2005-04-13 14:12:06 +00:00
Robert Osfield
2e10cffb4d Work in progress on shader language uniform support 2005-04-13 12:00:28 +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
813bb559aa Changed optimization flag to -O instead of -O2 to aid compile speed. 2005-04-11 15:40:30 +00:00
Robert Osfield
4fec031e6c Moved #include <osg/State> from header into .cpp to clean up build. 2005-04-11 15:17:24 +00:00
Robert Osfield
a9270a7c89 Build fix 2005-04-11 15:01:57 +00:00
Robert Osfield
2fb3d9aae5 Fixed warning, and sorted entries in GNUmakefile 2005-04-11 10:12:32 +00:00
Robert Osfield
20882b6b4b From Olaf Flebbe, Fixed cross platform compile error 2005-04-11 07:51:43 +00:00
Robert Osfield
0d8bd24250 Fixed typo 2005-04-09 11:17:12 +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
72a0e38ed0 From Stephan Huber, changed fixed string sizes for dynamically allocated ones in OSX file system gets. 2005-04-08 18:46:51 +00:00
Robert Osfield
d52e02aaeb From James French, a tweak with fix a compile problem related to STLport. 2005-04-08 14:44:44 +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
fed42a46ed Added #include <osg/io_utils> 2005-04-08 09:59:40 +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
3c76c9fd60 Added io_utils include 2005-04-08 09:14:50 +00:00
Robert Osfield
fcab21f9cc Added osg/io_utils include 2005-04-08 09:13:07 +00:00
Robert Osfield
a2974de978 Moved the istream and ostream support from Vec* and Matrix* into a seperate io_utils file. 2005-04-08 09:01:23 +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
Robert Osfield
9dd9464638 Fix to compute coordinate frame callback so that it can handle scaled
coordinate frames, rescaling as required.
2005-04-07 16:09:34 +00:00
Robert Osfield
d160b4977b Fixed the MatrixTransform(Matrix&) constructor so that it correct sets _inverseDirty = true; 2005-04-07 15:27:53 +00:00
Robert Osfield
83e21611f6 Fixed sort of sources so that the layer number is taken into account. 2005-04-07 10:55:17 +00:00
Robert Osfield
88d65263ec Fixed layer and levels handling in reprojection of source imagery. 2005-04-07 10:19:47 +00:00
Don BURNS
af3ac699aa Rolled in Olaf's changes for HP-UX build 2005-04-05 19:08:48 +00:00
Robert Osfield
9e5d905b05 Renamed _A and _B to make them more meanigful 2005-04-04 20:25:57 +00:00
Don BURNS
ed0f780321 Removed annoying "Can't find the ground" message 2005-04-04 18:07:27 +00:00
Robert Osfield
56787b4195 Fixed output of MultiTextureControl. 2005-04-04 16:06:28 +00:00
Robert Osfield
5f75f765f0 From Marco Jez, updates to osgIntrospection. 2005-04-04 13:50:07 +00:00
Robert Osfield
816df3a1d0 Fixes for VS6.0 build 2005-04-04 12:24:18 +00:00
Robert Osfield
2e32a7cb78 From Carlo Camporesi,fixed for loop bug 2005-04-04 11:47:50 +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
aa8dbea11c From Mike Weiblen, updates to Shander Language support 2005-04-04 10:08:15 +00:00
Robert Osfield
2e91a74f14 Added FluidProgram 2005-04-04 10:05:35 +00:00