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

1740 Commits

Author SHA1 Message Date
Robert Osfield
7ac71b939f Added setOverlayClearColor and setTexEnvMode and automatic set up of TexEnv. 2005-09-29 10:22:06 +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
3ef0406105 From Marco Jez, "Problems fixed: 
1. type converters created automatically by the I_BaseType macro use
static_cast<> even for base-to-derived conversions. dynamic_cast<> should be
used instead.
2. as a consequence of the above fix, I_BaseType must now differentiate
between polymorphic and non-polymorphic base classes, because the latter
can't be dynamic_cast'd to derived classes. Some template magic (see
is_polymorphic<> in ReflectionMacros) is used to detect polymorphism at
compile time (I'm NOT sure it works on all platforms as it's partly
implementation-dependent. Please test!).
3. predefined custom property getters/setters/counters/etc. (as those
defined for STL containers) only work on Value objects that contain
non-pointer instances. This was an unwanted restriction that no longer
exists.

Wrappers will need to be recompiled. This is a good time to give them a
fresh update with genwrapper.

NOTE: fix #1 should get rid of those crashes and strange behaviours that
some users noticed while using osgIntrospection through osgTcl or in their
own code."
 2005-09-28 14:18:31 +00:00
Robert Osfield
f26c3da074 From Chris Hanson, "The following files are drop-in replacements for the include/*/Export files to permit 
building statically linked osg libraries under Win32."
 2005-09-28 14:05:05 +00:00
Robert Osfield
97f6a82b1e From Leandro Motta Barros: fixed type of ATTRIBUTE_* 2005-09-28 13:55:22 +00:00
Robert Osfield
52dea86a3e From A. Botorabi, "slightly modified osgUtil's TangentSpaceGenerator class to allow the 
option for using or not using geom's indices for tangent space vectors
generation. now, Ruben's code is also used (it was disabled before). in
order to keep backward compatibility, the compute method behaves as before
in default case."
 2005-09-28 13:53:54 +00:00
Robert Osfield
9e5eed280d From Joran Jessurun, comments explaining font search rules 2005-09-28 13:45:32 +00:00
Robert Osfield
05528abf25 From Chris Hanson: 
Spelling fixes in include/osg/LOD

   Negated priority in PagedLOD when using _rangeMode==PIXEL_SIZE_ON_SCREEN

   Added clampedPixelSize() methods to CullStack and CullingSet to return fabs()ed values.

   Changed LOD and PagedLOD ::traverse to use clampedPixelSize() methods.
 2005-09-28 13:33:58 +00:00
Robert Osfield
3c88b0cae9 Added degugging methods. 2005-09-27 20:28:42 +00:00
Robert Osfield
871cc70c32 From Ravi Mathur, added extension checks for point sprite support. 
From Robert Osfield, tweaks of the above to use osg::buffer_object and a local struct to store
initialized to help with multi-thread and out of order context usage.
 2005-09-19 15:28:31 +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
b8ce046f88 Moved copyLeavesFromRenderGraphListToRenderLeafList into public. 2005-09-15 09:03:14 +00:00
Robert Osfield
196eafd70b Removed duplicate typedef. 2005-09-09 15:42:48 +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
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
14980872a7 Standardised the Vec* class interfaces, and added num_components enum to aid 
generic programming.
 2005-09-04 11:17:00 +00:00
Robert Osfield
e404b95dc3 Added support in osgTerrain/osgdem for setting the image format to use when writing tiles out to disk 2005-09-04 06:36:52 +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
21cabaf5f6 Renamed osgUtil::RenderStageLighting osgUtil::PositionalStateContainer 2005-09-02 10:35:38 +00:00
Robert Osfield
caaeaee321 Fixed typo 2005-09-01 19:12:06 +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
7fc95ddae7 Added graphics context pointer to osg::Texture in prep for support for Pbuffer 
Render To Texture.
 2005-08-31 12:56:15 +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
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
f3be713d66 Added OveralyNode into VS project file, and fleshed out more code in the OveralyNode implementation. 2005-08-26 20:01:21 +00:00
Robert Osfield
42752347aa Added beginings of new OverlayNode, for managing a render to texture which is 
then used to overaly other parts of the scene such as terrain.
 2005-08-26 14:00:02 +00:00
Don BURNS
5f27216e7e made removeExpiredSubgraphs virtual. 2005-08-25 18:18:27 +00:00
Robert Osfield
d154c2a4cd From Eric Sokolowsky, warning fixes for g++ 4.0 under Fedora Core 4. 2005-08-25 17:53:01 +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
320d0f67e4 Removed old commented out code. 2005-08-24 19:21:12 +00:00
Robert Osfield
dedf81fa51 From Domenico Mangieri, added constructor. 2005-08-24 19:20:36 +00:00
Robert Osfield
3ac94784fc From Geoff Michel, added normal definition for tesselation 2005-08-22 15:13:04 +00:00
Robert Osfield
b50ac89b9d From Domenico Mangieri: 
"I've added a Plane constructor which accepts a normal and a point.
I also removed calculateUpperLowerBBCorners() from the Plane(const
Vec3& v1, const Vec3& v2, const Vec3& v3) since the constructor is
using the function set(const Vec3& v1, const Vec3& v2, const Vec3& v3)
which already computes the upper and lower bounding box."
 2005-08-22 14:07:47 +00:00
