Commit Graph

2966 Commits

Author SHA1 Message Date
Robert Osfield
5408077c3b Added ive reader/writer - from Rune Schmidt Jensen/Michael Gronager 2003-05-23 19:51:12 +00:00
Robert Osfield
058e4939fc Convert Performer plugin across to generate osg::Geometry directly. 2003-05-22 11:09:28 +00:00
Robert Osfield
4a6bdad3e1 Removed osg::GeoSet for core osg lib and osgPlugin.
Commented out OpenDX plugin as its still based on GeoSet.

Added support for loading and converting GeoSet into the osgconv example.
2003-05-21 12:15:45 +00:00
Robert Osfield
eb3169634a Removed spurious editing file. 2003-05-20 19:48:07 +00:00
Robert Osfield
715ba6fb66 Renamed png pnm 2003-05-17 09:03:06 +00:00
Robert Osfield
06054d9520 Added support for multibuffering of tex coordinates. 2003-05-06 13:13:31 +00:00
Robert Osfield
86254927b9 From Eric Sokolowsky - pnm (ppm, pgm, pbm) plugin 2003-04-30 15:40:57 +00:00
Robert Osfield
0ab467483f Added support for automatic scaling of text to screen coords. Optimized
the text implementation to provide better speed, especially by using the
alignement to screen option.

Deprecated the Text::setFontSize(,) method, which is now being replaced
by setFontResolution(,)

Fixed typos in Texture*.cpp.

Removed old deprecated methods from osg headers.
2003-04-30 11:40:17 +00:00
Robert Osfield
c1b1a091fa From Tree, addition of ; after MACRO_'s to help with Java port.
From Tree + Robert, Addition of LEFT_BASE_LINE,RIGHT_BASE_LINE,CENTER_BASE_LINE
Alignment options in Text.
2003-04-27 10:58:39 +00:00
Robert Osfield
af1eae0418 cout -> notify. 2003-04-24 13:45:10 +00:00
Robert Osfield
a79fada938 Mannually computes the mipmap levels to ensure correct loading of dds
images which arn't square.
2003-04-19 06:57:07 +00:00
Robert Osfield
1cf0be9963 Fixes to BlendFunc - adding missing ZERO handling.
Improved handling of alpha values in DXT1 compression.
2003-04-18 19:46:46 +00:00
Robert Osfield
bc8bd29646 Updated NEWS for the release.
Fixed warnings.
2003-04-18 15:59:34 +00:00
Robert Osfield
1c8db044f1 Removed various assert() instances since these were causing crashes.
From Alberto, changed the use of the DynGeoSet to it was querried on demand
rather than used as a pointer which was originally being invalidate before
use.
2003-04-18 10:10:14 +00:00
Robert Osfield
0b0c6c4e60 Added support for set/getColor to ShapeDrawable. 2003-04-16 20:02:15 +00:00
Robert Osfield
0036018507 Added -I/usr/X11R6/include to osgProducer and all the examples GNUMakefiles.
From Bob, mods to GNUMakefile and Make/makedefs for the extra includes for
freetype.
2003-04-14 19:39:22 +00:00
Robert Osfield
a202cfa4f3 Changed push back to a += to try and fix compile on hopeless OSX g++ version. 2003-04-14 08:16:55 +00:00
Robert Osfield
1a943c69ba Convertex a std::copy() into a for loop to get round compile problems under
OSX.
2003-04-11 18:57:35 +00:00
Robert Osfield
0c9b652f31 Changed the uint arrays to GLuint to keep OSX build compiling. 2003-04-11 15:33:40 +00:00
Robert Osfield
83fb3f40c9 Added afterescher back into the example list in runexamples.bat.
Added osgSim and osgText into the geo/GNUmakefile LIBS.
2003-04-11 10:00:56 +00:00
Robert Osfield
eb995684fb Added using namespace std; 2003-04-09 11:45:41 +00:00
Robert Osfield
692283100c Added support for osg::Node::get/setNodeMask() into .osg format. 2003-04-09 10:30:24 +00:00
Robert Osfield
4fd2352afa Cleaned up some warnings and added :
LINKARGS += -Wl,multiply_defined -Wl,suppress

To GNUmakefile for the OSX build.
2003-04-08 10:17:44 +00:00
Robert Osfield
e04b36b467 Fixes to dds plugin from Rune. 2003-04-07 15:11:29 +00:00
Robert Osfield
9f0fa75484 Added support for unref image data after apply in the osg::Texture*
classes.  Only unref's after all graphics context have been applied.
2003-04-07 12:51:00 +00:00
Robert Osfield
8a3b81f00d Fixed handling of pixel and internal images formats. 2003-04-06 10:07:44 +00:00
Robert Osfield
7473bf573d Suported for mip mapping added by Rune. 2003-04-03 21:00:12 +00:00
Don BURNS
03a0b4f5de Changes to fix compiles on Mac OS X 2003-04-03 08:14:49 +00:00
Robert Osfield
78d95b2414 Fixes for Win32 - removed second copy constructor from protected section
in ReaderWriterLOGO.cpp, and add osgText as a dependancy to osgtexture3D example app.
2003-04-03 07:37:08 +00:00
Robert Osfield
12e2e1968a Fixes to the dds plugin. 2003-04-02 19:41:18 +00:00
Robert Osfield
0f3eaeba46 From Rune Schmidt Jensen - new dds loader. 2003-04-02 18:26:34 +00:00
Robert Osfield
7aab621405 Added support for min pixel size, max pixel size and max visable distance to
osgSim::LightPointNode, the max pixel size from was originally in osg::LightPoint.

Added additional get/set methods to osg::LightPointNode.

Increased the compute pixel size by a ratio 1.41 (sqrtf(2)) to correlate the
computed size with the actual size seen on screen.
2003-04-02 10:50:15 +00:00
Robert Osfield
732dad0e6e Fixed std::string usage so that std::string::size_type is used where
appropriate.
2003-04-01 20:52:56 +00:00
Robert Osfield
49b62ff92c Moved the logo plugins from the osgPlugins/logos directory to osgPlugins/logo
to make it consistent with the naming of the plugin.
2003-04-01 15:13:26 +00:00
Robert Osfield
b728b1dd99 Implemented load and subload methods in osg::Texture/Texture2D. 2003-03-31 21:41:17 +00:00
Robert Osfield
c784f8a669 Changed the background pixel colour to white, but kept the alpha value zero.
This has been done to improve the quality of the mip mapping of text.
2003-03-27 10:58:20 +00:00
Robert Osfield
b04edb70aa Added a clear of allocated Records and the cache's in flt::Registry to
prevent memory leaks and unneccesary references to model models remaining
beyond the scope of the loader.
2003-03-18 20:10:51 +00:00
Don BURNS
3786683636 Removed the building of the osgTXP library so the build system builds only
the plugin.  Building both the plugin and the library causes a race condition
during parallel makes.
2003-03-14 02:29:34 +00:00
Don BURNS
ec3e1dc611 Fixes for Mac OS X 2003-03-13 06:22:31 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*.
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
2003-03-12 10:39:43 +00:00
Robert Osfield
78de76f17f Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene
graph containing text.

Fixed warning in MD2 plugin.
2003-03-11 13:30:03 +00:00
Robert Osfield
4cdbbf1b4a Added missing osgDB:: to writeArray() usage. 2003-03-11 13:24:28 +00:00
Robert Osfield
06fb808ad3 Improvements to the Text .osg support. 2003-03-10 16:40:26 +00:00
Robert Osfield
ef3b957cb9 From Daniel Sjolie, support for light source. 2003-03-07 09:04:04 +00:00
Robert Osfield
08cdf05b3e Fix to comment record and longID length using both inbedded null's and
rec length to determine the length of a string.
2003-03-07 08:52:51 +00:00
Robert Osfield
fab6f24f4e Changed the osgText::Font implementation so it used a facade us abstract away
the actual implemention. This has been done so that when a freetype font is
created the implementation can unloaded when the freetype plugin is unloaded
without breaking the main font.

Also add image margin around founds to prevent any image boundaries appearing.
2003-03-06 17:11:24 +00:00
Robert Osfield
352204f358 Renamed Text::TextString String. 2003-03-06 11:18:38 +00:00
Robert Osfield
6bfc06dc0e Fixes for Win32 build. 2003-03-05 14:02:48 +00:00
Robert Osfield
7cc69d4d66 Added md2 plugin from Vladimir Vukicevic. 2003-03-05 09:56:56 +00:00
Robert Osfield
7b6eaa72f2 Updates to Text for Sun Forte compilers. 2003-03-05 09:08:11 +00:00
Robert Osfield
1c34c0981e Further improvements to osgText and the freetype plugin, handling different
font sizes better and plugin removal safely.
2003-03-04 12:34:42 +00:00
Robert Osfield
fcbf1e200a Fix for warning under Windows. 2003-03-03 20:28:07 +00:00
Robert Osfield
fe978ac122 Compile fixes to osgText. 2003-03-03 20:12:18 +00:00
Robert Osfield
878c545785 Fixes for the new osg::Image::setImage() parameter, from Ulrich Hertlein. 2003-03-03 11:04:15 +00:00
Robert Osfield
5b7718ea45 Updates to the quicktime plugin from Bob Kuehne. 2003-03-03 11:02:35 +00:00
Robert Osfield
fbe674b321 First cut of new osgText implementation. 2003-03-02 21:05:05 +00:00
Robert Osfield
a826f5ee31 Changed incorrect instance "TRUE" to "FALSE" to match DepthMask state. 2003-02-27 08:43:02 +00:00
Robert Osfield
4275a96d40 Changed the title of the ReaderWriter, removing the "Default" word as its no
longer appropriate.
2003-02-27 08:38:53 +00:00
Robert Osfield
b32c8c65f3 Added osg::Image::AllocationMode enum and associated set/get methods.
osg::Image::setImage has also been modified to require the AllocationMode
mode to be passed to it so that it knows how to delete the data once the
image goes out of scope.

