Commit Graph

5372 Commits

Author SHA1 Message Date
Robert Osfield
2c2083db72 From Vivek Rajan, "Rotated text in SCREEN_COORDS was looking a little squished especially
in orthographic projection. Performing the rotation before the scaling
fixed the problem. I've attached Text.cpp with the fix."

From Robert Osfield, in keeping with Vivek's change moved the auto rotate to screen befor the scale as well.
2006-07-06 08:36:12 +00:00
Robert Osfield
d7f1c34df8 From Eric Sokolowsky, "The attached Texture.cpp fixes a problem when subloading compressed
textures.  Near the top of the function that implements texture
subloading, osg::Texture::applyTexImage2D_subload(), the local variable
compressed_image examines the _image's_ pixel format to see if it is
compressed. However, further on, in calls to getCompressedSize() the
_texture's_ pixel format is used. In my application's Texture2D class,
I use osg::Texture::USE_ARB_COMPRESSION to
osg::Texture2D::setInternalFormatMode(), which causes the internal format
to become one of the generic ARB_COMPRESSED types, which do not have a
specific size. Thus the recent warning message added to
osg::Texture::getCompressedSize() is triggered. The correct behavior is
to use the format mode from the Image class instead of the Texture class
within the subload implementation, and then the size is calculated
correctly."
2006-07-05 21:52:36 +00:00
Robert Osfield
7caccc5ece Updated AUTHORS file 2006-07-05 21:12:45 +00:00
Robert Osfield
1d6f2884b1 Fixed typo. 2006-07-05 21:12:24 +00:00
Robert Osfield
5622e0d202 From Brede Johansen, "Changed ">" to ">=" when testing for version 16.1 or later." 2006-07-05 20:56:37 +00:00
Robert Osfield
0f209a5362 From Eric Sokolowsky, "There is code in Image.cpp that calculates the size of a compressed image
based on the internal format. There is similar code in the Texture class
but it does not account for the ARB types. I modified the Texture class
implementation to show a warning when an incomplete internal format is
used to calculate the image size."
2006-07-05 13:44:07 +00:00
Robert Osfield
822ef01531 Added mutex to the test context. 2006-07-05 13:31:38 +00:00
Robert Osfield
b871ae5cf7 Added vertex program hack to get round apparent NVidia bug when handling
vertex texture read.
2006-07-05 13:18:00 +00:00
Robert Osfield
d91ebd42c3 Updated AUTHORS file 2006-07-05 12:54:18 +00:00
Robert Osfield
bb459bb871 More fixes for typos 2006-07-05 12:51:41 +00:00
Robert Osfield
f1505a8485 Updated AUTHORS file 2006-07-05 10:48:04 +00:00
Robert Osfield
2105f12a69 Updated osgversion to correct for ChangeLog typos. 2006-07-05 10:47:38 +00:00
Robert Osfield
4a00fc013c Updated ChangeLog. 2006-07-05 10:29:46 +00:00
Robert Osfield
7b1c07d834 Updated NEWS. 2006-07-05 10:24:24 +00:00
Robert Osfield
0735ebc93e First steps towards updating NEWS for 1.1 release 2006-07-05 10:23:39 +00:00
Robert Osfield
9ae10af995 Fixed warnings 2006-07-05 09:52:03 +00:00
Robert Osfield
a0050bc8db From Markus Trenkwalder, "Mingws gcc includes a file called types.h which in turn defines
_TYPES_H_.  types.h in the directx plugin defines the same include
guard.  I've renamed the guard name in this file to _DX_TYPES_H_.  Now
the plugin compile in mingw too."
2006-07-05 08:59:23 +00:00
Robert Osfield
7c1926118a From Brede Johansen, renaned FLT_preserveFace to preserveFace 2006-07-05 08:55:23 +00:00
Robert Osfield
ce4b3a7b9e Changed parameter name from osberver_ptr to observer. 2006-07-04 19:58:53 +00:00
Robert Osfield
6c6c131452 From Paul Martz,
"Previously, the new OpenFlight plugin only allowed ext ref models to use
their own palettes. With this change, parent models can override child model
palettes with the parent palettes.

These changes are made against very current CVS (just updated about 1/2 hour
ago, eliminated conflicts, and retested before this posting).

To regurgitate what I did:

A new class, ParentPools (public osg::Referenced), is created when an ext
ref record is parsed, and it is populated with any parent model pools that
should override the child model pools (according to bits in the ext ref
record). The ParentPools object is then set as UserData on the ProxyNode
corresponding to the ext ref.

When the ReadExternalsVisitor hits the ProxyNode, it takes its UserData and
sets it as UserData in the Options parameter to the osgDB::ReadNode call,
which then read the ext ref model. In the course of parsing the Options
string, ReaderWriterFLT also looks at the Options UserData and sets the
parent pools in the Document class accordingly.

When palette records are encountered while loading a file, they are ignored
if the corresponding pool was set by the parent.

Thanks to Brede for consulting with me on the implementation.
"
2006-07-04 19:54:29 +00:00
Robert Osfield
00fbfd4835 Updated wrappers. 2006-07-04 14:37:56 +00:00
Robert Osfield
e7d9e91525 From Stephan Huber,
"attached you'll find some modifications to Producer, osgGA and
osgProducer to enable Mac OS X support for