Robert Osfield
c0d6126313 From Domenico Mangieri, addded some missing const qualifiers in osgUtil::SceneView. 2005-08-22 13:58:23 +00:00
Robert Osfield
29958a5612 Added OSG_EXPORT to GrephicsThread and fixed typo in osg.dsp. 2005-08-21 15:32:38 +00:00
Robert Osfield
ac07e07705 Further work on GraphicsContext/GraphicsThread 2005-08-20 08:59:03 +00:00
Robert Osfield
356f1ccfaf Added GraphicsThread class 2005-08-18 20:35:19 +00:00
Robert Osfield
51faa7e43a Various updates to support the new GraphicsThread class. 2005-08-18 20:17:51 +00:00
Robert Osfield
717a6dcf14 Added beginings of GraphicsThread class 2005-08-18 09:36:40 +00:00
Robert Osfield
84618ffcb3 Merged RenderToTextureStage functionality into RenderStage 2005-08-17 10:12:49 +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
aedb187718 Added getStartTick() acess method 2005-08-09 10:48:50 +00:00
Robert Osfield
a5d64e5a77 Added getDisplayList access method 2005-08-09 10:48:26 +00:00
Robert Osfield
4e69d46289 Further work on trying to get glGenerateMipMapEXT working in conjunction with 
frame buffer objects.  Still don't work under Linux yet through :-|
 2005-07-27 11:27:44 +00:00
Robert Osfield
72a59527f5 From Marco Jez, added setEventHandled() and getEventHandled() to osgGA::EventVisitor. 2005-07-27 09:37:26 +00:00
Robert Osfield
b9a74c87e1 From Jeremy Bell, 
"My patch is a slight refactoring of the mac specific code in
Registry.cpp and FileUtils.cpp, specifically around the library and
resource file path initilialization methods. This patch cleans up a
lot of the mac specific code by moving repeated code into separate
local functions in FileUtils.cpp that are only compiled on mac builds.
It also adds one function to the API,
appendPlatformSpecificResourceFilePaths in FileUtils. This function
will mirror the already existing
appendPlatformSpecificLibraryFilePaths except for resource file paths.
Currently this function is empty except when built on the mac, in
which case it will add the application bundle's internal Resources
folder and the bundle's parent folder. Previously this code was
implemented as a separate mac specific #ifdef block in Registry.cpp
around the initDataFilePathList method. However, it now is implemented
in appendPlatformSpecificResourceFilePaths in FileUtils.cpp and the
initDataFilePathList method is now the same on all platforms. This
patch should behave the same as before on non-mac platforms.

This patch already includes the fix that Eric mentioned earlier. This
patch is based off of the 0.99 release code. I have tested this patch
using the following testing scheme:

Make a proper bundled application.
While Run from the Finder:
   Test that it finds plugins in its internal plugins path.
   Test that it finds resources in its internal resources path.
   Test that it finds resources in the bundle's parent directory
   Test that it finds plugins in the user's Application Support Directory
   Test that it finds plugins in the system's Application Support Directory
   Test that it finds plugins in the Network Application Support Directory
   Check the plugin and resource path lists after they have been
initialized to see if they are in the correct order

While Run from the command line (both from it's parent directory and
from inside the /Contents/MacOS directory) and repeat the above tests.
Check that it also finds plugins and resources within the paths
defined by various environment variables.

Now, Make an application that is NOT bundled/command line only
   Test that it does NOT try to look in an internal bundle
plugin/resource directory for plugins or resources.
   Test that it finds plugins/resources in the paths defined by the
environment variables.
"
 2005-07-26 21:07:31 +00:00
Robert Osfield
bddaefd569 Perliminary support for glGenerateMinMapEXT. 2005-07-25 16:12:24 +00:00
Robert Osfield
384830d37e Added handling of automatic setting up of the contextID. 2005-07-25 14:28:22 +00:00
Robert Osfield
3c23a42f17 Added support for TextureCubeMap into osgUtil::RenderToTextureStage. 2005-07-25 13:05:57 +00:00
Robert Osfield
ee8f7bb756 Added post draw callback to osg::CameraNode/osgUtil::RenderToTextureStage. 
Added support for Texture1D, 2D, 3D and TextureRectangle into osgUtil::RenderToTextureStage.
 2005-07-24 20:31:21 +00:00
Robert Osfield
c210dd2db9 Added osg::CameraNode to ImpostorSprite in prep for moving across to using 
camera node in pre rendering of impostors.
 2005-07-23 19:05:42 +00:00
