Commit Graph

1199 Commits

Author SHA1 Message Date
Robert Osfield
3b499341ed From Philipp Siemoleit,
There are some group codes (i.e. "62") which are interpreted as
    dxfDataType::SHORT. That's right because the dxf-specification defines
    "16 bit integer" as the type for the corresponding value.
    But readerBase::readGroup() calls readValue(std::ifstream&, unsigned
    short). I changed readValue(std::ifstream&, unsigned short) to
    readValue(std::ifstream&, short). I found no group code at the dxf-specs
    which needs a "16 bit unsigned integer" value. So the
    readValue(std::ifstream&, unsigned short) function is obsolete - right?
2006-06-26 09:30:16 +00:00
Robert Osfield
2e2684c05a From Paul Martz, added support to textured light points into osgSim and OpenFlight loader, as part of the OpenFlight v16.0 spec. 2006-06-08 14:32:02 +00:00
Robert Osfield
e1c77dfe2a Minor tweaks of ints to unsigned ints 2006-05-16 21:20:36 +00:00
Robert Osfield
90fc234cf1 From Mike Weiblen, support for new Uniform arrays.
From Robert Osfield, refactor of above with original code to ensure backwards compatibility.
2006-05-16 21:00:15 +00:00
Robert Osfield
bf065ed3a4 From Mike Weiblen, support GLSL uniform arrays. A couple of tweaks and fixes from Robert Osfield. 2006-05-15 15:46:08 +00:00
Robert Osfield
d42a8fd269 From Paul Martz, "This change is based on current CVS. (Note both Brede and I have submitted
changes to this plugin that aren't in current CVS yet -- this change is
based on current CVS, not our changed files.)

This changes how shader palette records are parsed to support GLSL per the
OpenFlight 16.1 spec. Existing functionality for 16.0 files is preserved.

The change to Document.h simply adds an enum for VERSION_16_1."
2006-05-15 13:22:59 +00:00
Robert Osfield
56d4c7a269 From Paul Martz, "add support for the v16.0 "Add" texture environment and "mirrored repeat" wrap mode." 2006-05-15 11:27:07 +00:00
Robert Osfield
fdda54e77e Changed instances of setCoord(const Vec3) to setCoord(const Vec3&) style. 2006-05-15 11:22:08 +00:00
Robert Osfield
132b355d4f From Brede Johansen,
"- Replaced some member attributes with local variables in Face record.
 - Multitexture support in Vertex class.
 - Renamed VertexList to VertexListRecord (VertexList is now a Vertex array)
 - new Mesh (with reserved field at offset 12, thanks to Paul Martz)
 - new LocalVertexPool
 - new MeshPrimitive
 - Use ProxyNode for externals.
 - Local cache for externals"
2006-05-15 11:18:50 +00:00
Robert Osfield
f104656d9f From Carlos García and Paul Baker, Port of Paul Baker's Quake3 BSP loader to OSG by Carlos García.
Added Quake3 BSP plugin.
2006-05-15 09:46:54 +00:00
Robert Osfield
43f0efd6d2 Reorganised the Group::removeChild and Geode::removeDrawable methods so
that removeChild(Node*), removeChild(uint) and equivilant Geode methods are
now inline methods, not designed to be overriden, and seperated out the
multiple remove method to be called removeChildren(uint, uint) which is
now the only virtual method.  There removeChildren is now the method to
override in subclasses.

