FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,786 Commits 1 Branch 26 Tags 73 MiB
8c7f71ef39
Commit Graph

966 Commits

Author SHA1 Message Date
Robert Osfield
6e55d48352 From Sohey Yamamoto, addition of TexEnvFilter support. 2004-10-18 14:42:32 +00:00
Don BURNS
597e2cc0bd Fixed small typo. 2004-10-15 20:13:33 +00:00
Robert Osfield
9d67383621 Added population and access of the ReaderWriter::Options::s/getDatabasePath() 
to enable paged database to accessed without setting file paths explictly
 2004-10-13 14:13:17 +00:00
Robert Osfield
840ae915e9 Added a direct call to the osgUtil::Optimizer in GeoSetBuilder.cpp so that 
the resultant geomety would be more efficiently packed.
 2004-10-12 09:00:51 +00:00
Robert Osfield
d7ab56e31f From Sondra Iverson, with mods by Robert Osfield. Support for copying texenv 
from the source StateSet when multi-texturing.
 2004-10-12 07:54:45 +00:00
Robert Osfield
0fcc08d867 From Sondra Iversion "Loading a single model from an externally 
referenced file is a standard option for OpenFlight and is specified by
including the modelname in angle brackets, such as:  filename<modelname>.

The attached code identifies and handles this case."
 2004-10-07 10:03:27 +00:00
Robert Osfield
d77e6a0829 Added new clear, removeAttribute, removeMode, removeTextureAttribute and 
removeTextureMode method and deprecated the setToInherit equivilants.
 2004-10-07 09:40:03 +00:00
Robert Osfield
c27bf441e2 Improved the osg::Geometry::computeCorrectBindingsAndArraySizes() implemention 
so that it produce more optimal settings.

Changed flt/GeoSetBuilder so that it doensn't merge geometry, as it was
merging geometry even when inappropriate.
 2004-10-06 20:32:09 +00:00
Robert Osfield
a907042618 From Jason Daly, fix to multi-texturing/detail texture handling. 2004-10-06 19:19:22 +00:00
Robert Osfield
b4cfc3656d Generalised the .net plugin so it could handle object, image, heightfield and node 
file reads.
 2004-10-06 14:44:11 +00:00
Robert Osfield
c4e5e0fa30 Added passing on of Options object 2004-10-06 13:10:29 +00:00
Robert Osfield
024044094e Added support for readNode(istream,Options*) into OBJ to allow loading 
over the internet
 2004-10-06 13:09:35 +00:00
Robert Osfield
7e4d34c57a Added : 
osg::PagedLOD::s/getDatabasePath() and support in PagedLOD::traverse().
    osgDB::ReaderWriter::Options::s/getDatabasePath()
    osgDB::Input::s/getOptions()
    setting of osgDB::Input::setOptions() in ReaderWriterOSG.cpp
    src/osgPlugins/ive/DataInputStream::s/getOptions()
    setting of src/osgPlugins/ive/DataInputStream::setOptions() in ReaderWriterIVE.cpp
 2004-10-06 09:31:34 +00:00
Robert Osfield
0e119ec26c Added support for write to ostream into .osg plugin 2004-10-01 07:39:15 +00:00
Robert Osfield
a8739f952a Added support for ClipPlane, ClipNode, TexGenNode to .ive 2004-09-29 19:10:00 +00:00
Robert Osfield
eb346bed13 Added Texture3D implementation. 2004-09-29 14:31:06 +00:00
Robert Osfield
0e4f7077ab Removed erroneous casts that would have been causing uneccessary copying. 2004-09-26 19:01:27 +00:00
Don BURNS
fc68ccacb7 Fixed warnings 2004-09-23 16:05:24 +00:00
Don BURNS
eea9ddccf5 removed makeDir.h 2004-09-20 17:42:59 +00:00
Don BURNS
95b9ec54e9 Removed temporary makeDir files and call in ReaderWriterNet.cpp 2004-09-20 17:42:40 +00:00
Robert Osfield
e68cfd1965 From Sebastien Grignard, add writing out/reading in of drawable components of 
a ShapeDrawable.

From Robert, add versioning of the above change to allow old files to still
work.
 2004-09-15 19:14:00 +00:00
