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

3186 Commits

Author SHA1 Message Date
Robert Osfield
16801f82e0 From Steve Lunsford, added psuedo event dispatch to init within selectCameraManipulator 
to force the new minpulator to update correctly.
 2005-11-07 15:43:29 +00:00
Robert Osfield
31ec432e06 From David Spilling, added "noRotation" ReaderWriter::Option into the .obj plugin 
to enable disabling of the automatic rotation from Y up coordinate frame to Z up coordinate frame.
 2005-11-07 14:42:36 +00:00
Robert Osfield
b2f5a48c15 From Marco Jez, Added an unregister of the GraphicsContextImplement on unload. 2005-11-07 13:54:25 +00:00
Robert Osfield
a3f42b480c From David Spilling, fix for typo of OVERRIDE. 2005-11-07 12:41:32 +00:00
Robert Osfield
efd96108fb From Gideon May, compile fixes for OSX. 2005-11-07 11:14:23 +00:00
Robert Osfield
4ea3956fda From Norman Vine, "Cygwin uses unix style path separators" 2005-11-07 11:09:59 +00:00
Robert Osfield
2773d45f2a From Wang Lam,"The changes allow users of OpenSceneGraph to call a new function 
readFontStream() to load fonts from a std::istream, rather than from the
local filesystem by name.  Such a call may be used, for example, if the
user has a font fetched over a network, or a font available in memory
without a correspondng filename.

The changes implement the new function by following the corresponding code
for readFontFile().  readFontStream() reads a stream into memory, and
holds that memory for FreeType.

As a basic test, I mangled the osgtext example to use
readFontStream(std::ifstream("font")) in lieu of a readFontFile call, and
the modified example ran completely."
 2005-11-07 11:05:16 +00:00
Robert Osfield
9bfc6ead94 Added extra debugging checks on FBO's 2005-11-04 19:00:49 +00:00
Robert Osfield
4915259878 Improved support for texture subload/render to texture in various Texture classes 
and RenderStage.
 2005-11-04 12:08:16 +00:00
Robert Osfield
89b0ef09a8 Improvements to CameraNode IO support, now handles render to texture. 2005-11-03 21:35:45 +00:00
Robert Osfield
06e8ee3646 Changed the CameraNode read/write code to use Transform as its parent. 2005-11-03 19:20:04 +00:00
Robert Osfield
e7ac09153a Removed debugging message 2005-11-03 17:12:49 +00:00
Robert Osfield
40ef0bbdff Further work on osg::CameraNode support. 2005-11-03 17:08:40 +00:00
Robert Osfield
fb2d3ae108 Further work on added IO support from CameraNode. 2005-11-03 15:59:17 +00:00
Robert Osfield
9d9d6c5a12 Completed osg::CameraView support in .osg and .ive formats. 2005-11-03 12:25:25 +00:00
Robert Osfield
7c612fb1d9 Added env var docs on OSG_MAX_TEXTURE_SIZE 2005-11-03 10:59:22 +00:00
Robert Osfield
e183c79f08 Updated wrappers 2005-11-03 10:18:19 +00:00
Robert Osfield
6562aa4f5f Added initial CameraNode and CameraView stups for the .ive loader 2005-11-03 10:16:38 +00:00
Robert Osfield
eb28f9f587 From Eric Sokolowsky, added writeEnvironmentSettings to help report what OSG 
centric environment variables are used.
 2005-11-03 10:01:09 +00:00
Robert Osfield
4c13328d98 Added CameraNode.cpp and CameraView.cpp 2005-11-03 09:03:46 +00:00
Robert Osfield
5dee96c14f Inital work on adding .osg support for CameraNode and CameraView. 2005-11-02 19:52:58 +00:00
Robert Osfield
511dda8525 Updated wrappers. 2005-11-02 19:35:35 +00:00
Robert Osfield
f3cfe97da9 Added support in DisplaySettings and OscCameraGroup for requesting accumulator buffer. 2005-11-02 19:15:18 +00:00
Robert Osfield
df2299cb50 From Alan Ott, added support for palletted imagery. 2005-11-02 16:20:55 +00:00
Robert Osfield
b0df518d11 Added handling of CameraNode into PickVisitor in src/osgProducer/Viewer.cpp. This 
is unlikely to be the final solution, but does at least fix part of the problem of handling
picking HUD's underneath CameraNodes.
 2005-11-02 15:23:54 +00:00
Robert Osfield
6c31d05172 Added a setSupportsDisplayList(false) to constructor to prevent end users 
enabling display lists, something that can break the osgText's managment
of state.
 2005-11-02 12:22:12 +00:00
