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

1609 Commits

Author SHA1 Message Date
Robert Osfield
289ae01420 From Geoff Michel, conversion from GeoSet to Geometry. 2003-05-25 16:08:57 +00:00
Robert Osfield
087944d343 Removed export macro. 2003-05-24 14:42:00 +00:00
Robert Osfield
5bfaf54292 Added missing std:: 2003-05-24 14:26:20 +00:00
Robert Osfield
5408077c3b Added ive reader/writer - from Rune Schmidt Jensen/Michael Gronager 2003-05-23 19:51:12 +00:00
Robert Osfield
efa16a34c5 Fixes to the Optimizer's handling of merging of osg::Geometry 2003-05-22 15:29:20 +00:00
Robert Osfield
058e4939fc Convert Performer plugin across to generate osg::Geometry directly. 2003-05-22 11:09:28 +00:00
Robert Osfield
fb55f6ffbc Improved the handling of scaled matrices in the Quat::set(Matrix&) method. 2003-05-21 21:32:56 +00:00
Robert Osfield
72b86dee82 Removed the _state.reset() call as it was doing OpenGL calls outside of the 
thread with the graphics context.
 2003-05-21 16:33:53 +00:00
Robert Osfield
4a6bdad3e1 Removed osg::GeoSet for core osg lib and osgPlugin. 
Commented out OpenDX plugin as its still based on GeoSet.

Added support for loading and converting GeoSet into the osgconv example.
 2003-05-21 12:15:45 +00:00
Robert Osfield
fcbbf12b75 Added usage of the InputRectangle into setting up of the EventAdapter. 2003-05-20 20:45:10 +00:00
Robert Osfield
eb3169634a Removed spurious editing file. 2003-05-20 19:48:07 +00:00
Robert Osfield
094e0f2e48 Fixes to the handling of mouse coords after changes in the default behavior 
of Producer.
 2003-05-20 13:21:05 +00:00
Robert Osfield
e2ec462fab Changed the fusion distance update code to use OsgCameraGroup::setDistanceDistance() 
rather than going through the SceneView's by hand. This should ensure that values
are kept consistent betwen OsgCameraGroup and SceneView's.
 2003-05-20 08:47:21 +00:00
Robert Osfield
ab1b199da8 Removed the now redundent osg::Camera. 2003-05-20 08:09:36 +00:00
Robert Osfield
00e94b86d8 Removed all KeySwitchCameraManipulator class, replacing it 
with the KeySwitchMatrixManipulator
 2003-05-19 20:18:37 +00:00
Robert Osfield
940ce67133 Removed remaining dependancies on osg::Camera. 2003-05-19 15:15:17 +00:00
Robert Osfield
4151312dc5 Removed redundent const 2003-05-17 13:15:54 +00:00
Robert Osfield
715ba6fb66 Renamed png pnm 2003-05-17 09:03:06 +00:00
Don BURNS
b6d6759337 Small operation precedence bug fixed in Text.cpp 2003-05-14 16:07:39 +00:00
Robert Osfield
57af40ee95 Updates to the handling of vertex attributes. 2003-05-09 13:07:06 +00:00
Robert Osfield
876e40802e Memory leak fixes from Joseph Steel. 2003-05-08 14:02:50 +00:00
Robert Osfield
cda2c90315 From Romano José Magacho da Silva, support for vertex attributes in vertex program. 2003-05-07 13:13:13 +00:00
Robert Osfield
ba8bf1e94c From Eric Sokolowsky, support for mouse scroll wheel in osgGA/osgProducer. 2003-05-07 11:13:49 +00:00
Robert Osfield
aa0d5fc52e Changed the CullVisitor::popProjection() so that it doesn't adjust orthorgraphic 
projection matrices.
 2003-05-07 09:35:43 +00:00
Robert Osfield
fa0333b6fe Aded extra constructors to BlendFunc and Depth to help set them up convieniently. 
Added a background quad to osghud.
 2003-05-06 18:04:27 +00:00
