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
Robert Osfield
8b1e9345df
Updates to osg::Drawable::AppCallback and osgprerender demo.
2002-07-10 20:30:57 +00:00
Robert Osfield
27338f57b1
Added app callback to Drawable.
2002-07-10 15:35:47 +00:00
Robert Osfield
b3ac26f3dc
Updates to osgprerender to support use of rendering to an image, rather then
...
just a texture.
2002-07-10 13:33:25 +00:00
Robert Osfield
7f56ceaea1
Rejigged the line endings.
2002-07-10 11:26:48 +00:00
Robert Osfield
c1fc3dcdb9
Ported all the demos and loaders across to use the new multitexturing API.
2002-07-10 11:22:24 +00:00
Robert Osfield
46af97727a
Added Yefei He's RoadRecords to the flt loader, these records will be
...
ignored by the loader, but will allow the loader to skip over them and
continue reading the rest of the file correctly.
2002-07-10 09:32:44 +00:00
Robert Osfield
44d0bb05e7
Updates from Macro to support the new multitexture API, and improve
...
bounding box computation.
2002-07-10 09:14:46 +00:00
Robert Osfield
f4a167c64c
Added setCurrentRenderBin() method.
2002-07-10 09:04:28 +00:00
Robert Osfield
842eb59e1f
Implemented more code for the new osgprerender demo.
2002-07-09 19:23:53 +00:00
Robert Osfield
68540f5fb1
Updates to the osgprerender code. Still doesn't do anything interesting yet..
2002-07-09 13:31:50 +00:00
Robert Osfield
3ab727713d
Added new demo osgprerender to demonstrate how to prerender a scene and use
...
the result in the main rendering for special effects.
2002-07-09 13:17:42 +00:00
Robert Osfield
b3904ef729
Warnings fixes for IRIX - there was a missing "const" in the sameKindAs(.) method.
2002-07-09 10:33:15 +00:00
Robert Osfield
aca7f7b216
Fixes for IRIX build.
2002-07-09 10:23:48 +00:00
Robert Osfield
0c943945f7
Implemented most of the changes required for supporting multitexturing in
...
the osg::State/osg::StateSet/osg::StateAttribute and related classes.
2002-07-09 09:35:42 +00:00
Robert Osfield
419e1360d5
Added Mike Connell to authors list.
2002-07-08 09:42:51 +00:00
Robert Osfield
211a823642
Added comment to reflect Clay Fowlers findings on getting VS to compile
...
without the Vector wrapper classes.
2002-07-07 22:12:51 +00:00
Robert Osfield
2baeea6cae
Added winsock32 libs to osgcluster demo.
2002-07-07 22:08:27 +00:00
Robert Osfield
eb361bc047
Rehashed the osgcluster project file to see if it solves the failure under
...
windows.
2002-07-07 20:16:30 +00:00
Robert Osfield
8f4a77ce4c
Fixes for Windows build.
2002-07-07 17:42:34 +00:00
Robert Osfield
e23b40e316
Added include<unistd.h> to __DARWIN_OSX__ build.
2002-07-07 17:40:34 +00:00
Robert Osfield
4696d319e5
Did a to_dos on osgcluster.dsp since it was original saved with unix file endings.
2002-07-07 17:30:48 +00:00
Robert Osfield
0801b363f5
Work on supporting multitexturing in State/StateSet/StateAttribute/Geoemtry.
2002-07-07 14:40:41 +00:00
Robert Osfield
9787641512
Added VisualStudio files for Win32 port of osgcluster demo.
2002-07-04 18:47:33 +00:00
