FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
2,854 Commits 1 Branch 26 Tags 73 MiB
04798b4e63
Commit Graph

730 Commits

Author SHA1 Message Date
Robert Osfield
252da5e5f9 From Marco Jez, moved color matrix IO code across to using Marix.h so it 
handles float's double's properly.
 2003-09-10 11:21:56 +00:00
Robert Osfield
b165fc9b4d Cleaned up handling of vertex arrays in osg::Geometry. 
Added support for vertex attribute arrays in .osg and .ive.
 2003-09-09 22:18:35 +00:00
Robert Osfield
584f805327 Updates to osgFX, from Marco Jez, to map Effect across to being derived 
from osg::Group rather than from osg::Node.
 2003-09-09 11:54:05 +00:00
Robert Osfield
5c3c0ed17c Made writeMatrix/readMatrix use doubles exclusively. 2003-09-09 10:09:20 +00:00
Robert Osfield
cf1fe8edc2 From Boris Bralo, addition of support for osgSim::LightPoint's into TXP 
plugin.
 2003-09-07 14:18:22 +00:00
Robert Osfield
5b93250eb0 Added support for Matrixd and Matrixf implementations, with the default 
Matrix typedef's to either Matrixd or Matrixf.
 2003-09-05 20:48:42 +00:00
Robert Osfield
bd44cfcfd8 Added a Matrix::value_type typedef'd trait into osg::Matrix, defaulting its 
value to float, and converted the internal code across to use value_type.  This
allows Matrix to be converted to use double's simply by change the definition
of value_type.  Added Matrix::glLoadlMatrix and Matrix::glMultMatrix() to
help encapsulate the changes between float and double matrix usage.

Updated code that uses Matrix so it doesn't assume float or double matrices.
 2003-09-03 10:47:25 +00:00
Robert Osfield
218c6e8d13 Added Inventor plugin, submitted by Sean Spicer, Written by Vivek (c) Magic-Earth. 
To compile in do a setenv/export USE_COIN or USE_INVENTOR.
 2003-09-02 21:53:41 +00:00
Robert Osfield
4761442005 Merged changed to osgParticle from Marco Jez, the changes are (quoted from 
email from Marco)

"Most relevant news:
1) particle systems now have the "freezeOnCull" property set to false by
default. Since it is an optimization, and using it may cause some unwanted
behaviors if not handled properly, it makes more sense to turn it off by
default.
2) new "LINE" shape mode which uses GL_LINES to draw line segments that
point to the direction of motion.
3) particles can now have a rotation angle and angular velocity.
4) new AngularAccelOperator applies angular acceleration to particles.
5) particle processors such as emitters and programs can have a "start",
"end" and "reset" time coordinate. For example, an emitter may be instructed
to start emitting particles only after a certain time, stop after another
amount of time and then start again.

Update (2) is from Gideon May.
Updates (3) to (5) are from Douglas A. Pouk."
 2003-09-02 20:39:41 +00:00
Robert Osfield
f90e4ff5f8 Converted eroneous writeLong/readInt boolean entries used writeBool/readBool. 2003-09-02 17:16:17 +00:00
Robert Osfield
da6f7ebeef Fixes for IRIX build + to_unix on txp plugin files. 2003-09-02 10:27:57 +00:00
Robert Osfield
7575f45800 Support for BumpMapping added by Marco Jez. 2003-09-01 21:53:53 +00:00
Robert Osfield
6bb951a5bb From Alberto Farre, fixes to the file path handling of internally referenced 
files.
 2003-08-31 22:17:15 +00:00
Robert Osfield
0b75a59cfe Added an explicit check for file extension so that only .jpg and .jpeg files 
are loaded with the JPEG plugin, thus avoid a crash which was occuring when
it was passed non JPEG files.
 2003-08-29 22:04:35 +00:00
Robert Osfield
64e3c052d6 Removed double line spacing in ExternalReference code. 2003-08-28 12:49:38 +00:00
Robert Osfield
138835d817 Added a PushAndPopFilePath usage to the internal flt file references. 2003-08-28 12:47:32 +00:00
Robert Osfield
f7d7a746f3 Added missing osgFX files. 2003-08-26 22:09:15 +00:00
Robert Osfield
e46d1cf941 Moved OpenThreads::Threads::Yield() calls across to new 
OpenThreads::Threads::YieldCurrentThread() naming.
 2003-08-21 09:52:12 +00:00
Robert Osfield
1a68dd80d7 Added explicit calls cancel and wait until thread and no longer running to the 
DatabasePager and TXP pager.
 2003-08-20 12:52:33 +00:00
Robert Osfield
56044e6cf7 Moved the delete of expired subgraphs to the database thread to improve 
the stability of the frame rate.
 2003-08-20 07:36:47 +00:00
Robert Osfield
5b7d480c0a Fixes to the database paging. 2003-08-19 19:46:18 +00:00
Robert Osfield
75e4d43026 Removed inappropriate static_cast<>. 2003-08-19 13:01:01 +00:00
Don BURNS
52819c3f25 Added check for byte swapping when writing RGB files so rgb files can be 
created on big endian machines
 2003-08-16 18:52:37 +00:00
Robert Osfield
4b7bde1440 Removed the deprecated NodeVisitor::getLocalToWorld/WorldToLocal methods as 
this are replaced by the osg::computeLocalToWorld/WorldToLocal() functions
found in osg/Transform.

Made the ReleaseTextureAndDisplayListsVisitor a public nested class of
osgDB::DatabasePager to allow it to be used in the TXP plugin, and added
usage of this visitor to the TXP plugin to make sure that textures and
display lists are released during the update thread.
 2003-08-14 00:05:34 +00:00