Port the image plugins across to specify the new AllocationMode, and converted
them across to using new/delete in place of malloc/free.
2003-02-25 11:56:18 +00:00
Robert Osfield
73f741d16f Completed first pass at providing commandline option usage via the new
osg::ArgumentPareser and osg::ApplicationUsage classes. The osgproducer
demo has been implemented using these new mechansims.
2003-02-18 21:58:40 +00:00
Robert Osfield
73dd9eb59b Added reference to Group in the RegisterDotOsgWrapperProxy. 2003-02-18 11:33:55 +00:00
Robert Osfield
319e84ceed Added support for ClipNode in the .osg plugin. 2003-02-13 15:37:32 +00:00
Robert Osfield
43d304c24e From Geoff Michel, updates to the Geo plugin.
Removed osg::uint reference form the pfb plugin.
2003-02-13 15:16:04 +00:00
Robert Osfield
8f1ba9d21b Removed include/osg/Types header defining osg::ubyte, osg::ushort etc. Changed
any reference to these in the distribution across to using unsigned char,
unsigned short etc.  This has been done to keep the OSG code more opaque
to what types are.
2003-02-12 19:20:47 +00:00
Robert Osfield
0e8154d3d3 From Norman Vine, updates to TXP plugin so that the Cygwin build uses pthreads. 2003-02-12 12:02:25 +00:00
Robert Osfield
042af2be03 Add if (!textureStateSet) return check to replace assert() to prevent crashes
when multi-texture layers don't exist.
2003-02-12 10:10:03 +00:00
Robert Osfield
636c5e3d98 Added if (!null) guard around description strings. 2003-02-12 09:52:27 +00:00
Robert Osfield
fa643c8795 From Geoff Michel, updates to the Geo loader including handling of
.geo files from the rc1 of the GEO modeller.
2003-02-10 15:16:51 +00:00
Robert Osfield
ebb31fb339 Updates from Ulrich for sharing of textures. 2003-02-10 14:47:20 +00:00
Robert Osfield
31e4185aa6 Added an #ifdef to osgGLUT/Window.cpp to handle the case of compiling against
older versions of GLUT.
2003-01-24 15:12:54 +00:00
Robert Osfield
df21d69666 Fixed the formating of the Matrix output. 2003-01-24 09:35:05 +00:00
Robert Osfield
5a05e14e50 Fix to handling of comment records and longid's. 2003-01-23 14:46:10 +00:00
Robert Osfield
3cdf42e599 Fixed Win32 compile problem. 2003-01-23 10:11:11 +00:00
Robert Osfield
9aaf5a560b Changed the implementation of the texture objects and display list to delete
caches so that they use a std::vector<> swap on the internal data structures
when ready to delete to minimize the amount of time that a race condition
condition can happen.
2003-01-22 23:34:18 +00:00
Robert Osfield
fbeae00fa2 Fixed handling of rotations reading from .osg of osg::Shapes. 2003-01-22 16:17:56 +00:00
Robert Osfield
d2b7340fb5 Changed the decal=true setting to decal=false to make sure that textured models
come out lit ok.  The makes the assumption that colour values on the objects
and realistic, if they arn't then decal texture can produce better results..
2003-01-22 12:25:04 +00:00
Robert Osfield
1c56ee52a2 Changed the local header includes from <> to "" to help the OSG compile. 2003-01-21 21:02:17 +00:00
Robert Osfield
87973523ad Added gaurds around alpha function value to catch erroneous values before they
are passed on to the OSG.
2003-01-21 16:02:29 +00:00
Robert Osfield
2261b1cc86 From Joseph Steel, addition of texture filter modes to txp plugin. 2003-01-21 09:09:48 +00:00
Robert Osfield
2ac175484a Updates from Pavel.
1. Storing color of geometry in ColorArray e.g. its don't work when
    lighting off.

  2.  Detecting of alpha channel and automatically enabling blending.
2003-01-20 10:41:21 +00:00
Robert Osfield
ec30f7d8a6 Update the ReaderWriterATTR file so that it used the definitions that Joseph
Steel obtained from MPI.

Removed the unique child check from the flt::PrimRecord and osg::Group, this
allows more flexibility when specifing nodes, and is faster..
2003-01-20 09:56:09 +00:00
Robert Osfield
3723dcda1d From Ruben, updates to the IV/VRML1 loader to handler large datasets. 2003-01-20 09:09:46 +00:00
Robert Osfield
4dd273de70 Added support for ReferenceFrame into osg::LightSource, modified the .osg
plugin and cull visitor to account for this change.
2003-01-16 16:37:24 +00:00
Robert Osfield
d6480b0425 Warning fix for Win32. 2003-01-15 20:57:48 +00:00
Robert Osfield
5960307703 Patch from Joseph Steel, added missing check for the mipmap usage. 2003-01-15 11:33:33 +00:00
Robert Osfield
af6a6ff9f0 Fixes for Win32 build. 2003-01-14 16:39:41 +00:00
Robert Osfield
3365634a01 Submission from Joseph Stell, added LoadModels to TerrapageNode. 2003-01-14 14:00:09 +00:00
Robert Osfield
7ee6d4f3f4 Clean up to the cross platform support in DirectX plugin. 2003-01-13 14:11:06 +00:00
Don BURNS
0adc037d20 ReaderWriterDirectX.cpp needed some std::'s 2003-01-11 20:56:29 +00:00
Robert Osfield
9bd4145405 From Ulrich, fixes to double to float conversion warnings under Windows. 2003-01-11 20:43:47 +00:00
Robert Osfield
e8ddbdd195 Updates from Ulrich. 2003-01-10 17:06:20 +00:00
Robert Osfield
f790d1ff15 Added missing header for new matric reading and writing methods. 2003-01-10 16:56:39 +00:00
Robert Osfield
f36bc69c58 Made the more of the OSG's referenced object desctructors protected to ensure
that they arn't created on the stack inappropriately.

Split the implemention of Matrix up so that it is a simple no referenced counted
class and can be safefly created on the stack.  To support referenced counting a
seperate subclass now exists, this is RefMatrix which inherits from both Matrix and
Object.
2003-01-10 09:25:42 +00:00
Robert Osfield
ba2c3a187d From Ulrich Hertlein, DirectX .x model loader plugin. 2003-01-08 22:52:27 +00:00
Robert Osfield
a1f6b8730b Added Shape.cpp to cvs resposity. Shape.cpp adds support for the various
osg::Shape in the .osg file format.
2003-01-08 16:33:02 +00:00
Robert Osfield
6727b8d5f7 Cleaned up the code for the animation flags of the group record. 2003-01-08 16:30:48 +00:00
Robert Osfield
ba34880464 Added support for reading and writing Sphere, Box, Cone, Cylinder and Grid shapes. 2003-01-08 14:32:13 +00:00
Robert Osfield
e6b64a5550 Added support for sharing arrays in the .osg format for osg::Geometry.
Fixed the osgUtil::Optimizater so it takes into account sharing of arrays when
deciding whether an geometry can be merged or not.
2003-01-07 16:29:07 +00:00
Robert Osfield
53204898f3 Fixes for Irix64 build. 2003-01-06 23:19:42 +00:00
Robert Osfield
3ef3666d0f Added new ARB vertex program state attribute and demo program,
sent in my Brede Johansen.
2003-01-04 20:45:53 +00:00
Robert Osfield
7b6d802131 Fixed options code. 2003-01-04 20:43:27 +00:00
Robert Osfield
fe64942c54 Added a AnimationPathCallback which can update both a MatrixTransform and a
PositionAttitudeTransform, removed the equivialnt callbacks once found in these
transform classes.

Changed the NodeCallback class so its derived from osg::Object instead of
osg::Referenced to allow it to be saved out in the .osg format.

Added support for Update and Cull callbacks into the .osg file format.

Added support for AnimationPathCallback into the .osg file format.
2003-01-02 20:10:04 +00:00
Robert Osfield
6ee563ad55 Updates the terrapage to try and make it thread "safer" when used with the OSG. 2002-12-21 19:41:27 +00:00
Robert Osfield
e9287afd5e Turned display lists off in the osg::Geomety created by the terrapage loader,
this is done because terrapage will dynamic page in and out geometry so we
don't want to keep creating and deleting display lists.
2002-12-21 11:30:54 +00:00
Robert Osfield
adf5c91808 Renamed all instance of AppCallback/AppVisitor to UpdateCallback/UpdateVisitor
inline with the decision to rename the "app phase" the "update phase".
2002-12-19 15:55:40 +00:00
Robert Osfield
eb42926ab1 Changed the remaining #include <> to #include "" to get things compiling under VS. 2002-12-19 10:32:02 +00:00
Robert Osfield
a2e76e4ab0 Removed the reference of Sequence from Switch. 2002-12-18 11:43:39 +00:00
Robert Osfield
30a665288e Removed the osg:: from the front of the Group::computeBound() method to keep
things compiling under Windows.
2002-12-18 10:17:52 +00:00
Robert Osfield
677764bed9 Changed the <*.h> to "*.h> in the terrapage plugin to get it compile under Windows. 2002-12-18 09:50:36 +00:00
Robert Osfield
6d4e13ab1b From Daniel Sjölie, support for reading comment records into description fields. 2002-12-17 17:22:06 +00:00
Robert Osfield
c82927293e Moved the include/osgTXP back into src/osgPlugins/txp as a seperate include directory is no longer required.
Removed the osgtxp demo as it is no longer required.
2002-12-17 16:07:59 +00:00
Robert Osfield
ee3348afc9 Added txp::TerrapageNode to the txp plugin, and implemented the node so that it
automatically assign handles the updates of eye points and database merges.
2002-12-17 15:41:05 +00:00
Robert Osfield
00cc3a1833 Converted the instance of osgNew and osgDelete back to new and delete as part
of depecating the include/osg/MemoryManager
2002-12-16 13:40:58 +00:00
Robert Osfield
cb87e7b3bc Integrated further updates from Geoff on the Geo loader. 2002-12-16 10:22:37 +00:00
Robert Osfield
88424530b4 Changed the std::hex and std::dec to hex and dec to get it compile under VisualStudio,
and added a using namespace std to keep it compiling on all other compilers!
2002-12-16 10:05:55 +00:00
Robert Osfield
c6b6e200a4 Added supported for setting animation path on MatrixTransform's. 2002-12-16 09:55:30 +00:00
Robert Osfield
c32585a046 Added a check for extension of a filename to the gif loader, since it looks
like the isn't reconginizing rgb files as not being gif.
2002-12-14 06:42:56 +00:00
Don BURNS
25b333b05b Move TrPageViewer.cpp to src/Demos/osgtxp 2002-12-13 20:28:58 +00:00
Robert Osfield
a388800c95 Merged fixes to warnings in geo plugin from Geoff. 2002-12-13 19:41:59 +00:00
Robert Osfield
591ab7c52e Removed erroneous character from end of file. 2002-12-11 16:27:01 +00:00
Robert Osfield
2e3bf33ce6 Removed the duplicate file out from the GEO plugin.
Changed the osglogo to reference a jpeg instead of a tiff one.
2002-12-11 14:30:27 +00:00
Robert Osfield
0e6d702906 Fixes for Win32. 2002-12-11 10:07:14 +00:00
Robert Osfield
442fa34aaa From Ulrich Hertlien, fix for new changes in osg::Switch interface.
Small clean to changes by Robert.
2002-12-10 20:26:56 +00:00
Robert Osfield
530b85c807 Updates from Geoff Michel to geo loader and demo. 2002-12-10 20:00:56 +00:00
Robert Osfield
6efe79c33c Changed cout to notify. 2002-12-09 09:26:49 +00:00
Don BURNS
5622e704cf fixed small typo (forgot std::) 2002-12-09 06:00:57 +00:00
Robert Osfield
55d04ef381 Modifed the .attr loaders handling if TX_BILINEAR minification filter so that
it remaps it to LINEAR_MIPMAP_LINEAR to get round image quality issue of some
OpenFlight databases.
2002-12-08 17:22:20 +00:00
Robert Osfield
109f6f22fe Updated the Switch, Sequence and Group classes so that they all used a
similar style removeChild() mechansim.