Robert Osfield
b0d19b0b66 From Farshid Lashkari, "I need the ability to check for a font file without actually loading 
the font object.  I've modified font.h/cpp of osgText so that it
exports the findFontFile function."
 2005-11-02 10:57:42 +00:00
Robert Osfield
ddd609e37b From Marco Jez, commented out debuggin message. 2005-11-02 10:55:20 +00:00
Robert Osfield
781f6d3cec From Colin McDonald, "Fixes for some duplicate global symbol definitions in the plugins, 
which cause errors when creating a statically linked executable."
 2005-11-02 10:29:38 +00:00
Robert Osfield
44d0e90f92 Changed the error number reporting to be reported as hex. 2005-11-01 20:16:31 +00:00
Robert Osfield
2584d43393 Removed the double call to the camera post draw callback. 2005-11-01 19:31:30 +00:00
Robert Osfield
e23176c3b6 Set the draw and read buffer to GL_NONE when using FBO's, thereby avoid 
invalid enumrates being generated.
 2005-11-01 15:39:26 +00:00
Robert Osfield
4509232792 Improved handling of osg::Image copying. 2005-11-01 15:23:03 +00:00
Robert Osfield
a4275fb8d7 From Brad Colbert, Added checking for a NULL return string rom gluErrorString (with slight reformating of this by Robert Osfield.) 2005-11-01 11:18:40 +00:00
Robert Osfield
e47d56ba88 Updated wrappers 2005-11-01 11:00:07 +00:00
Robert Osfield
a742cb682e Added RenderTargetFallback option into osg::CameraNode. 2005-11-01 10:42:54 +00:00
Robert Osfield
030fe7d9ea From Steve Lunsford, "Attached is a copy of TXPNode.cpp with the repaired computeBounds call. I 
discovered that TXPNodes were being culled out prematurely because the
loaded sub-tiles resulted in a computed bounds that was smaller than the
extents indicated in the archive.  I think this fix should be fine.  I can't
think of any reason why we would want to use anything other than the archive
extents."
 2005-10-31 16:40:23 +00:00
Robert Osfield
b704045e6c Added default setting of _threading_model to ThreadPerCamera when multiple cameras 
are present, and SingleThreaded when a single camera is being used.
 2005-10-31 14:48:11 +00:00
Robert Osfield
b61a8a6603 From Brede Johansen, "some tweaks to the osgSim lightpoints. 
- The first change is to start fadeing a lightpoint just before the
maximum distance of a light is reached.
- The second change is to start fading a lightpoint when pixelSize is
less than _minPixelSize instead of 1.0."
 2005-10-31 11:43:54 +00:00
Robert Osfield
c4ae277893 Updated wrappers. 2005-10-29 11:29:58 +00:00
Robert Osfield
79a7f8c729 Added catch for NULL return from glGetString( GL_VERSION ); 2005-10-29 10:04:35 +00:00
Robert Osfield
d1de669f03 Updated wrappers. 2005-10-29 09:52:56 +00:00
Robert Osfield
0956f3cdb4 From Marco Jez, Fix for the class name lookup in osgDB::Registry::writeObject(), which can silently fail when a NodeKit's class (for example osgNVCg::Program) has the same name as that of an OSG's class (for example osg::Program). 2005-10-28 18:39:14 +00:00
Robert Osfield
578530d0b4 Fixed env var docs for sharing graphics contexts. 2005-10-28 18:37:15 +00:00
Robert Osfield
fa5ab64c94 From Ravi Mathur, "Here is an update to BlendEquation that adds checking for the 
SGIX_blend_alpha_minmax and EXT_blend_logic_op extensions.  It is
tested with the osgblendequation example.  If the extensions are not
supported, a WARN level notification is generated."
 2005-10-28 13:18:09 +00:00
Robert Osfield
ab1bd48511 Moved SceneView across to use an osg::CameraNode to store the projection and view matrices, 
the viewport, the clear colour and the subgraph needing rendered.  This is done
transparently so all existing functionality will behave as before.  What it does
add is the ability to set a SceneView directly by a single osg::CameraNode when required.
 2005-10-28 13:11:56 +00:00
Robert Osfield
3e3d16a99d Changed debug message from NOTICE to INFO level of notification 2005-10-28 10:33:11 +00:00
Robert Osfield
669bd46d97 Updated wrappers. 2005-10-28 09:20:21 +00:00
Robert Osfield
96a88f968a Added error message to report when too many line segments are added to an IntersectVisitor. 2005-10-27 11:11:02 +00:00
Robert Osfield
d2487e73e5 Added support for tracking the directory of the output file whilst still maintaining 
local file references within this directory.
 2005-10-27 10:48:44 +00:00
