Commit Graph

1609 Commits

Author SHA1 Message Date
Robert Osfield
0476348a0c Added support for setting up VisualChoose with destination alpha, stencil and
quad buffers attributes from DisplaySettings values.
2003-03-20 14:07:03 +00:00
Robert Osfield
65485370f6 Added missing
setInterleavedArray( InterleaveArrayType format, float *ia, GLuint *iai )
method.
2003-03-20 08:43:38 +00:00
Robert Osfield
a3bb1da618 Added Endian test header to the core osg, and add use of the new
getCpuByteOrder test in LightPointDrawable.
2003-03-19 21:46:44 +00:00
Robert Osfield
21a74223e6 Added getCameraManipulator(unsigned int) method. 2003-03-19 21:14:50 +00:00
Robert Osfield
ca0ff266e2 First pass fix at implementing requestWarpPointer. 2003-03-19 15:49:21 +00:00
Robert Osfield
426e301c48 Addd a full screen toggle event handler to osgProducer & its viewer base
class.
2003-03-19 14:27:05 +00:00
Robert Osfield
74f8f18ad6 Added a realize callback to the OsgCameraGroup.
Move osgtexture3D across to using the new realize callback for creating its textures.
2003-03-19 12:06:29 +00:00
Robert Osfield
a7bb0126f5 Fixed crash in osgoccluder which was calling setUpViewer and the
osgProducer/Viewer was assuming that the update was always set.
2003-03-19 10:28:19 +00:00
Don BURNS
d241ca763b Fixed a globalState setting order in OsgCameraGroup::realize() 2003-03-19 02:31:22 +00:00
Robert Osfield
8ed643ca24 Chaned the OsgCameraGroup so that its scene handler list used ref_ptr<> for
robustly managing memory.
2003-03-18 20:27:09 +00:00
Robert Osfield
b04edb70aa Added a clear of allocated Records and the cache's in flt::Registry to
prevent memory leaks and unneccesary references to model models remaining
beyond the scope of the loader.
2003-03-18 20:10:51 +00:00
Robert Osfield
96b72af169 Implemented a object cache in osgDB::Registry. 2003-03-17 22:53:46 +00:00
Robert Osfield
d01d155ff9 Fixes for new beta release of VS.NET 2003-03-16 22:00:42 +00:00
Robert Osfield
787fe46e4f Removed the GNUMakefile for the old Demos directory. 2003-03-15 20:41:05 +00:00
Robert Osfield
f811b2580e Removed osgGLUT and Demos/*.
Integrated Marco's updated examples/*/*.dsp's.
2003-03-15 20:20:46 +00:00
Robert Osfield
59995dde90 Moved code across to use the new ArgumentParser. 2003-03-14 21:01:35 +00:00
Robert Osfield
7083773b64 Ported osgGLUT based src/Demos across to being osgProducer based, and placed
them in the new examples/ directory.
2003-03-14 20:35:45 +00:00
Robert Osfield
2ca505b3d8 Ported all glut based demos across to using the new osg::ArgumentParser. 2003-03-14 10:49:06 +00:00
Robert Osfield
34fc7dd289 The wrong file name was being used readFontFile. 2003-03-14 09:28:34 +00:00
Don BURNS
3786683636 Removed the building of the osgTXP library so the build system builds only
the plugin.  Building both the plugin and the library causes a race condition
during parallel makes.
2003-03-14 02:29:34 +00:00
Don BURNS
ec3e1dc611 Fixes for Mac OS X 2003-03-13 06:22:31 +00:00
Don BURNS
693a889ece Various changes to the BUILD system:
o Object files now go in subdirectories named $(OS)$(ARCH).Opt and
       $(OS)$(ARCH).Debug for OS's that support both architectures.
          eg.  Linux32.Opt and Linux32.Debug

     o Libraries links are now placed in lib/$(OS)$(ARCH)
          eg.  lib/Linux32/

     o Binaries are now placed in bin/$(OS)$(ARCH)
          eg. bin/Linux32

     o 'make install' and 'make instlinks' now place files/links in
       /usr/local/{include,lib,share/OpenSceneGraph} by default on
       most systems (Solaris still goes in /opt/OpenSceneGraph).
       Rather than having the somwehat confusing INST_SYS_PREFIX and
       INST_SHARE_PREFX, you can override these with just
            INST_LOCATION
       For example,
             make INST_LOCATION=/usr
       will place files at /usr/include, /usr/lib,
       /usr/share/OpenSceneGraph.
2003-03-13 02:53:40 +00:00
Robert Osfield
3343c3a970 Fix from Gabor for proper casting of char's to unsigned ints be setting up the
osgText::String.
2003-03-12 15:36:26 +00:00
Robert Osfield
edaed5996a Added 'w' toggle to StateSetManipulator to toggle between filled, line and
point polygon drawing modes.
2003-03-12 13:54:59 +00:00
Robert Osfield
6021ffecac Changed std::min to osg::minimum. 2003-03-12 12:17:57 +00:00
Don BURNS
fa33244f92 1) Replaced all Makefile* with GNUmakefile*.
2) Changed Makedepend system to make individual dependency files, which
   should save time rebuilding dependencies by limiting the regeneration
   of dependency file for only modified source files.
2003-03-12 10:39:43 +00:00
Robert Osfield
88b686faca Added (unsigned int) cast to the call to osg::minimum. 2003-03-12 09:45:12 +00:00
Robert Osfield
b0dce04063 Added setBound() method to Drawable. 2003-03-11 21:53:28 +00:00
Robert Osfield
5ae998dbc2 Added missing osg:: to StateAttribute. 2003-03-11 21:42:55 +00:00
Robert Osfield
e51c7f1587 Added support for AbortRendering flag pointer in osg::State which is used
by osgUtil::RenderLeaf to test if any abort state has been set, if so it
doesn't do any further drawing.

The osgProducer::Viewer has been set up to set the osg::State's it manages
with their AbortRendering flag pointers set to the osgProducer::Viewer::_done
memeber varaible.  Now when escape is pressed the rendering is aborted early.
2003-03-11 15:25:49 +00:00
Robert Osfield
78de76f17f Bug fixes to osgText to handle the osgUtil::Optimizer being used on a scene
graph containing text.

Fixed warning in MD2 plugin.
2003-03-11 13:30:03 +00:00
Robert Osfield
4cdbbf1b4a Added missing osgDB:: to writeArray() usage. 2003-03-11 13:24:28 +00:00
Robert Osfield
06fb808ad3 Improvements to the Text .osg support. 2003-03-10 16:40:26 +00:00
Robert Osfield
5c4bcd4aac Moved the RenderLeaf implementatation across to always applying matrices
before state, which fixes problem that can occur with state that needs
the current model view or projection matrices.

Changes osgreflect so that it uses ClipNode rather than clip plane, thereby
fixing the problems which occur when the above is applied.

Create a new osgProducer version of the original GLUT based version.
2003-03-10 11:59:41 +00:00
Robert Osfield
ebbd03c114 Marged new getLibaryMethod added by Daniel. 2003-03-10 11:57:17 +00:00
Robert Osfield
efea365412 Moved the remain inline osg::Font methods into Font.cpp to avoid problems with the
impossibly stupid visual studio compilers.
2003-03-10 09:15:59 +00:00
Robert Osfield
397edcd579 Fixed examples/osghud and osgtext Makefile's to include osgText. 2003-03-08 21:39:40 +00:00
Robert Osfield
6a87495c80 Fixes for IRIX build. 2003-03-07 21:05:35 +00:00
Robert Osfield
ef3b957cb9 From Daniel Sjolie, support for light source. 2003-03-07 09:04:04 +00:00
Robert Osfield
08cdf05b3e Fix to comment record and longID length using both inbedded null's and
rec length to determine the length of a string.
2003-03-07 08:52:51 +00:00
Robert Osfield
47087585c0 Added maximum width and maximum height limits to the osgText::Text which
automatically wraps text which goes beyond these limits.
2003-03-06 21:35:33 +00:00
Robert Osfield
fab6f24f4e Changed the osgText::Font implementation so it used a facade us abstract away
the actual implemention. This has been done so that when a freetype font is
created the implementation can unloaded when the freetype plugin is unloaded
without breaking the main font.