+ scrollwheels,
+ mightymouse-srollballs
+ new tracking-pads with scroll feature
+ tablet-support (pressure, proximity and pointertype) (Wacom only tested)

I think there was a bug in the windows-implementation of scroll-wheel
support (wrong order of ScrollingMotion-enum, casting problem) which is
fixed now.

The scrollwheel-code is a bit klunky across platforms, some devices on
OS X can report an absolute delta in pixel-coordinates not only the
direction, so for now there is scrollingMotion (which describes the
direction) and scrolldeltax and scrolldeltay. I decided to leave the
scrollingmotion-stuff to not break old code relying on this."
2006-07-04 14:18:44 +00:00
Robert Osfield
b0d738384f Updated wrappers. 2006-07-04 13:56:38 +00:00
Robert Osfield
3ad5140942 Change osgText so that the Text drawable now can have its own StateSet
that users can assign to it without it being overriden.  If none is
assigned externally it now uses a StateSet associated wit the Font assigned
to the Text.
2006-07-04 13:56:29 +00:00
Robert Osfield
e8a3444b88 From Brede Johansen,
"The attached file corrects two small typos in MultiSwitch.cpp.  The
local "values" reference and the "_values" member attribute are of
different types but both are vectors so the size() operator happily
compiles.  A renaming of _values to _masks or similar may be a more
future proof solution but the submission only removes the underscore
in two places.

The switch_1701.flt model part of the Creator gallery revealed this bug."
2006-07-04 13:33:19 +00:00
Robert Osfield
7511fce540 Fix to Registry::read(ReadFunctor) to better handle reporting of errors 2006-07-04 12:57:59 +00:00
Robert Osfield
c8aec2a07d Fixed warnings. 2006-07-04 11:24:36 +00:00
Robert Osfield
0170689c9d Warning fix. 2006-07-04 10:55:58 +00:00
Robert Osfield
eff37b0fdf Warning fix 2006-07-04 10:52:16 +00:00
Robert Osfield
b6b9e4bc7e fixed warning and add a few extra tests 2006-07-04 09:46:41 +00:00
Robert Osfield
f1e7b6d5cb From Roland Smeenk, Added missing initialization to zero of the _carryOver value in
default and copy constructor.
2006-07-04 09:18:04 +00:00
Robert Osfield
62ecea541d From Ulrich Hertlein, updates to DirectX loader 2006-07-04 09:13:15 +00:00
Robert Osfield
5e9076ec10 From Brede Johansen, set the default value of texture wrap mode to REPEAT to fix problem
with database without .attr files.
2006-07-03 20:28:26 +00:00
Robert Osfield
e4dea2b8c4 Fixed a couple of warnings. 2006-07-03 16:31:30 +00:00
Robert Osfield
70391108fd Fixed orientation and lighting of model. 2006-07-03 16:21:57 +00:00
Robert Osfield
7a42716036 Removed template methods that were break VS6.0 build. 2006-07-03 15:21:08 +00:00
Robert Osfield
c986f6ea41 Added a performace test section to osgunitests, currently just does basic C/C++ tests. 2006-07-03 13:53:39 +00:00
Robert Osfield
07ac167fa8 Added merge geodes and geometries optimizer call 2006-07-03 10:47:16 +00:00
Robert Osfield
c90e35038a From Eric Sokolowski, "Added the ability to read and write images directly in the ive plugin,
through the osgDB::readImageFile and osgDB::writeImageFile functions.
This is useful for storing compressed textures on disk for rapid playback
for animations."
2006-07-03 09:26:12 +00:00
Robert Osfield
e7d04408d3 From Michael Platings, added support for blend seperates to .ive and .osg 2006-07-03 09:22:11 +00:00
Robert Osfield
8b445af79b Updated wrappers. 2006-06-30 13:50:32 +00:00
Robert Osfield
f181228d4a From Michael Platings, added support for glBlendFuncSeperate. 2006-06-30 13:50:02 +00:00
Robert Osfield
6a2387373c From Eric Sokolowsky, made a couple of methods static. 2006-06-30 13:47:12 +00:00
Robert Osfield
4ce0d8af64 From David Callu, compile fix for gcc 4.1 2006-06-29 19:38:07 +00:00
Robert Osfield
30265ac0b3 Added support for RenderBin's have a local top level StateSet. This is now
used by default in the depth sorted bin.
2006-06-29 15:57:24 +00:00
Robert Osfield
d74397ce58 Updated wrappers 2006-06-29 11:57:15 +00:00
Robert Osfield
2b293df713 Updated wrappers. 2006-06-29 11:00:08 +00:00
Robert Osfield
ee72373bfa Updated wrappers 2006-06-29 10:19:44 +00:00
Robert Osfield
a6fbb7a044 Changed _WIN32 to _MSC_VER 2006-06-29 10:17:19 +00:00
Robert Osfield
459f147da7 From Eric Wing, updates to QuickTime plugin 2006-06-29 10:06:27 +00:00