Commit Graph

3944 Commits

Author SHA1 Message Date
Robert Osfield
154656e24a Commented out support for the -m option for inserting 3d models in a terrain
database, as this feature isn't yet supported by osgTerrain.
2005-04-20 08:51:48 +00:00
Robert Osfield
06dc3ebb34 From Reinhard Sainitzer, bug fix, added missing break; 2005-04-19 07:37:59 +00:00
Robert Osfield
ef07e51d4c Removed eroneous /dv1 flag (should have been /vd1, but it this is default anway
so can safely remove entirely).
2005-04-18 18:23:25 +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
3953190dfe Fixed typo in testLookAt debug info. 2005-04-17 19:14:32 +00:00
Robert Osfield
6a22af590a Fixed warnings. 2005-04-17 19:10:32 +00:00
Robert Osfield
000e5f8d10 Changed the animation on default to false, so things only move if you ask them to. 2005-04-17 11:35:26 +00:00
Robert Osfield
6017b810eb From Marco Jez, osgWrappers updates to latest changes in core osg. 2005-04-17 11:30:33 +00:00
Robert Osfield
88e8477cbf Moved istream/ostream includes out of Vec3f, and reimpleted osg::Matrix*::compare. 2005-04-17 10:41:23 +00:00
Robert Osfield
62994ac4a2 From Tony Horrobin, fix for VS6.0 2005-04-17 09:41:48 +00:00
Robert Osfield
8bf4a98a91 From Marco Jez, added operator >> for Plane and Quat to io_utils, and added
OSG_EXPORT to PerContextProgram.
2005-04-16 17:44:11 +00:00
Robert Osfield
20f26ee011 Fixed wrapping of text string to allow internal "" strings 2005-04-16 10:18:56 +00:00
Robert Osfield
1525a00e1f From Mike Weiblen,added debug info to osg::Program and changed shader uniform names to
avoid conflict with built in functions
2005-04-16 10:11:18 +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
d3bdfe49ea Added dxf to the list of projects 2005-04-15 20:44:28 +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
08f593a54b From Joran Jessurun, Added setting of original node mask to flatten transforms 2005-04-15 20:11:50 +00:00
Robert Osfield
066c829768 Added setValue and setSwitchSet methods 2005-04-15 20:05:30 +00:00
Robert Osfield
e67ed01612 From Mike Weiblen, fix for Win32 build 2005-04-15 18:28:44 +00:00
Robert Osfield
292cbdcf29 Removed link reference to osgGL2 in doxygen file, added osgIntrospection 2005-04-15 10:15:26 +00:00
Robert Osfield
fc3df7fe9b Changed all instances of /vd0 to /vd1 2005-04-15 10:09:51 +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
0503712fe4 Removed osgGL2 from CVS, osgGL2 now can be found on the Community/NodeKits section on the OSG website. 2005-04-15 08:35:06 +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
869548bafb Uniforms open for business :) 2005-04-14 20:14:53 +00:00
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