Also add image margin around founds to prevent any image boundaries appearing.
2003-03-06 17:11:24 +00:00
Robert Osfield
352204f358 Renamed Text::TextString String. 2003-03-06 11:18:38 +00:00
Robert Osfield
d3e9fea28b Fixed the setInterleavedArray call. 2003-03-06 10:38:56 +00:00
Robert Osfield
63df52d408 Added osgText::String implementation to better handle decoding of encoded text. 2003-03-05 21:05:37 +00:00
Robert Osfield
5e396d40e1 Made the State::setInterleavedArrays method use a const GLvoid*. 2003-03-05 21:02:37 +00:00
Robert Osfield
d1c0d74bb7 Fix for non standard compiliant Forte compilers. 2003-03-05 20:18:12 +00:00
Robert Osfield
6bfc06dc0e Fixes for Win32 build. 2003-03-05 14:02:48 +00:00
Robert Osfield
8e6a1d38e4 Updates to the GLUT and Producer text demo.
Fix to text to better handle unsetting of vertex arrays.
2003-03-05 12:28:42 +00:00
Robert Osfield
7cc69d4d66 Added md2 plugin from Vladimir Vukicevic. 2003-03-05 09:56:56 +00:00
Robert Osfield
7b6eaa72f2 Updates to Text for Sun Forte compilers. 2003-03-05 09:08:11 +00:00
Robert Osfield
ba9fbd371f Updates to the new osgtext example and fix to the friend usage. 2003-03-04 17:14:42 +00:00
Robert Osfield
55c25a551b Added support for using the generate mip map extension within osgText. 2003-03-04 15:47:28 +00:00
Robert Osfield
1c34c0981e Further improvements to osgText and the freetype plugin, handling different
font sizes better and plugin removal safely.
2003-03-04 12:34:42 +00:00
Robert Osfield
e433b42bc0 Updates osghud demo.
Compile fixes for VisualStudio6.0 because its a hideous pile of junk and can't
compile its way out of a paper bag.
2003-03-03 22:18:33 +00:00
Robert Osfield
fcbf1e200a Fix for warning under Windows. 2003-03-03 20:28:07 +00:00
Robert Osfield
99e7c50d7a Typo fix. 2003-03-03 20:24:49 +00:00
Robert Osfield
fe978ac122 Compile fixes to osgText. 2003-03-03 20:12:18 +00:00
Robert Osfield
b871020222 Added search path to osgText::readFontFile. 2003-03-03 16:42:48 +00:00
Robert Osfield
5d84c10c8f Changed the ownership of Glyph's so that GlyphTexture's own a reference to
Glyph's as well as Font's so keeping the Font valid even after the Font
itself has been desctructed.
2003-03-03 16:12:00 +00:00
Robert Osfield
371d84683f Fixes to osgText for default parameter. 2003-03-03 15:36:52 +00:00
Robert Osfield
878c545785 Fixes for the new osg::Image::setImage() parameter, from Ulrich Hertlein. 2003-03-03 11:04:15 +00:00
Robert Osfield
5b7718ea45 Updates to the quicktime plugin from Bob Kuehne. 2003-03-03 11:02:35 +00:00
Robert Osfield
e2b95c50a4 Added support for computing bounds of text. 2003-03-03 09:37:02 +00:00
Robert Osfield
fbe674b321 First cut of new osgText implementation. 2003-03-02 21:05:05 +00:00
Robert Osfield
a826f5ee31 Changed incorrect instance "TRUE" to "FALSE" to match DepthMask state. 2003-02-27 08:43:02 +00:00
Robert Osfield
4275a96d40 Changed the title of the ReaderWriter, removing the "Default" word as its no
longer appropriate.
2003-02-27 08:38:53 +00:00
Robert Osfield
57e73682ce Added using namespace Producer to get round scoping issues associated with
trying to support VS6 and the rest of the compiler world.
2003-02-25 21:00:26 +00:00
Robert Osfield
2f74b2cf7c Renamed osgProducer::CameraGroup and SceneHandler to OsgCameraGroup and
OsgSceneHandler to avoid the namespace bug under VS6.

Removed the osgproducer demo (its now been replaced by examples/osgviewer.)
2003-02-25 12:28:16 +00:00
Robert Osfield
b32c8c65f3 Added osg::Image::AllocationMode enum and associated set/get methods.
osg::Image::setImage has also been modified to require the AllocationMode
mode to be passed to it so that it knows how to delete the data once the
image goes out of scope.

Port the image plugins across to specify the new AllocationMode, and converted
them across to using new/delete in place of malloc/free.
2003-02-25 11:56:18 +00:00
Robert Osfield
7877c55770 Implemented an osg::minimum and osg::maximum template functions to replace
the std::min/max functions previously used in parts of the osg, since the
std::min/max methods do not seem implemented under IRIX.
2003-02-24 12:02:00 +00:00
Robert Osfield
5471ada6da Fixes to try and keep OSX and Win32 compiling with the new usage of std::max. 2003-02-23 15:50:57 +00:00
Robert Osfield
696c89e2c5 Added #include<algorithm> to keep OSX build compiling.
Reverted the mymax implementation to std::max, hopefully this should be ok now
that we have standardised on non native STL under VisualStudio.
2003-02-21 20:22:32 +00:00
Robert Osfield
0d56658191 Added std:: infront of cout. 2003-02-20 21:58:47 +00:00
Robert Osfield
0b3f300642 Changed the license details across to OSGPL instead of GPL. 2003-02-20 21:52:50 +00:00
Robert Osfield
9d711d80e9 Added missing std:: infront of string usage. 2003-02-19 21:37:12 +00:00
Robert Osfield
7c6cdcde1e Added check into the application usage list of command line args for
unrecognized options to prevent unprocessed, but valid options being
classed as unrecognized.
2003-02-19 11:32:15 +00:00
Robert Osfield
0d3f78350a Added keyboard mouse binding usage to the osg::ApplicationUsage and
osgGA::GUIEventHandler and its subclasses.
2003-02-19 10:43:02 +00:00
Robert Osfield
73f741d16f Completed first pass at providing commandline option usage via the new
osg::ArgumentPareser and osg::ApplicationUsage classes. The osgproducer
demo has been implemented using these new mechansims.
2003-02-18 21:58:40 +00:00
Robert Osfield
cabc0025cb Made the osg::ApplicationUsage forward declared.
Added include of ostream to ArgumentParser header.
2003-02-18 21:10:42 +00:00
Don BURNS
4f0972f3c3 std::cout replaced cout 2003-02-18 19:45:53 +00:00
Robert Osfield
c10d5f2d6f Added new osg::ApplicationUsage and osg::ArgumentParser to help streamline
application/example developement.
2003-02-18 16:36:42 +00:00
Robert Osfield
73dd9eb59b Added reference to Group in the RegisterDotOsgWrapperProxy. 2003-02-18 11:33:55 +00:00
Robert Osfield
20489dbd4c Added missing ; 2003-02-18 10:50:57 +00:00
Robert Osfield
cbad9b7610 Removed linking to osgGLUT/GLUT in the osgconv program. 2003-02-18 09:12:27 +00:00
Robert Osfield
9208e24bd4 Fixes to RenderToTextureStage to account for the cull/draw traversal no longer using
reference counting of statesets.