Made the old style osg::Switch::setValue() method deprecated.
2002-12-07 21:18:12 +00:00
Don BURNS
97ec694e21 Fixes to txp loader 2002-11-29 16:14:03 +00:00
Robert Osfield
aa3d887e94 Added check of translucency of an image via osg::Image::isImageTranslucent(). 2002-11-25 16:40:30 +00:00
Robert Osfield
b113dfeb73 Added extra check to the freeing of memory. 2002-11-25 16:30:34 +00:00
Don BURNS
12e922bc3c Added Paging TerraPage loader and osgTXP library. 2002-11-24 21:36:05 +00:00
Don BURNS
4acee51414 Merged in Joseph Steel's updates to rgb plugin 2002-11-22 17:36:46 +00:00
Robert Osfield
22c313cf3e Warning fixes. 2002-11-22 09:46:25 +00:00
Don BURNS
65fec63389 Fixes for IRIX build 2002-11-22 05:00:43 +00:00
Robert Osfield
de85272032 Moved the code to create StateSet around textures into flt::Pool::getTexture so that
the code associated with loading textures is done is just one place.
2002-11-20 14:40:33 +00:00
Robert Osfield
e02ae73edc Added osgSim library which encapulsulates light points.
Added osglightpoint demo.
2002-11-19 10:57:40 +00:00
Robert Osfield
b89e7282ed From Jason Daly, fix for long file names on sequence nodes. 2002-11-14 15:30:28 +00:00
Robert Osfield
0980eeda1e Updated the plugins so they do the extension checking with a non
case sensitive comparison.
2002-11-14 09:03:31 +00:00
Robert Osfield
4617294722 Fixes to build in VS7.0 2002-11-08 15:56:49 +00:00
Robert Osfield
a059191c1c Updates to GEO loader from Geoff Michel. 2002-11-08 12:56:45 +00:00
Robert Osfield
0cd0c575f0 Fixes for VisualStudio6.0 build. 2002-11-08 08:51:30 +00:00
Robert Osfield
ccd208422f Converted usage of GLuint to usigned int, in hope that it will get round the
warnings generated under OSX.
2002-11-08 08:34:06 +00:00
Robert Osfield
e852ee6dd8 Commented back in LIBS into Makefile for OSX build. 2002-11-08 08:12:18 +00:00
Robert Osfield
23064c9c64 Fixes for VisualStudio build and OSX build. 2002-11-08 08:11:12 +00:00
Robert Osfield
16d53271cc Compile fix from Duvan Cope. 2002-11-07 16:08:37 +00:00
Robert Osfield
2a35dab922 Renamed Primitive:: to PrimitiveSet. 2002-11-07 14:44:01 +00:00
Robert Osfield
c84cdf159c Updates to GEO loader from Geoff Michel. 2002-11-07 13:47:39 +00:00
Robert Osfield
15773d920a Fix for build under Linux. 2002-11-07 08:48:30 +00:00
Don BURNS
7669b96c28 Changed a couple of const/non-const discrpancies between header and source
for TexGen.  Removed external library dependencies in plugin makefiles
2002-11-06 18:39:32 +00:00
Robert Osfield
3bd400130c Name change and const change of Drawable::drawImmediateMode(State&) to
Drawable::drawImplementation(State&) const.   Various updates to the
rest of the OSG to accomodate this.
2002-11-06 15:43:11 +00:00
Robert Osfield
afa27a13ec From Jason Daly, fix for 14.2 color records in versions of OpenFlight files. 2002-11-05 07:50:40 +00:00
Robert Osfield
a6eafa79e2 From Ulrich Hertlien, added ReaderWriter::Options to the osgconv and pfb plugin
so that all the pfi files can be converted to rgb be the plugin.
2002-11-04 09:08:50 +00:00
Robert Osfield
6bb8002116 Added in guard to png loader so that it only accepts png files. This has been
added since the png loader itself doesn't not seem robust enough at detecting
non png files.

Added a tab in to the flt code to make it more obvious what is happening in
the flow of the code.
2002-11-04 08:40:51 +00:00
Robert Osfield
92895370f7 Futher fixes for VisualStudio.NET compilation. 2002-11-01 15:11:05 +00:00
Robert Osfield
f74b4ec847 Fixed VisualStudio7.0 compile error related to an std::vector<>::iterator
no longer being a pointer, fixed by using a &(*itr).
2002-11-01 12:48:15 +00:00
Robert Osfield
24746728e4 From Geoff Michel, added AC3D .ac and GEO .geo loaders. 2002-10-31 12:51:09 +00:00
Robert Osfield
85af8cc4ba Yefei He's updates to Pool and flt2osg to use lazy loading of textures from a
texture pallette.
2002-10-31 10:35:15 +00:00
Robert Osfield
aa5d172f99 Updated osgText .osg support so that it handles text via the osgDB::Outpur::wrapString() method. 2002-10-30 12:56:55 +00:00
Robert Osfield
32c6a7809a Updated the handling of string in the .osg reading and writing so that it
handles the use of " quotes inside the string.
2002-10-28 12:55:19 +00:00
Robert Osfield
18d99c06e4 Updated the min and mag filter modes to be more appropriate, still some
of the FLT modes havn't been mapped across as its is not obvious how to map
them to OpenGL/OSG.
2002-10-25 09:34:51 +00:00
Robert Osfield
761fc0574f Merged Pavel's updates to LWO2 for handle multiple texture layers. 2002-10-18 12:47:36 +00:00
Robert Osfield
00fd58283c Added extension checking to the rgb and bmp write of images. 2002-10-18 12:23:42 +00:00
Robert Osfield
ab59703e54 Fixed compile error under Windows. 2002-10-17 11:39:04 +00:00
Robert Osfield
6c0861ef80 Maded the "flt::Registry::getPrototype: Unkown opcode:" message a INFO level
notify message rather than a NOTICE.
2002-10-10 09:42:41 +00:00
Robert Osfield
2e92e7d242 Made the warning about a mis-matching in the number of children in a switch
a INFO level notify message rather than a WARN.
2002-10-10 09:39:09 +00:00
Robert Osfield
88ecacfd7a Changed the default value of StandardOrientation to true, to fix orientation
problems which commonly occur with png files.   Leaves the quesition of how to set
this value automatically.
2002-10-09 15:41:22 +00:00
Robert Osfield
c59fc9a2b7 Fixed a bug in the Optimizer where BIND_PER_PRIMITIVE_SET primitives where being eroneously merged.
Added missing support for reading geometry indices from the .osg format.

Added handling of geometry indices into the primitive functor in osg::Geometry.

Moved the method implementions of AnimationPathManipulator into src/osgGA and added extra convinience
methods for setting the manipulator with an hand built AnimationPath.

FCVS: 	VisualStudio/osgPlugins/iv/iv.dsp
2002-10-08 14:10:55 +00:00
Robert Osfield
70861ef70e Converted osg::LOD from used n+1 successive ranges to n min/max ranges,
one min/max pair per child. Converted the rest of the OSG to use the new
osg::LOD node.
2002-10-06 20:33:13 +00:00
Robert Osfield
84332f5b77 Fixes for Win32 build. 2002-10-04 16:40:45 +00:00
Robert Osfield
4a3cc5c182 Implemented OpenFlight style switches so that each child of a switch can now
be individually turned on or off.  Moved the OpenFlight code across to use the
new scheme, removing the old hack of using node masks to achieve the same end
result.
2002-10-04 14:50:33 +00:00
Robert Osfield
0a5ed26940 Moved the new osg::IndexedGeometry class over the top of the the existing
osg::Geometry class, and removed the temporary IndexedGeometry.  Port the rest
of the OSG across to account for the change in method calls -
osg::Geometry::addPrimitive(..) becomes osg::addPrimitiveSet(..)
2002-10-02 13:12:16 +00:00
Robert Osfield
d176f752a5 From Daniel, Fixes for warnings under Win32. 2002-09-29 12:33:30 +00:00
Robert Osfield
444a6eaf97 From Ulrich Hertlien, supported add to textures in the .lwo format. 2002-09-20 15:54:17 +00:00
Robert Osfield
55215651d7 Renamed osg::Primitive to osg::PrimitiveSet which better reflect what it
encapsulates.

Added new osg::IndexGeometry implemention, *not* complete yet.

Changed the rest of the OSG to handle the renaming og Primitive to PrimitiveSet.
2002-09-20 14:51:59 +00:00
Robert Osfield
4a54b7bdb1 From Daniel Sjölie - added support for multitexured flt files. 2002-09-18 11:11:10 +00:00
Don BURNS
866af14f86 Added ability to accept '.tif' files (as well as '.tiff') and printed
notify() on error
2002-09-09 04:40:50 +00:00
Robert Osfield
1ad924d0ca Fixes to the LWO to better handle 3 and 4 vertex polygons.
Added an extra pass into the Optimizer's merging of geometry primitives so
it convertex 3 and 4 vertex polygons into triangles and quads respectively.
2002-09-03 20:12:29 +00:00
Robert Osfield
0cb75d42e0 Fixed LWO2 ReaderWriter problem which was down to an the compiler reodering
the evaluation of a Vec3 paramter.
2002-09-03 13:04:53 +00:00
Robert Osfield
46585242a1 Fixed and unmatched malloc/free pair, which was previously doing a mallco/delete. 2002-09-03 09:50:51 +00:00
Robert Osfield
12226e4371 Converted the instances of const built in types being returned from methods
and passed as paramters into straight forward non const built in types,
i.e. const bool foogbar(const int) becomes bool foobar(int).
2002-09-02 12:31:35 +00:00
Robert Osfield
52518673d1 From Yfei He, added in missing RoadConstruction handler. 2002-08-31 09:59:18 +00:00
Robert Osfield
6c08183b45 Updated docs. 2002-08-29 14:29:49 +00:00
Robert Osfield
79aaac4e0c Renamed the ConvexPlaner* classes to ConvexPlanar* and changed all the various
classes that reference it.