Robert Osfield
7ed516e443 Fixed capitalization of QTtexture.h 2003-08-12 23:06:25 +00:00
Robert Osfield
372c5b636a Fixed VC6 for scoping problem in ive plugin. 2003-08-03 02:59:48 +00:00
Robert Osfield
79855cf669 Fixed warning in jpeg loader by replacing longjmp with throw/catch. 2003-07-26 18:57:12 +00:00
Robert Osfield
525cd9292d Fixed long jump warning. 
CV: ----------------------------------------------------------------------
 2003-07-26 14:15:24 +00:00
Robert Osfield
edeb32778c Fixed warnings. 2003-07-26 04:25:27 +00:00
Don BURNS
49a93076c1 Removed references to PRODUCER_INCLUDE_DIR and PRODUCER_LIB_DIR in the 
local makefiles.

Small change in txp loader for sun build
 2003-07-25 23:49:03 +00:00
Robert Osfield
acc200a6a2 Fixed warning, which was actually a bug, sometimes you've just gotta love 
pedantic warnings.
 2003-07-24 06:07:12 +00:00
Robert Osfield
c404bd09ed Removed all references to sleep/usleep. 2003-07-23 21:32:11 +00:00
Robert Osfield
70db0608a9 Moved t->testCancel() to end of loop. 
Changed a sleep() to a Yield.

Removed debugging messages.
 2003-07-23 21:18:04 +00:00
Robert Osfield
bf5add799d Added makefile. 2003-07-23 20:57:57 +00:00
Robert Osfield
52aa73b18a Fixes for Win32 build. 2003-07-23 18:32:52 +00:00
Robert Osfield
a7b7d6cefc Added support for PagedLOD node into .ive format and added support for 
Enabled texture object reuse by setting an expiry delay in the TextureObjectManager
of 10 seconds - done for both osgDB::DatabasePager and TXP plugin.
 2003-07-23 15:52:05 +00:00
Robert Osfield
e95768417c From Gideon May, added support for osgSim into .osg file format. 2003-07-23 14:06:32 +00:00
Robert Osfield
0c662e596c Merged changes from Nicklov Trajce and Boris Bralo. 2003-07-23 13:34:48 +00:00
Robert Osfield
2ce08d8088 Warning fixes from Gideon May. 2003-07-23 11:45:37 +00:00
Robert Osfield
aa8b552ca6 From Marco, updates to osgDB and .osg plugin to better handle reading of 
objects of specified types.
 2003-07-21 18:36:47 +00:00
Robert Osfield
23fc1900ce From Romano Jose Magacho da Silva, added osg:FragmentProgram. 
From Robert, add .osg support for FragmentProgram.
 2003-07-17 06:43:15 +00:00
Robert Osfield
1bf874ec1f From Ruben, added support for vertex program in .osg loader. 2003-07-16 22:26:17 +00:00
Robert Osfield
c8e7f04200 Fix for compile oddities on an Octane with old zlib headers hanging around, 
change is non intrusive.
 2003-07-15 16:20:50 +00:00
Robert Osfield
b2e5e09c28 From Bart Gallet, updates to VisualStudo .dsp's to keep things compiling under Windows. 2003-07-15 09:39:45 +00:00
Robert Osfield
fc4b990a7a Compile fixes. 2003-07-15 07:53:25 +00:00
Robert Osfield
1b9d7d458a Added support for texture object manager, which provides an automatic mechansim 
for reusing deleted textures.
 2003-07-14 14:42:10 +00:00
Robert Osfield
94d8e72ad3 warning fixes for IRIX. 2003-07-11 22:05:34 +00:00
Robert Osfield
c2eabe1d4b Added osg::PagedLOD and osgProducer::DatabasePager class, and linked up osgProducer::Viewer 
to manage the pager.
 2003-07-08 14:44:00 +00:00
Robert Osfield
71eb715068 Added an osg:: infront of the Object() copy constructor call to AttrData. 2003-06-30 06:41:42 +00:00
Robert Osfield
1d73bb8bec Added support for chunking the point data clouds into 10,000 point chunks to 
better optimize the VBO and AGP needs.
 2003-06-29 21:53:38 +00:00
Robert Osfield
a632652507 Added #include <TextureRectangle> 2003-06-27 14:33:37 +00:00
Robert Osfield
8d4ab4668e From Tree, updates to osgText and freetype plugin to support are kerning paramter. 2003-06-26 16:21:49 +00:00
Robert Osfield
aca924113f From Julia Oritz Rojas, support for detail textures. 2003-06-25 10:12:50 +00:00
Robert Osfield
46c5eec0d0 From Ulrich Hertlein, added support for TextureRectangle to .osg format. 2003-06-25 08:58:48 +00:00
Robert Osfield
367750997b Test of cvs. 2003-06-25 07:59:59 +00:00
Robert Osfield
9d6341b620 Added TessellationHints. 2003-06-25 07:50:19 +00:00
Robert Osfield
d70ab592ed Additions since the CVS back up was made. 2003-06-24 21:57:13 +00:00
Don BURNS
15f88f35b2 *** empty log message *** 2003-06-24 15:40:09 +00:00
Robert Osfield
a12fd61266 Added missing std:: 2003-05-26 11:02:42 +00:00
Robert Osfield
f8ba149e19 Added 3dc plugin for reading Arias 3D point clouds. 2003-05-26 10:05:52 +00:00
Robert Osfield
7b657aed3a Adding support using istream and ostream with the reader writers. 2003-05-26 09:27:16 +00:00
Robert Osfield
289ae01420 From Geoff Michel, conversion from GeoSet to Geometry. 2003-05-25 16:08:57 +00:00
Robert Osfield
087944d343 Removed export macro. 2003-05-24 14:42:00 +00:00
Robert Osfield
5bfaf54292 Added missing std:: 2003-05-24 14:26:20 +00:00
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