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

1314 Commits

Author SHA1 Message Date
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