Robert Osfield
06054d9520 Added support for multibuffering of tex coordinates. 2003-05-06 13:13:31 +00:00
Robert Osfield
6c60fa233e Fixed accept(PrimitiveFunctor&) so it uses the transform coords correctly. 2003-05-05 14:30:12 +00:00
Robert Osfield
ee550382c8 Fixed build. 2003-05-02 18:24:56 +00:00
Robert Osfield
895a722842 Addd support for maximum screen text size into osgText when auto scale to 
screen is active.

Added osgautotransform demo.
 2003-05-01 21:06:18 +00:00
Robert Osfield
d2d9b97953 Added set/getNearFarRatio() to CullVisitor. 2003-05-01 19:56:02 +00:00
Robert Osfield
2d360c344c Remved exit(). 2003-05-01 08:51:03 +00:00
Robert Osfield
86254927b9 From Eric Sokolowsky - pnm (ppm, pgm, pbm) plugin 2003-04-30 15:40:57 +00:00
Robert Osfield
0ab467483f Added support for automatic scaling of text to screen coords. Optimized 
the text implementation to provide better speed, especially by using the
alignement to screen option.

Deprecated the Text::setFontSize(,) method, which is now being replaced
by setFontResolution(,)

Fixed typos in Texture*.cpp.

Removed old deprecated methods from osg headers.
 2003-04-30 11:40:17 +00:00
Robert Osfield
821313d102 From Ben, promoted floats to doubles to produce better stability in the 
invert method.
 2003-04-29 14:24:11 +00:00
Don BURNS
e1468428e3 set glDrawBuffer( GL_BACK ) in SceneView::draw() when not drawing in 
stereo mode.  Without this, we end up drawing to the wrong buffer when
toggling stereo off.
 2003-04-29 00:55:12 +00:00
Robert Osfield
c1b1a091fa From Tree, addition of ; after MACRO_'s to help with Java port. 
From Tree + Robert, Addition of LEFT_BASE_LINE,RIGHT_BASE_LINE,CENTER_BASE_LINE
Alignment options in Text.
 2003-04-27 10:58:39 +00:00
Robert Osfield
89b1365b2b Added support for gather information on which vertices have been intersected with. 2003-04-25 13:47:33 +00:00
Robert Osfield
af1eae0418 cout -> notify. 2003-04-24 13:45:10 +00:00
Robert Osfield
341fa340ce Added check for camera's sharing the same RenderSurface, if so switches off 
multi-threading of cull and draw.
 2003-04-23 09:59:08 +00:00
Robert Osfield
a79fada938 Mannually computes the mipmap levels to ensure correct loading of dds 
images which arn't square.
 2003-04-19 06:57:07 +00:00
Robert Osfield
b6ee5445b7 Changed the ordering of the picking intersections. 2003-04-18 21:44:48 +00:00
Robert Osfield
1cf0be9963 Fixes to BlendFunc - adding missing ZERO handling. 
Improved handling of alpha values in DXT1 compression.
 2003-04-18 19:46:46 +00:00
Robert Osfield
bc8bd29646 Updated NEWS for the release. 
Fixed warnings.
 2003-04-18 15:59:34 +00:00
Robert Osfield
1c8db044f1 Removed various assert() instances since these were causing crashes. 
From Alberto, changed the use of the DynGeoSet to it was querried on demand
rather than used as a pointer which was originally being invalidate before
use.
 2003-04-18 10:10:14 +00:00
Robert Osfield
ba575396a4 Added setting of the RenderSurface name to the application name. 2003-04-17 15:57:05 +00:00
Robert Osfield
d0aac6e6f0 Added an alternate compile path for Windows in the toggle of fullscreen 
for the first time.
 2003-04-17 13:57:15 +00:00
Robert Osfield
67f5cc46c1 Changed the maxx initializiation to use (*points)[last_valid_index].x(); 2003-04-17 13:36:41 +00:00
Robert Osfield
fd262554ac Moved the managing of frame stamp from osgProducer::Viewer into 
osgProducer::OsgCamaraGroup.

Added setting of trackball in osgcameragroup so its starts in the
correct place for different models.
 2003-04-17 11:14:25 +00:00