Robert Osfield
6d7a046160 Added usage of std::vector<> and ref_ptr<>'s to avoid memory leaks 2004-09-15 15:09:46 +00:00
Robert Osfield
99332ef11a Added missing LightModel.h and .cpp from Stansilav. 2004-09-10 17:49:50 +00:00
Robert Osfield
217fa3ec0e From Stanislav Blinov, addition of LightModel support for .ive format. 2004-09-09 13:07:18 +00:00
Robert Osfield
2c60114a94 From Martin Aumueller, added ref() and unref() to Inventor node handling. 2004-09-09 08:18:43 +00:00
Robert Osfield
568bd8f945 Fixed keyword used for setting the database name. 2004-09-08 18:14:04 +00:00
Robert Osfield
a9c731eff2 Quick fix to crash in TXPNode. 2004-09-08 15:14:18 +00:00
Robert Osfield
e0a3e687ec Changed the wrap mode from CLAMP to CLAMP_TO_EDGE 2004-09-07 10:09:52 +00:00
Robert Osfield
4571238459 From Joakim Simonsson, add s/getHPROrder method 2004-09-06 14:59:11 +00:00
Don BURNS
83b94144b4 Fixed .net plugin errors on Mac 2004-09-02 20:42:28 +00:00
Robert Osfield
452cfa7744 Added comments from Eric 2004-09-02 07:44:33 +00:00
Robert Osfield
cc4a22a117 Added crude #ifdef COIN_BASIC_H around ::REPLACE usage as this is only 
available under Coing
 2004-09-01 09:10:15 +00:00
Robert Osfield
da6993fc77 Added support for CONSTANT_COLOR and ONE_MINUS_CONSTANT_COLOR into .osg 2004-09-01 09:00:20 +00:00
Don BURNS
573079fbae Added Visual Studio files for osgPlugin net 2004-08-31 21:06:01 +00:00
Don BURNS
3c0ea75e28 added makeDir - temporary UNIX only 2004-08-31 20:49:23 +00:00
Don BURNS
b7b3c7cd10 Fixes (hopefully) for windows and other platforms... 2004-08-31 20:26:54 +00:00
Robert Osfield
de686f409b Added support for spherical texture mapping and better file search support 
for meterial files.
 2004-08-31 14:48:05 +00:00
Don BURNS
15def16d43 Added cache_mode option to Net plugin 2004-08-31 01:12:56 +00:00
Don BURNS
0724243959 Added the local_cache_dir option to the net plug-in allowing for the 
keeping and populating of a local cache.  With this option, the cache
is checked first before fetching from the network.
 2004-08-30 01:15:49 +00:00
Robert Osfield
6a82bb28fc Added handling of $ comment line, and 'g' empty group name 2004-08-29 15:09:26 +00:00
Don BURNS
2f4a384fa9 Added two options to the .net loader: 
hostname=<hostname>  - Specify the host to connect to to retreive files
  server_prefix=<directory> - Specify a prefix to each file indicating
                              a directory for the server to look into
Also, the .net server now does not require a file to have the .net
suffix.  ALl this together now means that you can do this:

    osgviewer -e net -O "hostname=openscenegraph.org server_prefix=BlueMarble" earth.ive

And view the whole earth streamed from a server.
 2004-08-29 00:57:02 +00:00
Don BURNS
3e74db50e5 Changes for IRIX build and fix to build system 2004-08-28 23:04:47 +00:00
Don BURNS
2a3f7b2799 Added the .net plug-in. This allows the reading of files by 
specifying <host>:file.<ext>.net for example:

    osgviewer osgcvs.no-ip.com:OSGModels/cow.osg.net
 2004-08-28 07:25:21 +00:00
Robert Osfield
255c27d552 Added a new osgDB::appendPlatformSpecificLibraryFilePaths() method to FileUtils.cpp 
Includes a new OSX code from Eric Wing
 2004-08-27 16:14:21 +00:00
Robert Osfield
79bcd892bd Added .tif extension to handled extension list 2004-08-27 14:56:08 +00:00
Robert Osfield
5d8d05970e Added handling of short (<=4 points) polygons as tri fans and the rest 
as polygons which are tesselated, to improve load and build time, yet
still resselating the large polygons that need it.
 2004-08-27 08:03:26 +00:00