Moved last uint reference over to unsigned int.
2003-02-15 19:51:53 +00:00
Robert Osfield
a07cbb969d Moved osghanglide back to pure osgGLUT based, removing osgProducer pathways. 2003-02-14 22:32:29 +00:00
Robert Osfield
b4293fe93a More work on uint -> unsigned int. 2003-02-14 20:27:23 +00:00
Robert Osfield
77fee92d71 Renamed futher uint/ushort instances. 2003-02-14 16:52:47 +00:00
Robert Osfield
bd506b53da Removed last of the uint references. 2003-02-14 11:41:52 +00:00
Robert Osfield
319e84ceed Added support for ClipNode in the .osg plugin. 2003-02-13 15:37:32 +00:00
Robert Osfield
43d304c24e From Geoff Michel, updates to the Geo plugin.
Removed osg::uint reference form the pfb plugin.
2003-02-13 15:16:04 +00:00
Robert Osfield
8f1ba9d21b Removed include/osg/Types header defining osg::ubyte, osg::ushort etc. Changed
any reference to these in the distribution across to using unsigned char,
unsigned short etc.  This has been done to keep the OSG code more opaque
to what types are.
2003-02-12 19:20:47 +00:00
Robert Osfield
28732e3451 Merged linkage changes from Duncan Cavens to help the OSG osgtext and osghud
demo's build cleanly even when a previous version of the OSG is installed.
2003-02-12 14:39:51 +00:00
Robert Osfield
0e8154d3d3 From Norman Vine, updates to TXP plugin so that the Cygwin build uses pthreads. 2003-02-12 12:02:25 +00:00
Robert Osfield
042af2be03 Add if (!textureStateSet) return check to replace assert() to prevent crashes
when multi-texture layers don't exist.
2003-02-12 10:10:03 +00:00
Robert Osfield
636c5e3d98 Added if (!null) guard around description strings. 2003-02-12 09:52:27 +00:00
Robert Osfield
cdf63f2ca7 Made the Professional services subscript optional - use "osglogo ps" to enable
it.
2003-02-11 15:54:31 +00:00
Robert Osfield
2eea610703 Clean up of the logo demo. 2003-02-11 12:37:48 +00:00
Don BURNS
1ab232b113 Used INC instead of CXXFLAGS
GVS: ----------------------------------------------------------------------
2003-02-10 22:15:04 +00:00
Robert Osfield
07f96583f5 Removed the osg::notify() calls from the RenderBin prototype construction to
avoid problems under OSX with construction/deletion of std::cout/cerr.
2003-02-10 16:48:53 +00:00
Robert Osfield
fa643c8795 From Geoff Michel, updates to the Geo loader including handling of
.geo files from the rc1 of the GEO modeller.
2003-02-10 15:16:51 +00:00
Robert Osfield
1b08b02df2 From Tree, added support for using wchar_t strings with osg::Text/EncodedText. 2003-02-10 15:01:27 +00:00
Robert Osfield
ebb31fb339 Updates from Ulrich for sharing of textures. 2003-02-10 14:47:20 +00:00
Robert Osfield
c3c70c9415 Changed int to GLint for OSX build. 2003-02-10 14:23:31 +00:00
Robert Osfield
c2b4a05825 Minor fixes to ReaderWriter and Paragraph to help work with use of Doxygen.
Fix to CullVisior to handle the new no referenced counted cull and draw traversal.
2003-02-10 13:58:39 +00:00
Don BURNS
d4f7da7bb8 Right, em.... fixed eh.. problem with destruction of RenderBin prototype list 2003-02-05 23:13:27 +00:00
Robert Osfield
9cc9b0000b Fixed infinite loop in osgProducer::CameraGroup::advance(). 2003-01-31 23:46:15 +00:00
Robert Osfield
fa70860427 Port of osghangglide to use osg producer. Default build still uses GLUT. 2003-01-31 00:44:56 +00:00
Robert Osfield
4c4735a586 Added FrameStats support into osgProducer lib, and removed them from the
osgproducer demo.

Removed the producer config files osgproducer demo.

Added a search the osgDB::DataFilePath for the producer config file.
2003-01-30 23:02:32 +00:00
Robert Osfield
f485304665 Fix for endianess of colour set up of RGBA values. 2003-01-30 21:46:57 +00:00
Robert Osfield
03eee3b700 Fixed warning in osgText
Added getBound() to begining of osgProducer::CameraGroup::frame() to ensure
that the parallel cull traversals don't all do a getBound().

Added osgProducer::CameraGroup::getTopMostSceneData() convinience method.
2003-01-30 16:11:39 +00:00
Robert Osfield
787bbef714 From Max, fixes to UniCode support for bitmap fonts. 2003-01-30 01:31:22 +00:00
Robert Osfield
8422040e97 Fixes to osgprerender and osgshadow scene for new cull and draw implemention
without use of ref counting.

New StatsEventHandler for osgprerender demo to add keyboard control of stats
output.
2003-01-30 00:34:35 +00:00
Robert Osfield
6439a719aa Fixed CullVisitor::getDistanceFromEyePoint so that withLODScale is handled
correctly.
2003-01-29 17:24:54 +00:00
Robert Osfield
6c4f2f5207 Fixes for multipipe support.
Addition of FrameStatsHandler to osgproducer demo to add frame stats.
2003-01-29 17:16:26 +00:00
Don BURNS
cf1ff34d38 Fixes to osgProducer for IRIX build. 2003-01-27 20:40:08 +00:00
Robert Osfield
6d02ccfc58 Removed the inline declarations of several method implementations. 2003-01-24 16:57:28 +00:00
Robert Osfield
31e4185aa6 Added an #ifdef to osgGLUT/Window.cpp to handle the case of compiling against
older versions of GLUT.
2003-01-24 15:12:54 +00:00
Robert Osfield
63303787fc Changes to try and placate the Sun Forte compiler. 2003-01-24 12:39:18 +00:00
Robert Osfield
1ce53fcfba Changed the setUpViewer so it takes unisigned int to make it easier to
do OR'ing of the various enumerates when passing in paramters (avoids a
warning).
2003-01-24 09:37:11 +00:00
Robert Osfield
df21d69666 Fixed the formating of the Matrix output. 2003-01-24 09:35:05 +00:00
Robert Osfield
6eb62b1e30 Added an #ifdef check around the glutSpecialUpFunc to help compile unde old
version of GLUT.
2003-01-24 09:34:33 +00:00
Robert Osfield
20ba1a4033 Fix for impostors bug where image insert were visible, this was down to a double
call to RenderStage::drawPreRenderStage().  The call to it in RenderStage inside
the draw() method has been removed, leaving on the call in SceneView.
2003-01-24 09:11:05 +00:00
Robert Osfield
f74f50161c Changed the template insert(,,) method for a std::copy() implemention as it
seems that the Sun Forte compiler can't handle member templates!
2003-01-23 22:12:04 +00:00
Robert Osfield
f43d02f496 Added extra checks in the removal of rendundent nodes code so that description
fields etc are checked.
2003-01-23 15:12:58 +00:00
Robert Osfield
5a05e14e50 Fix to handling of comment records and longid's. 2003-01-23 14:46:10 +00:00
Robert Osfield
bf41106ce8 Changed the image directory refered to in billboard demo.
Updates NEWS.

Changed the line endings in TextureCubeMap to unix endings.
2003-01-23 12:18:22 +00:00
Robert Osfield
a32a392d8d Tweaking of the osgvertexprogram tex matrix settings. 2003-01-23 12:07:01 +00:00
Robert Osfield
3cdf42e599 Fixed Win32 compile problem. 2003-01-23 10:11:11 +00:00
Robert Osfield
79eaabd961 Fixed typo of APPLY_MATICES_BEFORE_STATE. 2003-01-23 08:39:48 +00:00
Robert Osfield
ecc2f02f0d Removed eroneous std:: from the from of DisplayListVector. 2003-01-23 08:37:15 +00:00
Robert Osfield
fce55a22ad Added a couple more #defines for the texture cube maps that one can use. 2003-01-22 23:35:19 +00:00
Robert Osfield
f7439363ea Added support for a -c option. 2003-01-22 23:34:43 +00:00
Robert Osfield
9aaf5a560b Changed the implementation of the texture objects and display list to delete
caches so that they use a std::vector<> swap on the internal data structures
when ready to delete to minimize the amount of time that a race condition
condition can happen.
2003-01-22 23:34:18 +00:00
Robert Osfield
d6f25a112d Vertex program update from Brede. 2003-01-22 20:48:10 +00:00
Robert Osfield
6afedcc6d1 Updated version numbers to 0.9.3 2003-01-22 19:17:39 +00:00
Robert Osfield
ec8afe0392 Fixed compute bound code which was applying offset first then rotating, rather
than rotating first then offset.
2003-01-22 16:49:05 +00:00
Robert Osfield
fbeae00fa2 Fixed handling of rotations reading from .osg of osg::Shapes. 2003-01-22 16:17:56 +00:00
Robert Osfield
ea35796526 From Daniel Sjölie, support for controlling which viewports are focusable i.e.
recive mouse/keyboard events.
2003-01-22 15:44:22 +00:00
Robert Osfield
6fd27a4b59 Clean up to the osgProducer lib and demo. 2003-01-22 15:30:17 +00:00
Robert Osfield
4b671e5023 Fixed remove transform code to work with the new extra paramter require by osgUtil::Optimizer. 2003-01-22 12:50:52 +00:00
Robert Osfield
d2b7340fb5 Changed the decal=true setting to decal=false to make sure that textured models
come out lit ok.  The makes the assumption that colour values on the objects
and realistic, if they arn't then decal texture can produce better results..
2003-01-22 12:25:04 +00:00
Robert Osfield
329a8a1656 Fixed an Optimizer crash where if the top most node of a model was
a static transform it would crash when this root was deleted.  Have fixed
by recognising this node as one not to remove and set it to identity instead.
2003-01-22 12:06:22 +00:00
Robert Osfield
1c56ee52a2 Changed the local header includes from <> to "" to help the OSG compile. 2003-01-21 21:02:17 +00:00
Robert Osfield
926394dcb8 Removed debugging messages. 2003-01-21 19:37:45 +00:00
Robert Osfield
48bda9cc79 Added new Copyright/License notice to header and source files. 2003-01-21 16:45:36 +00:00
Robert Osfield
6cd43acb5a Made the pre rendering texture using glCopySubImage rather than copy to image
and then copy to texture, as the later was no longer working due to
texture->apply ordering.
2003-01-21 16:40:18 +00:00
Robert Osfield
87973523ad Added gaurds around alpha function value to catch erroneous values before they
are passed on to the OSG.
2003-01-21 16:02:29 +00:00
Robert Osfield
ac5c9a6847 Made a new osgproducer demo based on the new osgProducer::Viewer class.
Kept the old camera group version around for future reference.
2003-01-21 13:22:13 +00:00
Robert Osfield
128be070ba Added new osgProducer::Viewer class for putting together simple producer
based viewers very quickly.
2003-01-21 13:14:29 +00:00
Robert Osfield
2261b1cc86 From Joseph Steel, addition of texture filter modes to txp plugin. 2003-01-21 09:09:48 +00:00
Robert Osfield
0f69a4c3ae Made the drawable::compile(State&) method const and the DisplayListVisitor to
compile even when dislay list is off.  This has been done to allow subclasses
of Drawable handle their own compile implementation, such as used by text.
2003-01-20 20:40:06 +00:00
Robert Osfield
dc83e399a9 Improvements to osgProducer lib, in particular adding a mutex lock to the init() call in
SceneView to prevent init running multi-threaded.
2003-01-20 20:33:50 +00:00
Robert Osfield
4de63e72c6 Improvements to the handling of multiple graphics contexts. Still needs alot
of work, but at least it isn't crashes in trivial cases right now.
2003-01-20 20:28:28 +00:00
Robert Osfield
7633ffce3c Removed the ReaderWriterFLY demo since it was causing OSX builds to crash when
running the osghangglide demo.
2003-01-20 14:07:27 +00:00
Robert Osfield
5cb765ff25 Clean up to the osgproducer demo. 2003-01-20 11:54:34 +00:00
Robert Osfield
a889cb8f88 Fixed bug in the flight and drive manipulators where they would uncontrollably
shrink down to a tiny window size when one rezized the window.
2003-01-20 11:52:34 +00:00
Robert Osfield
f034ca6d74 Fixed osglogo demo so that is correctly set up the colour of the background. 2003-01-20 11:07:41 +00:00
Robert Osfield
c1831b21f7 Made the setting of default glNormal and glColor values an compile
option via #ifdef USE_DEFAULT_NORMAL and USE_DEFAULT_COLOR defines respectively.
2003-01-20 11:02:27 +00:00
Robert Osfield
2ac175484a Updates from Pavel.
1. Storing color of geometry in ColorArray e.g. its don't work when
    lighting off.

  2.  Detecting of alpha channel and automatically enabling blending.
