Commit Graph

707 Commits

Author SHA1 Message Date
Robert Osfield
38103c588b Changed the NO_ROTATION label so it is aligned with the XZ plane to make it easier to see. 2005-11-09 17:06:12 +00:00
Robert Osfield
83d492162e Added the support in AnimationPathCallback for taking a pivot, axis and rotation rate
paramters in its constructor to allow it to be used to create rotations around a point.
This provides the same interface and functionality as osgUtil::TransformCallback but
has the advantage and AnimationPathCallback is fully supported by the .osg and .ive file formats.
2005-11-09 15:11:22 +00:00
Robert Osfield
4d42be705d Reduced the size of the "oversized" cessna.osg 2005-11-09 13:39:08 +00:00
Robert Osfield
6c3c5554b6 Update texture file names to reflect new files in OpenSceneGraph-Data distribution. 2005-11-09 13:18:46 +00:00
Robert Osfield
6c70812928 Fixed warnings. 2005-11-09 10:41:52 +00:00
Robert Osfield
28d939e617 Fixed compile warning. 2005-11-09 10:37:10 +00:00
Robert Osfield
53e075f78b From Brad Colbert/Robert Osfield: added s/getSourceFormat and s/getSourceType to osg::Texture
along with support for this Texture1D, 2D, 3D, TextureCubeMap and TextureRectangle.  The
new SourceFormat and SourceType parameters are only used when no osg::Image is assigned to
an osg::Texture, and main use is for render to texture effects.

Added support for --hdr option in osgprerender, which utilises the new Texture::setSourceFormat/Type() methods.
2005-11-08 15:52:21 +00:00
Robert Osfield
416f908f29 From Ruben (with a few addition/changes from Robert), fixed the commandline of the osgsimplifier example. It now reads
--ratio and --max-error.

---------------------------------------------------
2005-11-07 10:29:24 +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
35b0dbc505 Added request for accumulator buffer. 2005-11-02 19:15:41 +00:00
Robert Osfield
366aaf72e8 From Brede Johnasen, changed wrap mode to CLAMP_TO_EDGE to avoid edges being
seen when zoomed into the reflectio map.
2005-11-02 15:56:29 +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
7e858b15f1 From Marco Jez, added Image/ path to image files to help find them from the OpenSceneGraph-Data directory. 2005-11-02 14:24:29 +00:00
Robert Osfield
682b867e4f From Marco Jez, moved the rear view camera's viewport to the bottom left of window to accomdate a greater range of display sizes.
From Robert Osfield, made the background colour of the intersted camera a scaled down verson of the main background colour to make it more obvious.
2005-11-02 14:22:31 +00:00
Robert Osfield
5319e1d650 Added an image negation callback to the render to image. Added commandline docs
for the new --image and --texture-rectangle options.
2005-11-01 19:32:26 +00:00
Robert Osfield
12bd1f7d4b Added usage of image copy and modification. 2005-11-01 17:07:55 +00:00
Robert Osfield
37aa7f55a6 Added warning message for when no file is loaded. 2005-10-28 14:02:37 +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
9c94bf2fdc Added command line option --overlay to turn on the use of an OverlayNode. 2005-10-28 10:11:12 +00:00
Robert Osfield
839f2058cc From Mike Weiblen, added check to make sure that vertex texture was
supported in the OpenGL driver.
2005-10-28 08:35:55 +00:00
Robert Osfield
52b7ce608e Added option to osgdepthpartion for loading the model specified on the commandline. 2005-10-27 13:53:55 +00:00
Robert Osfield
601ac461a2 From Ravi Mathur, "New functionality is the ability to automatically determine the
maximum traversal depth necessary to obtain an accurate estimate of
the minimum number of required cameras.  In addition, the user can
specify an absolute maximum traversal depth that will not be exceeded."
2005-10-27 09:38:06 +00:00
Robert Osfield
0906851eeb From Geoff Michel, update to osgdelaunday. 2005-10-27 09:37:38 +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
fe1536ebd6 Fixed compile warnings. 2005-10-24 13:46:31 +00:00
Robert Osfield
5d1b46d25f Changed the "Cessna" text so that it is sized according to OBJECT_COORDS rather
than SCREEN_COORDS as the later was causing problems with the pixel size based LOD selection.
2005-10-13 10:29:40 +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
b7fd3bfdc4 From Ravi Mathur, osgdepthpartition example program. 2005-10-10 10:10:44 +00:00
Robert Osfield
18d680d01f Improved the UpdateCameraAndTexGenCallback so it properly handles rotation and
translations within the reflector nodepath.
2005-10-06 20:02:18 +00:00
Robert Osfield
cf2974329f Added code paths for PBuffer RTT support. 2005-10-04 18:50:00 +00:00
Robert Osfield
c401e31bd8 Added test cases for SphereSegment intersection code. 2005-10-01 19:28:34 +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
Robert Osfield
07d7d39eb5 Added TexEnv DECAL mode. 2005-09-26 11:24:14 +00:00
Robert Osfield
30478f0fef From Mike Weiblen: support for OSGHANGGLIDE_REVERSE_CONTROLS env which reverses
the pitch and roll control to account from Mike's "unique" way of flying hang gliders :-)
2005-09-19 15:33:25 +00:00
Robert Osfield
d1108ea862 Added support for "-O OutputTextureFiles" options string in .osg plugin to
allow texture files to be written out when writing out a .osg file.
2005-09-19 14:07:44 +00:00
Robert Osfield
d2f98ef56e Added line connectivity code. 2005-09-15 20:03:37 +00:00
Robert Osfield
e2361865fc From Sondra Iverson, "The options to rewind/restart and to toggle looping in the osgmovie
example have been implemented. "
2005-09-11 19:05:30 +00:00
Robert Osfield
745834c329 Added triangle index functor to src/osgUtil/SphereSegment.cpp for computing
the intersection between an indivual geometry and the sphere segment.