Robert Osfield
b5c2d85962 Improvements to handling of winding of polygons. 2004-08-26 16:20:26 +00:00
Robert Osfield
71149635fc Removed debugging output. 2004-08-26 14:52:14 +00:00
Robert Osfield
889704964b Rewrite of OBJ parser + converter to OSG 2004-08-26 14:33:38 +00:00
Robert Osfield
8c92d043ad Removed "interlace" debugging message 2004-08-24 18:27:47 +00:00
Robert Osfield
91dfbf1f06 Added support for looping mode 2004-08-24 13:25:45 +00:00
Robert Osfield
b2d39d7f5b Added s/getLoopingMode() to ImageStream and MPEG plugin 2004-08-24 12:55:15 +00:00
Robert Osfield
314874cf81 Made the command buffer have 20 elements in it to protect against wrapping 
around.
 2004-08-24 08:43:53 +00:00
Robert Osfield
ffc5dfb83b Changed the "flip" keyword to "dds_flip" 2004-08-17 07:44:31 +00:00
Robert Osfield
4f376529b7 Added support for "flip" option string, which if present flips incoming 
images about the vertical axis.  Accessed via -O flip on the commandline.
 2004-08-16 21:14:19 +00:00
Robert Osfield
7d41c7f4c3 Cleaned up output level of debugging messages 2004-08-16 14:21:31 +00:00
Robert Osfield
dc0bc861b2 Fix to order of materials 2004-08-16 14:03:17 +00:00
Robert Osfield
87a2a282be From Michael Gronager, addition of NodeCallback support in .osg format. 2004-08-16 13:54:40 +00:00
Robert Osfield
a8c05e9342 Improvements to the handling of OBJ files 2004-08-16 13:17:29 +00:00
Robert Osfield
3568e60718 Changed the "Reading a byte swapped file" message to info level. 2004-08-13 12:38:12 +00:00
Robert Osfield
195a1be76e Fix for VS6.0 build 2004-08-13 12:05:08 +00:00
Robert Osfield
740524bb56 Added support for the "precision <value>" options string 2004-08-06 08:56:18 +00:00
Robert Osfield
3579506fa8 Added support for osg::AutoTransform::setAutoRotateMode(AutoRotateMode) deprecating 
the previous setAutoRotateToScreen().  Added support for ROTATE_TO_CAMERA mode.

Cleaned up the autotransform demo to use a sensible number of labels
 2004-08-06 08:22:58 +00:00
Robert Osfield
b57a4ec323 From Marco Jez, VS.NET warning fixes. 2004-08-05 13:41:52 +00:00
Robert Osfield
e59fcfe6ce Cleaned up the gdal-config usage to work with gdal-1.1.9 2004-08-04 10:03:57 +00:00
Robert Osfield
7eb3f2646e From Norman Vine (with small tweaks by Robert Osfield), build fixes for Cygwin 2004-08-04 08:27:43 +00:00
Robert Osfield
5cfe2e2d91 From Don Tidrow, build fix for Peformer 2004-08-04 06:57:03 +00:00
Robert Osfield
7da65a859e Added include of scoped lock 2004-08-03 12:38:11 +00:00
Robert Osfield
7a7358553f Fixed warning 2004-08-02 15:52:50 +00:00
Robert Osfield
2d901bf7ee Fixed warnings 2004-08-02 14:52:24 +00:00
Robert Osfield
6524fe1293 From Norman Vine, fixes for Mingw 2004-08-02 09:11:31 +00:00
Robert Osfield
4d9bd4d825 Build fixes for gcc 3.4.1 support 2004-08-01 08:26:44 +00:00
Robert Osfield
8d1b390c7e Removed old iv plugin 2004-08-01 04:10:54 +00:00
Robert Osfield
cb31021ab0 From Corbin Holtz, addition of GDAL_INCLUDE and GDAL_LIB env vars for setting 
a non standard location of GDAL
 2004-07-28 12:29:15 +00:00