Robert Osfield
e66fd1dc70 Changed the minimum tile image size to be 4x4 to avoid problems in mipmap generation 
that was occuring at sizes of 2x2, seemingly somewhere in the OpenGL driver.
 2005-10-26 20:00:10 +00:00
Robert Osfield
be07f48884 From Geoff Michel, compile fixes for VS6.0 2005-10-26 09:22:13 +00:00
Robert Osfield
9c51a3db8d Updated wrappers 2005-10-25 18:34:46 +00:00
Robert Osfield
1b26232f71 Added command line support for the interlaced stereo modes. 2005-10-25 15:49:48 +00:00
Robert Osfield
f46044084a From Farshid Lashkari & Robert Osfield: Added support for VERTICAL_INTERLACE and HORIZONTAL_INTERLACE 
stereo modes use the stencil buffer.
 2005-10-25 15:43:04 +00:00
Robert Osfield
e14262df85 Updated wrappers. 2005-10-25 14:01:50 +00:00
Robert Osfield
598dda59f5 From Geoff Michel, added support for constrain delaunay triangultion, and osgdelaunay example. 2005-10-25 13:28:48 +00:00
Robert Osfield
2b2ca82b5a Added check against glGetString(GL_VERSION) returning NULL. 2005-10-25 13:24:39 +00:00
Robert Osfield
032b7484d4 From Markus Trenkwalder, added meanigful return types in 
Registry::read(const ReadFunctor& readFunctor) for ERROR_IN_READING_FILE and
FILE_NOT_FOUND cases.
 2005-10-25 09:54:15 +00:00
Robert Osfield
280f50b3d9 From Don Tidrow, removed unncessary includes. 2005-10-25 09:43:37 +00:00
Robert Osfield
285418d6f8 From Brede Johansen, changed osg_InverseViewMatrix to osg_ViewMatrixInverse to bring 
into line with OpenGL shader languague conventions.

From Robert Osfield, changed the SceneView::ActiveUnforms enum to from INVERSE_VIEW_MATRIX_UNIFORM
VIEW_MATRIX_INVERSE_UNIFORM to be convistent with the above change.
 2005-10-25 09:23:21 +00:00
Robert Osfield
758ee8ed80 Changes to fix divide by 0 warning under VS. 2005-10-24 18:51:36 +00:00
Robert Osfield
51f74bd37a Updated wrappers. 2005-10-24 13:49:19 +00:00
Robert Osfield
fe1536ebd6 Fixed compile warnings. 2005-10-24 13:46:31 +00:00
Robert Osfield
5374ddaccb From Mike Weiblen, "some fixes for OSG_OPTIMIZER envar parsing and help display" 2005-10-24 11:46:51 +00:00
Robert Osfield
a76ae5e830 From Tony Horrobin: 
"This is a small fix for flt2osg.[cpp|h] that handles
    old style road segments ( from Multigen II w/road
    tools on IRIX ) in the same way as the newer road
    constructions. ie create a group and do a nested
    traversal.

    This makes roads appear in older format files where
    there was previously a gap.  This actually works
    properly with the paths which are marked as hidden in
    the openflight database."
 2005-10-24 11:37:03 +00:00
Robert Osfield
f7bd1fc456 From Don Tidrow, "I discovered that externally-referenced models in the TXP format didn't 
get positioned correctly when the TXP database was built using the
'tile-offset' mode.  I've included a tarball with what I believe are the
needed changes - they work for the sample databases I have available,
but not all conditions have been tested.  I've set things up such that
these changes shouldn't affect 'normal' txp databases."
 2005-10-24 11:34:12 +00:00
Robert Osfield
b5085b7799 Warning fixes for Win32 build. 2005-10-24 11:25:20 +00:00
Robert Osfield
7b1b3b6ace Added copyright notices. 2005-10-24 10:53:01 +00:00
Robert Osfield
f2f6e6bb45 Added beginnings of Programming Guide, and NodeTrackerCallback. 2005-10-24 10:51:50 +00:00
Robert Osfield
89f6753492 From Farshid Lashkari, compile fix for VS 2002. 2005-10-14 21:40:03 +00:00
Robert Osfield
a312b0451e From Farshid Laskari, changed the compute of the text bounding box to include the spaces. 2005-10-14 09:29:13 +00:00
Robert Osfield
fb524952b6 Renamed osgUtil::RenderGraph to osgUtil::StateGraph 2005-10-13 12:51:00 +00:00
Robert Osfield
5f3ec7dbcb Updated wrappers. 2005-10-13 08:18:12 +00:00
Robert Osfield
1e508d432b Added SmokeTrailEffect which renders created particles as single quad or line 
strip, in the case of the quad strip the strip is aligned to the be orthogonal with
the eye point.
 2005-10-12 18:42:36 +00:00