2003-01-20 10:41:21 +00:00
Robert Osfield
ec30f7d8a6 Update the ReaderWriterATTR file so that it used the definitions that Joseph
Steel obtained from MPI.

Removed the unique child check from the flt::PrimRecord and osg::Group, this
allows more flexibility when specifing nodes, and is faster..
2003-01-20 09:56:09 +00:00
Robert Osfield
3723dcda1d From Ruben, updates to the IV/VRML1 loader to handler large datasets. 2003-01-20 09:09:46 +00:00
Robert Osfield
c325de6865 Updates to osgProducer, moving the implementation of CameraGroup and
SceneHandler into the source directory.
2003-01-20 08:58:32 +00:00
Robert Osfield
08456ecf70 Added osg::State::dirtyAllModes() and dirtyAllAttributes() methods. 2003-01-19 15:28:08 +00:00
Robert Osfield
762db56a40 Improvements to the osgProducer lib to better handle Producer's normalized
coord system.

Addition of ReadCameraConfigFile and WriteCameraConfigFile as a tempory
measure for implementing local a C++ read/write of the Producer::CameraConfig, this
will be removed once these implementations or similar have been moved to Producer.
2003-01-18 22:07:59 +00:00
Robert Osfield
13aa469628 Updated the KeyboardMouseCallback so this it takes into account the the new
passiveMouseMotion support in Producer.
2003-01-18 10:17:28 +00:00
Robert Osfield
0bc11fcbf1 From Eric Sokolowsky, Fix for IRIX build, adding typename into the graph_array
to allow the compiler to leave instation of typedefs until required.
2003-01-18 09:44:12 +00:00
Robert Osfield
eaaf758910 Added KeyboardMouse::allowContinousMouseMotionUpdate(), but commented out right
now as Producer crashes when you use it..
2003-01-17 20:05:41 +00:00
Robert Osfield
619862f8d6 Added osgProducer library to the distribution.
Cleaned up the osgproducer demo, and made it work with the new osgProducer lib.
2003-01-17 18:34:35 +00:00
Robert Osfield
359e0d9c70 Removed the addition of 0 to the add of the encoded text vector as it is now
redundent having added support for the begin,end range into FTFont.
2003-01-17 16:00:09 +00:00
Robert Osfield
a86d519a89 Fixed a bug on the handling of empty EncodedText. 2003-01-17 15:01:27 +00:00
Robert Osfield
f87dc60ddd Further improvements to the osgproducer demo. 2003-01-17 14:12:46 +00:00
Robert Osfield
c2c38955c6 Added new getCurrentCamaeraManipulator(), and removed and debugging message. 2003-01-17 14:12:25 +00:00
Robert Osfield
c406d2476f Removed the osg::Referenced::createCount() and deleteCount() methods and
associated variables which were only compiled in on debug build.  These optional
methods/static vars were causingproblems when mixing debug and release builds.
2003-01-17 14:11:34 +00:00
Robert Osfield
63fe1433bb Integated the trackball manipulator with the osgproducer demo. 2003-01-17 13:34:03 +00:00
Robert Osfield
097030766d Added ProducerEventCallback class to manager the conversion of producer events
into GUIEventAdapter versions.
2003-01-17 11:26:16 +00:00
Robert Osfield
4dd273de70 Added support for ReferenceFrame into osg::LightSource, modified the .osg
plugin and cull visitor to account for this change.
2003-01-16 16:37:24 +00:00
Robert Osfield
a0e5b9b007 Added support for frame stamping each frame. 2003-01-16 12:39:15 +00:00
Robert Osfield
cab41ec32d Updates to clean up the demo. 2003-01-16 12:18:45 +00:00
Robert Osfield
d6480b0425 Warning fix for Win32. 2003-01-15 20:57:48 +00:00
Robert Osfield
0e6b3b68bd Added #include <osg/Export> simply to include the #pragma's for disabling the
daft VisualStudio warnings.
2003-01-15 20:53:27 +00:00
Robert Osfield
e0074d7c44 Made the osgDB::ParamterOutput class so that it is purely defined in terms
of the header, and therefore not requiring to be exported.

Updated the MUSE_READ_ME.txt to include mention of syntax highlighting.
2003-01-15 20:50:12 +00:00
Robert Osfield
5ad9602673 Updates to the osgproducer demo. 2003-01-15 19:23:16 +00:00
Robert Osfield
7bf60026f7 Removed the -> methods from the arc class to prevent stupid warnings under
VisualStudio6.0.
2003-01-15 15:44:49 +00:00
Robert Osfield
afb0ff775d First cut and a demo which uses Open Producer for windowing. 2003-01-15 15:24:35 +00:00
Robert Osfield
ac718b6abb Attempts to fix more of the *stupid* errors in the VisualStudio6.0 compiler. 2003-01-15 13:17:52 +00:00
Robert Osfield
5960307703 Patch from Joseph Steel, added missing check for the mipmap usage. 2003-01-15 11:33:33 +00:00
Robert Osfield
d542a2165d Removed the template versions of the PrimitiveSet constructors as this was
causing problem under VisualStudio6.0.
2003-01-15 11:29:30 +00:00
Robert Osfield
64efc8ecbb Fix for win32. 2003-01-14 19:12:22 +00:00
Robert Osfield
af6a6ff9f0 Fixes for Win32 build. 2003-01-14 16:39:41 +00:00
Robert Osfield
59969be08d From Daniel Sjölie, updates to the GUIEventAdapter and GLUTEventAdapter to handle
key and key down, modifiers and funcion keys.
2003-01-14 14:25:56 +00:00
Robert Osfield
a03fff8c57 Added an compile in option of applying the matrices before state in the RenderLeaf
apply method.  This order is intended to help support of vertex programming, but
unfortunately breaks the osgreflect demo so the original ordering is kept by default.
2003-01-14 14:21:06 +00:00
Robert Osfield
3365634a01 Submission from Joseph Stell, added LoadModels to TerrapageNode. 2003-01-14 14:00:09 +00:00
Robert Osfield
edd04fd5a0 Fixed typo. 2003-01-14 12:36:14 +00:00
Robert Osfield
36857d6b2f Replaced the NVTriStrip code with tri_stripper written by Tanguy Fautré. 2003-01-14 10:54:01 +00:00
Robert Osfield
c882283b5d Typo fix if USE_HOME_POSITION. 2003-01-13 20:14:23 +00:00
Robert Osfield
c3c346e647 Added handling of the case when length is -1, allowing the code to just test
against characters being zero, rather than against length, which is now only
done when a valid value of length (i.e >=0) is passed in.
2003-01-13 14:56:04 +00:00
Robert Osfield
7ee6d4f3f4 Clean up to the cross platform support in DirectX plugin. 2003-01-13 14:11:06 +00:00
Robert Osfield
c3a7ce7352 Fixes to osgText to handle std::string correctly. 2003-01-13 14:05:08 +00:00
Robert Osfield
29f4fa713f Added missing _bbox.init() to ShapeDrawable.cpp. 2003-01-13 10:39:14 +00:00
Don BURNS
0adc037d20 ReaderWriterDirectX.cpp needed some std::'s 2003-01-11 20:56:29 +00:00
Robert Osfield
9bd4145405 From Ulrich, fixes to double to float conversion warnings under Windows. 2003-01-11 20:43:47 +00:00
Robert Osfield
ef7d7fce2e Moved some in inline methods in ParamterOutput into the new ParamterOutput.cpp
file to clean up the interface.
2003-01-11 12:50:39 +00:00
Robert Osfield
e8ddbdd195 Updates from Ulrich. 2003-01-10 17:06:20 +00:00
Robert Osfield
f790d1ff15 Added missing header for new matric reading and writing methods. 2003-01-10 16:56:39 +00:00
Robert Osfield
f36bc69c58 Made the more of the OSG's referenced object desctructors protected to ensure
that they arn't created on the stack inappropriately.