Added MUST_READ_ME.txt to the VisualStudio directory.
2002-08-29 11:02:01 +00:00
Don BURNS
76959d5648 Blast it, Don... You should rebuild before you check things in! 2002-08-29 03:49:23 +00:00
Don BURNS
2b10b4c3df Fixed 69 occurance of 'Seperate' misspelling (should be 'Separate') 2002-08-29 03:22:27 +00:00
Robert Osfield
fe93b91f73 Fixes to Win32 build. 2002-08-28 18:38:33 +00:00
Robert Osfield
8353fc0ed6 Removed deprecated code from the distribution.
Added .osg support for Texture1D and Texture3D.
2002-08-28 15:28:11 +00:00
Robert Osfield
951b6e9f3f Added -I{THISDIR} into the iv Makefile. 2002-08-28 14:28:21 +00:00
Robert Osfield
bff4728eac Commented out the #define TEXTURE_USE_DEPRECATED_API from includ/osg/Texture
which forces the use of a typedef Texture2D Texture; in place of the orignal
texure implementation.
2002-08-27 21:01:22 +00:00
Robert Osfield
5ad4cc4f2f Added code to write byte/int/float arrays out with 8 values per line by default, rather than
1 per line as before.
2002-08-27 20:54:58 +00:00
Robert Osfield
55d4affded Added support for DOFTransforms into .osg format, and add pivot point support
to the PositionAttitudeTransform .osg support.

Removed a double light reference in the osglight demo.
2002-08-27 20:18:43 +00:00
Robert Osfield
1f7b133eff Added support for reading and writing osg::PositionAttitudeTransform. 2002-08-27 15:46:47 +00:00
Robert Osfield
4a4334c2ab Fixed bug in the Light reading code. 2002-08-27 15:46:29 +00:00
Robert Osfield
83af5e7a95 Added osgtexture3D demo, renamed osgtexture demo to osgtexture2D, and have
added osgtexture1D demo which currently is simply copy of osgtexture2D. I
will be modifying it to do 1D texturing next.

Fixed a bug in osg::Texture3D relating to checking of existance of
texturing.

Merged some fixes to the pfb loader from Ulrich Hertlein.
2002-08-27 10:06:57 +00:00
Don BURNS
0f0b32f43b Added writer to RGB plugin 2002-08-26 03:15:45 +00:00
Robert Osfield
8e75f531e3 Converted code dependant on osg::Texture across to its replacement osg::Texture2D. 2002-08-25 15:31:44 +00:00
Robert Osfield
61ff1c7b0a Fixes for Win32 build 2002-08-25 11:00:30 +00:00
Robert Osfield
d87dee5a75 Added support for the texture_env_dot3 extension. 2002-08-24 21:11:07 +00:00
Robert Osfield
239068f223 Added new osg::TextureBase, osg::Texture1D, osg::Texture2D, and osg::Texture3D
classes, and changed osg::Texture and osg::TextureCubeMap so that they now derive
from osg::TextureBase.
2002-08-24 19:39:39 +00:00
Robert Osfield
942e23caf3 From Stephan Huber, "I found a small bug in QTtexture.c: the code fails, when the image-files
don't reside on the boot-partition. I replaced the offending function by a
cleaner one.".
2002-08-21 20:42:19 +00:00
Robert Osfield
814dcc9677 Added IO Support for TexEnvCombine state attribute. 2002-08-20 18:00:22 +00:00
Robert Osfield
88f387810d Added support for the tex_env_add and tex_env_crossbar extensions. 2002-08-20 14:15:49 +00:00
Robert Osfield
df9a899d9e Moved the IO support for the osgText and osgParticle libraries into seperate
plugin libraries.
2002-08-20 11:27:08 +00:00
Robert Osfield
93303cf1cd A FogCoordinateSource set/get methods to osg::Fog which correspond to the
FogCoord support added to osg::Geometry. Added suppot for these new parameters
to the .osg plugin.
2002-08-20 10:08:04 +00:00
Robert Osfield
b23a48a763 Renamed the osg::EarthSky to osg::ClearNode to make it more obvious what
role it has play and make it more relevant to non vis-sim applications.
2002-08-19 11:42:37 +00:00
Robert Osfield
bff72e1077 Fixes from Ulrich Hertlein to get the pfb plugin compiling with using
any deprecated API.
2002-08-16 10:56:20 +00:00
Robert Osfield
848ce4ae74 From Perry, support for color added to the MeshPrimtive/LocalVertexPool code. 2002-08-15 20:25:46 +00:00
Robert Osfield
5f6dbfecf3 Removed the getData() from MeshRecord and the dummy SMesh record, this
allow the FaceRecord base class to directly provide the datatype.
2002-08-15 15:04:23 +00:00
Robert Osfield
ccbc1df85b Added a using namespace std; and removed std:: from from std::hex and std::dec. 2002-08-15 14:09:36 +00:00
Robert Osfield
4cbab17096 Added a virtual keyword into the getData() overrided methods. 2002-08-15 13:04:13 +00:00
Robert Osfield
61e3b34bc7 Submission from Perry Miller for support of OpenFlight15.7's local vertex pool
and mesh primitives.  Converted Perry's code to work with the osg::Geometry
instead of osg::GeoSet.
2002-08-15 11:25:23 +00:00
Robert Osfield
29490a8c1c Updates to DOFTransform so that its overrides the traverse() and compute*() methods
rather than depending upon callbacks for animating and compute matrices.  Merged the
put/inverseput code between Sasa's and Ferndinand's DOF code.

From Bora Utka, Added support to osg::Sequence/OpenFlight AnimNode to the flt plugin.
2002-08-12 13:42:43 +00:00
Robert Osfield
f5c7fcf51d Fixed the shininess factor in 3ds plugin. 2002-08-08 11:01:07 +00:00
Robert Osfield
b9b013e15b Changed the support for anisotropic filtering in osg::Texture so that it
is now controlled via the setMaxAnisotropy(float) method, and is set up
independently for the mag filter mode, which it previously was done.
2002-08-07 15:52:24 +00:00
Robert Osfield
e01f9eb891 Added shells for DOFTransform and PositionAttitudeTransform to the .osg
loader, still need to fill in the saving and loading of paramters.

Went through the distribution remove old API usage.
2002-08-06 17:07:05 +00:00
Robert Osfield
25740b5c7f Added new osg::DOFTransform node from Sasa Bistrovic, designed to mirror
the OpenFlight DOF transform nodes.
2002-08-05 15:07:18 +00:00
Robert Osfield
6c998bf97d Added support for PROTECTED modes into the .osg reading and writing. 2002-08-05 13:29:51 +00:00
Robert Osfield
6b52e17c48 Fix to iv/vrml loader so that it correctly passes back the right ReadResult
and checks the validity of the file extension being passed to the plugin.
Removed main.cpp * .h moving all its functionality into readerwriter.cpp.
2002-08-04 21:11:00 +00:00
Robert Osfield
93403a54db Changed the error reporting so that it directs it all via osg::notify, and
only uses the INFO level for reporting that the file to load is not
recognised.  Also add check for LWO2 loading so that it returns FILE_NOT_HANDLED
message correctly.
2002-08-04 20:51:03 +00:00
Robert Osfield
cab49a9307 From Ruben Lopez, updates to VRML/IV loader.
From Ben Discoe, corrections to comments in osg::Transform

From Alberto Barbati, Lazy evaluation of inverse matrix in osg::MatrixTransfrom
2002-08-04 20:34:48 +00:00
Robert Osfield
fb0d87b29c Added Sequence.cpp to osg plugin workspace file. 2002-08-03 19:42:39 +00:00
Robert Osfield
6a04fc3dee Integrated Ulrich Hertlien's osg::Sequence node, and osgsequence demo, and
support for osg::Sequence in the pfb loader.
2002-08-03 18:11:21 +00:00
Robert Osfield
ddd78eb95e Fix for Win32 build 2002-08-02 19:11:06 +00:00
Robert Osfield
1adc4992ff Updates to iv/vrml loader from Ruben. 2002-07-31 15:16:14 +00:00
Robert Osfield
3840972440 Updates to the iv loader from Ruben - conversion from GeoSet to Geoemetry. 2002-07-30 10:08:50 +00:00
Robert Osfield
02bb66a572 Checked in Pavel's updates for non texured surfaces. 2002-07-28 23:27:21 +00:00
Robert Osfield
63e3364cc3 Checked in Marco's commented out #defines/rejigged struct names to get things
compiling under Windows, will need to check this in future as it may change with regeneration of parser files
with lex/yacc.
2002-07-28 21:15:25 +00:00
Robert Osfield
556fa81fda Chagned the initiliazation of iterators, sent in by Alberto Barbati. 2002-07-28 12:52:15 +00:00
Robert Osfield
74f5cbe16a Fixes to the inventor/vrml loader. 2002-07-27 21:35:21 +00:00
Robert Osfield
2c1b07e752 Fix for Windows 2002-07-27 10:25:51 +00:00
Robert Osfield
933ecce3d9 Fixes for Win32 build. 2002-07-27 10:22:58 +00:00
Robert Osfield
83a276a16a Added missing osg:: from various references to osg::Objectf 2002-07-26 18:46:18 +00:00
Robert Osfield
5622b8c48b Added support for LWO2, send in by Pavel Moloshtan. 2002-07-26 16:33:25 +00:00
Robert Osfield
078cdbed49 Added Ruben Lopez's Inventor/VRML 1.0 loader. 2002-07-26 15:37:23 +00:00
Robert Osfield
fe8d097cc0 From Ferdinand Cornelissen - Futher updates to the DOF code. 2002-07-25 22:08:51 +00:00
Robert Osfield
ec6c2cd229 Fix to DOF Record from Sasa Bistroviae. 2002-07-25 15:25:42 +00:00
Robert Osfield
a6eb0a8209 Fix for colors in old flt models from Brede. 2002-07-25 15:21:18 +00:00
Robert Osfield
55b7ed10a1 Implemented the DOF handling more cleanly, as per OpenFlight15.7 docs. 2002-07-24 16:29:00 +00:00
Robert Osfield
a41930ed17 Support added for Gnu C++ under Solaris. 2002-07-23 13:30:47 +00:00
Robert Osfield
80afddc08d Checked in Tino Schwarze's port to HP-UX. 2002-07-23 10:48:22 +00:00
Robert Osfield
b23aea5173 Futher work on ensuring that all datatypes are initilizaed in OSG objects. 2002-07-21 10:04:33 +00:00
Robert Osfield
7682e32521 Updates to the Geometry to add more access methods, and updates to Optimizer
to add the new merge primtives option.
2002-07-19 14:19:49 +00:00
Robert Osfield
3cba9a52ef Updates NEWS file for 0.9.0 release.
Added default computeBound() implementation to osg::Drawable which uses
a PrimtiveFunctor to compute the bounding box in a generic way, that
will work for all Drawable subclasses that implement the accept(PrimitiveFunctor&).
2002-07-18 22:35:54 +00:00
Robert Osfield
34be82c1ee Moved get/setUserData from osg::Node into its superclass osg::Object to
allow other subclasses to add their own custom data.
2002-07-18 19:41:52 +00:00
Robert Osfield
979fc70a94 From Brede Johansen, fix the TexturePaletteRecord::endian() to handle
old flt versions (11, 12 & 13).
2002-07-18 15:25:02 +00:00
Robert Osfield
b513517502 From Brede Johansen
"I have found one bug in the ConvertFromFLT::visitFace() function.  In the
early days of the Flight format, before the LightPoint record existed
they used face records with a light (-point) attribute."
2002-07-18 14:29:32 +00:00
Robert Osfield
8378d6802b Removed repeated return transform in the visitDOF method. 2002-07-18 10:41:39 +00:00
Robert Osfield
8ad68f98e9 Added support for .sgi alias extension to the .rgb plugin. 2002-07-18 10:38:16 +00:00
Robert Osfield
a7c365c396 Fixed warnings. 2002-07-18 10:06:21 +00:00
Robert Osfield
7a8eeb3c92 Converted the osg::Material::set/getShininess option to use the standard
OpenGL range of 0.0 to 128.0 instead of the previous normalised shiniess
range. This brings it inline with the way the rest of the OSG uses a
1 to 1 mapping to OpenGL.