Robert Osfield
69efae505b Renabled impostor support using old style RenderToTextureStage setup. 2005-07-22 16:25:38 +00:00
Robert Osfield
47651d3c8d Added glSissor suppor via new osg::Scissor class. 
Added .osg support for osg::Scissor.
Added .ive support for osg::Viewport and osg::Scissor.
 2005-07-22 09:31:19 +00:00
Robert Osfield
37b4df3f71 Added missing typedef 2005-07-22 08:21:17 +00:00
Robert Osfield
9b34bc5c86 Added GraphicsContextImplementation 2005-07-21 19:37:44 +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
7776924407 Checked in graphics context. 2005-07-21 08:43:24 +00:00
Robert Osfield
1e9fb4ab03 From Marco Jez (with tweaks by Robert Osfield) : clean up of inheritance from std::vector<> classes 2005-07-20 19:42:59 +00:00
Robert Osfield
b9e651baf1 Added new osg::GraphicsContext base class 2005-07-20 15:55:07 +00:00
Robert Osfield
7b23cf930e Added support for multiple colour buffers into osg::CameraNode/osgUtil::CullVisitor 2005-07-19 20:01:00 +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
5c9bd792a3 Updated wrappers 2005-07-15 21:47:11 +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
0c7f228224 From Brede Johansen, fixed range check 2005-07-15 10:48:23 +00:00
Robert Osfield
cfac4c74bc Added reference frame to TexGenNode 2005-07-15 08:32:36 +00:00
Robert Osfield
53347812cb From Mike Weiblen, addiding of Program::validateProgram and osg::isNotifyEnabled() method 2005-07-14 10:27:00 +00:00
Robert Osfield
5cfc42daf8 Added missing copy _referenceFrame in copy constructor 2005-07-14 10:17:20 +00:00
Robert Osfield
3943a14f0d From Tom Jolly, added setPulse 2005-07-08 19:33:38 +00:00
Robert Osfield
99279fbf61 From Marco Jez, added missing method implementations to CameraNode and 
added check to ensure FBO extension is support to RenderToTextureStage.
 2005-07-08 14:46:13 +00:00
Robert Osfield
0d8e38f9ee Tweaks for better OSX paging support, 6 and 9 keys for control drive manipulator 
up and down looking, and removed redundent API from osg::Geometry.
 2005-07-07 14:14:38 +00:00
Robert Osfield
facb0e2638 From Pavel Moloshtan, Byte2,3,4 and Short2,3,4 classes and their Array counterparts. 
With a few build tweaks and bug fixes by Robert Osfield.
 2005-07-05 15:57:53 +00:00
Robert Osfield
72488d274f Added support for equalizing the normals along tile boundaries. 2005-07-02 08:11:55 +00:00
Robert Osfield
34be5166ff From Tom Jolly, added method for getting the number of frames. 2005-06-20 10:38:39 +00:00
Robert Osfield
7453711267 From Mike Weiblen, 
" - adjustments to improve namespacing on VS
  - clarify compilation status message"
 2005-06-20 10:36:06 +00:00
Robert Osfield
9c950f0f3c From Andreas Jochens (submitted by Loic Dachary), addintion of forward declare 
of class Progam; to fix compile problem under gcc4.0/amd64/debian unstable.
 2005-06-20 10:28:52 +00:00
Robert Osfield
ba2aeb52e5 From Mike Weiblen, added OSG_EXPORT to FrameBufferObject files. 2005-06-20 10:16:30 +00:00
Robert Osfield
c5cad6982e Further FBO support work. 2005-06-16 14:01:38 +00:00
Robert Osfield
1641cd7b54 From Pavel Moloshtan, added support of Drawable::Extensions::glDeleteQueries() 2005-06-16 13:53:52 +00:00
Robert Osfield
3a0b742461 Added copyright notices. 2005-06-16 11:45:50 +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
868d381528 Added osg::CameraNode. 2005-06-14 13:16:58 +00:00
Robert Osfield
27c4c6a956 Moved the set/getName() support from osg::Node etc into the osg::Obejct 
base class
 2005-06-08 13:16:19 +00:00
Robert Osfield
e0cf176590 From Mike Weiblen, added GLSL datatypes mat2 and mat3 to osg::Uniform, with .osg and .ive support 2005-06-08 10:36:56 +00:00
Robert Osfield
a799cdca2f From Tim Daust, "I fixed the getScale functions in matrixf and 
matrixd.  It was returning the values of the diagonal
of the matrix, which only returns the scale if there
is not a rotation.  I fixed this by returning the
length of the  vectors that form the basis.
  I also added a function to orthonormalize the
rotation component of the matrix. I seem to always run
into situations where non uniform (or even uniform)
scale complicate my calculations, and I thought other
members of the community could use this function as
well."
 2005-05-31 06:21:16 +00:00
Robert Osfield
44b8b0177c Added ability to toggle on/off the pre compile of OpenGL objects in the 
DatabasePager via the setDoPreCompile(bool) method or via the env var
OSG_DO_PRE_COMPILE=ON or OFF.
 2005-05-31 05:37:13 +00:00