Split the implemention of Matrix up so that it is a simple no referenced counted
class and can be safefly created on the stack.  To support referenced counting a
seperate subclass now exists, this is RefMatrix which inherits from both Matrix and
Object.
2003-01-10 09:25:42 +00:00
Robert Osfield
f948a3de7c Fixed typo. 2003-01-09 18:41:01 +00:00
Robert Osfield
043839f40b Added #ifndef GL_TEXTURE_WRAP_S #define block to keep things compiling
on old drivers.
2003-01-09 16:13:30 +00:00
Robert Osfield
97da5d7f92 Fixed typo. 2003-01-09 11:48:49 +00:00
Robert Osfield
e8c2226e38 Added setting of the R wrap paramter to applyTexParamters(). 2003-01-09 10:06:44 +00:00
Robert Osfield
ba2c3a187d From Ulrich Hertlein, DirectX .x model loader plugin. 2003-01-08 22:52:27 +00:00
Robert Osfield
f91e141e7a Fix to case statement from Tree. 2003-01-08 16:37:09 +00:00
Robert Osfield
a1f6b8730b Added Shape.cpp to cvs resposity. Shape.cpp adds support for the various
osg::Shape in the .osg file format.
2003-01-08 16:33:02 +00:00
Robert Osfield
6727b8d5f7 Cleaned up the code for the animation flags of the group record. 2003-01-08 16:30:48 +00:00
Robert Osfield
c5d3c860d8 From Tree, support for encoded text added into osgText. 2003-01-08 15:22:17 +00:00
Robert Osfield
ba34880464 Added support for reading and writing Sphere, Box, Cone, Cylinder and Grid shapes. 2003-01-08 14:32:13 +00:00
Robert Osfield
e6b64a5550 Added support for sharing arrays in the .osg format for osg::Geometry.
Fixed the osgUtil::Optimizater so it takes into account sharing of arrays when
deciding whether an geometry can be merged or not.
2003-01-07 16:29:07 +00:00
Robert Osfield
53204898f3 Fixes for Irix64 build. 2003-01-06 23:19:42 +00:00
Robert Osfield
0161dacc15 Removed the osg::LightPoint::OPAQUE option, and implemented the ADDTIVE blending option. 2003-01-06 16:42:02 +00:00
Robert Osfield
3ef3666d0f Added new ARB vertex program state attribute and demo program,
sent in my Brede Johansen.
2003-01-04 20:45:53 +00:00
Robert Osfield
060975a05c Fixed small typo. 2003-01-04 20:44:17 +00:00
Robert Osfield
1317f6feaf Added usage info in -O option. 2003-01-04 20:43:53 +00:00
Robert Osfield
7b6d802131 Fixed options code. 2003-01-04 20:43:27 +00:00
Robert Osfield
141f065b17 Removed the dual inheritance from the AnimationPathCallback, moving the
NodeVisitor implemention into the .cpp.

Small tweak to the lighpoint drawable implmenentation to improve the additive
blending and state resotoration.
2003-01-03 21:42:02 +00:00
Robert Osfield
fe64942c54 Added a AnimationPathCallback which can update both a MatrixTransform and a
PositionAttitudeTransform, removed the equivialnt callbacks once found in these
transform classes.

Changed the NodeCallback class so its derived from osg::Object instead of
osg::Referenced to allow it to be saved out in the .osg format.

Added support for Update and Cull callbacks into the .osg file format.

