Commit Graph

1085 Commits

Author SHA1 Message Date
Robert Osfield
7cf7d8fadb Added protected destrcutor to TemplateArray. 2002-07-16 10:16:34 +00:00
Robert Osfield
8a14aa29cd Added support to osgUtil::Tesselator to insert extra vertices and other
attributes into an osg::Geometry node.  Uses the new osg::ArrayVisitor.

Converted the osg plugin Geometry support to use the new UByte4 class.
2002-07-15 22:23:57 +00:00
Robert Osfield
e280b50d31 Added osg::UByte4 class, which can be used to represent packed colors.
Changed osg::UByte4Array across to use the new osg::UByte4 class rather
than a GLuint as do previously.

Cleaned up some of the paramters in osg::Vec4.
2002-07-15 22:18:47 +00:00
Robert Osfield
5530406c9a Removed the second texture from the prerender demo so as not over complicate
the final image.
2002-07-15 13:39:11 +00:00
Robert Osfield
9c56a57de3 Fixed the orientation of the osgreflect demo so that the reflection plane
is orientated towards the viewer.

Changed the lightmodel ambient level to 0.1,0.1,0.1 instead of 0.0, so that
a small amount of ambient lighting is available to render back surfaces.
The osgreflect and osgprerender suffered unexpected behaviors because of
no lighting on the backfaces.
2002-07-15 13:20:41 +00:00
Robert Osfield
e9f30add38 Added a MatrixTransform to tilt the osgreflect demo so that the reflection
plane is seen clearly.
2002-07-15 13:14:28 +00:00
Robert Osfield
0a6fdb6ae0 Fixed the optimization of the orientation conversion. 2002-07-15 13:13:46 +00:00
Robert Osfield
e6f48efe78 Fixed memory leak in FieldReaderIterator.cpp.
Updated the Make/osgtests.bat and Make/debugtests.bat scripts.
2002-07-15 11:44:21 +00:00
Robert Osfield
5a8ae07035 Renamed hangglide to osghangglide 2002-07-15 10:53:51 +00:00
Robert Osfield
08f5b7cbdd Removed the old hangglide directory. 2002-07-15 10:51:45 +00:00
Robert Osfield
6e40d676a2 Renamed osghangglide demo. 2002-07-15 10:45:13 +00:00
Robert Osfield
02f0995ef3 Renamed the hangglide demo osghangglide to make it consistent with the rest
of the demos.
2002-07-15 10:43:32 +00:00
Robert Osfield
db892e6bfe Added State::disableTexCoordPointersAboveAndIncluding( unit ) method so that
all unsed texture units can be turned off simply within Drawables such
as Geometry and GeoSet. This can be used to prevent bleed of arrays from
one object to the next - which can cause crashes.
2002-07-15 10:03:59 +00:00
Don BURNS
6a2aa35c26 Changes for Sunos 2002-07-15 04:42:44 +00:00
Don BURNS
523b64ef3f Added Logos loader 2002-07-14 21:49:51 +00:00
Robert Osfield
8883f1d571 Fixed unused variable `osg::StateSet *osgStateSet' warning 2002-07-14 20:51:31 +00:00
Robert Osfield
e7657f6b51 Added Drawable::AppCallback example and fixed a warning. 2002-07-14 20:48:30 +00:00
Robert Osfield
9792aa09dc Tweaked the color and aspect ratio settings of the pre rendering bin. 2002-07-14 20:32:05 +00:00
Robert Osfield
f32245ba5b Fixed computeNearFar bug in CullVisitor::apply(Billboard&). 2002-07-14 16:26:03 +00:00
Robert Osfield
733be1b309 Fixes to read/write of MatrixTransform/Transform. 2002-07-14 10:46:46 +00:00
Robert Osfield
32a4625e59 Copy and Paste bug where an for() loop was repeated within itself, which
was introduced when moving across to use osg::Geometry.
2002-07-14 08:35:35 +00:00
Robert Osfield
4895b22da1 Fixed various warnings which were appearing under MacOSX. 2002-07-13 21:17:40 +00:00
Robert Osfield
db888b191c Conveted GeoSet to use the new state::set*Pointer/disable*Pointer methods
to keep the current state valid.
2002-07-13 20:31:30 +00:00
Robert Osfield
12be8e5493 Support added for multitextured TXP files, sent in by Boris Bralo. 2002-07-13 14:16:41 +00:00
Don BURNS
b92ee3c95d put a typedef in public area of class for sun compilers 2002-07-13 02:46:06 +00:00
Robert Osfield
bbc6779f95 Added missing MatrixTransform.cpp file 2002-07-12 21:45:54 +00:00
Robert Osfield
717dab9389 added glutInit to osgparticle demo to fix crash under MacOSX. 2002-07-12 21:45:08 +00:00
Robert Osfield
5504f51774 Added second texture to osgprerender demo to test out multitexture in
osg::Geometry, it works!!
2002-07-12 21:42:27 +00:00
Robert Osfield
d87d27b749 Added MatrixTransform header and source. 2002-07-12 21:08:19 +00:00
Robert Osfield
1f9e4547e7 Changed the osgmultitexture demo so that it uses a TexEnv::BLEND mode
with a colour.  This lightens the resultant models.
2002-07-12 19:50:52 +00:00
Robert Osfield
995f6f9e21 Added using namespace osgUtil to get round IRIX/Windows compiler differences. 2002-07-12 18:14:45 +00:00
Robert Osfield
6f392cdbfa Ported distribution across to use the new osg::MatrixTransform and osg::BlendFunc
class instead of osg::Transform and osg::Transparancy respectively.
2002-07-12 18:12:01 +00:00
Robert Osfield
8128265e09 Have added a #define USE_DEPRECATED_API to include/osg/Export, and
various
osg header and source files to optional compile in deprecated parts of
the
OSG API.

Have renamed osg::Transparency osg::BlendFunc to bring it in line with
the
rest of the OSG's StateAttribute classes which are named after their
OpenGL counterparts.  include/osg/Transparency still exists and is
simply
a typedef to BlendFunc and is enclosed in a #ifdef USE_DEPRECTATED_API
block.

The matrix methods in the osg::Transform class have been
moved/replicated in
a osg::MatrixTransform sublcass from osg::Transform.  The old matrix
functionality is still present in the osg::Transform class but is guard
by #ifdef USG_DEPRECATED_API blocks.  One should now think of
osg::Transform
as being a Transform Node base class.  MatrixTransform has all the
functionality of the original Transform class, so should be used
instead.
2002-07-12 14:25:10 +00:00
Robert Osfield
00470acb61 Fix, sent in by Macro Jez, to the set of the camera with the computed near and far plane, so that
it is only updated when  _computeNearFar != CullVisitor::DO_NOT_COMPUTE_NEAR_FAR.
2002-07-12 13:00:09 +00:00
Robert Osfield
3edb8a3d18 Added blend color to osg::TexEnv 2002-07-12 10:30:27 +00:00
Robert Osfield
0d84d3ed15 Fixed indenting. 2002-07-12 09:16:49 +00:00
Robert Osfield
5b97336e37 Addition of RoadRecords from Yefei He. 2002-07-12 08:48:27 +00:00
Don BURNS
c0360c15bc added -lpthread to the link line for Linux builds. Seems Red Hat 7.3
turns up undefined symbols without it.
2002-07-11 23:30:18 +00:00
Robert Osfield
0ea6a7af4a Fixes for Win32 build 2002-07-11 21:08:02 +00:00
Robert Osfield
840df13438 Added Makefile for osgmultitexture demos. 2002-07-11 18:33:30 +00:00
Robert Osfield
1d136eab9f Added #define for GL_TEXTURE0_ARB 2002-07-11 18:32:41 +00:00
Robert Osfield
8219a0a63a Added support for multitexturing to osg::State and added osgmultitexture
demo which adds as spherical environment map using texture 1 to any model.
2002-07-11 16:12:24 +00:00
Robert Osfield
c4c97a0f64 Moved the code referencing osg::BoundingBox::isValid() and
osg::BoundingSphere::isValid() across to use the valid() methods, the later
being more consitent with other classes such as osg::ref_ptr<>.
2002-07-11 14:32:21 +00:00
Robert Osfield
b015d80d68 Fixes for win32 build 2002-07-11 12:57:53 +00:00
Robert Osfield
cd3c2c0b77 Fixes for Win32 build 2002-07-11 11:36:25 +00:00
Robert Osfield
eca5797ae4 Fixed bug in disabledTexCoordPointer where a '>' was being used where it
should have been a '>='.
2002-07-11 11:33:06 +00:00
Robert Osfield
76d4b4bdf9 Fixed the pathname for the osgprerender demo. 2002-07-11 11:08:34 +00:00
Robert Osfield
4372c9a334 changed unsigned int/short/char* references to GLuint,GLushort,GLubyte respectively. 2002-07-11 08:28:09 +00:00
Robert Osfield
54c27e36bf Updates for new use of GLushort instead of osg::ushort in GeoSet index pointer. 2002-07-10 22:38:02 +00:00
Robert Osfield
5d18f0ee11 Tidied up the types in osg::GeoSet so that the index pointers use GLushort
and GLuint to get round compile issues under MacOSX.
2002-07-10 22:33:08 +00:00