Robert Osfield
3c308104a9 Updated Version numbers for release. 
UPdated wrappers.
 2005-05-25 20:02:25 +00:00
Robert Osfield
24849f3c70 Renamed ExplosionDebriEffect to ExplosionDebrisEffect 2005-05-25 16:42:36 +00:00
Robert Osfield
2b08f729f3 Updated change log. 
From Fredric Marmond, changed unsigned int to unsigned long to avoid compile errors under 64 bit compile.
 2005-05-25 15:35:51 +00:00
Robert Osfield
40ef0026df Updated doxgen docs. 2005-05-25 11:45:02 +00:00
Robert Osfield
59be8c19f3 Changd unsigned int's to unsigned char* to fix gcc3.4 64 bit issues. 2005-05-25 09:50:11 +00:00
Robert Osfield
cf06b40891 Added pragma to remove warnings under VS.8.0 2005-05-24 18:57:13 +00:00
Robert Osfield
e229a8cb67 Updates to clean up wrapper generation, and to update wrappers 2005-05-24 15:34:23 +00:00
Robert Osfield
b8b6ed8e34 Fixed doxygen comments. 2005-05-20 21:01:57 +00:00
Robert Osfield
43ad7114be Reworking to avoid compile issues under VS6.0. 2005-05-20 15:45:12 +00:00
Robert Osfield
56f415f7a8 From Martin Aumueller, fixed copy and paste error on getActiveUniforms(). 2005-05-19 21:42:38 +00:00
Robert Osfield
276dfbd0ad Added support for setting the default render bin sort mode via the 
env OSG_DEFAULT_BIN_SORT_MODE variable or via or RenderBin::setDefaultRenderBinSortMode()
method.
 2005-05-19 15:17:53 +00:00
Robert Osfield
955cc1ec2a Added s/getClearMask() support to osg::ClearNode, osgUtil::SceneView and the 
.osg plugin.
 2005-05-18 19:55:14 +00:00
Robert Osfield
2e4b266c39 Added differentiation between Non power of two textures when mip mapped vs 
when not mipped mapped to get round the issue of incomplete support under
ATI cards.
 2005-05-17 11:00:13 +00:00
Robert Osfield
1dd553ed0e Bumped version numbers to 0.9.9 in rediness for 0.9.9 release. 2005-05-16 17:17:53 +00:00
Robert Osfield
b9d0f59002 Changed the getHitList and getNumHits methods to take const osg::LineSegment* as a parameter. 2005-05-16 14:27:03 +00:00
Robert Osfield
10232cf81a Fixed method signatures. 2005-05-16 11:18:11 +00:00
Robert Osfield
668aada787 From Marco Jez, fixes to/and for osgIntrospection. 2005-05-15 20:32:10 +00:00
Robert Osfield
a9f37f1f05 Moved computeBounds into public scope. 2005-05-15 20:31:22 +00:00
Robert Osfield
95a9a4362f From John Grant, added getDrawableList() const. 2005-05-15 05:47:14 +00:00
Robert Osfield
ad5e2d45f1 From Marco Jez, added export symbols. 2005-05-14 18:57:47 +00:00
Robert Osfield
dce2fbf7ec From Marco Jez, change of Doxygen docs name of class from UFOManipulator to 
osgGA::UFOManipulator, done to avoid automated wrapper issues.
 2005-05-14 14:31:37 +00:00
Robert Osfield
76e7853971 From Tom Jolly, removing trailing comma for last entries in enums to fix 
IRIX compile warnings.
 2005-05-13 21:38:34 +00:00
Robert Osfield
3b4636311b Moved BaseOptimizerVisitor out of Optimizer into osgUtil namespace to try and 
get round MipsPro compile problems.
 2005-05-13 13:29:45 +00:00
Robert Osfield
e82a63ca81 Cross platform build fixes. 2005-05-13 11:11:52 +00:00
Robert Osfield
715df123f1 From Mike Weiblen, Added queries of compilation state to Shader (for symmetry with Program's 
link state queries)
 2005-05-12 20:59:53 +00:00
Robert Osfield
7c90800822 From Jan Ciger, gcc 4.0 compile fix. 2005-05-12 20:35:15 +00:00
Robert Osfield
54abc6f471 Added IO support for new intialBound and callbacks to .osg, and initialBound to .ive 2005-05-12 14:48:56 +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
25b36ef648 Moved OpenGL2 definitions from Uniform header to GL2Extensions 2005-05-12 07:47:43 +00:00
Robert Osfield
ea1dc4dd20 Added missing required includes 2005-05-11 21:06:29 +00:00
Robert Osfield
1f6cdc49e5 Compile fix. 2005-05-11 20:37:22 +00:00
Robert Osfield
9ef29824aa Moved GL2Extensions back out of Program and into its own header file. 2005-05-11 19:59:21 +00:00
Robert Osfield
52666a6dee Added support for setting the texture filename and more fine control over 
the particle template used in ParticleEffects
 2005-05-11 15:26:16 +00:00