Added support for AnimationPathCallback into the .osg file format.
2003-01-02 20:10:04 +00:00
Robert Osfield
6ee563ad55 Updates the terrapage to try and make it thread "safer" when used with the OSG. 2002-12-21 19:41:27 +00:00
Robert Osfield
e9287afd5e Turned display lists off in the osg::Geomety created by the terrapage loader,
this is done because terrapage will dynamic page in and out geometry so we
don't want to keep creating and deleting display lists.
2002-12-21 11:30:54 +00:00
Robert Osfield
3113fe360b Tweaked the colours in the logo. 2002-12-20 10:48:22 +00:00
Robert Osfield
20a0cc5445 Renamed the app method update. 2002-12-20 09:43:15 +00:00
Don BURNS
454c0480c0 update for ia64 2002-12-19 19:50:16 +00:00
Robert Osfield
adf5c91808 Renamed all instance of AppCallback/AppVisitor to UpdateCallback/UpdateVisitor
inline with the decision to rename the "app phase" the "update phase".
2002-12-19 15:55:40 +00:00
Robert Osfield
eb42926ab1 Changed the remaining #include <> to #include "" to get things compiling under VS. 2002-12-19 10:32:02 +00:00
Robert Osfield
a2e76e4ab0 Removed the reference of Sequence from Switch. 2002-12-18 11:43:39 +00:00
Robert Osfield
30a665288e Removed the osg:: from the front of the Group::computeBound() method to keep
things compiling under Windows.
2002-12-18 10:17:52 +00:00
Robert Osfield
677764bed9 Changed the <*.h> to "*.h> in the terrapage plugin to get it compile under Windows. 2002-12-18 09:50:36 +00:00
Robert Osfield
6d4e13ab1b From Daniel Sjölie, support for reading comment records into description fields. 2002-12-17 17:22:06 +00:00
Robert Osfield
c82927293e Moved the include/osgTXP back into src/osgPlugins/txp as a seperate include directory is no longer required.
Removed the osgtxp demo as it is no longer required.
2002-12-17 16:07:59 +00:00
Robert Osfield
ee3348afc9 Added txp::TerrapageNode to the txp plugin, and implemented the node so that it
automatically assign handles the updates of eye points and database merges.
2002-12-17 15:41:05 +00:00
Robert Osfield
8f81cf2ac6 Moved TriangleFunctor from Drawable into its own header file. 2002-12-16 17:00:05 +00:00
Robert Osfield
ddbf2ad8a0 Removed the redundent export symbol. 2002-12-16 16:57:47 +00:00
Robert Osfield
1c34b83e11 Fix for a warning. 2002-12-16 14:52:48 +00:00
Robert Osfield
7bcef50e3b Removed reference to osg/MemoryManager. 2002-12-16 14:12:48 +00:00
Robert Osfield
89269463ef Removed the memory manager. 2002-12-16 13:44:35 +00:00
Robert Osfield
00cc3a1833 Converted the instance of osgNew and osgDelete back to new and delete as part
of depecating the include/osg/MemoryManager
2002-12-16 13:40:58 +00:00
Robert Osfield
a37e3551e6 Fixed the traverse method so it calls Transform::traverse() instead of
MatrixTransform::traverse() which was recursive..
2002-12-16 13:14:27 +00:00
Robert Osfield
98648105f9 Added seperate Referenced.cpp implementation. 2002-12-16 10:28:14 +00:00
Robert Osfield
884b2730e8 Added a DeleteHandler into osg::Referenced so that it can delete objects
via a seperate delete handler.  Useful for making unref()/ref() thread safe if
the users needs to address this issue.
2002-12-16 10:25:31 +00:00
Robert Osfield
cb87e7b3bc Integrated further updates from Geoff on the Geo loader. 2002-12-16 10:22:37 +00:00
Robert Osfield
88424530b4 Changed the std::hex and std::dec to hex and dec to get it compile under VisualStudio,
and added a using namespace std to keep it compiling on all other compilers!
2002-12-16 10:05:55 +00:00
Robert Osfield
c6b6e200a4 Added supported for setting animation path on MatrixTransform's. 2002-12-16 09:55:30 +00:00
Don BURNS
22ada7ee6b Uncommented fix for returning to non-stereo from stereo to get color mask
back to normal.
2002-12-16 00:33:48 +00:00
Robert Osfield
c32585a046 Added a check for extension of a filename to the gif loader, since it looks
like the isn't reconginizing rgb files as not being gif.
2002-12-14 06:42:56 +00:00
Don BURNS
a8ce4e9c0d Added TrPageViewer.[h,cpp] to Demos/osgtxp (moved from the plugin directory)
and modified Makefile accordingly
2002-12-13 20:33:05 +00:00
Don BURNS
25b333b05b Move TrPageViewer.cpp to src/Demos/osgtxp 2002-12-13 20:28:58 +00:00
Robert Osfield
a388800c95 Merged fixes to warnings in geo plugin from Geoff. 2002-12-13 19:41:59 +00:00
Robert Osfield
ffb200e4f4 Added the axis alignment into the Outline and Texture fonts drawing. 2002-12-12 11:36:08 +00:00
Robert Osfield
93973c09ad Turned lighting off for whole of logo. 2002-12-12 11:35:09 +00:00
Robert Osfield
4cc0ffbbf8 Changed the osglogo demo to use arial texured font. 2002-12-12 11:25:25 +00:00
Robert Osfield
449418a8e9 Changed the colour of the text to be the same as the OpenGL logo. 2002-12-12 10:03:05 +00:00
Robert Osfield
75676f026c Removed redundent std:: 2002-12-11 22:39:59 +00:00
Robert Osfield
591ab7c52e Removed erroneous character from end of file. 2002-12-11 16:27:01 +00:00
Robert Osfield
b8faa9b6f7 Added the afteresher.geo demo to osgtest.bat and debugtests.bat.
Converted the osgtxp demo to use straight string comparison instead of case sensitive string
comparion to help cross platform portability.
2002-12-11 16:24:42 +00:00
Robert Osfield
2e3bf33ce6 Removed the duplicate file out from the GEO plugin.
Changed the osglogo to reference a jpeg instead of a tiff one.
2002-12-11 14:30:27 +00:00
Robert Osfield
c19a236561 Added code to the path to the executable, adding it into the libary and data
file paths.
2002-12-11 14:24:44 +00:00
Robert Osfield
0e6d702906 Fixes for Win32. 2002-12-11 10:07:14 +00:00
Robert Osfield
442fa34aaa From Ulrich Hertlien, fix for new changes in osg::Switch interface.
Small clean to changes by Robert.
2002-12-10 20:26:56 +00:00
Robert Osfield
530b85c807 Updates from Geoff Michel to geo loader and demo. 2002-12-10 20:00:56 +00:00
Robert Osfield
64c5fb644a From Micheal Gronager, fix to osg::Quat::getRotate(..) to handle zero rotations.
Port of Sequence to subclass directly from osg::Group.
2002-12-10 19:58:03 +00:00
Robert Osfield
97a4775b7e Updates to the light points support to improve the control of the blending of
light points with their background.
2002-12-10 19:56:14 +00:00
Robert Osfield
6efe79c33c Changed cout to notify. 2002-12-09 09:26:49 +00:00
Don BURNS
5622e704cf fixed small typo (forgot std::) 2002-12-09 06:00:57 +00:00
Robert Osfield
55d04ef381 Modifed the .attr loaders handling if TX_BILINEAR minification filter so that
it remaps it to LINEAR_MIPMAP_LINEAR to get round image quality issue of some
OpenFlight databases.
2002-12-08 17:22:20 +00:00
Robert Osfield
6f16193a7a Tweaks the light points blend function. 2002-12-07 21:20:40 +00:00
Robert Osfield
109f6f22fe Updated the Switch, Sequence and Group classes so that they all used a
similar style removeChild() mechansim.

Made the old style osg::Switch::setValue() method deprecated.
2002-12-07 21:18:12 +00:00
Don BURNS
b63827c5d9 Cleanin' up after Robert's spelling ...er ... challenges. 2002-12-07 06:59:08 +00:00
Robert Osfield
baa7c11eb9 From Tree, added support for accept(PrimitiveFunctor) into osg::Text. Currently
implemention is overly simple, but will do until rewrite.
2002-12-06 19:03:34 +00:00
Robert Osfield
8b58a1df83 Added checking of parents against switch and sequence into the
RemoveRendundentNodeVisitor to prevent breaking of the orinal order of the nodes.
2002-12-06 11:16:45 +00:00
Robert Osfield
d0887b19c1 Updates to the osglogo demo adding colour to the sides of the cube. 2002-12-06 09:20:20 +00:00
Robert Osfield
3715320b85 Fixes from Norman Vine for Cygwin support. 2002-12-06 09:19:35 +00:00
Robert Osfield
92d31b132b Updates to the osglogo demo. 2002-12-05 15:21:25 +00:00
Robert Osfield
a91324e158 Added Brede Johansen's osgpbuffer demo, currently only runs under Windows,
requires the equivilant glx support to be added.
2002-12-05 14:30:57 +00:00
Robert Osfield
af400cb5ab Added first pass at a new logo, this time generated by a osglogo demo. 2002-12-05 12:04:38 +00:00
Robert Osfield
d7692f83d7 Added support for setting the axis which the text should be aligned along. 2002-12-05 12:01:38 +00:00
Robert Osfield
a4404a388d Fixes for Cywin gcc3.x build in GL and Math headers.
Fix for VS build in osgshadowtexture.
2002-12-04 17:34:52 +00:00
Robert Osfield
b9110154c4 Removed the osg:: from the from of the osg::TexGen::apply() call. 2002-12-04 13:26:11 +00:00
Don BURNS
bf0cbf6b10 Modified Files:
include/osgTXP/trPagePageManager.h src/Demos/osgtxp/osgtxp.cpp
 Added Files:
    VisualStudio/Demos/osgtxp/osgtxp.dsp
2002-11-29 22:10:12 +00:00
Don BURNS
97ec694e21 Fixes to txp loader 2002-11-29 16:14:03 +00:00
Robert Osfield
d370227d89 Added comment for future reference about the validity of using delete in
the demo code... should really by using ref_ptr<> etc.
2002-11-25 16:57:49 +00:00
Robert Osfield
aa3d887e94 Added check of translucency of an image via osg::Image::isImageTranslucent(). 2002-11-25 16:40:30 +00:00
Robert Osfield
010e56c8cc Added implementation of isImageTranslucent method. 2002-11-25 16:39:05 +00:00
Robert Osfield
b113dfeb73 Added extra check to the freeing of memory. 2002-11-25 16:30:34 +00:00
Robert Osfield
cbbbee4c41 Fixes for OSX build from Stephan Huber. 2002-11-25 16:13:57 +00:00
Don BURNS
12e922bc3c Added Paging TerraPage loader and osgTXP library. 2002-11-24 21:36:05 +00:00
Don BURNS
89b2575ffe Forced GLPixmapGlyph color to white rather than using glGetCurrentColor 2002-11-24 00:23:47 +00:00
Don BURNS
1098a7ded1 Freetype 2.1 and later align bitmap pitch on boundaries of 2 bytes. It is
therefore necessary to use glPixelStorei(..,UNPACK_..., 2).  There is an
#if() statement that allows the continued use of freetype 2.0 (Rh 7.x), as
well as accomodating newer releases.
2002-11-23 05:16:47 +00:00
Don BURNS
4acee51414 Merged in Joseph Steel's updates to rgb plugin 2002-11-22 17:36:46 +00:00
Robert Osfield
22c313cf3e Warning fixes. 2002-11-22 09:46:25 +00:00
Don BURNS
65fec63389 Fixes for IRIX build 2002-11-22 05:00:43 +00:00
Don BURNS
c735c379af Fixed std:: prefix and reinitialized variable for gcc 3.2 2002-11-21 20:28:28 +00:00
Robert Osfield
493d86fc73 Added use of ref_ptr<> for the replaced node in osg::Group::replaceChild(,)
to prevent it being deleted while it was still being used with the body of
the method.