Robert Osfield
aa619be4c1 Added initializer for _videoWriteData and _rows pointers 2004-07-28 12:27:25 +00:00
Robert Osfield
0073978894 Added double buffer of video imagery so that the OpenGL never reads as Mpeg writes 2004-07-28 08:28:31 +00:00
Robert Osfield
29d21dabec Made the static mutex a pointer to a static mutex to get round a exit 
problem on deletion of the plugin.
 2004-07-27 15:14:52 +00:00
Robert Osfield
7deea8531e Clean up of debugging messages 2004-07-27 13:32:15 +00:00
Robert Osfield
2e524ed9d7 Changes to fix multiple thread start. 2004-07-27 10:23:11 +00:00
Robert Osfield
a4f93740d1 Fixed double thread start problem. 2004-07-27 09:04:56 +00:00
Robert Osfield
7c05fe8906 Fixed iddle update. 2004-07-23 09:49:04 +00:00
Robert Osfield
cf62f7097d Added ImageStream::quit(bool) for exiting from video threads, and added 
clean up to OsgCameGroup to quit movie threads automatically.
 2004-07-23 09:15:22 +00:00
Robert Osfield
1fa4bd8ab4 Fixed build 2004-07-22 15:41:13 +00:00
Robert Osfield
f75d109e12 Added more usage mutex to serialize access to Quicktime. 2004-07-22 15:11:14 +00:00
Robert Osfield
b0a371ddb0 Added missing tex env mode 2004-07-21 19:15:34 +00:00
Robert Osfield
9232aac60d Removed the stop method, replacing it by pause 2004-07-21 19:01:40 +00:00
Robert Osfield
d1981df21f Removed the stop method 2004-07-21 19:01:16 +00:00
Robert Osfield
24df4b93d6 Clean up of thread handling. 2004-07-21 10:01:56 +00:00
Robert Osfield
dfaed29d6b From Geoff Michel, fixes. 2004-07-20 18:50:30 +00:00
Robert Osfield
aed65903db From Bob Kuehne, add usage of version number to differentiate between 
rev's of the LOD.
 2004-07-20 07:46:05 +00:00
Robert Osfield
12a315ec1d From Eric Sokolosky, added INVENTOR_INCLUDE and INVENTOR_LIB vars. 2004-07-20 05:36:44 +00:00
Robert Osfield
d5aea35895 From Geoff Michel, fix for handling of texture filenames enclosed in quotes. 2004-07-19 18:35:01 +00:00
Robert Osfield
f9ea73fbe2 From Mike Weiblen, updates to the psuedo loaders to add documentation. 2004-07-17 10:33:26 +00:00
Robert Osfield
3c7dfa389d Added mutex to image stream thread to serialize calls to Quicktime. 2004-07-06 15:10:33 +00:00
Robert Osfield
105c3568f8 From Geoff Michel, replaced used C style FILE with iostream. 2004-07-06 13:00:14 +00:00
Don BURNS
4c5f33d397 Changed internal formatt on jpeg loader to be GL_RGB, GL_RGBA, etc. rather 
than numComponents.
 2004-07-05 16:21:43 +00:00
Robert Osfield
2ce192f0ae Change the light in LightSource from a generic osg::StateAttribute to 
a osg::Light.
 2004-07-02 14:46:24 +00:00
Robert Osfield
a0eead991f Fixed indenting 2004-07-01 14:22:11 +00:00
Robert Osfield
0c38189018 Moved the radius parameter from PageLOD into LOD. 2004-07-01 13:53:30 +00:00
Robert Osfield
d4c46df7ce Fixed parsing of internalTextureFormat. 2004-06-29 08:03:28 +00:00
Robert Osfield
9b03d8c67e Fixed warnings. 2004-06-28 21:39:31 +00:00
Robert Osfield
0887e22c3f Added .osg support for new TexGenNode 2004-06-28 15:09:49 +00:00
Robert Osfield
124f64c55f Fixed warning 2004-06-28 14:18:48 +00:00
Robert Osfield
ca96c9e731 From Michael Logan, build fix for Performer plugin 2004-06-28 13:18:31 +00:00
Robert Osfield
db43e34bce From Michael Gronager, added support for alpha channel in writing of BMP images 2004-06-28 13:18:10 +00:00
Robert Osfield
6de63f097b From Eric Sokolowsky. Added missing blend modes into .osg reading and writing 
and fixed typo.
 2004-06-28 12:52:13 +00:00