Robert Osfield
aa6ea8c047 Completed GLSL support in .ive 2005-05-11 13:37:38 +00:00
Robert Osfield
fb34b22e34 Cleaned up API of BindAttributeLocation, added deletion of shader objects. 2005-05-11 11:41:44 +00:00
Robert Osfield
1afd5e48a7 Added support for PROTECTED and OVERRIDE to uniforms. 2005-05-10 13:56:05 +00:00
Robert Osfield
44c363dd3f Added code to prevent ProxyNode's from been "flattened" by 
osgUtil::Optimizer::FlattenStaticTransforms.
 2005-05-09 15:29:18 +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
08d5f9f85a From Tim Daoust/Robert Osfield, added Font::releaseGLobjects(State*state=0) to 
facilate clean up of scene when a graphics context is deleted/reused.
 2005-05-07 09:17:55 +00:00
Robert Osfield
cdab058b32 Added osg_DeltaFrameTime uniform to default set. 2005-05-06 10:32:31 +00:00
Robert Osfield
7480d51830 From Mike Weiblen, further work on GLSL support 2005-05-06 09:58:49 +00:00
Robert Osfield
fc585cd33d From Farshid Lashkari, support for non power of two extension. 2005-05-06 09:04:41 +00:00
Robert Osfield
2798d58a41 Added support for osg_FrameNumber, osg_FrameTime, osg_ViewMatrix, osg_InverseViewMatrix 
into SceneView, controlled via a setActiveUniforms(.) method.
 2005-05-05 12:30:54 +00:00
Robert Osfield
c4e2e85aa1 From Farshid Lashkari, added Texture::Extension support for non power of two extension. 2005-05-05 09:18:03 +00:00
Robert Osfield
f8c855a576 Fix for Tiger build 2005-05-04 11:38:34 +00:00
Robert Osfield
97daa561f4 Added support for lazy state updating of uniforms. 2005-05-03 21:46:47 +00:00
Robert Osfield
015c9a9765 Added support for generating RGBA, RGBA-16 and RGBA-compressed texture databases 2005-05-02 14:16:25 +00:00
Robert Osfield
991feca6cc Added support for reading from RGBA source textures 2005-05-02 13:00:17 +00:00
Robert Osfield
b85d4d4e7e Added support for optimization of Uniforms 2005-05-02 10:18:37 +00:00
Robert Osfield
938d13ecc7 Improved the handling of update/event callbacks on Drawable and Geodes 2005-05-02 09:57:58 +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
adba6fa559 Added RemoveLoadedProxyNodes pass to Optimizer, set on by default at present. 2005-04-30 15:16:05 +00:00
Robert Osfield
a5fcddc5e5 From Mike Weiblen, Progra/Shader fixes 2005-04-30 07:02:02 +00:00
Robert Osfield
7117ff4bd3 Added support for controlling the frequency of checking for OpenGL errors 
via:

        enum CheckForGLErrors
        {
            /** NEVER_CHECK_GL_ERRORS hints that OpenGL need not be checked for, this
                is the fastest option since checking for errors does incurr a small overhead.*/
            NEVER_CHECK_GL_ERRORS,
            /** ONCE_PER_FRAME means that OpenGl errors will be checked for once per
                frame, the overhead is still small, but at least OpenGL errors that are occurring
                will be caught, the reporting isn't fine grained enough for debugging purposes.*/
            ONCE_PER_FRAME,
            /** ONCE_PER_ATTRIBUTE means that OpenGL errors will be checked for after
                every attribute is applied, allow errors to be directly associated with
                particular operations which makes debugging much easier.*/
            ONCE_PER_ATTRIBUTE
        };

        /** Set whether and how often OpenGL errors should be checked for.*/
        void setCheckForGLErrors(CheckForGLErrors check) { _checkGLErrors = check; }

        /** Get whether and how often OpenGL errors should be checked for.*/
        CheckForGLErrors getCheckForGLErrors() const { return _checkGLErrors; }
 2005-04-29 20:56:20 +00:00
Robert Osfield
7781be9cc9 Compile fix 2005-04-29 11:22:15 +00:00
Robert Osfield
f2d696f871 Moved osgIntrospection across to standard OSG coding style. 2005-04-29 11:19:58 +00:00
Robert Osfield
af13199e05 Added Copyright 2005-04-29 10:06:50 +00:00
Robert Osfield
6b5238c294 Moved osgParticle across to standard OSG coding style. 2005-04-29 09:47:57 +00:00
Robert Osfield
6211eb7b48 Coding style update 2005-04-29 06:32:45 +00:00
Robert Osfield
98126f1706 Moved to standard OSG coding style. 2005-04-29 06:32:13 +00:00
Robert Osfield
0b34ab9cb7 Added version number #define's 2005-04-28 12:45:55 +00:00
Robert Osfield
4f6114ef77 From Brede Johansen, tweaks to emitter classes to make them more extensible. 2005-04-26 19:34:03 +00:00
Robert Osfield
a1bda0dab8 Added support for per context extension string. 
Note, this required adding a unsigned int context ID to the osg::isGLUExtensionSupported(,)
and osg::isGLExtensionSupported(,) functions.  This may require reimplementation
of end user code to accomodate the new calling convention.
 2005-04-26 13:15:27 +00:00
