Commit Graph

175 Commits

Author SHA1 Message Date
Robert Osfield
ce07879e2e Moved plugins across to using ReaderWriter::Options* for search paths in addition
to standard osgDB::DataFilePaths
2004-11-22 23:54:45 +00:00
Robert Osfield
1f5b044c71 Made ReaderWriter::className const 2004-10-26 10:26:43 +00:00
Robert Osfield
1dd682f6b4 From Fred Mammond, fixes for x86_64 build 2004-10-24 17:50:54 +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
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
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
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
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
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
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
ae7ceae631 From Paul Martz, added support for OpenFlight15.8 LightPointSystems 2004-04-10 11:30:16 +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
231b4c7564 From Paul Martz, code change to make the flt loader pass its light point intensity value in to osgSim::LightPoint. 2004-03-20 17:21:53 +00:00
Robert Osfield
1aa0592878 From Paul Martz, "The attached code change causes the flt plugin to leave _sector unset if the
direction normal has a zero length. The net effect is that unidirectional
light points with zero length direction vectors are now treated as
omnidirectional light points."
2004-03-17 20:34:23 +00:00
Robert Osfield
c4deb5510f From Paul Martz, added (non-meters) unit scaling to the flt plugin
failed to set the scaling of external references.
2004-03-17 08:15:24 +00:00
Robert Osfield
3bf1bbdabd From Paul Martz, "I've added support for indexed light points and the light
point appearance palette to the OpenFlight loader. Both are 15.8 features.
I also added parsing/comments regarding other things that have changed for
v15.8."
2004-03-14 15:26:36 +00:00
Robert Osfield
cdd9c2ae25 From Paul Martz, fix to the scaling of light points in flt plugin. 2004-03-09 23:00:01 +00:00
Robert Osfield
8d25f0766a From Paul Marz : "Input.h, Input.cpp -- Here's where support for reading the continuation
record goes. I added a new function to read a continued record body. I added
code in the existing ReadRecord routine to peek ahead for a CONTINUATION_OP
if the current record could possibly be continued.

opcodes.h -- Besides adding the opcode for CONTINUATION_OP, I also added new
15.8 opcodes. I labeled opcodes as "ignored" if I could easily discern that
our loader wasn't doing anything with them. For historical reasons, I added
all obsolete opcodes, prefixed with "OBS_".

LocalVertexPoolRecord.h, LocalVertexPoolRecord.cpp -- This is one of three
types of records that can be continued with a CONTINUATION_OP record. I
removed all invalid assertions that assumed the record length would always
be less than 65535. I replaced the "vertex size" calculation with a more
efficient method based on caching the size from attribute bits, rather than
taking the length of the record and dividing it by numVerts (which would
have been incorrect if the record had been continued)."
2004-03-06 15:03:55 +00:00
Robert Osfield
0a3384de64 From Paul Martz/Robert Osfield. Addition of initializers in AttrData to prevent
bugs due to uninitialized memory references.
2004-03-04 18:35:06 +00:00
Robert Osfield
88f2f38741 From Paul Martz, fix to the byte swapping of the version number 2004-03-04 16:38:56 +00:00
Robert Osfield
cfe376b644 From Paul Martz, with a couple of mods by Robert Osfield:
"Changes to return the lat/long origin of an
OpenFlight model as userData of the root node object."
2004-03-02 16:12:11 +00:00
Robert Osfield
adcb6665d4 From Paul Martz:
"These two files fix the alignment bug in the flt plugin header
parsing, which I posted about on Saturday. They go in the flt plugin
directory.

The fix is to memcpy the data read from the flt file into individual fields
in our Header struct, then replace the raw (packed) data block with our
header struct. This avoids the alignment problem entirely, and all fields
now contain valid data."
2004-03-02 15:37:41 +00:00
Don BURNS
fc3d4aa5f0 Submission by Paul Martz for doing units conversions on flight files. 2004-02-12 18:40:15 +00:00
Don BURNS
362cc3ccc3 Fixed WIREFRAME_CLOSED swap in flt loader. submitted by Andreas Ekstrand 2004-01-28 22:23:10 +00:00
Robert Osfield
9927c664b5 Merged changes from Cobin Holtz for support of "noUnitsConversion" via
the ReaderWriter::Options string.
2004-01-06 12:27:20 +00:00
Robert Osfield
3702947ef9 From Jeremy Bell, add -losgText to fix OSX compile. 2003-12-13 22:07:55 +00:00
Robert Osfield
83bf813e58 Moved the responsibility for finding file to load on to the ReaderWriter plugins,
instead of osgDB::Registry where it original lay.  This has been done to allow
fileName strings to be encode data rather than just file names, such as one
requires when using PagedLOD along with plugins for doing dynamic tesselation.
2003-12-08 11:24:43 +00:00
Robert Osfield
dd44734635 From Nikolaus Hanekamp, Fixes to lightpoint code 2003-11-27 13:31:16 +00:00
Robert Osfield
d41a3de37c From Trajce Nikolov:
> There are databases that contain both Matrix and GeneralMatrix records as
> ancillary records. If this happens, this fix will only use one matrix to
> create osg::TransformMatrix node.
2003-11-27 13:25:52 +00:00
Robert Osfield
d950ee8410 Addition of light point. 2003-11-26 16:56:32 +00:00
Robert Osfield
72ba462251 Added osgSim::MultiSwitch and support for it in the OpenFlight and
.osg plugins
2003-11-25 15:58:57 +00:00
Robert Osfield
31c5528ffb Moved osg::DOFTransform to osgSim::DOFTransform.
Fixed crash associated with .osg files which contain empty description fields.

From Sondra Inverson, added support to .ive plugin for osgSim::DOFTransform.
2003-11-25 14:11:05 +00:00
Robert Osfield
357078f207 From Trajce Nicklov, support for GeneralMatrix record 2003-11-25 10:47:13 +00:00
Robert Osfield
689e11693a From Alberto Farre, added support for nesting of files. 2003-11-25 10:32:23 +00:00
Robert Osfield
bd686c4598 From Michael Morrison, added support for the OpenFlight BSPRecord, simply
mapping it to a Group.
2003-11-25 10:20:21 +00:00
Robert Osfield
21881490cd From Dean Iversion, fix to the ReaderWriter::Options management in Pool.cpp 2003-11-11 08:52:41 +00:00
Robert Osfield
980cfc78f9 Renamed _mips to _mipMapKernel 2003-10-31 10:11:38 +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
c342b29a04 Warning fixes for Win32. 2003-09-16 19:56:19 +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