This reorganisation requires some call code to be rename removeChild usage
to removeChildren.
2006-05-02 09:45:31 +00:00
Robert Osfield
ffb4c79132 Ran dos2unix. 2006-05-01 16:13:37 +00:00
Don BURNS
f76a324c95 Don Tidrow's ifdef for MingW 2006-03-31 01:37:38 +00:00
Robert Osfield
7f101c37ad From Glenn Waldrom, addition of .ive support for PriorityOffset and PriorityScale. 2006-03-28 14:45:48 +00:00
Robert Osfield
7f731f330a From Farshid Lasharki, added IO suppoty fo osgParticle::ConstantRateContour 2006-03-18 07:07:19 +00:00
Robert Osfield
14dab7f818 From Farshid Lashkari, Added ability to read/write the texture tile
settings of osgParticle::Particle to .osg files.
2006-03-17 14:05:40 +00:00
Robert Osfield
3425ba9706 From Martin Naylor, build fix for Win32. 2006-03-15 11:21:44 +00:00
Robert Osfield
d43dbaeadd Build fixes 2006-03-14 13:18:21 +00:00
Robert Osfield
f3715665c0 Added 21 as the version number of xine video plugin to allow it work with latest versions of xine. 2006-03-14 09:33:14 +00:00
Robert Osfield
d50f2e3add From Andrew Sampson, "The terravista terrain generation tool can insert references to external model files into a terrapage tile. It unfortunately does not update the bounding sphere of that tile to include the extents of the external model. This means that if a large model (such as an airfield model) is attached to a tile, the model will disappear when the tile is off-screen (outside the view volume), even though the model is on-screen." 2006-03-13 21:20:07 +00:00
Robert Osfield
3246dde716 From Brede Johansen, new OpenFlight plugin!!!!!
By default the original flt plugin is still used, to select at runtime
the new plugin set the env OSG_OPEN_FLIGHT_PLUGIN=new
2006-03-08 21:38:37 +00:00
Robert Osfield
02f5681180 From Roger James, "1. Fixed a problem with the caching of textures when the associated image file was not in the current working directory. In this case the texture object was being placed in the cache with the short filename, but was looked up with the full path.
2. Fixed a problem with the caching of textures when CACHE_IMAGES was enabled. This caused a conflict is the names used to cache the image and texture objects.

3. Fixed a problem where AC3D generates surfaces with duplicate vertex indices.

4. Removed what I believe are redundant calls to the tesselator.

5. Added a couple of asserts which should fire in debug mode if my assumptions about 4. are incorrect.

6. Removed obviously unused code. (Stuff that was commented or ifdeffed out.)"

Note, from Robert Osfield, changed the asserts to if () report error using notify so we can catch errors in both optimized and debug builds, but without crashing.
2006-03-08 15:16:59 +00:00
Don BURNS
582967286a Improved the GET protocol for the http socket. By adding Connection: close
the server sends a EOF immediately after the data, improving performance
because readers are not left waiting for EOF.
2006-03-07 18:26:32 +00:00
Robert Osfield
cdc8b13f14 From Farshid Lashkari, support for writing to istream for the the TIFF plugin and support for
controlling PNG compression level via the the ReaderWriter::Option string "PNG_COMPRESSION <level>"
2006-03-02 20:39:20 +00:00
Robert Osfield
8796f37acb Added automatic toggling between png and jpeg when compressImageData option is used. Jpeg
is used to compress RGB data only, the just of the formats are passed on to the png plugin.
2006-03-02 20:31:40 +00:00
Robert Osfield
507fb0074f From Farshid Lashakari, support for png write. 2006-03-02 14:58:13 +00:00
Robert Osfield
74f073c2a8 From Farshid Lashkari, "I've attached another modified version of the IVE loader which
supports compressing the image data. The option to compress the data
is "compressImageData". Currently it uses the jpeg plugin to write the
image. Maybe we could add an option that allows the user to specify
which image format to use. The jpeg writer supports specifying the
quality of the jpeg, so you could use the following command line to
convert the skydome.osg model to IVE using 50% jpeg quality:

osgconv -O "compressImageData JPEG_QUALITY 50" skydome.osg skydome.ive"
2006-03-01 10:17:53 +00:00
Robert Osfield
58bdc6f92f Added TextureRectangle.cpp 2006-02-28 21:18:45 +00:00
Robert Osfield
10d139fc1f From Farshid Lashkari, "I've made some changes to the IVE loader which will add the capability
of saving image files inside the IVE file. Currently, only the raw
image data is saved into the file. If your model uses jpg images as
textures then this will cause your file size to increase.

I've added an option that will embed the original image file into the
IVE file. The IVE file will then attempt to read the image from
memory. Since most image loaders support reading from memory, this
shouldn't be a problem. To use this new feature the user must specify
the option "includeImageFileInIVEFile" when converting to IVE.

I tested this out on the "skydome.osg" model that comes with OSG.
Using the old method, the IVE file size would be 785 KB, with the new
method it is only 42 KB.