Robert Osfield
3c90a5f694 Added support notification of Drawable parents of StateSet that event/update callbacks have been called. 2005-04-26 09:58:19 +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
bc83e63bb4 Futher work on adding event and update callbacks to StateSet, Uniform and StateAttributes 2005-04-25 11:05:02 +00:00
Robert Osfield
193c83cb9c Added ParentList's into StateSet, Uniform and StateAttribute in preparation for 
providing update and event handling.
 2005-04-24 21:04:54 +00:00
Robert Osfield
0d9887462a Added MergeGeometryVisitor::setTargetMaximumNumberOfVertices(uint); 2005-04-23 16:09:20 +00:00
Robert Osfield
f91efb7f31 Added missing bodes of Uniform::operator = and setEvent/UpdateCallback in StateSet. 2005-04-23 10:41:30 +00:00
Robert Osfield
819d2c6c56 Preliminary steps to adding update and event callbacks to StateSet, StateAttribute 
and Uniform.
 2005-04-22 22:45:39 +00:00
Robert Osfield
2914f7c342 Improved handling of invalid imagery in BufferObject 2005-04-22 15:43:34 +00:00
Robert Osfield
af70cd8801 Removed unusaged methods 2005-04-22 14:40:22 +00:00
Robert Osfield
bba76cfa31 From Tree, removed dependency on Producer 2005-04-22 14:40:06 +00:00
Robert Osfield
8b4f9dce60 From Mike Weiblen, added support for samplers and mat4 to .osg 2005-04-22 07:13:50 +00:00
Robert Osfield
e2a85f6bc6 From Brede Johnansen, adding support for EXT, ARB and GL version 1.4 point parameters. 2005-04-20 12:32:43 +00:00
Robert Osfield
648677ce44 Added next stage of support for osg::Uniform in .osg plugin 2005-04-18 12:34:28 +00:00
Robert Osfield
88e8477cbf Moved istream/ostream includes out of Vec3f, and reimpleted osg::Matrix*::compare. 2005-04-17 10:41:23 +00:00
Robert Osfield
62994ac4a2 From Tony Horrobin, fix for VS6.0 2005-04-17 09:41:48 +00:00
Robert Osfield
8bf4a98a91 From Marco Jez, added operator >> for Plane and Quat to io_utils, and added 
OSG_EXPORT to PerContextProgram.
 2005-04-16 17:44:11 +00:00
Robert Osfield
f4be038d46 Moved Plane and Quat << operators into the io_utils headers 2005-04-15 20:59:24 +00:00
Robert Osfield
066c829768 Added setValue and setSwitchSet methods 2005-04-15 20:05:30 +00:00
Robert Osfield
0503712fe4 Removed osgGL2 from CVS, osgGL2 now can be found on the Community/NodeKits section on the OSG website. 2005-04-15 08:35:06 +00:00
Robert Osfield
678b22ce83 Updated Copyright notices to 1998-2005. 2005-04-14 21:41:28 +00:00
Robert Osfield
869548bafb Uniforms open for business :) 2005-04-14 20:14:53 +00:00
Robert Osfield
e7ce7c0529 Fixed getUniformLocation and getAttribLocation methods 2005-04-14 20:05:16 +00:00
Robert Osfield
086efcdff1 Removed setProgram from osg::StateSet as Program works just fine right now 
as a standard osg::StateAttribute and set in a StateSet with setAttribute.
 2005-04-14 15:53:28 +00:00
Robert Osfield
d6d764a729 From Terry Welsh, added copy texture support to TextureRectangle 2005-04-13 18:19:38 +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
2e10cffb4d Work in progress on shader language uniform support 2005-04-13 12:00:28 +00:00
Robert Osfield
d268cf46fa Renamed SG_LIBRARY and SG_EXPORT macro's to OSG_LIBRARY and OSG_EXPORT 2005-04-11 17:14:17 +00:00
Robert Osfield
195b63dc65 From Olaf Flebbe, compile fix for Sun. 2005-04-11 15:22:29 +00:00
Robert Osfield
4fec031e6c Moved #include <osg/State> from header into .cpp to clean up build. 2005-04-11 15:17:24 +00:00
Robert Osfield
d0097718e1 Added friend class PerContextProgram; 2005-04-11 08:15:43 +00:00
Robert Osfield
864817d0d0 From Randall Hopper, fixed typo of setRedMask. 2005-04-10 21:26:49 +00:00
Robert Osfield
0d8bd24250 Fixed typo 2005-04-09 11:17:12 +00:00
Robert Osfield
f46858c49b Moved UByte4 i/ostream support into io_utils. 2005-04-08 14:10:22 +00:00
Robert Osfield
a2974de978 Moved the istream and ostream support from Vec* and Matrix* into a seperate io_utils file. 2005-04-08 09:01:23 +00:00
Robert Osfield
f417974f5b Added iostream operators 2005-04-07 21:28:57 +00:00
Robert Osfield
d006ce627f From Olaf Flebbe, removed supporios BufferObject:: 2005-04-07 20:28:36 +00:00
Robert Osfield
84e8338be1 From Mike Weiblen, "adds sourcefiles for beginnings of .osg fileformat i/o support 
> - enhancemens to core GLSL classes to support file i/o"
 2005-04-07 20:23:58 +00:00