Converted the various loaders to use the new range, which is almost all
cases was simply removing the /128.0f which was required before!
2002-07-18 09:55:30 +00:00
Robert Osfield
3ec32aab82 Fixed spelling mistake. 2002-07-18 00:55:01 +00:00
Robert Osfield
09bdb10af5 Various fixes to the flt loader, and knock on changes to the osgUtil::Optimizer
to better support removal of seperate osg::Geometry instances where they
share the same state and bindings.
2002-07-18 00:53:03 +00:00
Robert Osfield
dadbd03443 Fix to DOF Record from Sasa Bistrovic 2002-07-16 19:19:31 +00:00
Robert Osfield
7fe394ac42 Removed repeat line from Makefile. 2002-07-16 18:56:12 +00:00
Robert Osfield
a389dfef8b Fixes for MacOSX build from Bob Kuehne. 2002-07-16 15:13:57 +00:00
Robert Osfield
b9281a6f58 Added TextureCubeMap.cpp to the .osg plugin Makefile. 2002-07-16 11:33:36 +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
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
733be1b309 Fixes to read/write of MatrixTransform/Transform. 2002-07-14 10:46:46 +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
Robert Osfield
bbc6779f95 Added missing MatrixTransform.cpp file 2002-07-12 21:45:54 +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
3edb8a3d18 Added blend color to osg::TexEnv 2002-07-12 10:30:27 +00:00
Robert Osfield
5b97336e37 Addition of RoadRecords from Yefei He. 2002-07-12 08:48:27 +00:00
Robert Osfield
b015d80d68 Fixes for win32 build 2002-07-11 12:57:53 +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
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
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
0801b363f5 Work on supporting multitexturing in State/StateSet/StateAttribute/Geoemtry. 2002-07-07 14:40:41 +00:00
Robert Osfield
3700e7e2cd Reimplemted the osgUtil::SceneView::setCalcNearFar() functionality to bring
it inline with the CullStack/CullVisitor implementation.  Also added the
setSmallFeatureCullingPixelSize() method and wired them up inside
SceneView.cpp so they set the corresponding CullVisitor paramters.

Intergrated pfImage copying change in the Performer plugin, submission sent in by Ulrich Hertlein
2002-07-02 19:53:18 +00:00
Robert Osfield
48e7679e78 Rewrote the osgUtil::Tesselator so that it is easier to use, and can also
easily retesselate osg::Primitive::POLYGONS found in Geometry objects.
Added calls to the tesselate to the lwo and flt loaders.
2002-06-28 22:42:02 +00:00
Robert Osfield
4e81711ef7 A couple fixes to remove Performer runtime warnings. 2002-06-28 20:54:09 +00:00
Robert Osfield
ebbd72556e Fixes from Ulrich Hertlein to build of pfb plugin. Small mods to these
by Robert.
2002-06-28 16:25:46 +00:00
Robert Osfield
26497c7581 Change =0 to osg::Vec2Array::iterator() in .obj loader to get round warnings
under gcc3.0.x
2002-06-28 08:36:02 +00:00
Robert Osfield
01992a7790 Ported the flt plugin across to use osg::Geometry, it still uses a GeoSet
internally, and I will remove this after some futher work.
2002-06-27 20:29:32 +00:00
Robert Osfield
fb3e705709 Converted the template DrawElements primitive class into three seperate
non templated classes - UByteDrawElements, UShortDrawElements, UIntDrawElements.
2002-06-27 13:15:34 +00:00
Robert Osfield
726d680184 Removed the test aginst a iterator as a bool. 2002-06-27 09:56:30 +00:00
Robert Osfield
7c95922300 Ported LWO loader across to use osg::Geometry. Work not quite complete,
as we need to retesselate any concave polygons that can exists in these
datasets.
2002-06-26 21:08:17 +00:00
Robert Osfield
8094c777b7 Added templated constructor to TemplateArray & DrawElements template to
handle VisualStudio7.0 build.

Ported 3DS across to use osg::Geometry instead of osg::GeoSet.
2002-06-26 17:48:13 +00:00
Robert Osfield
bdafc27d9c Ported pfb, txp and obj loaders across to use osg::Geometry. 2002-06-26 14:34:04 +00:00
Robert Osfield
40fefcf335 Ported various demos and support classes over to use the new osg::Geometry class
thus removing dependancy on osg::Geoset from most of the OSG, only loaders
left to port now.
2002-06-26 10:28:17 +00:00
Robert Osfield
cbeeeefdab Added osg::Drawable::PrimitiveFunctor and TriangleFunctor subclass for
querrying the primitive data inside Drawables.  Moved various support
classes over from being osg::GeoSet based to osg::Geometry based.
2002-06-25 20:27:51 +00:00
Robert Osfield
cbb95d0445 Checked in .osg support for the new osg::Geometry class. 2002-06-24 21:37:34 +00:00
Robert Osfield
bbc129e5c6 Compile Fixes for Win32. 2002-06-22 15:46:43 +00:00
Robert Osfield
53b6d0c92e Bug fix to the size calculation of bmp images, changed both the reading and
writing of images.
2002-06-21 15:14:29 +00:00
Robert Osfield
77e1fb7f80 Added support for reading and writing OccluderNode's to the .osg file format. 2002-06-19 16:06:03 +00:00
Robert Osfield
b3c26d5634 Changed the osg::LightSource so its Light attribute is now generalised to
be a StateAttribute.  This allows alternative implementations of Lights
other than the standard osg::Light.
2002-06-19 08:34:19 +00:00
Robert Osfield
aa58ecae2f Clean ups for the Windows build. 2002-06-18 10:18:12 +00:00
Robert Osfield
6767dd49d0 Rewrote the FileUtils support for data and library file paths, moving the
storage of the path lists into osgDB::Registry, and changed the data
structor from a char* to a std::deque.  Changed a names of couple of the
convinience functions in osgDB/FileUtils to better reflect the two
public FilePathList's - DataFilePathList and the LibraryFilePathList.

Added support into the osgDB::Registry::readNode/Image/Object methods
for pushing and popping the path of the current file being loaded.
2002-06-17 21:50:37 +00:00
Robert Osfield
d7760fbbd4 Further updates to the occlusion culling code, also adding missing OccludeNode
file the .osg plugin.
2002-06-14 08:45:28 +00:00
Robert Osfield
61df1ed6b7 Further work on occlusion culling. 2002-06-13 23:46:02 +00:00
Robert Osfield
247cb3ff7e Checked in Macro Jez's additions to osgText to support .osg IO make it
a fully functioning NodeKit.

Also reimplement notify() to try an prevent a crash which has been caused by
to objects in notify.cpp being initiliazed twice, the second time the auto_ptr
holding the dev/null ofstream was being initilized to 0.
2002-06-11 18:41:57 +00:00
Robert Osfield
e73d4ca5b3 Changes for Cygwin build, sent in by Norman Vine. 2002-05-28 11:40:37 +00:00
Robert Osfield
d17714939e Modified the setting of min and mag texture filter modes to produce higher
quality mip maps.
2002-05-18 08:35:09 +00:00
Robert Osfield
a9ef1ecb1d Reverted change to use decal flag. 2002-05-13 07:30:21 +00:00
Robert Osfield
8d48cc8dd7 Support added for OpenFlight switch nodes, submission from Brede Johansen. 2002-05-07 11:12:01 +00:00
Robert Osfield
1f1d3b57fe Updated docs.
Fix to pfb Makefile for missing $.
2002-04-26 13:45:01 +00:00
Robert Osfield
07ba07dc62 Fixed remaining MAX_PATH usuage, replacing it with the new DX_MAX_PATH, this
should solve compile problems under VisualStudio .NET.
2002-04-26 08:25:51 +00:00
Robert Osfield
26d34ed6d6 Qarning fixes, and updated the date in NEWS to reflect todays release of 0.8.45 2002-04-26 08:16:14 +00:00
Robert Osfield
2bd20f5c6f Fixes for IRIX build.
Fix for a warning under VisualStudio.NET.
2002-04-25 22:09:28 +00:00
Robert Osfield
a1a1876875 Cygwin build fixes. 2002-04-25 22:07:48 +00:00
Robert Osfield
62dc8f7cda Fix for window build. 2002-04-25 21:31:16 +00:00
Robert Osfield
6dbfa3b88d Fixes to .obj plugin from gideon. 2002-04-25 11:30:21 +00:00
Robert Osfield
61b0865309 Merged Bob's changes for MacOSX build. This change is simply the addition of
GLUT_LIB to the link line.  This change should be removed once we fixed the
OSG_LIBS so that it doens't include osgGLUT, however, I'll leave this for another
day...
2002-04-24 20:57:00 +00:00
Robert Osfield
8f3debaf9b Changes for Mac OSX build, sent in by Bob Kuehne 2002-04-24 20:04:34 +00:00
Robert Osfield
20b5e59dfd Fix for the Cygwin build related to the new FileUtils_Unix not using the
Windows PATH environmental variable for searching for libraries.  Sent in
by Norman Vine.

Reoder of the makedefs/makedirdefs to fix Mac OSX compilation. Sent in by
Bob Kuehne.
2002-04-24 08:50:03 +00:00
Robert Osfield
f4f4423fe7 Added a pragma to get round a VisualStudio warning that I couldn't fix
in any easy way.
2002-04-23 11:02:09 +00:00
Robert Osfield
2d0df88ee4 Added an imageList.clear() to osgbillboard so that its memory would be
cleared before entering the viewer main loop, this removes memorymanager
a reported memory leak due to the viewer using exit() which bypasses
the clean up on main itself.

Added an osgNew to the ReaderWriterRGB.cpp to aid detected of tracking of
memory leaks.
2002-04-23 10:55:45 +00:00
Robert Osfield
dcfef4a023 Integrated submission from Boris Bralo:
Supported added for precompiled mip maps stored in osg::Image, and read
by osg::Texture.

