Robert Osfield
e7ce7c0529
Fixed getUniformLocation and getAttribLocation methods
2005-04-14 20:05:16 +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
22c695cdef
From Mike Weiblen, fixed copy and paste error in new osgshaders.cpp example.
2005-04-14 08:00:25 +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
67ba3c94c9
Added #if block for swith between imagery
2005-04-12 19:28:37 +00:00
Robert Osfield
493bcdd694
Fixed bug
2005-04-12 19:17:01 +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
195b63dc65
From Olaf Flebbe, compile fix for Sun.
2005-04-11 15:22:29 +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
d0097718e1
Added friend class PerContextProgram;
2005-04-11 08:15:43 +00:00
Robert Osfield
20882b6b4b
From Olaf Flebbe, Fixed cross platform compile error
2005-04-11 07:51:43 +00:00
Robert Osfield
864817d0d0
From Randall Hopper, fixed typo of setRedMask.
2005-04-10 21:26:49 +00:00
Robert Osfield
3bdfbbe70f
Further work on kiddies game.
2005-04-10 21:25:37 +00:00
Robert Osfield
0d8bd24250
Fixed typo
2005-04-09 11:17:12 +00:00
Robert Osfield
a54a3b2bfb
From Mike Weiblen, osgGLUTsimple and osgGLUTkeyboardmouse examples
2005-04-08 19:40:16 +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
bd31479740
From Marco Jez, updates to reflect new osgIntrospection API
2005-04-08 19:29:12 +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
f46858c49b
Moved UByte4 i/ostream support into io_utils.
2005-04-08 14:10:22 +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
394708bb2c
Added #include <osg/io_utils>
2005-04-08 10:32:10 +00:00
Robert Osfield
fed42a46ed
Added #include <osg/io_utils>
2005-04-08 09:59:40 +00:00
Robert Osfield
52f192f53f
Reverted back to not test version of osgsimulation
2005-04-08 09:55:52 +00:00
Robert Osfield
21ea5a55a8
Added #include <osg/io_utils>
2005-04-08 09:51:56 +00:00
Robert Osfield
4de8199011
Added #include <osg/io_utils>
2005-04-08 09:45:06 +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
f417974f5b
Added iostream operators
2005-04-07 21:28:57 +00:00
Robert Osfield
d006ce627f
From Olaf Flebbe, removed supporios BufferObject::
2005-04-07 20:28:36 +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
c8a3198129
From Mike Weiblen, ported osgshaders example from osgGL2 to core osg based.
2005-04-07 20:20:09 +00:00
