Commit Graph

681 Commits

Author SHA1 Message Date
Robert Osfield
de77cede2b Merged fixes from Geof Michel. 2003-11-02 20:10:04 +00:00
Robert Osfield
980cfc78f9 Renamed _mips to _mipMapKernel 2003-10-31 10:11:38 +00:00
Robert Osfield
f1c4dc3b0d Updates for osgdem. Including new read/writeHeightField() methods. 2003-10-29 11:11:17 +00:00
Robert Osfield
b9775a1a3e Fixed PNG plugin so it handles endianess correctly, and alpha/grey scale textures. 2003-10-29 10:41:36 +00:00
Robert Osfield
eb4ee3afad *** empty log message *** 2003-10-27 16:07:21 +00:00
Robert Osfield
fa8a06990d From Trajce Nikolov, support for use of PagedLOD in the txp plugin. 2003-10-19 11:46:34 +00:00
Robert Osfield
c11762aeb3 Changed the warnings about unhandled op codes to NOTICE instead or WARN 2003-10-17 10:28:55 +00:00
Robert Osfield
8b0a5035b2 From Eric Hammil, fix for bmp image size. 2003-10-17 10:24:22 +00:00
Robert Osfield
98ed1a8d7d From Michael Gronenger, updates to JP2 plugin. 2003-10-17 10:23:24 +00:00
Robert Osfield
4e7867ba8c From Geoff Michel & Roger James,revised AC3D loader - accepted the improvement from Roger James for texture mapping, and developed his writer until it actually writes most geometries (no text or osgFX nodes of course). 2003-10-12 15:20:09 +00:00
Robert Osfield
b9423da386 Added ClusterCullingCallback to ive. 2003-10-10 12:56:35 +00:00
Robert Osfield
5d35daa970 Udates to Drawable + IVE plugin with support for new ClusterCullingCallack.
Improvement to osgbluemarble.
2003-10-10 12:54:21 +00:00
Robert Osfield
83b04bd04b Fix for 64bit build. 2003-10-10 11:12:37 +00:00
Robert Osfield
aee27a18eb Fix for 64bit build. 2003-10-09 20:56:15 +00:00
Robert Osfield
6a3f7dfc45 Added DrawElementsUByte to ive plugin. 2003-10-09 14:55:56 +00:00
Robert Osfield
e7c0d70747 Added new GDAL plugin and osgbluemarble example to demonstrate how to create
PagedLOD'd databases using GDAL.
2003-10-08 13:09:23 +00:00
Robert Osfield
48fc18fe8b From Rune Schmidt Jensen, bug fix to reading of osg::Quat's 2003-10-07 18:41:38 +00:00
Robert Osfield
d3ae2ed90a Added -losgGL2 2003-10-06 08:53:56 +00:00
Robert Osfield
b0b73f4ad9 Changed the texture search path mechanism to better utlise the OSG's search file
path mechansim.
2003-10-05 16:16:39 +00:00
Robert Osfield
ce15c880b1 From Mike Weiblen, updates to osgGL2 to support Uniform values 2003-10-05 11:30:54 +00:00
Robert Osfield
5227bc60df Updated docs for 0.9.6-2 release 2003-10-02 14:28:30 +00:00
Robert Osfield
dec5bb1f2a Updated NEWS
Added support for inline/nonlining of texture cube maps.
2003-10-02 14:11:57 +00:00
Robert Osfield
6deedbf08c Added a check against opaque textures, when detected turn the material white
as per specs for 3ds.
2003-10-01 21:59:55 +00:00
Robert Osfield
e693f148cb Made osg::Quat support either float or double internal representation, defaulting to double.
Generalised the osgDB::Field so that its getFloat() method can be used with either doubles or
floats governed by the type passed in - this helps support either float/double
Quat and Matrix classes seemlessly.
2003-09-29 13:35:02 +00:00
Robert Osfield
da8ef894c1 Added equals operator to CUllingSet.
Update AUTHORS file.