Robert Osfield
540e676dae Added new shell of new class ConnectedParticleSystem, which will be used 
for managing connect particle system for the purpose of doing missile trails etc.
 2005-10-11 09:47:28 +00:00
Robert Osfield
34dd065d66 Added into CVS missing PolgonMode files. 2005-10-07 07:46:48 +00:00
Robert Osfield
808511468b From Brede Johansen, added support for PolygonMode into .ive format. 2005-10-06 15:43:29 +00:00
Robert Osfield
449333b5d3 Changed the fallback code to use the result form the realize() call, removed 
the code path from running a PBuffer as a seperate graphics context (this
was found to be slower than running single threaded so its not worth the
extra complexity).
 2005-10-06 15:41:47 +00:00
Robert Osfield
3bf7cba453 Added env var reporting for the OSG_CAMERA_THREADING and OSG_SHARE_GRAPHICS_CONTEXTS env vars. 2005-10-06 13:31:23 +00:00
Robert Osfield
1a152afda0 Added catch for disabling ThreadPerCamera when contexts are shared. 2005-10-06 13:20:08 +00:00
Robert Osfield
a380a49509 Improved the fallback mechanism from FBO, down to PBuffer_RTT down to PBuffer down to frame buffer. 2005-10-06 11:26:07 +00:00
Robert Osfield
5cb66efc86 Moved the testing and setting up of FBO/Pbuffer extension from CullVisitor to 
support into RenderStage to allow better fallback implementations.
 2005-10-05 16:21:51 +00:00
Robert Osfield
4b43b22c5a Added support for CameraView into NodeVistor, and support for CameraNode and CameraView 
into the AnimationPathCallback so you can now animate both via animation paths.
 2005-10-05 09:48:53 +00:00
Robert Osfield
cf2974329f Added code paths for PBuffer RTT support. 2005-10-04 18:50:00 +00:00
Robert Osfield
8e9ffd09af Added osg::CameraView to help application/modellers position their cameras in scenes. Note, 
CameraView is *not* a camera, it isn't an active object, but a passive one that
camera must track each frame to following the path of the CameraView.
 2005-10-04 13:41:20 +00:00
Robert Osfield
ff9ace16b4 From Keith Steffen, fixed bug in StateSet::clear() where parents of texture attributes 
where not being reset correctly due to incorrect ordering of _textureAttributeList.clear().
 2005-10-03 19:37:54 +00:00
Robert Osfield
436521e205 Added a couple of (double) casts for VS7 build. 2005-10-03 19:24:12 +00:00
Robert Osfield
ef093bd5e5 Added closing of loops. 2005-10-03 19:18:53 +00:00
Robert Osfield
ba5c7cdc91 Added fusing of ends of lines 2005-10-03 16:13:26 +00:00
Robert Osfield
550bb4b74e Improved handling of convex azim ranges. 2005-10-03 13:19:03 +00:00
Robert Osfield
e2f2960704 Added a dirtyDisplayList() to the setColor() and setTesselationHint() methods. 2005-10-01 19:27:52 +00:00
Robert Osfield
024b43b017 Adding handling of case of convex azimuth side ways of sphere segment. 2005-10-01 12:23:10 +00:00
Robert Osfield
06401ba129 Changed the line intersection algorithm to computer full line intersections then 
trim down to size by intersecting with the sphere segmenet sufaces
 2005-09-30 19:36:22 +00:00
Robert Osfield
913dccc14c Fix to intersection code. 2005-09-29 15:55:55 +00:00
Robert Osfield
e18cb598e6 Updated wrappers. 2005-09-29 13:07:26 +00:00
Robert Osfield
7ac71b939f Added setOverlayClearColor and setTexEnvMode and automatic set up of TexEnv. 2005-09-29 10:22:06 +00:00
Robert Osfield
76058f747c From Marco Jez, added fallback to TextureCubeMap subloading that calls load 
when mipmaps are required, but non are present.
 2005-09-29 09:49:20 +00:00
Robert Osfield
d82d598115 Fixed typo of CameraNode::setRenderTargetImplementation(..) 2005-09-29 09:36:51 +00:00
Robert Osfield
b38f491c12 From Volker Walkiewicz (with tweaks from Robert Osfield): 
Fix to the update of the error metrics on the edges in the simplification mesh that are affected by an edge collapse.

Addition of 'n' and 'p' keyboard control in osgsimplifier example to allow users to control the sample ratio manually.
 2005-09-28 16:05:35 +00:00