Added mention of the shadow texture demo.
2002-11-21 16:08:30 +00:00
Robert Osfield
a545f3b48c Moved the shadow creation code into a seperate CreateShadowedScene header and source,
and exposed just the basic createShadowedScene function in the header.
2002-11-21 15:35:51 +00:00
Robert Osfield
3f97d6a44d Clean up of the shadow texture code... 2002-11-21 14:54:14 +00:00
Robert Osfield
201f753170 Fixed the updating of projection matrix so that is done in eye coordinates. 2002-11-21 13:25:39 +00:00
Robert Osfield
5ddcd5d878 Added osg::Geometry::setPrimtiveSet,removePrimtiiveSet, insertPrimitiveSet
and getPrimitiveSetIndex().

Renamed osg::Group::findChildNum(..) to getChildIndex().

Renamed osg::Geode::findDrawableNum(..) to getDrawableIndex().
2002-11-21 09:07:11 +00:00
Robert Osfield
f2fc281b00 Fix for compile problems under IRIX. 2002-11-21 07:53:48 +00:00
Robert Osfield
7ca90a3b44 First pass at shadow textures. 2002-11-20 15:51:18 +00:00
Robert Osfield
de85272032 Moved the code to create StateSet around textures into flt::Pool::getTexture so that
the code associated with loading textures is done is just one place.
2002-11-20 14:40:33 +00:00
Robert Osfield
6c8ef3b7df Fixed the texture apply method which was broken yesterday, the new code wasn't
checking for the validity of _image before doing checks on it.  This breaks when
render to texture is used as there is no image to check against...

Added osgshadowtexture demo source.  Demos still in development, so don't expect
any shadows yet...
2002-11-20 07:46:25 +00:00
Robert Osfield
f46b231305 Added handling of image dirty after a textyre has been bound, the texture
is now updated when the image is dirty.
2002-11-19 12:48:58 +00:00
Robert Osfield
2b957675d5 Added visual workspace files for osgSim nodekit and osglightpoint demo. 2002-11-19 12:23:45 +00:00
Robert Osfield
e02ae73edc Added osgSim library which encapulsulates light points.
Added osglightpoint demo.
2002-11-19 10:57:40 +00:00
Robert Osfield
5fca8ea229 Moved Drawable across to using osg::buffered_value.
Added new osg::State::setInterleavedArray() method.

Added new osg::Group::setNode(uint,Node*) method.

Cleaned up and fixed the osg::Texture's handling of dirtyTextureParamters().
2002-11-19 10:56:59 +00:00
Robert Osfield
42fb3c5987 Added setDrawable(uint,Drawable*) method. 2002-11-18 16:14:00 +00:00
Robert Osfield
b89e7282ed From Jason Daly, fix for long file names on sequence nodes. 2002-11-14 15:30:28 +00:00
Robert Osfield
0980eeda1e Updated the plugins so they do the extension checking with a non
case sensitive comparison.
2002-11-14 09:03:31 +00:00
Robert Osfield
bd7762a73e Added State::computeSecondaryColorSupported() & computeFogCoordSupported().
Updated NEWS.
2002-11-13 11:09:55 +00:00
Robert Osfield
b6838c703e Small improvement to the computation of the pixel size vector. 2002-11-13 10:23:55 +00:00
Robert Osfield
b468d2f939 Fixed ansisotropic scaling problem with pixel scaling/small feature culling. 2002-11-12 15:50:39 +00:00
Robert Osfield
f07dc35976 Fixed bug in stats where overdraw would be reported incorrectly. 2002-11-12 13:51:04 +00:00
Robert Osfield
e1643bd16b Removed debugging messages. 2002-11-12 13:37:43 +00:00
Robert Osfield
4b27430931 Fixed bug in osg::Transform's computation of a its bounding sphere, where
it was erroneously using the y axis for the z axis test.
2002-11-12 13:36:56 +00:00
Robert Osfield
8e84722f90 Added LEFT_EYE and RIGHT_EYE stereo to osg::DisplaySettings/osgUtil::SceneView
Renamed LODBias to LODScale.
2002-11-12 10:22:38 +00:00
Don BURNS
6d1ba6c0f4 Fixed a const/non-const inconsistency in NodeVisitor.cpp
Fixed a blank namespace issue in UnitTestFramework.cpp
2002-11-11 20:18:27 +00:00
Robert Osfield
35b9317baf Fixes to typo of *Dirty() 2002-11-11 16:11:48 +00:00
Robert Osfield
1f50138ec4 Added a getBound() to the SceneView::app() to make sure the bounding volume is
updated well before the cull traversal which can be multithreaded.
2002-11-11 09:01:54 +00:00
Robert Osfield
6f3e2b681c Fixed bug in osg::Node::isCullingActive().
Rnabled the automatic selection of the animation path if one is specified
on the commandline in sgv.
2002-11-11 08:52:24 +00:00
Robert Osfield
3713bf1ced *** empty log message *** 2002-11-11 07:20:11 +00:00
Robert Osfield
4617294722 Fixes to build in VS7.0 2002-11-08 15:56:49 +00:00
Robert Osfield
f42205a3ef Updates version numbers to 0.9.2 2002-11-08 12:58:34 +00:00
Robert Osfield
a059191c1c Updates to GEO loader from Geoff Michel. 2002-11-08 12:56:45 +00:00
Robert Osfield
90b5d81c7a Minor warning fix. 2002-11-08 12:54:09 +00:00
Robert Osfield
9816a51bc7 Added GL_LIBS to the osgText/Makefile for OSX build.
Fixed typo in IntersectVisitor.

Fixed warnings in osgimpsotor demo.
2002-11-08 11:00:16 +00:00
Robert Osfield
5db3229b5f Updates to Math for OSX build.
Added 3dmodelworld.com to the data source directory.

Fixed compile problem under VC6.0 in osgimpostor.
2002-11-08 10:25:08 +00:00
Robert Osfield
0cd0c575f0 Fixes for VisualStudio6.0 build. 2002-11-08 08:51:30 +00:00
Robert Osfield
a0d2808b92 Removed the usage report from sgv when it fails to load a file. 2002-11-08 08:45:30 +00:00
Robert Osfield
ccd208422f Converted usage of GLuint to usigned int, in hope that it will get round the
warnings generated under OSX.
2002-11-08 08:34:06 +00:00
Robert Osfield
e852ee6dd8 Commented back in LIBS into Makefile for OSX build. 2002-11-08 08:12:18 +00:00
Robert Osfield
23064c9c64 Fixes for VisualStudio build and OSX build. 2002-11-08 08:11:12 +00:00
Robert Osfield
16d53271cc Compile fix from Duvan Cope. 2002-11-07 16:08:37 +00:00
Robert Osfield
cb6c0b2251 Commented out the selection of the animation path manipulator since it
was somehow disabling culling?!?
2002-11-07 15:45:01 +00:00
Robert Osfield
ba62fe4e48 Titled the view in osganimate and added the title into osgimpostor. 2002-11-07 15:13:32 +00:00
Robert Osfield
2a35dab922 Renamed Primitive:: to PrimitiveSet. 2002-11-07 14:44:01 +00:00
Robert Osfield
93f3378b86 Intergrated Martin Kada's impostor test program with the old test
program.
2002-11-07 14:13:51 +00:00
Robert Osfield
71bea99ba2 Added Geoff Michel's new osggeomdemo program which allows control of
geo models via the mouse.
2002-11-07 13:56:12 +00:00
Robert Osfield
c84cdf159c Updates to GEO loader from Geoff Michel. 2002-11-07 13:47:39 +00:00
Robert Osfield
15773d920a Fix for build under Linux. 2002-11-07 08:48:30 +00:00
Don BURNS
7669b96c28 Changed a couple of const/non-const discrpancies between header and source
for TexGen.  Removed external library dependencies in plugin makefiles
2002-11-06 18:39:32 +00:00
Robert Osfield
3bd400130c Name change and const change of Drawable::drawImmediateMode(State&) to
Drawable::drawImplementation(State&) const.   Various updates to the
rest of the OSG to accomodate this.
2002-11-06 15:43:11 +00:00
Robert Osfield
e34ecafb1e Added in default value of _timeScale. 2002-11-06 11:15:23 +00:00
Robert Osfield
26875c965d Renamed ProceduralGeometry to ShapeDrawable to better reflect its current
purpose.
2002-11-06 10:46:34 +00:00
Robert Osfield
5eb65f65cc Added support for recording camera animation paths in osgGLUT::Viewer, and fixed
the osgGA::AnimationPathManipulator to handle it.