Don BURNS
6fc19084ac Changed Rect('s to Rectangle('s 2003-04-16 21:16:23 +00:00
Robert Osfield
0b0c6c4e60 Added support for set/getColor to ShapeDrawable. 2003-04-16 20:02:15 +00:00
Robert Osfield
cad160fbe6 From Marco Jez, added DelaunayTriangulator class. 2003-04-16 19:21:27 +00:00
Robert Osfield
d9ddd0bb06 Changed near and far instances into near_point, far_point to avoid 
problems with Win32 build.
 2003-04-16 19:20:15 +00:00
Robert Osfield
3bd03476f4 Moved the PickVisitor from osgUtil into the implementation of 
osgProducer::Viewer.  Removed methods in PickVisitor which wern't being
used by osgProducer::Viewer.  This has been done because the PickVisitor
interface and implementation weren't ready for general usage.
 2003-04-16 15:14:25 +00:00
Robert Osfield
2e659c9ebf Renamed computeNearFar to computeNearFarPoints. 2003-04-16 14:22:36 +00:00
Robert Osfield
904aceec22 Added convinence methods to osgProducer::Viewer: 
/** compute, from normalized mouse coords, for sepecified Camera, the pixel coords relative to that Camera's RenderSurface.*/
        bool computePixelCoords(float x,float y,unsigned int cameraNum,float& pixel_x,float& pixel_y);

        /** compute, from normalized mouse coords, for sepecified Camera, the near and far points in worlds coords.*/
        bool computeNearFar(float x,float y,unsigned int cameraNum,osg::Vec3& near, osg::Vec3& far);

        /** compute, from normalized mouse coords, for sepecified Camera, intersections with the scene.*/
        bool computeIntersections(float x,float y,unsigned int cameraNum,osgUtil::IntersectVisitor::HitList& hits);

        /** compute, from normalized mouse coords, for all Cameras, intersections with the scene.*/
        bool computeIntersections(float x,float y,osgUtil::IntersectVisitor::HitList& hits);
 2003-04-16 14:17:49 +00:00
Robert Osfield
f9eb43083a Changed OsgSceneHandler so it re-uses osgUtil::SceneView project and modelview 
matrices.

Changed the osgpick demo so that it uses the OsgSceneHandler's projection and
modelview matrices where possible.
 2003-04-16 09:22:33 +00:00
Robert Osfield
63628ce099 From Romano, extra methods/variables for controlling tesselation. 2003-04-15 09:33:11 +00:00
Robert Osfield
0036018507 Added -I/usr/X11R6/include to osgProducer and all the examples GNUMakefiles. 
From Bob, mods to GNUMakefile and Make/makedefs for the extra includes for
freetype.
 2003-04-14 19:39:22 +00:00
Robert Osfield
95636af81c Added using namespace Producer to get round namespace issue with CameraGroup 
call.
 2003-04-14 18:53:50 +00:00
Robert Osfield
deac5b8d4a Updated osgstereoimage and osgimpostor to handle the new default 
orientation of normalized mouse coords.
 2003-04-14 18:49:41 +00:00
Robert Osfield
5df7118d6d Updates to the osgpick code. 
Updates to osgGA::CameraManipulors.
 2003-04-14 15:44:30 +00:00
Robert Osfield
b66f464a1b Tweak to the debug output. 2003-04-14 15:03:55 +00:00
Robert Osfield
39a5cf3ad9 Added extra debugging details to help track down IRIX64 & Solaris64 problems. 2003-04-14 15:02:13 +00:00
Robert Osfield
f543d69881 Improved the handling of Producer's no dimensional mouse coords. 2003-04-14 13:23:12 +00:00
Robert Osfield
3df0401007 Addd new computeLocalToWorld(NodePath) etc methods. 2003-04-14 13:22:21 +00:00
Robert Osfield
a202cfa4f3 Changed push back to a += to try and fix compile on hopeless OSX g++ version. 2003-04-14 08:16:55 +00:00
Robert Osfield
026dc2cbb7 Added Geoff Michel's osgpick and osgUtil::PickVisitor code. 2003-04-13 13:26:41 +00:00
Robert Osfield
1a943c69ba Convertex a std::copy() into a for loop to get round compile problems under 
OSX.
 2003-04-11 18:57:35 +00:00
Robert Osfield
0c9b652f31 Changed the uint arrays to GLuint to keep OSX build compiling. 2003-04-11 15:33:40 +00:00
Robert Osfield
c2a9234cc5 Updated the version numbers to 0.9.4 2003-04-11 10:04:53 +00:00
Robert Osfield
83fb3f40c9 Added afterescher back into the example list in runexamples.bat. 
Added osgSim and osgText into the geo/GNUmakefile LIBS.
 2003-04-11 10:00:56 +00:00
Robert Osfield
50d1fcfea2 From Romano, added support in osg::VertexProgram for deleting the flushed 
vertex programs.
 2003-04-11 09:54:27 +00:00
Robert Osfield
aaa761e333 Added tests for presense of extensions to osgcubemap, osgvertexproram and 
osgmultitexture examples.

Added osg::VertexProgram::Extensions class to better handle multiple graphics
context vertex program extensions.
 2003-04-10 19:32:32 +00:00
Robert Osfield
52d2d8eaff Moved the osgcameragroup example across to being just based on 
osgProducer::OsgCameraGroup with no usage of osgGA manipulators.

Removed redundent files from osgProducer.
 2003-04-10 15:23:49 +00:00
Robert Osfield
8b03d59be3 Added support for modifying the osg::Texture*:Extensions stuctures. 
Added an example modifying osg::Texture::Extensions to osgtext.  Optionally
compiled out by default.
 2003-04-10 13:41:45 +00:00
Robert Osfield
bc4fd5b051 Added usage of Producer::CameraGroup::isValidForRendering() to the Viewer::done() 
implemention so apps automatically close if one of the windows is killed.
 2003-04-10 12:55:48 +00:00
Robert Osfield
22546b8085 Added support for multiple graphics context to osg::VertexProgram and osg::Impostor 2003-04-10 12:11:40 +00:00
Robert Osfield
5c88b5ff8b Fix to the CameraGroup::setViewByMarix usage. 2003-04-10 10:16:39 +00:00
Robert Osfield
e1e54570cb Fixed Viewer and OsgCameraGroup classes so that work properly with the 
Prodicer::setViewByMatrix calls.
 2003-04-10 10:02:24 +00:00
Robert Osfield
0a68608bc4 From Brede, added 
if (cv->getComputeNearFarMode() != osgUtil::CullVisitor::DO_NOT_COMPUTE_NEAR_FAR)
to protect
  cv->updateCalculatedNearFar(matrix,_bbox);
call to avoid inapporpriate near/far warnings.
 2003-04-10 08:25:30 +00:00
Robert Osfield
2166f9b701 Fixes to the Impostor implementation. 2003-04-09 21:53:09 +00:00
Robert Osfield
3dc180f3fd From Romano, ' ' now sets pause to false. 2003-04-09 13:29:12 +00:00
Robert Osfield
eb995684fb Added using namespace std; 2003-04-09 11:45:41 +00:00
Robert Osfield
38cccb696b Added environmental variable usage to OsgCameraGroup. 2003-04-09 10:51:13 +00:00
Robert Osfield
692283100c Added support for osg::Node::get/setNodeMask() into .osg format. 2003-04-09 10:30:24 +00:00
Robert Osfield
ca4b558994 Made the AnimationPathManipulator::home() reset the timming of the 
animation path so that the timing always starts at the begining of the loop.
 2003-04-09 10:26:50 +00:00
Robert Osfield
2c030170ff Added a setting of OsgCameraGroup::_applicateUsage to 
ApplicationUsage::instance() by default.
 2003-04-09 10:13:07 +00:00
Robert Osfield
e377424752 Added fallback in RenderBin::createRenderBin(const std::string& binName) which 
return a new RenderBin when the no prototype is found with className of binName.
 2003-04-09 10:10:57 +00:00
Robert Osfield
b02917e7a2 Fixed type of osg::ApplicationUsage::set/getApplictionName(), updated 
demos accordingly.

Made OsgCameraGroup set the _applicationUsage to the
osg::ApplicationUsage::instance() when no ArgumentParser is supplied.

Added export to osgProducer::ViewerEventAdapter.
 2003-04-09 08:20:08 +00:00
Robert Osfield
1e689ae57a Added support for key modifiers to osgProducer::EventAdapter. 2003-04-08 20:39:47 +00:00
Robert Osfield
c3fd384eb1 From Romano José Magacho da Silva, added 'p' toggle to animation path 
manipulator to allow animations to be paused and resumed.

Added frame rate stats which are output on each repetition of the path.
 2003-04-08 20:06:37 +00:00
Robert Osfield
8a3d731739 Added support for Viewer::setViewer::setView so that the internal old 
style osg::Camera and camera manipulators are updated correctly.
 2003-04-08 15:47:45 +00:00
Robert Osfield
e928bca4c9 Changed the Viewer::realize() calls across to not using the threading paramter 
leaving it up to the Viewer to specify the mode (which by default is MultiThreaded).
Added a check for the presence of osgParticle systems so that threading is
disabled in this case.
 2003-04-08 15:18:45 +00:00
Robert Osfield
afef5ad2fa Set the static mouse position values in osgProducer::EventAdater to the same 
value as warp pointer to ensure that the now roll is encountered on warping
of the pointer.
 2003-04-08 13:53:28 +00:00
Robert Osfield
5f8411ac5c Changed the KeySwichCameraManipulator::setNode() so it set all camera's 
attached to it.
 2003-04-08 13:10:47 +00:00
Robert Osfield
4fd2352afa Cleaned up some warnings and added : 
LINKARGS += -Wl,multiply_defined -Wl,suppress

To GNUmakefile for the OSX build.
 2003-04-08 10:17:44 +00:00
Robert Osfield
18ab95a294 Added support for snaping screen images from osgProducer::Viewer apps. 2003-04-07 19:19:01 +00:00
Robert Osfield
e04b36b467 Fixes to dds plugin from Rune. 2003-04-07 15:11:29 +00:00
Robert Osfield
6a178f76c4 Set the hardware mip map generation to false in TextureCubeMap since this 
extension is not implemented when texture cube mapping.
 2003-04-07 15:07:45 +00:00
Robert Osfield
7af174fadb From Ulrich Hertlien, new osg::TextureRectangle class. 2003-04-07 13:20:53 +00:00
Robert Osfield
9f0fa75484 Added support for unref image data after apply in the osg::Texture* 
classes.  Only unref's after all graphics context have been applied.
 2003-04-07 12:51:00 +00:00
Robert Osfield
0df1b28672 Added osgwindows example which sets up and Producer::CameraConfig up 
and uses that to create multiple windows.
 2003-04-07 10:20:34 +00:00
Robert Osfield
7e58786b11 Moved the modified tag's from osg::Texture into the osg::Texture1D,2D,3D and 
CubeMap classes.
 2003-04-07 09:46:06 +00:00
Robert Osfield
98f691f693 Added if (!_kbmcb) to handle the case where the keyboard mouse callback 
is pre set.
 2003-04-06 21:46:48 +00:00
Robert Osfield
49a28660dc Added the usage report to the examples for when no arguments are passed 
to the examples.
 2003-04-06 21:32:44 +00:00
Robert Osfield
8a3b81f00d Fixed handling of pixel and internal images formats. 2003-04-06 10:07:44 +00:00
Robert Osfield
c7a7bd03cb Added support for recording animation paths in the osgProducer::Viewer. 2003-04-05 22:24:48 +00:00
Robert Osfield
cac6642de5 Improvements to the handling of warp pointer call on start up. 2003-04-05 07:19:40 +00:00
Robert Osfield
c6e3cb044b Fixed the drive manipulator so its height is now 1.5m and the buffer size if 
2.0m.
 2003-04-05 07:11:07 +00:00
Robert Osfield
169bf25f77 Implemented support for float x and y mouse positions, and normalization of 
mouse coords in osgGA::GUIEventAdapter, and ported osgGA camera manaipulators
to use the new normalized values.

Moved osgProducer across to tracking the window dimensions and ensure that the
internals values in osgProducer::EventAdapter are kept consistent.  Moved
the warp pointer in Viewer across to using KeyboardMouse::positionPointer().
 2003-04-04 19:10:37 +00:00
Robert Osfield
e9e0b4304d Improved support for toggle between full screen and non fullscreen in 
the osgProducer::Viewer.
 2003-04-04 11:06:09 +00:00
Robert Osfield
7473bf573d Suported for mip mapping added by Rune. 2003-04-03 21:00:12 +00:00
Robert Osfield
a47a6f0310 Fixes to the multipipe initialization. 2003-04-03 14:12:09 +00:00
Don BURNS
03a0b4f5de Changes to fix compiles on Mac OS X 2003-04-03 08:14:49 +00:00
Robert Osfield
78d95b2414 Fixes for Win32 - removed second copy constructor from protected section 
in ReaderWriterLOGO.cpp, and add osgText as a dependancy to osgtexture3D example app.
 2003-04-03 07:37:08 +00:00
Robert Osfield
12e2e1968a Fixes to the dds plugin. 2003-04-02 19:41:18 +00:00
Robert Osfield
0f3eaeba46 From Rune Schmidt Jensen - new dds loader. 2003-04-02 18:26:34 +00:00
Robert Osfield
7aab621405 Added support for min pixel size, max pixel size and max visable distance to 
osgSim::LightPointNode, the max pixel size from was originally in osg::LightPoint.

Added additional get/set methods to osg::LightPointNode.

Increased the compute pixel size by a ratio 1.41 (sqrtf(2)) to correlate the
computed size with the actual size seen on screen.
 2003-04-02 10:50:15 +00:00
Robert Osfield
d3d32edfcd Added prefix's to ApplicationUsageProxy's and made them static to help 
prevent problems under OSX.
 2003-04-02 08:22:47 +00:00
Robert Osfield
732dad0e6e Fixed std::string usage so that std::string::size_type is used where 
appropriate.
 2003-04-01 20:52:56 +00:00
Robert Osfield
5a974ab091 Fixes to osg::Texture's handling of anisotropy updating and 
hardware generate mip mapping.

Added switching off generate mip map from osgText::Font.cpp.

Changed savedmodel.osg to saved_model.osg in ViewerEventHandler.
 2003-04-01 20:32:57 +00:00
Robert Osfield
b59760482f Changed unsigned int to std::string::size_type. 2003-04-01 18:50:36 +00:00
Robert Osfield
5b36049f33 Added convinience constructor. 2003-04-01 18:42:38 +00:00
Robert Osfield
060b9f7150 Added futher debugging messages to track down the x86-64 crash. 2003-04-01 18:42:17 +00:00
Robert Osfield
49b62ff92c Moved the logo plugins from the osgPlugins/logos directory to osgPlugins/logo 
to make it consistent with the naming of the plugin.
 2003-04-01 15:13:26 +00:00
Robert Osfield
43f1c0121b Bug spotted and fix by Sébastien Kuntz. Changed < to <= on Geometry.cpp, in removePrimitiveSet(), 
if( i+numElementsToRemove<_primitives.size() )
 2003-04-01 15:08:30 +00:00
Robert Osfield
fee0debfde Added timer code to the init in OsgCameraGroup. 
Made the stats view 20 frames rather than 6.
 2003-04-01 11:55:29 +00:00
Robert Osfield
763ee7f086 Cleaned up the reset of the vertex arrays in osg::State. 2003-04-01 11:53:34 +00:00
Robert Osfield
3975fc9b01 Improved handling of subloading. 
Removed the rescalling of images in osg::Image during texture apply, moving
the rescale so it is locally calculated.  This solves an outstanding threading
problem which occured by multiple draw threads all tried to rescale the same
image at one time.

Made osg::Image ptr in osg::Texture2D non mutable as it is no longer modified
during apply.
 2003-04-01 11:49:09 +00:00
Robert Osfield
90a2c93e50 Added extra debugging messages into the ArgumentParser::reportRemainingOptionsAsUnrecognized(ErrorSeverity severity) 
method to help track down a crash under x86-64.
 2003-04-01 08:47:11 +00:00
Robert Osfield
b728b1dd99 Implemented load and subload methods in osg::Texture/Texture2D. 2003-03-31 21:41:17 +00:00
Robert Osfield
11a38e12f2 Made the default transparent bin be bin number 10 rather than 1 to allow 
more bins between it and the default opaque bin of 0.

Added a check for compressed image format in osg::Texture.
 2003-03-31 12:48:33 +00:00
Robert Osfield
60e16ea044 Added Escape to the help list. 
Changed the help key from '?' to 'h'
 2003-03-28 10:04:58 +00:00
Robert Osfield
6b7102d16e Improved stats. 2003-03-27 14:39:19 +00:00
Robert Osfield
c784f8a669 Changed the background pixel colour to white, but kept the alpha value zero. 
This has been done to improve the quality of the mip mapping of text.
 2003-03-27 10:58:20 +00:00
Robert Osfield
fc4fe9c625 Updates to utilise the new Producer keyboard bindings. 2003-03-27 10:54:01 +00:00
Robert Osfield
e93c812021 Improved the stats reporting. 2003-03-26 16:48:29 +00:00
Robert Osfield
8779fe20a7 Added help support for display help on screen to osgProducer::Viewer. 2003-03-26 12:50:30 +00:00
Robert Osfield
e00b8f2868 Tweak the tex coords of fonts slightly to avoid cut off of text. 2003-03-25 15:48:17 +00:00
Robert Osfield
cad1d8162b Fixed axis alignment bug in text, which occured what text was placed on the XZ 
or YZ planes.
 2003-03-25 15:45:08 +00:00
Robert Osfield
0c60d14c00 Added a ViewerEventHandler which manages full screen, file write, and help 
output to osgProducer.  Removed FullSreenEventHandler as it is now superseeded
by ViewerEventHandler.
 2003-03-25 15:13:20 +00:00
Robert Osfield
ce46db87b0 Spotted by Brede - missing ! 2003-03-25 13:01:34 +00:00
Robert Osfield
f2772debf4 Added back into the win32 build of KeyboardMouseCallback the check against VK_ESCAPE. 2003-03-25 12:42:06 +00:00
Robert Osfield
35e0ba12bc Added a viewer.sync to the end of all the demos. 
Removed the Win32 remapping of keycodes from the osgProducer::EventAdapter.
 2003-03-25 10:05:09 +00:00
Robert Osfield
a03675495a Added new osgkeyboad example. 2003-03-24 21:17:51 +00:00
Robert Osfield
09acadb560 Added support for remapping of Win32 key symbols to 
osgGA::GUIEventAdpater::KeySymbols.
 2003-03-24 15:13:00 +00:00
Robert Osfield
19e2368991 Added osgGA::GUIEventAdapter::KeySymbol enumate list, which is a remapping 
of the X settings.

Added a pass through of X11 sybmbols from Producer to osgGA::GUIEventAdapter::KeySymbol
in the osgProducer::EventAdapter.
 2003-03-24 13:43:22 +00:00
Robert Osfield
6dbc770347 Made the osgGA::GUIEventHandler sublassed from osg::Object as a virtual 
inheritence to allow handler to also be used as node callbacks.

Fix to UpdateVisitor to make the visitation of Drawable more consistent
with the way that nodes are traversed.
 2003-03-24 08:42:35 +00:00
Robert Osfield
f0eae16828 Added overide of the SceneHandler::clear() making it a no-op. Will revisit 
this implemention later.
 2003-03-20 17:24:25 +00:00
Robert Osfield
fe49a97baa Updates to osgProducer and osgstereoimage for stereo support. 
Changed the default distance from the scene of the home position of the
trackball and flight manipulators.
 2003-03-20 17:00:32 +00:00
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