Robert Osfield
7a27a0bef7 From Marco Jez, improvements to osgIntrospection, and new automatically generated 
osgWrappers/osg set.
 2005-04-07 20:00:17 +00:00
Don BURNS
5b4482c70d Set PagedLOD::removeExpiredSubgraph() to be virtual 2005-04-07 17:15:48 +00:00
Don BURNS
af3ac699aa Rolled in Olaf's changes for HP-UX build 2005-04-05 19:08:48 +00:00
Robert Osfield
9e5d905b05 Renamed _A and _B to make them more meanigful 2005-04-04 20:25:57 +00:00
Robert Osfield
5f75f765f0 From Marco Jez, updates to osgIntrospection. 2005-04-04 13:50:07 +00:00
Robert Osfield
097c8f18f9 Fixed comment 2005-04-04 13:22:24 +00:00
Robert Osfield
aa8dbea11c From Mike Weiblen, updates to Shander Language support 2005-04-04 10:08:15 +00:00
Robert Osfield
2e91a74f14 Added FluidProgram 2005-04-04 10:05:35 +00:00
Robert Osfield
22e446dbc9 Improved ParticleEffects 2005-04-04 07:54:52 +00:00
Robert Osfield
60cecb8959 Added State::getActiveUnit and usage of it in the glTexCopyImage*() implementations 2005-03-25 11:07:48 +00:00
Robert Osfield
7883574d28 From Mike Weiblen, 
"updates for GLSL core integration:
Code compiles and runs on win32.
Basic functionality of Program and Shader in place.
Program derived from StateAttribute.
Uniform value propagation is not yet functional (in development)
Includes some patches by Nathan Cournia.
includes example testcase to demo use of new classes."
 2005-03-24 09:37:45 +00:00
Robert Osfield
2ab78cfe38 From Marco Jez, fixed constness of data return type 2005-03-23 21:00:28 +00:00
Robert Osfield
1c34cceb3a Fixed indenting. 2005-03-23 20:35:19 +00:00
Robert Osfield
fb4157ae75 From Mike Weiblen: "Fix for VS7.1 warning C4715: not all control paths return a value" 2005-03-23 20:34:02 +00:00
Robert Osfield
aee1e88f15 Added extra controls for ParticleEffects. 2005-03-23 17:05:21 +00:00
Robert Osfield
dde703e3b0 Commented out the if (!node->getName().empty()) return false; in isOperationPermissibleImplementation() 2005-03-23 08:30:15 +00:00
Robert Osfield
476a83bb9c Added MatrixManipulator::s/getIntersectTraversalMask(uint) to allow control 
of which subgraphs should be used in intersection calculations.  Updated
Terrain,Drive and UFO manipulator to use this new flag.
 2005-03-22 21:06:06 +00:00
Don BURNS
5d10547ac5 Added getCameraByName method to viewer and home(double currentTime) to 
MatrixManipulator, UFO, Trackball and ANimation manipulator.
 2005-03-20 23:57:17 +00:00
Robert Osfield
b0c36076fb From Marco Jez, added OSGNVEXT_ prefex to StateAttribute enums. 2005-03-18 09:48:09 +00:00
Robert Osfield
d52f4ea23a Added support for a new IsOperationPermissibleForObjectCallback in osgUtil::Optimizer. 2005-03-18 02:44:08 +00:00
Robert Osfield
f8426a8ad8 Made supports(..) methods use support(const ...) 2005-03-18 02:42:59 +00:00
Robert Osfield
8bb4649cd5 Added extra controls into osgDB::DatabasePager for customizing how 
much time is allocated to compiling and deleting OpenGL objects, also
added support into osgProducer::OsgSceneHandler.cpp for these new parameters.

The new cotrols are:

    DatabasePager::s/getTargetFrameRate(..)
    DatabasePager::s/getMinimumTimeAvailableForGLCompileAndDeletePerFrame()
    DatabasePager::s/getMaximumNumOfObjectsToCompilePerFrame()
 2005-03-17 19:32:09 +00:00
Robert Osfield
4beb385d2d Changed tabs to four spaces 2005-03-14 09:28:31 +00:00
Robert Osfield
21ae4c6c65 From Marco Jez, fix for data corruption bug in TypedMethodInfo*::invoke() 2005-03-14 09:13:38 +00:00
Don BURNS
c332d1f751 Chagned osg::Matrix to osg::Matrixd 2005-03-13 05:02:02 +00:00
Don BURNS
fce7f24347 Added a few things to osgProducer::Viewer to support UFO manipulator and 
cleaned up UFOManipulator.
 2005-03-12 05:31:26 +00:00