Change tabs to 4 spaces in ive/TextureCubeMap.cpp
2003-09-28 10:15:10 +00:00
Robert Osfield
65c33b0574 From Michael Gronager, jp2 plugin for reading and writing JPEG2000 files. 2003-09-26 16:02:53 +00:00
Robert Osfield
f8df9991b2 Improves to CullStack.
From M.Grngr. options support for f=switching off internal imagery in .ive files
2003-09-26 11:20:43 +00:00
Robert Osfield
49cc9b85d5 From Tom Jolly, added support for TexEnv to pfb plugin. 2003-09-23 14:42:56 +00:00
Robert Osfield
c342b29a04 Warning fixes for Win32. 2003-09-16 19:56:19 +00:00
Robert Osfield
cec0b35cd4 Fixes for .osg output of UByte4 values, and added missing template contructor
to DrawElementsUShort.
2003-09-16 19:54:57 +00:00
Robert Osfield
e7b1edef56 Improved the tesselation of obj surfaces so that rendering performance
is significantly improved.
2003-09-16 19:53:51 +00:00
Robert Osfield
00eff9c860 Warning fixes for VS .NET. 2003-09-16 11:22:48 +00:00
Robert Osfield
6019d54dc2 Added support for per vertex colors. 2003-09-16 09:54:41 +00:00
Robert Osfield
1a65db63fe Added inlucde<osgSim/LightPointNode> to trPageArchive to get round IRIX build
problem.
2003-09-16 08:10:11 +00:00
Robert Osfield
151bd467ca Changed a couple of int64's back to int32. 2003-09-15 22:13:26 +00:00
Robert Osfield
79b87c933e From Julian Ortiz, fix to OpenFlight loader so that it handlers OpenFlight
switches in a more appropriate way.
2003-09-15 15:03:30 +00:00
Robert Osfield
516db08681 Fixes for warnings under VS.NET from Marco Jez. 2003-09-15 10:12:04 +00:00
Robert Osfield
34008a05f4 Fixed warnings in geo plugin. 2003-09-15 08:32:36 +00:00
Robert Osfield
e6cd07f857 From Geoff Michel, updated geo plugin to support latest rev of Geo Modeller's file format. 2003-09-14 22:49:47 +00:00
Robert Osfield
81fbb26d62 Forom yne Schmidt Jansen, added support for osgSim into ive plugin. 2003-09-14 22:48:35 +00:00
Robert Osfield
4c168fc193 Fixed the OBJ loader so that it shares all duplicate state, improving the
load time and rendering performance significantly.
2003-09-13 15:59:38 +00:00
Robert Osfield
df8b9ab26b Changed std::size_t to unsigned int to attempt to fix IRIX build problem. 2003-09-12 21:15:13 +00:00
Robert Osfield
fe06711c9f Work around for OSX errors when reading .ive files. 2003-09-12 19:17:46 +00:00
Robert Osfield
688d52017c Added verbode debugging option to dataoutputstream and datainputstream to
help invstigation into crash under OSX when reading .ive files.
2003-09-12 15:29:02 +00:00
Robert Osfield
8e15f5fa9d Added #ifdef IVE_CATCH_EXCEPTIONS to allow catching of exceptions to be
turned off for debugging purposes.
2003-09-12 13:02:03 +00:00
Robert Osfield
1e3b346a52 From Sebastien Kuntz, added support for external refernces to vertex/fragment
program files.
2003-09-12 08:45:12 +00:00
Robert Osfield
d8caec91a4 Clean ups for the release. 2003-09-11 09:44:22 +00:00
Robert Osfield
5ca7659cda Fix warning under Win32. 2003-09-10 14:43:48 +00:00
Robert Osfield
6c22afa51c Fixes for osgFX. 2003-09-10 12:38:28 +00:00
Robert Osfield
a01903ac41 Added -losgText into txp plugin's GNUmakefile for OSX build. 2003-09-10 12:26:54 +00:00
Robert Osfield
514cbbf6f4 Added -losgText for OSX build. 2003-09-10 12:04:17 +00:00
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