Robert Osfield
20de9666dd From Terry Welsh, added support for reading and writing osg::FragmentProgram 
local parameters.
 2004-06-28 10:00:21 +00:00
Robert Osfield
8b0a98f03c Added Marco's AutoTransform.cpp 2004-06-15 12:26:39 +00:00
Robert Osfield
616ee0928a From Marco Jez, implemented I/O support for the AutoTransform node. 2004-06-14 20:12:04 +00:00
Robert Osfield
ade10ccebc Improved precision of AnimationPath IO. 2004-06-14 20:10:08 +00:00
Robert Osfield
2d35b3cc27 Changed Billboard::g/setPos(..) to g/setPosition(..). 2004-06-14 19:34:43 +00:00
Robert Osfield
6f03f991b3 Changed the color binding to better reflect the settings in the OpenFlight file. 2004-06-11 21:05:07 +00:00
Robert Osfield
09d585561a Added missing setColorBinding() into ConvertFromFLT::setMeshColors(). 2004-06-11 14:49:22 +00:00
Robert Osfield
343fa27fcd From Troy Yee, fixes to handling meshes. 
From Robert Osfield, replaced assert(0)'s with error messages.
 2004-06-10 15:43:56 +00:00
Robert Osfield
3adacbdeb7 Changed the *(itr++) instances with *(itr), *(itr+1) with a seperate itr+=n etc. This 
has been done to avoid VC6.0 optimization ordering problems.
 2004-06-09 16:28:51 +00:00
Robert Osfield
a8ce6b01d6 Added CoordinateSystem::s/getFormat(). 2004-06-09 15:00:03 +00:00
Robert Osfield
eec378a885 Moved the osg::ClusterCullingCallback into into own header and source file. 2004-06-07 15:05:22 +00:00
Robert Osfield
9236f6daa8 From George Tarantilils, add missing handling of alpha channel. 2004-05-25 20:40:26 +00:00
Robert Osfield
eb3917060f From George Tarantilis, fixes to DDS size computations. 
From Robert Osfield, addition of constructors for internal DDS structures.
 2004-05-25 16:10:28 +00:00
Robert Osfield
5312bcc54a Updates the movie support 2004-05-25 14:32:20 +00:00
Robert Osfield
eac7fdff76 From Alberto Farre, fixes to the computation of sizes 2004-05-24 19:50:13 +00:00
Robert Osfield
f8daf206ab Improved support for new double Vec* classes 2004-05-20 12:57:06 +00:00
Robert Osfield
f02c75f5ea Added Vec2d, Vec3d and Vec4d classes, and remapped Vec2, Vec3 and Vec4 to 
Vec2f, Vec3f an Vec4f respectively, with typedef's to the from Vec* to Vec*f.
 2004-05-20 10:15:48 +00:00
Robert Osfield
ae5aefac0e Added the beginings of new osgParticle Explosion, Fire and SmokeEffects. 
Added support for generation explosion, fire and smoke effects in osgsimulation
 2004-05-13 22:09:23 +00:00
Robert Osfield
90579a0e17 Fixes for FreeBSD 2004-05-12 20:31:58 +00:00
Robert Osfield
82562e5bdd From Eric Sokolowsky, fixed problems in PNG plugin for handling 
paletted images which contain alpha values.
 2004-05-12 10:45:36 +00:00
Robert Osfield
f66599e00c From Eric Sokolosky, with further additions from Robert, added support 
for RGBA TIFF files
 2004-05-11 20:44:31 +00:00
Robert Osfield
6f34ef29f8 From Joran Jessurun, "I needed to be able to set the quality of the saved jpeg images. I could 
not find a way to do this in OSG. Therefore I implemented this by adding
an option called: JPEG_QUALITY <quality> to the JPEG reader/writer.

To parse the options string I use the same method as used in the LWO
reader/writer. "
 2004-05-09 07:06:32 +00:00
Robert Osfield
86d323752d From Corbin Holtz, "I have completed my mods to the OpenFlight loader (modified files are 
attached):
   * Light point strings using the REPLICATE opcode should now be supported