Updates to TerraPage loader for support of compressed texture images and
precompiled mip maps.
2002-04-22 21:13:33 +00:00
Robert Osfield
4b9473eda9 Fixes the .mlt loading from Ben Discoe. 2002-04-22 09:31:54 +00:00
Robert Osfield
1131be56dc Fixes for Max OSX build from Bob Kuehne. 2002-04-19 16:22:25 +00:00
Don BURNS
c5f26d78f6 Fixed an assignment that should have been a test 2002-04-19 16:00:15 +00:00
Don BURNS
4624514924 Updated some files sent by Boris Bralo for the txp loader. 2002-04-19 15:34:40 +00:00
Don BURNS
0a2e5565ac Added Bob K's fix 2002-04-19 15:00:57 +00:00
Robert Osfield
4b5e4904ac Fixed VisualStudio .NET warnings in TXP plugin. 2002-04-18 10:38:58 +00:00
Robert Osfield
ab64566b61 Fixed memory leak in FTGL associated with the function of gluTesselate.
Fixed a warnings in the DW plugin.
2002-04-18 09:57:42 +00:00
Robert Osfield
b02cc80533 Fixed the seveal hunderd warnings in TerraPage loader! 2002-04-16 21:08:46 +00:00
Robert Osfield
3f249fcb57 Fix to TXP plugin to handle to new osg::Image method naming. 2002-04-16 15:44:31 +00:00
Don BURNS
6428715304 Added makedirdefs via a request from Bob Kheune. This allows us to edit
the DIRS cruft in a single file in the Make directory instead of having
to edit multiple files.  Also edited Makefiles that needed to include
this file.

Also cleaned up txp loader to compile with SunOS.  This needs to be retested
on other platforms.
2002-04-16 15:21:24 +00:00
Robert Osfield
7836540bb3 Added osg::Image::setPixelFormat(..) and setInternalTextureFormat(), and
renamed osg::Image::pixelFormat(), internalTextureFormat(),dataType() to
osg::Image::getPixelFormat() etc.  These changes are to bring it more
into line with the style of the rest of the OSG.

Updated the rest of the distribution to take account for these names changes.
2002-04-16 14:57:39 +00:00
Robert Osfield
2b4008bbbc Purge on warnings under Linux. 2002-04-16 14:09:46 +00:00
Robert Osfield
43fa577566 Updates to the flt plugin from Brede Johansen. 2002-04-16 11:36:23 +00:00
Don BURNS
f69e1276a9 fixed a few problems that didn't work right with installing demo source
on platforms other than Solaris.
2002-04-16 03:24:41 +00:00
Robert Osfield
9fd7c528f4 Compile fixes for IRIX, submitted by Randall Hopper. 2002-04-15 21:48:43 +00:00
Robert Osfield
5a0f8118b7 Added support for OSG_USE_MEMORY_MANAGER into Windows build. 2002-04-15 21:03:32 +00:00
Robert Osfield
1c1b29809b Fixes to warning in Win32 build 2002-04-15 10:59:16 +00:00
Robert Osfield
83a142b944 Fixed the copying of LongIDRecord's strings in flt plugin so it now uses the record length-4,
to create the string. Also Removed some in appropriate comments from LongIDRecord, since they
were obvious and hang over of a copy and paste job on the code.
2002-04-15 08:51:11 +00:00
Robert Osfield
09d41789da Fixes to osg::Image::createImage(..), and addition of code to Viewer.cpp to support
output of screen snapshot via 'O'.
2002-04-14 13:41:13 +00:00
Robert Osfield
03e9f63d54 Addition of write .bmp to the BMP plugin. 2002-04-14 12:54:26 +00:00
Robert Osfield
8a5c6d5102 Clean up for VisualStudio build 2002-04-13 22:19:29 +00:00
Robert Osfield
3f67300c82 Saved workspace from VisualStudio to follow up on missing demo dependancies 2002-04-13 10:18:58 +00:00
Robert Osfield
6ed233d0d2 Added DataVariance enum and set/get fields to osg::Object to help identify
which objects have values that vary over the lifetime of the object (DYNAMIC)
and ones that do not vary (STATIC).  Removed the equivalent code in
osg::Transform, StateSet and StateAttribute, as these are now encompassed
by the new DataVariance field.

Removed MatrixMode enum from Matrix, and associated fields/parameters from
osg::Transfrom and osg::NodeVisitor, since MatrixMode was not providing
any useful functionality, but made the interface more complex (MatrixMode
was an experimental API)

Added ReferenceFrame field to osg::Transform which allows users to specify
transforms that are relative to their parents (the default, and previous behavior)
or absolute reference frame, which can be used for HUD's, camera relative
light sources etc etc.  Note, the view frustum culling for absolute Transform
are disabled, and all their parents up to the root are also automatically
have view frustum culling disabled.  However, once passed an absolute Transform
node culling will return to its default state of on, so you can still cull
underneath an absolute transform, its only the culling above which is disabled.
2002-04-11 23:20:23 +00:00
Robert Osfield
421e381f17 Patch to ReadWriter3DS from Mike Connel. 2002-04-11 17:13:16 +00:00
Don BURNS
ef15655ea3 Added (previously omitted) libpng, libjpeg, libtiff, libgif to makedefs
in the Linux section
2002-04-10 01:29:45 +00:00
Don BURNS
30eab4b79a Added pkgadd distribution for Solaris.
Added a cleaner way to install demo source so that installed versions use a
simplified makedefs/makerules.

Small fix to get osgText to compile with Solaris CC.  Constructor declared
with a non-const argument, but implemented with const argument.
2002-04-09 14:55:38 +00:00
Don BURNS
1a51045ea4 Added a stop gap fix for cygwin build. Previous experiements were creating
library and  plugin files that looked like system library and system files
which would have deleted original files on a 'make install'.  Cygwin is not
tested yet, but this needed to get fixed before a cygwin user wiped out his
system library files.
2002-04-07 17:47:03 +00:00
Don BURNS
893dc6d65c Added Norman Vine's changes for CYGWIN builds
Added distrules and makerpms for building RPM distributions

Removed old RedHatRPM distribution build directory

Added new dist/RPM directory and placed temporary .spec files (these
are generated by Make/makerpms and are not intended for stand-alone
use, but they keep the directory warm and CVS happy)
2002-04-04 18:01:44 +00:00
Don BURNS
e0adca775b Reinstated Norman Vine's TARGET_BASENAME variable in the makefiles and
added prefixes and suffixes to libs and plugins.  ALl this to accomodate
cygwin...

Also added INST_SYS_PREFIX and INST_SHARE_PREFIX for installation, as well
as "standardizing" the install locations for the various platforms.
2002-04-03 17:42:12 +00:00
Don BURNS
3e6638320a The new order for building OSG. All Makefiles are replaced and
the Make directory is left with four files only :
    makedefs
    makerules
    makedirrules
    instrules

These work for all platforms supported so far, which include :
    Linux
    Irix
    Solaris
    MacOSX
    Cygwin
    FreeBSD
2002-04-02 06:44:57 +00:00
Robert Osfield
2786e4c083 Removed reference to malloc.h, replacing by stdlib.h instead. 2002-03-31 09:54:14 +00:00
Robert Osfield
6ff34d0bcb Warnings fixes, submitted by Randall Hopper. 2002-03-30 21:20:41 +00:00
Robert Osfield
33c89c3be0 Added support for setting the texture subload width and height within
osg::Texture.  The values default to 0, and in this state they are
sizes of the glTexSubImage2D are taken from the source image size.  This
allows the previous setup with no settings for subload size to work as
before.
2002-03-27 22:51:58 +00:00
Robert Osfield
84d2d01163 Added support for osg::MemoryManager which is based upon Paul Nettle's
memory manager published at flipcode.com.  This can be turned on
with the OSG_USE_MEMORY_MANGER option which then uses custom global
new and delete operators as well as provide osgNew and osgDelete macro's
which add ability to log line and file from which calls are made.

Updated osg,osgUtil,osgDB,osgText and osgPlugins/osg to use osgNew/osgDelete,
and fixed memory leaks highlighted by the new memory manager.
2002-03-26 23:52:52 +00:00
Robert Osfield
1ba7e67e2c Added missing TextureCubeMap.cpp to cvs. 2002-03-21 15:46:34 +00:00
Don BURNS
3816a4fcfc Modified files reflect small changes to work with Sun OS port....
Removed redundant README file in osgviews... was a copy of sgv/README.
2002-03-21 07:50:14 +00:00
Robert Osfield
9836af1055 Added osg::TextureCubeMap which encapsulates OpenGL's cube texture mapping. 2002-03-20 22:39:51 +00:00
Robert Osfield
8656adb463 Added a Referenced::unref_nodelete() method which unreferences but does
not delete the object even if its count goes to 0 or below.  This should
only be called in special circumstances, the ReaderWriter::ReadResult
being one of them. This new method has allowed the problem of objects
being multiple referenced on return from readNodeFile() & readImageFile().
2002-03-20 14:03:30 +00:00
Robert Osfield
49e7be88a7 Fixed the MS version number check in Optiizer.cpp. Fixes to memory handling
in ReaderWriterDW.cpp.  Submissions from Geoff Michel.
2002-03-18 22:03:28 +00:00
Robert Osfield
e80496d5db Changed Texture so that is use lazy updating on texture paramters (Filter/Wrap)
mode by using a _texParamtersDirty flag in combination with an
applyTexParamters(State&) method which does the paramters setting in one
tidy bundle.  This new implementations replaces the CompileFlags submitted
yesterday.

Simplified NodeCallback by remove osg::NodeCallback::Requirements as they
are no longer needed.

Fixed comments in Drawable.

Put guards around cosf definations so that they are only used under Win32/Mac.