Also, I've added the support for TextureRectangle's to the IVE reader/writer."
2006-02-26 17:45:52 +00:00
Robert Osfield
964110f315 Completed .osg support for ClusterCullingCallback. 2006-02-23 20:37:19 +00:00
Robert Osfield
ae9e0e6838 Added initial cut of ClusterCullingCallback .osg support. 2006-02-21 21:28:57 +00:00
Robert Osfield
4a0a0a30ea From Trajce Nikolov, "small fix for the flt loader - the back color of the bidirectional light points" 2006-02-21 12:39:47 +00:00
Robert Osfield
7d5c81bf5e From Ulrich Hertlein, spelling corrections and a few Doxgen comments. 2006-02-20 21:05:23 +00:00
Robert Osfield
b0358c698a From Eric Sokolowsky, "There was a problem with the PNG plugin when it encounters an image that is
less than 8 bits per pixel (this can happen with greyscale or paletted images).
It was a pretty simple problem to fix."
2006-02-20 20:06:26 +00:00
Robert Osfield
af6af82e56 From Nathan Monteleone, addition of AutoTransform support. 2006-02-20 19:13:11 +00:00
Robert Osfield
9935b0fa27 Added missing swap byte operations to readVec*sArray() methods. 2006-02-20 15:46:29 +00:00
Robert Osfield
4b8fb5e5f9 From Daniel Larimer, fixed error is swap byte code handling vector<short> 2006-02-20 15:32:03 +00:00
Don BURNS
da9de96fae Added 'normals' pseudoloader 2006-02-06 19:40:45 +00:00
Don BURNS
d4bacf93cd Changes to zip and tgz plug-ins to allow for use of TEMP variable on Windows.
Submitted by Zach Deedler
2006-01-24 17:43:53 +00:00
Robert Osfield
cc1ee1fa26 From Marco Jez, adding osgDB::findDataFile() usage. 2006-01-18 12:16:45 +00:00
Robert Osfield
fe3b68dbb1 From Marco Jez:
here is a patch that enables a new option named "BIND_TEXTURE_MAP" in the LWO plugin. Its purpose is to allow explicit binding between texture UV maps defined in the LWO file and OpenGL texture units, overriding the default mechanism that allocates texture units automatically. This is useful when you have an UV map built in Lightwave (for example an atlas map) but no textures actually using it, so you can keep the UV map (that would be discarded otherwise) and add a texture later int your program.

Syntax is:
BIND_TEXTURE_MAP <map_name> <texunit>
2006-01-18 12:13:48 +00:00
Robert Osfield
2067543aea From Maya Leonard, ERSIShape VS project file, and compile fixes for Win32. 2006-01-18 12:03:55 +00:00
Robert Osfield
eaf6c5ac35 Added new BoxPlacer files. 2006-01-17 15:18:44 +00:00
Robert Osfield
c9b25a5b50 From Zach Deedler, addition of osgParticle/BoxSpacer. 2006-01-17 15:17:15 +00:00
Robert Osfield
b5f86d9984 Added support for an externally referenced shader file, via the keyword combinations
file "shader.vert"

OR

   file shader.vert.
2005-12-21 10:32:48 +00:00
Robert Osfield
523f608ba6 From Ali Botorabi, adding of osg::Depth support in .ive format. 2005-12-19 14:48:04 +00:00
Robert Osfield
cc78197fb3 From Paul de Repentigny, ciyple fo fixes for the DXF reader. 2005-12-15 15:36:55 +00:00
Robert Osfield
fcdf5826db Added a static_cast<std::streampos> to get round IRIX64 build problem. 2005-12-02 09:57:19 +00:00
Robert Osfield
b324156ec8 From Thom DeCarlo, build fix for Cygwin. 2005-12-01 13:38:27 +00:00
Robert Osfield
f3f86973a0 Added default opening of the file as a binary file, and once the type is
confirmed then close and reopen as an ascii as required.  This is done to get
round problems under Windows.

Also made the running of the SmoothingVisitor optional, now use -O smooth to
make the loader run the osgUtil::SmoothingVisitor over the model.
2005-11-29 18:38:40 +00:00