Robert Osfield
a2e8bc6267 Added support for set/getUniform and set/getProgram into osg::StateSet. 2005-03-11 20:29:21 +00:00
Don BURNS
21c1d64b1c Added methods getCameraManipulatorNameList() and selectCameraManipulatorByName(). 2005-03-11 17:48:01 +00:00
Don BURNS
e59284501b Changed class name to UFO instead of UFOManipulator to conform to the other 
manipulators
 2005-03-11 17:46:12 +00:00
Don BURNS
2601412135 Added UFOManipulator to Viewer 2005-03-11 06:09:38 +00:00
Don BURNS
a7ac8f5992 Added UFO manipulator 2005-03-11 06:09:16 +00:00
Robert Osfield
6a103aa413 Added osgFX::MultiTextureControl node for managing blending between 
different texture layers.
 2005-03-09 16:54:10 +00:00
Robert Osfield
8dc1be6707 Added basic multiple texture layer support into osgTerrain::DataSet. 2005-03-08 16:51:48 +00:00
Robert Osfield
d155caf2a4 First steps to adding support for multiple texture layers. 2005-03-07 22:02:44 +00:00
Robert Osfield
99f80a78f1 From Ruben, added handling of vertex indices. 
Note from Robert.  New codes produces errors when running
osgfxbrowser cow.osg so I have elected to keep the original
implementation of compute_basis_vectors around and as the default
compile to keep the CVS version working.  Ruben's new version
of compute_basis_vectors has to be explicitly compiled in by
toggling an #if 1 block to #if 0.
 2005-03-07 17:25:30 +00:00
Robert Osfield
a72845cfc4 Sebastien Grignard, fixed getMember methods to properly use const type. 2005-03-07 14:38:43 +00:00
Robert Osfield
5684a130b7 From Alberto Farre, addition of ProxyNode, with support in .osg, .ive and .flt loaders 2005-03-07 14:06:09 +00:00
Robert Osfield
c3f40e2e67 Added improved handling of center justificaion of multiline text 2005-03-03 12:33:07 +00:00
Robert Osfield
6772a1deb6 From Paul Melis, fixed typo of setFunctionMask. 2005-02-26 21:44:16 +00:00
Robert Osfield
ce68304f90 Improved support GUIEventHandler's being node event callbacks. 2005-02-25 23:02:23 +00:00
Robert Osfield
0f61af08bd Added support for new event visitor type into osgGA and osgProducer::Viewer, 
and event callback into Drawable.
 2005-02-25 14:02:48 +00:00
Robert Osfield
96514b5077 New simplified timer implementation. 2005-02-25 08:38:05 +00:00
Robert Osfield
79833fa704 Added pause, rewind and play support into xine plugin. 2005-02-24 17:07:37 +00:00
Robert Osfield
5fbb1f11cd From Mike Weiblen, adding prelimimnary GL Shader Language support into core OSG lib. 
with renaming and reordering by Robert Osfield,
 2005-02-24 13:33:35 +00:00
Robert Osfield
164cb8216c Made Referenced::ref() and unref() inline methods. 2005-02-23 12:50:10 +00:00
Robert Osfield
e01990d419 Made the osg::Referenced Mutex be declared as a pointer to a Mutex, with the 
Mutex allocated dynamically when required. Added the following methods to
help manage the usage of the mutex:

        void setThreadSafeRefUnref(bool threadSafe);

        bool getThreadSafeRefUnref() const;
 2005-02-22 20:25:58 +00:00
Robert Osfield
10c3f934f1 Added support for control the pitch of the drive manipulator via the 
up and down cursor keys.
 2005-02-22 19:19:50 +00:00
Robert Osfield
b40fe170c7 From Igor Kravtchenko, add #define's for OpenGL float internal texture formats. 2005-02-22 10:16:22 +00:00
Robert Osfield
79a59e596c Tweak to comment. 2005-02-15 09:37:20 +00:00
Robert Osfield
dd0c29d19b Added new utilities for handling different '/' and '\' entries. 2005-02-11 09:58:30 +00:00
Robert Osfield
7282adef2b Removed redundent _nodePath entry. 2005-02-10 21:30:03 +00:00
Robert Osfield
7fb8dfe5ed From Chris Xennon, add support for billboard intersections + fix to addLineSegments. 
Small addition from Robert Osfield of setLODSelectionMode(..) to control
the LOD selection behavior.
 2005-02-10 21:18:04 +00:00
Robert Osfield
355ee7a785 Put pixel buffer define's into their own block. 2005-02-10 20:14:22 +00:00
Robert Osfield
117c791a3b Added osg::BufferObject and a made a number associated to accomodate this 
new class. osg::BufferObject wraps up OpenGL pixel and array buffer objects.
Currently implementation is work in progress.
 2005-02-09 10:39:45 +00:00