Fixed warning in CullVisitor.
2002-03-14 16:01:21 +00:00
Robert Osfield
3a4efd335a Fix to handling of big/little endian in trpage_readbuf sent in by Randall Hopper,
and a waning fix.
2002-03-14 15:26:55 +00:00
Robert Osfield
bc30edb9e6 Support added for pivot points, submission from Mike Connel. 2002-03-09 10:54:56 +00:00
Robert Osfield
c67950561e TXP plugin changes submitted by Boris Bralo. 2002-03-09 10:52:01 +00:00
Robert Osfield
ab5603e3d4 TXP plugin update from Boris Bralo. 2002-03-09 10:51:09 +00:00
Robert Osfield
689eca77d7 Added file extension guard to .obj reader plugin. 2002-03-04 01:37:18 +00:00
Robert Osfield
384b23ea62 Added an using namespace osg to fix a MipsPro7.3 build error. 2002-02-27 22:12:07 +00:00
Robert Osfield
ea11548b7b Fixes to DW loader, submitted by Geoff Michel. 2002-02-27 21:57:56 +00:00
Robert Osfield
e21af2adce Added support for glLightModel functionality via osg::LightModel. 2002-02-25 22:46:38 +00:00
Robert Osfield
f600f6fe4a Added support for glLineStipple via osg::LineStipple state attribute. 2002-02-24 20:55:45 +00:00
Robert Osfield
aefaafdbf9 Fixed stereo implementation. 2002-02-18 23:01:09 +00:00
Robert Osfield
6d267336c1 Fixes to Win32 build of new DX writer plugin. 2002-02-18 21:52:45 +00:00
Robert Osfield
36ae60180f Comment w.r.t OpenDX plugin updated. 2002-02-18 20:48:52 +00:00
Robert Osfield
4abfdb1ebd Added OpenDX writer from Randall Hopper. 2002-02-18 20:46:47 +00:00
Robert Osfield
e87f7cf853 Updated the makefiles to all have the #!gmake reference to force IRIX
compilation using gmake rather than pmake or smake.  This gets round
issues with exporting OSGHOME.
2002-02-13 22:56:47 +00:00
Robert Osfield
3ef8e4b0dd Updates for IRIX build, and docs updates. 2002-02-12 22:51:18 +00:00
Robert Osfield
61e3e0c693 Clean up of TXP plugin for IRIX build. 2002-02-11 22:53:42 +00:00
Robert Osfield
aeaa31bd2a Fixed Linux hang of the TXP loader by overriding the default -O2 optimization
level which appears to cause the code to hang, -O works fine for some strange
reason, I havn't found any direct problems in the code.  This may be compiler
bug or a code bug, the bug may go away in later versions of GNUC++, the
problem currently occurs under GCC2.96.
2002-02-11 15:09:52 +00:00
Robert Osfield
6238cef37f Applied fix to transparancy in flt loader. 2002-02-11 12:51:08 +00:00
Robert Osfield
479fc6d2f3 Fixed a make install error on the plugins related to the old definitions for
plugin names hanging around despite being deprecated.  These definiations
confused the make install/make instclean so it tried to link a non existant
library.  Have removed old definitions and everything intalls properly once
more:-)
2002-02-11 02:34:30 +00:00
Robert Osfield
86620891af Fixes to TXP loader for Cygwin and Ming builds. 2002-02-10 10:42:55 +00:00
Robert Osfield
6ccb4b20c5 Updates to BMP loader from Geoff Michel. 2002-02-09 21:29:33 +00:00
Robert Osfield
88b6691369 Added std:: infront of string refrences to solve compile problems under gcc 3.0.3.
Also converted to unix file endings so other the windows style files.
2002-02-09 19:46:44 +00:00
Robert Osfield
16ada0fa3b Fix to BMP loader. 2002-02-09 10:50:09 +00:00
Robert Osfield
ed45cccc25 Fixes for cygwin and mingw builds. 2002-02-09 10:24:39 +00:00
Robert Osfield
4c5fcd3f61 Fixes for IRIX and Boris Bralo's TerraPage loader. 2002-02-08 09:30:02 +00:00
Robert Osfield
7c7f195d6e Fix for the handling of lighting in the DW loader. 2002-02-07 01:12:06 +00:00
Robert Osfield
a4ea331f3a Added extensions code submitted by Yefrei. 2002-02-07 01:05:52 +00:00
Robert Osfield
92f68e2669 Added comment to flt2osg's handling of osg::Material setup w.r.t
osg::Material::_colorMode.
2002-02-05 10:49:58 +00:00
Robert Osfield
6630cfb455 Fixes for GCC 3.0.3 build. 2002-02-03 19:18:14 +00:00
Robert Osfield
4d43f83295 Removed the M_PI defines from include/osg/Math and have use a const double osg::PI etc
in its place.
2002-01-30 15:27:45 +00:00
Robert Osfield
78fc28be7c Fixed the LOD center and range code that so that the values are now multiple
by the _unitScale to compenstate for different scales in the flt model.  This
_unitScale had already been applied to the geometry data.