Converted the terrain in osgspheresegment to be an osg::Geometry based
drawable rather than a osg::ShapeDrawable/osg::HeightField one to make it
more practicle to use as a test for the new SphereSegment intersection code.
2005-09-09 11:13:40 +00:00
Robert Osfield
559219f519 Added initial interface for computing intersections between sphere segments
and terrain.
2005-09-08 13:10:04 +00:00
Robert Osfield
765db1998c Added support for cullable state, that uses a polytope to define the extents
of objects that will be influenced by it.
2005-09-07 16:18:43 +00:00
Robert Osfield
58112d9591 Added a grid of lines into the OverlaySubgraph to demonstate use the
OverlayNode for applying general drawing onto terrain.
2005-09-06 20:28:53 +00:00
Robert Osfield
4e6a8cfcd5 Added s/getContinousUpdate(bool) method to OverlayNode. 2005-09-06 19:54:29 +00:00
Robert Osfield
5283c11f8a Added osgSim::OverlayNode to osganimate and osgspheresegment examples, and
added support for setting texture size hint and coping with scene graphs
with CoordinateSystemNode in them.
2005-09-06 15:48:18 +00:00
Robert Osfield
db24ea247c Changed #if 2005-09-05 13:27:48 +00:00
Robert Osfield
4795fb88e6 Added checking of EventVisitor type 2005-09-05 13:26:50 +00:00
Robert Osfield
b8d7a3bf44 Added event handler to shader code so that alphaCuttOff, transparency and
sampleDensity are controlled via 'a', 't' and 'd' respectively.
2005-09-05 13:19:20 +00:00
Robert Osfield
efc4f2436f Integrated shaders into source. 2005-09-05 10:40:04 +00:00
Robert Osfield
ab879525ef Added all sides of the shader cube 2005-09-05 09:14:30 +00:00
Robert Osfield
7ed8bab8d4 Added preliminary GLSL shader path for volume rendering. 2005-09-05 07:48:55 +00:00
Robert Osfield
d58487c763 Changed red()/green()/blue()/alpha() to r()/g()/b()/a() for greater consistency
across Vec* classes and with OpenGL Shander Lanaguage.
2005-09-03 20:56:25 +00:00
Robert Osfield
2ea5d71d82 Added commandline arguments for controlling number of cameras through to the windowing library to use. 2005-09-02 20:06:11 +00:00
Robert Osfield
4167a3f980 Added clean up class to help improve the exit of GraphicsThread 2005-09-02 13:10:46 +00:00
Robert Osfield
727e55a63a Removed circular reference of osg::CameraNode, fixing memory leak. Added
a auto exit after a maximum number of frames are completed.
2005-08-31 20:39:05 +00:00
Robert Osfield
a420782199 Added osgSim::OverlayNode setup in osgsimulation, and added preliminary test
code to the osgSim::OverlayNode to test osgsimulation/the architecture.
2005-08-31 15:04:27 +00:00
Robert Osfield
af7eba1a7f Set number of cameras to 3. 2005-08-31 13:43:29 +00:00
Robert Osfield
8686ed3136 Disable the glFinishBarrierOp usage as glFinish was spin locking the CPU :-| 2005-08-31 12:49:23 +00:00
Robert Osfield
c1ebc87c2c Seperated out the cull and draw traversals into their own operations,
and added a glFinishBarrierOp which can be placed between the cull and the
draw or after swap.
2005-08-31 10:55:58 +00:00
Robert Osfield
3b065bc163 Add comments explain how example works. 2005-08-31 09:21:34 +00:00
Robert Osfield
c02e91c1b4 Added support for GrapicsOpeations that are reused each frame, cleaned up
osgcamera example.
2005-08-30 22:28:30 +00:00
Robert Osfield
f9bcde3cf0 Added name and keep member variables to osg::GraphicsThread::Operation to allow
the names of the operations to be logged for stats purposes, or used when
do searches of the operation list.  The keep member variable tells the graphics
thread run loop wether to remove the entry from the list once its been called.
2005-08-30 19:03:02 +00:00
Robert Osfield
aba3b4fa67 Clean up and fixes to GraphicThread class, and osgcamera example. 2005-08-30 14:41:08 +00:00
Robert Osfield
ceadd41ef1 Fixed reading and writng of data. 2005-08-29 20:38:46 +00:00
Robert Osfield
492956d73e Added scratch pad reset. 2005-08-29 20:16:15 +00:00
Robert Osfield
6e39f9f475 Implement a scratch pad for writing and read data to, to solve issue between
running a master and slave on a mix of 32bit and 64bit.
2005-08-29 19:57:02 +00:00
Robert Osfield
9f740f7397 Improved support for keyboard/mouse events in osgcluster. 2005-08-29 14:05:30 +00:00
Robert Osfield
2e84f10b21 Added extra debug info. 2005-08-29 12:25:16 +00:00
Robert Osfield
ffb06a8c49 Added extra access methods on osgProducer::KeyboardMouseCallback, and added
support for reading and writing keyboard/mouse events in osgcluster.
2005-08-29 12:05:17 +00:00
Robert Osfield
ee4d2128da Added --num-components <num> option. 2005-08-26 13:26:02 +00:00
Robert Osfield
be285c62c0 Added support for rapid movement of the emitter, with particle now seeding between
the position of the emitter in the previous frame and the new position in the new
frame, the number of particles added also scales up to compensate for this movement.
2005-08-25 14:12:08 +00:00
Robert Osfield
2fa2041655 From Joseph Winston, "Corrected displayed comment about the text size
to match the actual text size."
2005-08-22 13:45:15 +00:00
Robert Osfield
ac07e07705 Further work on GraphicsContext/GraphicsThread 2005-08-20 08:59:03 +00:00
Robert Osfield
db3fe3fd3b Implemented more SceneView operations in main as a move to try and replace SceneView usage in this example. 2005-08-18 08:37:01 +00:00
Robert Osfield
e98102219b Replaced osgUtil::SceneView usage by osg::CameraNode 2005-08-17 16:13:06 +00:00
Robert Osfield
e8fc5248fa Added realize() and isRealized() methods to osg::GraphicsContext.
Added osgcamera example that uses osg::GraphicsContext to create the required
window for rendering too, will eventually use osg::CameraNode to replace usage
of osgUtil::SceneView.
2005-08-16 13:29:07 +00:00
Robert Osfield
75987a045d Added osgshaderterrain example. 2005-08-15 13:54:25 +00:00
Robert Osfield
5959362e5c Added base texture support. 2005-08-09 14:13:24 +00:00
Robert Osfield
7cb6bbdfea Added GLSL shader pathway into osgforest. 2005-08-09 09:11:15 +00:00
Robert Osfield
81dab87154 Added blend shadow fragment shader 2005-08-06 04:33:56 +00:00
Robert Osfield
3c23a42f17 Added support for TextureCubeMap into osgUtil::RenderToTextureStage. 2005-07-25 13:05:57 +00:00
Robert Osfield
302c58fc93 Implemented the beginings of the osgProducer::GraphicsContexImplementation.
Added options into osgprerender for controlling how to do the pre rendering i.e.
--fbo, --pbuffer, --fb --window, and also added the option for controlling the
window size with --width and --height.
2005-07-21 19:27:19 +00:00
Robert Osfield
b9e651baf1 Added new osg::GraphicsContext base class 2005-07-20 15:55:07 +00:00
Robert Osfield
8dd013171c Ported all the render to texture examples across to using the new osg::CameraNode.
Added support for texture cube maps in FBO + CameraNode.
2005-07-19 16:30:55 +00:00
Robert Osfield
71a7078d79 Added return 1. 2005-07-15 19:24:46 +00:00
Robert Osfield
1c88914e5f From Yuri Vilmanis, improved multi-line justifaction support and new alignment modes 2005-07-15 16:22:53 +00:00
Robert Osfield
d35ea68f3e Renamed Byte2,3,4 and Short2,3,4 and UByte4 to use the Vec*b, Vec*s and Vec4ub form 2005-07-15 14:41:19 +00:00
Robert Osfield
ec5463c10d Cleaned up osghud and osgprerender examples 2005-07-15 08:31:02 +00:00
Robert Osfield
247327ef31 Updates 2005-07-14 21:04:40 +00:00
Robert Osfield
d4a8bc0f03 Changed osgpagedlod example to convert LOD nodes into PagedLOD ones. 2005-07-14 10:18:05 +00:00
Robert Osfield
4175def6be Ported osgshadow across to using new osg::CameraNode 2005-07-10 14:50:52 +00:00
Robert Osfield
94ad07af5e Ported osgdistortion example across to using osg::CameraNode. 2005-07-09 14:35:35 +00:00
Robert Osfield
68cb69ee82 Added support for point sprites 2005-07-01 09:10:37 +00:00
Robert Osfield
64cfa2773d Added tri sripping and support for outputing files. 2005-06-30 09:08:31 +00:00
Robert Osfield
92d15adf76 Added / and * controls of the distance attentuations of the point size extension 2005-06-27 14:28:29 +00:00
Robert Osfield
0a021cf04f From Mike Weiblen, fixes to shaders to correct modification of varying types 2005-06-22 11:26:56 +00:00
Robert Osfield
8bc1910767 Added experimental OpenGL shader path for positioning of trees (doens't work yet though..) 2005-06-22 11:01:22 +00:00
Robert Osfield
708b6f5530 Added option for terrain texturing. 2005-06-21 16:10:04 +00:00
Robert Osfield
91106262e8 Added matrix and simple vertex shader paths. 2005-06-21 15:24:23 +00:00
Robert Osfield
88f65c2c24 Combined uniforms. 2005-06-21 15:13:42 +00:00
Robert Osfield
1103911277 Tweaked the vertex program. 2005-06-21 12:12:50 +00:00
Robert Osfield
900739bd7e Added very simply osgparametric example which uses an OpenGL shader program
to create an animated parametric surface.
2005-06-20 21:10:32 +00:00
Robert Osfield
c5cad6982e Further FBO support work. 2005-06-16 14:01:38 +00:00
Robert Osfield
d702fed0ef Moved FBO support from osgfbo example into core osg. 2005-06-16 11:42:59 +00:00
Robert Osfield
77a4cef9d6 Futher work on FBO support 2005-06-15 20:06:10 +00:00
Robert Osfield
dfaed083ea Added osgmultiplecameras example and support for pre/post multiplaction. 2005-06-15 10:59:10 +00:00
Robert Osfield
71122ff38f Work on the RenderToTexture usage of the new osg::CameraNode. Both osghud
and osgprerender now ported across to osg::CameraNode.
2005-06-14 20:51:35 +00:00
Robert Osfield
a7b343237b Fixed makefiles 2005-06-09 11:53:23 +00:00
Robert Osfield
5c86ecebe4 From Marco Jez, added example that uses FBO extension to do prerendering. 2005-06-09 11:08:37 +00:00
Robert Osfield
96eb0b71c6 Added \n to end of a couple shader source lines. 2005-06-09 09:27:43 +00:00
Robert Osfield
119b528711 Added texture2D shader source 2005-06-09 08:29:22 +00:00
Robert Osfield
ac02c37718 Added experiment GLSL fragment shader to clip out dark areas of videos. 2005-06-08 15:57:05 +00:00
Robert Osfield
69cd27e37f Added sizeof(std::string) test to osgunittests 2005-06-08 10:39:43 +00:00
Robert Osfield
24849f3c70 Renamed ExplosionDebriEffect to ExplosionDebrisEffect 2005-05-25 16:42:36 +00:00
Robert Osfield
3ac091bb25 Changed .png files to .jpg to help save space in OpenSceneGraph-Data. 2005-05-22 20:30:30 +00:00
Robert Osfield
f1ef59b757 Added scoring, welcome page, you've lost and you've won pages. 2005-05-22 20:19:26 +00:00
Robert Osfield
a76e9c83c4 Added support for multiple levels, and exit on lose of all lives or on finishng
the highest level.
2005-05-21 21:19:11 +00:00
Robert Osfield
3d4e2fa4f3 Updates to osgcatch game to allow different types of falling objects 2005-05-21 12:57:28 +00:00
Robert Osfield
ea9cfaf11e Maded debugging output write out at INFO level 2005-05-21 09:55:43 +00:00
Don BURNS
0f164c9f7f PBuffer example revamped to use a normal CameraConfig for setting up the
PBuffer and main cameras, and a PBufferTexture2D for the texture, rather
than a subload callback
2005-05-18 21:34:55 +00:00
Robert Osfield
9717fcd3a5 Added destructor to fix Cygwin build problem. 2005-05-17 13:24:34 +00:00
Robert Osfield
bf4d63f6ea Added new Node/Drawable::s/getInitialBound and Node/Drawable::s/getComputeBoundCallback
methods and reimplement computeBound so that it passes back a bounding volume rather
than modifying the local one.
2005-05-12 14:03:22 +00:00
Robert Osfield
460c77b7f0 From Nathan Monteleone, rewrote the osgpbuffer example so that it uses
Producer xplatform support for pbuffer instead of Win32 specific pathways
    as support before. (with a few code tweaks to simplfy the code, by Robert Osfield).
2005-05-11 19:14:36 +00:00
Robert Osfield
538ced579e Removed deprecated API in preparation for 0.9.9 release. 2005-05-09 13:09:07 +00:00
Robert Osfield
d1a1b1d95c Added more comprehensive releaseGLObjects(State*=0) throughout Nodes,
Drawables,StateSet, and osgDB::Registry.

Added cleanup_frame() from to osgProducer::OsgCamerGroup to help with proper
clean of OpenGL objects before exit, and modified osgviewer, osghangglider,
osgwindows examples to do the extra frame call to cleanup_frame() before exit.
2005-05-07 20:47:09 +00:00
Robert Osfield
e025ba39f0 From Bob Kuehne, OSX 10.4 fix. 2005-05-03 16:34:54 +00:00
Robert Osfield
0b291e60bb From Mike Weiblen, added \n newlines to inline shader program strings.
From Robert Osfield, changed tabs to spaces.
2005-05-02 09:34:27 +00:00
Robert Osfield
03232ec667 Moved osg::Impostor to osgSim::Impostor, as Impostor isn't a core feature. 2005-05-01 19:48:49 +00:00
Robert Osfield
81f60233a9 From Geoff Michel :
ac3d loader - better sharing of states between objects and Roger James' bug fix for missing normals.

  Tesselator.cpp - faster processing of polygon tesselation for single triangles (which dont need to be tesselated)

  osgtesselate.cpp - added wrap for texture so that appearance is as originally. Default texture behaviour has changed to clamp."
2005-04-30 13:54:21 +00:00
Robert Osfield
6b5238c294 Moved osgParticle across to standard OSG coding style. 2005-04-29 09:47:57 +00:00
Robert Osfield
98126f1706 Moved to standard OSG coding style. 2005-04-29 06:32:13 +00:00
Robert Osfield
a753748a1a From Marco Jez, converted line endings to unix. 2005-04-28 05:12:54 +00:00
Robert Osfield
e24cfa0370 Futher work on supporting update and event callbacks in StateSet, Uniform and StateAttribute 2005-04-25 13:37:12 +00:00
Robert Osfield
6b8a50375b Removed the use of the post swap callback 2005-04-23 10:45:38 +00:00
Robert Osfield
c7fb7e8b5f From Brede Johansen, tweaked refraction and fresnel coefficients for a better
visual effect.
2005-04-22 20:56:03 +00:00
Robert Osfield
505db98c47 Improved handling of unsupported formats 2005-04-22 15:44:21 +00:00
Robert Osfield
8d1c407a9a Small tweaks 2005-04-20 19:53:07 +00:00
Robert Osfield
6ff535441b Removed the enabling of the point smooth mode. 2005-04-20 14:51:13 +00:00
Robert Osfield
3953190dfe Fixed typo in testLookAt debug info. 2005-04-17 19:14:32 +00:00
Robert Osfield
1525a00e1f From Mike Weiblen,added debug info to osg::Program and changed shader uniform names to
avoid conflict with built in functions
2005-04-16 10:11:18 +00:00
Robert Osfield
16c55531da Preparation for moving osgGL2 out of the core OSG into its own seperate distribution. 2005-04-14 11:28:23 +00:00
Robert Osfield
22c695cdef From Mike Weiblen, fixed copy and paste error in new osgshaders.cpp example. 2005-04-14 08:00:25 +00:00
Robert Osfield
789cb7dea7 Added applying of all parents uniforms 2005-04-13 14:31:25 +00:00
Robert Osfield
0015a31de8 Added basic support for applying uniforms to programs, non lazy state updating
is yet applied though.
2005-04-13 14:12:06 +00:00
Robert Osfield
67ba3c94c9 Added #if block for swith between imagery 2005-04-12 19:28:37 +00:00
Robert Osfield
493bcdd694 Fixed bug 2005-04-12 19:17:01 +00:00
Robert Osfield
3bdfbbe70f Further work on kiddies game. 2005-04-10 21:25:37 +00:00
Robert Osfield
a54a3b2bfb From Mike Weiblen, osgGLUTsimple and osgGLUTkeyboardmouse examples 2005-04-08 19:40:16 +00:00
Robert Osfield
bd31479740 From Marco Jez, updates to reflect new osgIntrospection API 2005-04-08 19:29:12 +00:00
Robert Osfield
394708bb2c Added #include <osg/io_utils> 2005-04-08 10:32:10 +00:00
Robert Osfield
52f192f53f Reverted back to not test version of osgsimulation 2005-04-08 09:55:52 +00:00