Added a new Drawable::ConstAttributeFunctor and make the accept(PrimitiveFunctor)
be a const method so can disallows modification.  Added Drawable::supports(...) methods
for each of the AttributeFunctor, ConstAttributeFunctor and PrimitiveFunctor so
that programs can querry whether it is possible to use functors with that object type.
2002-11-06 10:24:33 +00:00
Robert Osfield
afa27a13ec From Jason Daly, fix for 14.2 color records in versions of OpenFlight files. 2002-11-05 07:50:40 +00:00
Robert Osfield
dc3aed2332 From Stephan Huber, fix for OSX build. 2002-11-04 15:33:08 +00:00
Robert Osfield
e999f5ad0f Added std:: in front of string. 2002-11-04 10:37:11 +00:00
Robert Osfield
a6eafa79e2 From Ulrich Hertlien, added ReaderWriter::Options to the osgconv and pfb plugin
so that all the pfi files can be converted to rgb be the plugin.
2002-11-04 09:08:50 +00:00
Robert Osfield
22c6fa1565 Fixed warning under Visual.NET 2002-11-04 09:07:25 +00:00
Robert Osfield
6bb8002116 Added in guard to png loader so that it only accepts png files. This has been
added since the png loader itself doesn't not seem robust enough at detecting
non png files.

Added a tab in to the flt code to make it more obvious what is happening in
the flow of the code.
2002-11-04 08:40:51 +00:00
Robert Osfield
bba03297a7 Added support for primitive functor into the new osg::ProceduralGeometry class 2002-11-01 15:12:51 +00:00
Robert Osfield
92895370f7 Futher fixes for VisualStudio.NET compilation. 2002-11-01 15:11:05 +00:00
Robert Osfield
1dad443898 Michael Gronage fix for aspect ratio in split stereo. 2002-11-01 14:16:58 +00:00
Robert Osfield
f74b4ec847 Fixed VisualStudio7.0 compile error related to an std::vector<>::iterator
no longer being a pointer, fixed by using a &(*itr).
2002-11-01 12:48:15 +00:00
Robert Osfield
ee54835144 Futher updates to shapes support. 2002-11-01 12:20:34 +00:00
Robert Osfield
432654bde8 Added handled of invlid drawable bounding boxes. 2002-11-01 12:11:23 +00:00
Robert Osfield
94105025a0 Updates to Shape support. 2002-11-01 10:25:27 +00:00
Robert Osfield
75fb39adbd Added a dirtyBound & diryDisplayList to the geometry merge operation in the
Optimizer to fix a bug where the bouding volumes where being invildated.
2002-10-31 15:24:17 +00:00
Robert Osfield
24746728e4 From Geoff Michel, added AC3D .ac and GEO .geo loaders. 2002-10-31 12:51:09 +00:00
Robert Osfield
21ee9e4cb7 Added osg::Grid shape class, and added an example of its use into the
hang glide demo.
2002-10-31 10:36:11 +00:00
Robert Osfield
85af8cc4ba Yefei He's updates to Pool and flt2osg to use lazy loading of textures from a
texture pallette.
2002-10-31 10:35:15 +00:00
Robert Osfield
da84f9b4aa Added first cut of new primtive shapes support. 2002-10-30 13:27:15 +00:00
Robert Osfield
aa5d172f99 Updated osgText .osg support so that it handles text via the osgDB::Outpur::wrapString() method. 2002-10-30 12:56:55 +00:00
Robert Osfield
8a9fce09d8 Fixed addChild(node,value) so that it resizes using the _newChildDefaultValue
rather than the add child value, then sets the child's value to value.
2002-10-30 10:07:16 +00:00
Robert Osfield
32c6a7809a Updated the handling of string in the .osg reading and writing so that it
handles the use of " quotes inside the string.
2002-10-28 12:55:19 +00:00
Robert Osfield
91c73c6da1 Removed the remapping of special keys to keyboard events. 2002-10-28 09:43:21 +00:00
Robert Osfield
55b2a5ff30 From Gideon May, fixes to remain const base type instances in headers. 2002-10-25 12:29:03 +00:00
Robert Osfield
18d99c06e4 Updated the min and mag filter modes to be more appropriate, still some
of the FLT modes havn't been mapped across as its is not obvious how to map
them to OpenGL/OSG.
2002-10-25 09:34:51 +00:00
Don BURNS
cc122c5bcb changed unsigned int's to unsigned longs so 64 bit build would work. 2002-10-24 20:49:15 +00:00
Don BURNS
5c111680f6 FIxed set_new_handler to std::set_new_handler 2002-10-24 15:24:39 +00:00
Robert Osfield
3be6ffd9c3 Changed the nameing of iterators to prevent clashes with VisualStudio's dumb
compiler.
2002-10-21 15:09:03 +00:00
Robert Osfield
761fc0574f Merged Pavel's updates to LWO2 for handle multiple texture layers. 2002-10-18 12:47:36 +00:00
Robert Osfield
31e8323f17 Added default colour and normal definition to the Geometry draw to prevent state
inheritance of these attributes from causing problems of Geometry which arn't
fully defined.
2002-10-18 12:26:23 +00:00
Robert Osfield
00fd58283c Added extension checking to the rgb and bmp write of images. 2002-10-18 12:23:42 +00:00
Robert Osfield
e1b084749e Renamed the RenderBin::sort_local to sortImplementation(),
draw_local to drawImplementation() and added a new RenderBin::DrawCallback().

Added osgcubemap to the Make/ test scripts.
2002-10-17 13:48:46 +00:00
Robert Osfield
ee8ded2a90 Fixed memory allocation. 2002-10-17 11:59:01 +00:00
Robert Osfield
88130dfa5a Checked in fix for std::hex for dumb arsed compilers. 2002-10-17 11:50:53 +00:00
Robert Osfield
ab59703e54 Fixed compile error under Windows. 2002-10-17 11:39:04 +00:00
Don BURNS
68427b98ae Changed std::malloc to new in src/osgUtil/CubeMapGenerator.cpp 2002-10-15 19:10:05 +00:00
Don BURNS
90d2c3054f Fixed cstdlib to stdlib.h for IRIX in src/osgUtil/CubeMapGeneragortor.cpp 2002-10-14 21:10:44 +00:00
Robert Osfield
4bb344719a Fixes from Macro. 2002-10-10 20:04:02 +00:00
Robert Osfield
bfd614f907 Fixed the names of the ControlPoint parameters so they weren't capitals, to avoid
the clash with the parameter type itself.

Addd a PER_PRIMTIIVE_SET handling to the existing PER_PRIMTIIVE code, this code
is still flacky though and needs a rewrite as it doens't handle all attributes or
the full consequences of per primitive and per primitive set bindings.
2002-10-10 14:58:44 +00:00
Robert Osfield
50652f389b Added Macro's new cube map generation classes and osgcubemap demo. 2002-10-10 12:44:38 +00:00
Robert Osfield
6c0861ef80 Maded the "flt::Registry::getPrototype: Unkown opcode:" message a INFO level
notify message rather than a NOTICE.
2002-10-10 09:42:41 +00:00
Robert Osfield
2e92e7d242 Made the warning about a mis-matching in the number of children in a switch
a INFO level notify message rather than a WARN.
2002-10-10 09:39:09 +00:00
Robert Osfield
50e8ea423c Added remapping of special keys to be handle like a convential key press. 2002-10-10 09:29:07 +00:00
Robert Osfield
41893927c1 From Gabor Dorka, Fixes to memory leaks. 2002-10-10 09:00:31 +00:00
Robert Osfield
16291da3b0 Fixes to smoothing visitor and tesselator to handle indexed Geometry. 2002-10-09 15:43:56 +00:00
Robert Osfield
88ecacfd7a Changed the default value of StandardOrientation to true, to fix orientation
problems which commonly occur with png files.   Leaves the quesition of how to set
this value automatically.
2002-10-09 15:41:22 +00:00
Robert Osfield
f210e13944 Fixed bug in osg::LOD::addChild() which was forcing all ranges to be identical
values.
2002-10-08 16:02:09 +00:00
Robert Osfield
c59fc9a2b7 Fixed a bug in the Optimizer where BIND_PER_PRIMITIVE_SET primitives where being eroneously merged.
Added missing support for reading geometry indices from the .osg format.

Added handling of geometry indices into the primitive functor in osg::Geometry.

Moved the method implementions of AnimationPathManipulator into src/osgGA and added extra convinience
methods for setting the manipulator with an hand built AnimationPath.

FCVS: 	VisualStudio/osgPlugins/iv/iv.dsp
2002-10-08 14:10:55 +00:00
Don BURNS
bfedea5636 osgdb_osg loader had more issues with const/non-const discrepancies on
Solaris.  Modified Geoset.cpp and Point.cpp
2002-10-08 08:39:42 +00:00