(>=15.6?)

   * Directional lights should now work as in Performer using a viewing
frustrum defined by a direction vector, horizontal angular width, vertical
angular width, and roll angle about the direction vector.  The current
directional light implementation had some bad assumptions which caused
problems with direction vectors not on the XY plane.

   * IVE and OSG reader/writers were updated as appropriate"
 2004-05-08 22:18:38 +00:00
Robert Osfield
b6c1c44bd0 From Paul Martz, 
"Changes to provide rudimentary support for OF 15.8 light point
animation palettes. This change also includes light point palette override
support for external references. This is the last of my code changes to
support OF 15.8 in the flt loader. Barring bugs, of course, knock on wood.

The gist of the animation palette code is to create ref_ptr'd
osgSim::BlinkSequence objects for each palette entry, and then pass them on
to osgSim::LightPoint for any OpenFlight light points that reference that
palette entry. This should be conservative of memory (not that I expect the
animation palette to be extremely large)."
 2004-05-08 21:33:25 +00:00
Robert Osfield
3a8e5fc6b4 From Yefei Hi, replaced windows specific function with sprintf to afford 
better cross platform portability.
 2004-05-07 19:58:56 +00:00
Robert Osfield
bdeb391a00 From Mike Weiblen, added new rot, scale and trans pseudo loaders. 2004-05-07 15:18:59 +00:00
Robert Osfield
a196ea1d5d From Yefei Hi,fix to MultiSwitch set up, and adding of parsing of description 
fields (which is presently #if 0'd out while a compile problem is resolved.)
 2004-05-07 14:51:33 +00:00
Robert Osfield
bc3c6c2edf Fixed tabbing to be all four spaced tabs 2004-05-07 14:44:58 +00:00
Robert Osfield
9978c02b7f From Julian, fix to handling of multi-textures 2004-05-07 14:33:15 +00:00
Robert Osfield
324437d1e5 From Don Tidrow, changed cerr usage to osg::notify() 2004-05-07 11:09:05 +00:00
Robert Osfield
fced94fab3 Added support for decoration of the osgTerrain::DataSet generated databases 
with a CoordinateSystemNode which reflect the coordinate system of the
database.

Added support for reading and writing CoordianteSystemNode into the .osg
and .ive formats.
 2004-05-02 21:50:15 +00:00
Robert Osfield
f7d3f58470 Warnings fix for VS7.0 from Mike Weiblen 2004-04-29 21:57:42 +00:00
Robert Osfield
181761e56f Changed M_PI to osg::PI. 2004-04-28 15:07:08 +00:00
Robert Osfield
77f9a4d083 Added searching of the filepath. 2004-04-21 13:20:48 +00:00
Robert Osfield
e524092e1e Changed std::cout to osg::notify 2004-04-18 14:12:07 +00:00
Robert Osfield
7a6e9e35ec Changed std::cout to osg::notify 2004-04-18 14:02:09 +00:00
Robert Osfield
4df7836f65 From Marco Jez, "fixes a bug that prevented mipmaps in images from being read correctly (the call to 
setImage() clears the previously filled _mipmapData vector)."
 2004-04-18 13:44:09 +00:00
Robert Osfield
97ef4985f7 From Eric Wing, clean ups for OSX support. 2004-04-11 21:21:38 +00:00
Robert Osfield
ae7ceae631 From Paul Martz, added support for OpenFlight15.8 LightPointSystems 2004-04-10 11:30:16 +00:00
Robert Osfield
db9c192a37 Added an alteranive code path for the fallback for handling opaque texture 
blending.
 2004-04-07 18:38:06 +00:00
Robert Osfield
cb213d0ff4 From Paul Martz, changes to better support OpenFlight 15.8 2004-04-07 08:57:15 +00:00
Robert Osfield
459b350eb9 Fixed comments on the OBJ coords system 2004-04-06 20:15:11 +00:00
Robert Osfield
0b1f6fedc9 Changed the comment to make it clear what axis change is implementated. 2004-04-01 07:49:32 +00:00
Robert Osfield
74ef590992 Fixed handling of FOURCC_DXT1 pixel format. 2004-03-29 09:32:35 +00:00