Integrated new defaults for the texturing wrap mode, for when now .attr file
is supplied with a flt file.
2002-01-26 14:13:27 +00:00
Robert Osfield
9d3a81b715 Added support for node instances to Open Flight loader. Submitted by Yefei He. 2002-01-22 11:03:26 +00:00
Robert Osfield
1594b762b4 Fixes to makefiles which have become a bit unhinged after MacOS X integration. 2002-01-16 21:20:22 +00:00
Robert Osfield
13ed25221a Added support for billboard in OpenFlight loader. Submission from Nikolaus Hanekamp. 2002-01-16 21:12:02 +00:00
Robert Osfield
92785c864e Integrated the changes to osgPlugin/Makefile's for MacOSX port. 2002-01-16 12:05:22 +00:00
Robert Osfield
ad6a1665cc Added quicktime plugin (for Mac's only), submitted by Phil Atkin. 2002-01-16 10:41:55 +00:00
Robert Osfield
1fb8f9cb86 First batch of changes required for MacOS X build. Orignal submission from
Phil Atkin, merged by Robert Osfield.
2002-01-16 10:36:20 +00:00
Robert Osfield
f7e944c47f Changed the use of std::vector<..>.begin() to &vector<..>.front() in code
from passing the vector contents to the GeoSet::setPrimLengths(..) etc.
methods.  This has been done to fix the compile under the MS .NET compiler
which has changed the definiation of the std::vector<..>::iterator to
a class rather than a pointer.
2002-01-15 23:21:31 +00:00
Robert Osfield
ff61505789 Added '# LIBS += -limage' and explanation in comments to pfb Makefile,
submitted by Randall Hooper.
2002-01-15 15:49:02 +00:00
Robert Osfield
3671e77168 Added the set of GL_TEXTURE_GEN_S and _T to code converting pfTexGen to
osg::TexGen. This is try and fix a bug in handling tex gen datasets such
as sj_texgen.pfb.
2002-01-15 12:13:29 +00:00
Robert Osfield
42fd25c613 Renamed the TOP variable in the Makefiles to OSGHOME. 2002-01-04 20:44:41 +00:00
Robert Osfield
4ea7de39c6 Added osg::ShadeModel state attribute which encapsulates glShadeModel. 2002-01-04 17:35:54 +00:00
Robert Osfield
7a7322f7b0 Fixed a bug in writing of line strips and line loops to the .osg file. 2002-01-04 17:34:01 +00:00
Robert Osfield
75fe0a6a7f Makefile changes to support Cywin port - submission from Norman Vine, updates
to fix case problems under unix by Robert.
2002-01-03 23:19:18 +00:00
Robert Osfield
e3ad8a87ee Updates for Cygwin port, from Norman Vine. 2002-01-03 21:34:57 +00:00
Robert Osfield
19bf04c205 Updates from Randall Hopper to fix build under IRIX. 2002-01-02 15:42:42 +00:00
Robert Osfield
f9ee0fe44a A small bug fix to the matrix dump function (it was primtiing out 5 columns
instead of four).

Added support for multiplying mesh geometry by the matrix attached to the
Lib3dsMesh structure, however this produces disjointed models so have
to the default mode to bypass this multiplication code.  Will need to revisit
this in the future.
2002-01-02 11:03:26 +00:00
Robert Osfield
930db1112b Compilation fix to pfb plugin, sent in by Ulrich Hertlein. 2001-12-30 15:01:30 +00:00
Robert Osfield
98c8447ae9 Fixed the osg::Light so that it requires the user to explicitly define which
OpenGL light is being operated on, and also now relies upong the standard
osg::State handling of OpenGL modes to switch on the appropriate lights.

The previous static counter mechansim for the light number was causing a
redundent light to be created when the osg plugin created the first osg::Light
to use a prototype for other osg::Light's to be cloned from in the
.osg plugin execution.

The static count mechanism also prevent the lights modes being controlled
independantly from the setting of the light paramters themselves.  This
meant that a light once created was global, and couldn't be turned off
locally via the OSG's support for OpenGL mode enabling/disabling.  This
has been overcome with the new implementation, the user has complete
flexiblity of when and where to use the different lights at their
disposal.
2001-12-24 21:34:40 +00:00
Robert Osfield
3652bd9015 Various clean ups for the release. 2001-12-24 14:12:38 +00:00
Robert Osfield
9365f0e3b1 Added support for glLineWidth via an osg::LineWidth StateAttribute. 2001-12-20 20:48:46 +00:00
Robert Osfield
52cf47bf2e Updates to flt loading of light points, from Brede Johansen. 2001-12-20 12:12:30 +00:00
Robert Osfield
296865e250 Adding support for controlling visual settings via environmental variables
and command line paramters.  Including support for stereo and stencil buffer.
2001-12-19 00:38:23 +00:00
Robert Osfield
13641f1d6c Fixed compilation problems in flt plugin under Windows, and removed usage of
the default GeoSet::AtttributeDeleteFunctor from the DynGeoSet since it handled
the memory deletion iteself via STL containers.
2001-12-18 10:46:15 +00:00
Don BURNS
0509495340 Fixed IRIX compile issues with the flt loader.
ReaderWriterATTR.cpp had a variable "mips" defined, which is predefined for the IRIX preprocessor.
Changed this to _mips.

FltFile.cpp had a class and transient variable defined within the scope of member function
FltFile::readExternals(), which was causing the IRIX 7.3 compiles to hork.  Moved the class
definition to outside of the member function scope.
2001-12-17 17:34:17 +00:00
Don BURNS
b35b5f3c3c Fixed IRIX build. Required some namespace fixes and include and link
directives in the Makefiles
2001-12-17 16:21:33 +00:00
Robert Osfield
bc49a83c51 Updated the Optimzer::FatternStaticTransform visit so by default it ignores
all dynamic transforms, previously it flattened dynamic transforms as well.
2001-12-17 15:05:06 +00:00
Robert Osfield
cb8025d913 Renamed osg::Matric::makeIdent() to osg::Matrix::makeIdentity() to make
it consistent with the rest of the osg::Matrix naming.  Updated OSG
distribution to account for new name.

Added support for the STATIC/DYNAMIC osg::Transform::Type to the .osg
ASCII reader/writer plugin and the flt reader plugin.

Removed the non cost version of osg::Transform::getMatrix() as this could
by pass the dirty mechinism.
2001-12-15 16:56:39 +00:00
Robert Osfield
def6234d8c updates for windows build. 2001-12-15 10:00:43 +00:00
Robert Osfield
478274ae7d Fixes to Windows build in liu of the move to using just std::streams. 2001-12-14 23:18:28 +00:00
Robert Osfield
b1f478e5d2 Updated OSG so that the old OSG_USE_IO_DOT_H has be removed from all headers
that used it, all references to the Standard C++ stream classes use the
std::ostream etc convention, all references to "using namespace std" and
"using namespace std::ostream etc" have been removed.
2001-12-14 21:49:04 +00:00
Robert Osfield
84605a5f4e Fixes for Win32 build related to changes in using namespace std. 2001-12-14 10:47:20 +00:00
Robert Osfield
a4e4d4fa7c Removed all references to using namespace std to help solve compilation problems
under Windows and IRIX.

Also integrated small change to lib3ds from Drew for IRIX compilation.
2001-12-14 10:02:27 +00:00
Robert Osfield
f848c54ba3 Made the following name changes to Matrix and Quat to clean them up and make
the functionality clear given the name.  This will break user code unfortunately
so please be away of the following mapping.

  osg::Matrix::makeTrans(..)?\026 -> osg::Matrix::makeTranslate(..)
  osg::Matrix::makeRot(..)?\026   -> osg::Matrix::makeRotate(..)
  osg::Matrix::trans(..)?\026     -> osg::Matrix::translate(..)

  osg::Quat::makeRot(..)?\026     -> osg::Quat::makeRotate(..)

Also updated the rest of the OSG distribution to use the new names, and
have removed the old deprecated Matrix methods too.
2001-12-12 20:29:10 +00:00
Robert Osfield
05e4a0b4ce Fixed problem with loading interleaved arrays in the .osg loader, and corrected
a spelling mistake in osg::GeoSet.
2001-12-12 12:55:01 +00:00
Robert Osfield
a23627467b Added support for automatic deletion of osg::GeoSet's attributes, via a
default AttributeDeleteFunctor which uses delete [].  Users can create
their own handlers for the attribute memory to override this default
behavior.

Fixed a typo in ReaderWriterOBJ.cpp.
2001-12-04 22:57:40 +00:00
Robert Osfield
396b2668c8 Updates to the flt loader, from Brede Johansen. 2001-12-04 19:41:08 +00:00
Robert Osfield
d7ded2d90f Integrated Brede Johansen's updates to flt loader. 2001-12-04 16:03:10 +00:00
Robert Osfield
3e940e0b33 Made a output message output as osg::DEBUG only. 2001-12-04 15:56:08 +00:00
Robert Osfield
c92b730817 Improved support for anaglyphic stereo.
Integrated texture CLAMP_TO_EDGE, submitted by Ulrich Hertlein.
2001-12-04 12:31:10 +00:00
Robert Osfield
a434abafd7 Fixes for IRIX build.
Updates to the osg::Transform, adding preMult and postMult methods and
deprecating the old preRotate,preTranslate,preScale.

Updated the rest of the OSG so that it nolonger uses the deprecated
osg::Transform nodes.

Renamed osgUtil::SceneView::setGlobalState() to
osgUtil::SceneView::setGlobalStateSet() so that the name reflects its
functionality better.  Updated osgGLUT::Viewer etc to cope with new
name change.
2001-11-14 14:09:07 +00:00
Robert Osfield
7290f793f1 Added osgText::Paragraph which is a subclass from Geode which composes a
list of text drawables as a paragraph block, handles breaking of text into
individual lines automatically.

Changed the osg::Node::setUserData so that the data type has to be an
osg::Referenced, and removes the dependancy on osg::MemoryAdapter.  I have
done this since it simplifies the OSG side of the interface and makes it
less like that the user might abuse the memory managment of the data. It
does however mean that user data will have by subclassed from Referenced,
and therefor may require users to have their own adapter to do this.
However, this little nuasance is worth the extra cleaness and robustness
afforded by going the osg::Referenced route.
2001-11-09 15:06:01 +00:00
Robert Osfield
42faf78b47 Updated index.html with dependacy info about the new osgText library.
Modified osg/Drawable::draw(..) so that it uses display list COMPILE
rather than COMPILE_AND_EXECUTE to solve performance problems under
NVidia drivers.  The old behavior is still available by comments out
a #define.
Fixed the default compilation list src/osgPlugins/Makefile so that it
compiles by defalt png and gif.
2001-11-02 12:26:33 +00:00
Robert Osfield
aa725e899a Updates to the flt loader from Brede Johansen. 2001-11-01 16:35:26 +00:00
Robert Osfield
b462845857 Added missing config.h file to src/osgPlugins/lib3ds. 2001-10-31 22:35:44 +00:00
Robert Osfield
78372a5a62 Updated the lib3ds plugin with the new 1.1 version of lib3ds. 2001-10-31 18:33:27 +00:00
Robert Osfield
f0372817b5 Added support for ReadResult and WriteResult to the osgDB::ReaderWriter
to allo plugins to pass back more information about the success or failure
of a file load.  All plugins have been updated to the new convention.
2001-10-30 14:20:37 +00:00
Don BURNS
12826653b1 Added stat.c 2001-10-23 23:23:51 +00:00
Don BURNS
49b7219058 Fixed pfb loader functionality for IRIX 2001-10-23 23:10:47 +00:00
Don BURNS
6316d19df8 Fixed pfb loader so that it works for both Linux and IRix with dynamic
libraries, and provides support to load (almost) all that Performer loads.
2001-10-23 22:59:54 +00:00
Robert Osfield
489ef2d035 Added #ifdef to Performer ReaderWriterPFB so that pfdLoadFile is used under
IRIX and pfdLoadFile_pfb is used under Linux.
2001-10-20 09:48:22 +00:00
Robert Osfield
54d490e24b Added support for specifying whether view frustum and small feature culling
should be applied to a node or its child with the new osg::Node::setCullingActive()
flag.  A mechanism has been implemented so that if child has its culling disabled
then their parents, all the way up to the root are also have their culling
implicitly disabled.

The osg::CullVisitor has updated to take account of
both the explicit control via setCullingActive and the implicit culling
disabling through children being disabled.

This feature is useful for nodes which don't have a bounding volume to cull
against, earth sky implementations and light sources.

The default osg::Node::_cullingActive is true, i.e. culling is enabled by
default.
2001-10-19 12:56:37 +00:00
Don BURNS
e467f44575 Fixed static libraries in madefs.linux and error in ReaderWriterPFB.cpp 2001-10-17 22:17:23 +00:00
Robert Osfield
2ce6cdd6b2 Fixes for IRIX build - submitted by Randall Hopper. 2001-10-16 18:39:57 +00:00
Robert Osfield
8aefce4524 Fixed then normal smoothing function in the .3ds loader and the
osgUtil::SmoothingVisitor so that unused normals at left at 0,0,0 insead
of being normalized, which results in (nan,nan,nan).
2001-10-16 15:03:10 +00:00
Robert Osfield
c0b0ab5d62 Fixed problem caused by ReaderWriterPFB::writeNode(..) not ensuring that the
file extension was .pfb. Have added a check.
2001-10-16 08:24:26 +00:00
Robert Osfield
de924ca759 Fixes for compilation under IRIX, submitted by Randal Hopper, with mods
from Robert.
2001-10-15 15:50:55 +00:00
Robert Osfield
7c54b58306 The writeImage/Object/Node methods in the .osg and .pfb reader/writer didn't
have the new ReaderWriter::Options* structure passed to them, which meant the
the virtual functions didn't bind with the new base class methods and wern't
called on a write.
2001-10-15 08:40:30 +00:00
Don BURNS
d66bfdbbc5 Updated pfb loader to load pfb files into osg. Still broken for loading osg
files into Performer, however.
2001-10-15 03:32:47 +00:00
Robert Osfield
06dafa487e Added osgDB::ReaderWriter::Options class to the ReaderWriter base class, support
for settings options in osgDB::Registry, and added the paramter to all of the
reaader/writer plugins.  The Options structure by default has an string attached
for packing basic options, however, it also can be subclassed to encapsulate
any users defined option data. In the later case both the client code *and*
the plugin need to be aware of subclass, the plugin will need to use
dynamic_cast<> to assertain its type.
2001-10-14 17:54:25 +00:00
Don BURNS
cb17e99420 Added include/osg/Math to Makefile TARGET_INCLUDE_FILES and fixed references
to _mat in ConvertToPerformer.cpp
2001-10-12 17:45:15 +00:00
Robert Osfield
a7f0cacc41 Fixed a crash when opening an erroneous test file (reopen.bmp). 2001-10-09 21:55:47 +00:00
Robert Osfield
68e63ef750 Merged updates to BMP plugin from Geoff Michel. Also modified a little of the
code to fix a crash under Linux, Robert Osfield
2001-10-09 11:58:13 +00:00
Robert Osfield
8df894924c Fixed a recently introduced crash in the flt plugin which was happen when a
std::string was be be set with NULL char*.  Also added support for stripping
the filename from its original path, inside the osgDB::findFile function.
2001-10-08 15:54:16 +00:00
Robert Osfield
c66557087d Added support for using osgDB::fineFile into the .flt plugin. 2001-10-08 08:35:06 +00:00
Robert Osfield
2b85ce5c1c Merged Geoff Michel's udpdates to bmp plugin, and fixed a double fclose bug
which was causing a seg fault under Linux.
2001-10-07 20:10:58 +00:00
Robert Osfield
3da57d6d22 Added a osg::DegreesToRadians() and osg::RadiansToDegrees() method to osg/Math,
updated the ReaderWriterBMP.cpp (mods sent in my Geoff Michel) and
moved the osgUtil::Statistics to osg::Statistics in preperation to adding it
to the the Drawable base class.
2001-10-06 20:29:42 +00:00
Robert Osfield
c56a1b8c31 Added bmp plugin files, bmp plguin written by Geoff Michel 2001-10-05 19:55:58 +00:00
Robert Osfield
df362da11b Added bmp osgPlugin, written by Geoff Michel. 2001-10-05 10:39:27 +00:00
Robert Osfield
1ebddc2af7 Added missing EarthSky.cpp file to osg plguin. 2001-10-03 07:56:33 +00:00
Robert Osfield
430c8606e9 Added osg::EarthSky node to the core osg library, and added support for it into
osgUtil::SceneView, osg::CullVisitor, osgPlugin/osg and updated the hangglide
demo to use the new earth sky node.
2001-10-02 11:36:14 +00:00
Robert Osfield
2a9848ea95 *** empty log message *** 2001-09-27 16:34:41 +00:00
Don BURNS
7ae58df42a Synch with 20010921 2001-09-22 02:42:08 +00:00
Don BURNS
b5eb0a1137 Removed Makedepend files 2001-09-20 00:59:26 +00:00
Don BURNS
77494207fb Removed files.... synching witn 0.8.42 2001-09-19 21:51:06 +00:00
Don BURNS
bc739f47a9 And yet more clean up synch with 0.8.42 2001-09-19 21:41:52 +00:00
Don BURNS
7e81f6cfa6 More clean up for synch with 0.8.42 2001-09-19 21:19:47 +00:00
Don BURNS
e8f256a59d Added a bunch of files synched with 0.8.42 2001-09-19 21:08:56 +00:00
Don BURNS
70208ebc06 Initial revision 2001-01-10 16:32:10 +00:00