Robert Osfield
37f4740c45
From Mike Wittman, remove redundent const from in front of unsigned int.
...
From Robert Osfield, updated wrappers
2007-03-23 17:27:53 +00:00
Robert Osfield
92865923f3
Added missing StencilTwoSided header
2007-03-23 10:11:09 +00:00
Robert Osfield
6eee949142
From Eric Wing, added ${MATH_LIB} to osg CMakeLists.txt and definition of this to m under unix
2007-03-22 13:38:23 +00:00
Robert Osfield
ebd04bbbbf
Updated the header list
2007-03-22 13:37:47 +00:00
Robert Osfield
56a1808794
Added ImageLayer, ArrayLayer and HeightFieldLayer classes
2007-03-21 17:18:53 +00:00
Robert Osfield
541c3f13e9
Added GeometryTechinque to osgTerrain. Added usage of GeometryTechnique into osgterrain example
...
Added --width and --height command line options to osgdistortion to allow users
to control the window size.
2007-03-21 16:34:04 +00:00
Robert Osfield
2b52de5e9c
Removed erroneous entry of GNUmakefile
2007-03-21 09:42:14 +00:00
Robert Osfield
bab9938a5c
Added osg:: to computeLocalToWorld to fix build under VS7.
2007-03-20 17:07:37 +00:00
Robert Osfield
33817a7e5d
From Philip Lowman, added support for Inventor
2007-03-20 09:50:24 +00:00
Robert Osfield
7039ff4af4
From Andreas Goebel, build fix
2007-03-19 19:05:18 +00:00
Robert Osfield
282f4ce0b9
Moved the TARGET_NAME setting into the OsgMacroUtils.cmake.
2007-03-19 17:24:19 +00:00
Robert Osfield
9b30cf2960
Added CMake support for txf, osgViewer and osgShadow plugins
2007-03-19 14:10:12 +00:00
Robert Osfield
da64127539
Ran dos2unix on CMakeLists.txt files.
2007-03-19 13:26:34 +00:00
Robert Osfield
be3f61c49f
From Luigi Calori, move to using local CMakeLists.txt files and explicit file lists.
...
From Robert Osfield, small ammendments of the above to seperate example and application installs, and fix the osgPlugins install directory.
2007-03-19 12:30:26 +00:00
Robert Osfield
74f21c0b0d
Updated wrappers
2007-03-19 11:47:49 +00:00
Robert Osfield
6d49904170
From Andreas Goebel, add -lgdi to GNUmakefile
2007-03-19 11:35:36 +00:00
Robert Osfield
c66252ca3a
Further work on TerrainNode
2007-03-19 11:25:41 +00:00
Robert Osfield
32166ca631
Build fixes
2007-03-19 10:54:39 +00:00
Robert Osfield
ed9aa1c6bf
Removed now redundent method
2007-03-18 11:04:12 +00:00
Robert Osfield
72b348ea91
Updated wrappers
2007-03-16 14:27:30 +00:00
Robert Osfield
aa28f60357
Added WindowData structures to GraphicsWindowX11,Win32 and Carbon to help support
...
GraphicsWindow inheriting their window handles from an external toolkit
2007-03-16 13:22:05 +00:00
Robert Osfield
d4db767ec5
From Philip Lowman, added gdi32 entry fro Mingw build
2007-03-15 13:17:05 +00:00
Robert Osfield
7f2586d9db
Name fixes
2007-03-14 12:59:06 +00:00
Robert Osfield
c000f77502
Updated wrappers
2007-03-14 12:31:53 +00:00
Robert Osfield
2fae221f2d
Added class shells for osgTerrain::Locator and osgTerrain::Layer classes
2007-03-14 12:00:54 +00:00
Robert Osfield
c489b0af2c
Renamed HeightFieldNode and HeightFieldRenderer to TerrainNode and TerrainTechnique respectively
2007-03-14 11:24:04 +00:00
Robert Osfield
bd1d9e33d5
Changed typeid(CullVisitor) check to dynamic_cast
2007-03-14 10:02:45 +00:00
Robert Osfield
b079c9eb3a
From Mathieu Narache, build fixes for IRIX64
2007-03-13 12:25:30 +00:00
Robert Osfield
386f3a091e
Fixed gif plugin entry so that it uses GIFLIB_ rather than GIF to match it up
...
to the CMakeModels/FindGIFLIB.cmake entry
2007-03-13 11:58:52 +00:00
Robert Osfield
52371293b0
Checked in missing implementation of cleanSceneGraph.
2007-03-13 08:18:13 +00:00
Robert Osfield
54127cea20
Fixed install paths of wrappers and plugins
2007-03-12 12:46:36 +00:00
Robert Osfield
e9ad68c926
Removed GDAL references
2007-03-12 12:13:52 +00:00
Robert Osfield
6d4f81ba38
Cleaned up the ordering of the code component compilation
2007-03-12 11:49:10 +00:00
Robert Osfield
5fdeaeaaa2
Fixed osgTerrain CMakeLists.txt so it didn't include DataSet or GDAL references
2007-03-12 11:48:35 +00:00
Robert Osfield
e310198860
From Luigi Calori, fixes for building wrappers with lib prefix.
2007-03-12 08:32:56 +00:00
Robert Osfield
f5cf560fe1
Renamed the follow plugins to facilitate CMake build
...
lib3ds -> 3ds
ac3d -> ac
directx -> x
ESRIShape -> shp
2007-03-11 13:23:06 +00:00
Robert Osfield
cc64468b52
Moved introspection build into optional compile section
2007-03-11 13:21:48 +00:00
Robert Osfield
a291537a21
Changed the output directory for wrappers to osgPlugins and the name to osgwrapper_ to
...
make it consitent with the previous places used for wrappers.
Note, the wrappers still compile to libosgwarapper_, this will need fixing.
2007-03-11 13:15:15 +00:00
Robert Osfield
4173095f0b
From Bob Kuehne, fix for AGL build of osgViewer
2007-03-10 17:29:32 +00:00
Robert Osfield
4aeec214c7
Updated wrappers
2007-03-10 12:27:01 +00:00
Robert Osfield
fb1c25616b
Correct TransferFunction entry.
2007-03-10 11:56:34 +00:00
Robert Osfield
bff1b51361
Added preliminary work on osg::TransferFunction
2007-03-10 11:53:31 +00:00
Robert Osfield
16ba0a2fa1
Updated wrappers
2007-03-10 11:38:26 +00:00
Robert Osfield
c39f5f5188
From Luigi Calori, CMakeLists.txt support for wrappers
2007-03-10 11:38:13 +00:00
Robert Osfield
6c1b2d29d9
Commenting out Matrix_implementation.cpp entry to avoid it being installed.
2007-03-09 14:54:01 +00:00
Robert Osfield
426afa3e70
From Luigi Calori, fixed build of freetype and zlib.
2007-03-08 21:19:27 +00:00
Robert Osfield
db6f07f1d6
Ran dos2unx of CMakeLists.txt files
2007-03-08 15:31:36 +00:00
Robert Osfield
bf3180018e
From Luigi Calori, added support macro based build of plugins
2007-03-08 15:29:53 +00:00
Robert Osfield
ebb571473f
Changed _pixel_x and _pixel_y to be floats
2007-03-06 12:01:55 +00:00
Robert Osfield
5423add9e2
Added support for 4,7,12,16 bit luminance and intensity formats
2007-03-06 11:20:39 +00:00
Robert Osfield
62ac5301c9
Updated wrappers
2007-03-05 17:46:50 +00:00
Robert Osfield
71ec26ba62
From Luigi Calori, added marco support
2007-03-05 13:27:55 +00:00
Robert Osfield
b428aee852
Added missing files
2007-03-05 12:11:15 +00:00
Robert Osfield
ac1106372b
Added missing files
2007-03-05 12:09:42 +00:00
Robert Osfield
f50ed9667a
From Eric Wing and others, first cut of CMake build support
2007-03-04 13:05:33 +00:00
Robert Osfield
7c54b1b688
Changed the index value to 0 of the token vector, wheras original the 1 was used, the
...
later causing a crash when only one token was available. Also clean up #if #else #endif
block to help make the code more readable and maintainable. This bug and fix
was found by Anders Backman, but final implementation done by Robert Osfield.
2007-03-01 13:41:28 +00:00
Robert Osfield
c505e3d51e
From David Gurhrie, "Here is the updated txp loader code that we modified before to store
...
some of the material codes in the userdata field. It now takes an
option string to enable adding the extra data and doesn't add it by
default."
2007-03-01 12:10:52 +00:00
Robert Osfield
9b70538264
Updated wrappers
2007-03-01 11:58:36 +00:00
Robert Osfield
6c56383ba9
From Mike Wittman, added protected function support
2007-03-01 11:54:30 +00:00
Robert Osfield
8a04605e01
Ran cleanup to fix tabs
2007-02-28 12:15:01 +00:00
Robert Osfield
29c189c9ff
Added support for direction lights to ShadowTexture
2007-02-28 11:18:43 +00:00
Robert Osfield
b65045342e
From Mihai Radu, Added support for directional lights to ShadowMap
2007-02-28 11:12:51 +00:00
Robert Osfield
b00cbe5a17
Moved include/osgTerrain/DataSet/.cpp, gdal plugin and osgdem out into the VirtualPlaneBuilder project.
...
Updated examples to remove DataSet/GDAL dependency.
Updated wrappers
2007-02-27 21:12:48 +00:00
Robert Osfield
eb4ad4229f
Moved osgProducer and osgproducerviewer out into their own repository.
...
Clean up the source for remaining references to osgProducer/Producer.
2007-02-27 13:16:18 +00:00
Robert Osfield
b55f5c2bd8
Fixed auto rotate to screen so that it handles scales in to the parental path
2007-02-26 14:36:43 +00:00
Robert Osfield
7f8f4e331a
Completed changes to osgManipulator to make it more flexible w.r.t viewer usage, and
...
ported osgmanipulator example across of osgViewer
2007-02-26 13:01:17 +00:00
Robert Osfield
42689e83ef
Removed ReentrantMutex
2007-02-26 11:23:55 +00:00
Robert Osfield
f43cd7332c
Further work on add serialization support for osgViewer configurations
2007-02-25 20:05:23 +00:00
Robert Osfield
7174192444
Added new osgViewer plugin to help with serializing in/out of viewer configurtions
2007-02-25 19:59:27 +00:00
Robert Osfield
62e247fbd1
Added makefile
2007-02-24 09:04:27 +00:00
Robert Osfield
ad3cac84e9
Moved Block, ReentrantMutex and ReadWriteMutex into OpenThreads.
2007-02-23 16:31:34 +00:00
Robert Osfield
968a8d1118
Updated wrappers
2007-02-23 12:14:52 +00:00
Robert Osfield
96f567eff3
Added bool View::Slave::_useMastersSceneData to help manage HUD's and RTT
...
cameras that are embedded in the Viewer's View
2007-02-23 11:53:45 +00:00
Robert Osfield
2d05286dc2
Clean up the handling of views without camera manipulators, and cameras that
...
don't allow camera focus
2007-02-23 11:51:52 +00:00
Robert Osfield
03c198da4d
Removed the compile objects in init in the SceneView::setDefaults() setup.
2007-02-22 10:56:36 +00:00
Robert Osfield
b9eb2fcdee
Fixed calculation of inverted coordindates
2007-02-22 10:31:09 +00:00
Robert Osfield
b14fc636e7
Added STATIC_OBJECT_DETECTION optimizer pass to OpenFlight plugin
2007-02-22 09:16:54 +00:00
Robert Osfield
8dc84d0a8f
From Brede Johansen, Thanks for the model it helped to understand the problem. In Creator the "Last Frame Duration" is performed on the last frame of the last loop iteration, I tried to use it for the last frame of every loop iteration. As you already have explained we need a custom Sequence node. In the osgSim nodekit we already have a couple of specialized nodes for the OpenFlight format. We need an osgSim::GroupAnimation but I don't have the time right now to take this challenge. Until then I have modified my last attempt to work with the current osg::Sequence node by ignoring the "Last Frame Duration".
2007-02-21 21:20:33 +00:00
Robert Osfield
455b046433
Removed debugging info
2007-02-21 20:47:32 +00:00
Robert Osfield
becd84c2f3
Added the default setting of the SceneView's camera onto the RenderStage to
...
allow SceneView to automatically support FBO, PBuffers, image and texture copies and
Camera post draw callbacks
2007-02-21 20:38:14 +00:00
Robert Osfield
987fe5d93b
Added ability to discount Camera's that arn't appropriate for event focus
2007-02-21 19:41:53 +00:00
Robert Osfield
ee9440d155
Added Camera::s/getAllowsEventFocus() method to allow osgViewer to have non interfactive cameras such as RTT ones
2007-02-21 19:06:43 +00:00
Robert Osfield
37e3114534
Wojciech Lewandowski: "TexGenNode::TexGenNode( TexGen * texGen ) constructor does not initialize ReferenceFrame. I am not sure maybe this was the intent but first constructor does it so I don't see a reson why third one shouldn't."
2007-02-21 15:15:55 +00:00
Robert Osfield
35a466f400
Removed debug messages
2007-02-21 14:17:15 +00:00
Robert Osfield
228fd04a19
Removed the exclusion of CullSettings from the genwrapper.conf, and then changed the CullStack RefMatrix& methods to RefMatrix*
...
as the RefMatrix& versions caused the wrappers to fail.
2007-02-21 13:48:01 +00:00
Robert Osfield
664522fb02
Removed GL_TEXTURE_RECTANGLE_NV entries
2007-02-21 11:46:49 +00:00
Robert Osfield
ffda14c669
Fixed inheritance check for copying clear colour to slave cameras
2007-02-20 20:56:03 +00:00
Robert Osfield
416e6486f7
Added inhertCullSettings before SceneView::cull() calls
2007-02-20 16:46:53 +00:00
Robert Osfield
bdfc9de345
Updated wrappers
2007-02-19 15:42:32 +00:00
Robert Osfield
37526e3bea
Implemented basic ShadowMap technique
2007-02-19 14:20:18 +00:00
Robert Osfield
d5c68cfa02
Moved CameraCullCallback into ShadowTechnique scope to make it more resusable between various Techniques
2007-02-19 12:13:30 +00:00
Robert Osfield
1964690baa
Wired up the texgen to complete the first iteration of ShadowTexture effect
2007-02-18 15:24:32 +00:00
Robert Osfield
d8e6436dc1
From Andre Garneau:
...
* Fix for the aspect ratio not being properly set when screens have
different aspect ratios.
* Minor fix for makeCurrentImplementation being called directly instead of
makeCurrent() causing the owning thread pointer not being tracked
* Fix for osglauncher so that it sets its update text regions to DYNAMIC to
prevent multi-threading issues.
2007-02-18 14:21:16 +00:00
Robert Osfield
9d1e6e107c
Added basic set up of the RTT camera.
2007-02-17 17:16:13 +00:00
Robert Osfield
291d687cc9
From Paul Martz, "Add GL_TEXTURE_RECTANGLE to list of acceptable texture modes"
2007-02-17 14:37:55 +00:00
Robert Osfield
afab03a0fa
Fixed genwrapper so that it handles .svn directories, updated wrappers
2007-02-16 17:45:53 +00:00
Robert Osfield
049f907aad
Updated wrappers
2007-02-16 17:35:52 +00:00
Robert Osfield
a3594bc653
Added new osg::ComputeBoundsVisitor
2007-02-16 17:34:34 +00:00
Robert Osfield
808162d344
Added pushViewport/popViewport to CullVisitor::apply(Camera&)
2007-02-16 16:37:16 +00:00
Robert Osfield
d23b48fe3a
Updated wrappers
2007-02-16 15:29:47 +00:00
Robert Osfield
990417c9d1
Fixed typo
2007-02-16 15:14:16 +00:00
Robert Osfield
526ba8c506
From Stephan Huber, "I added a bool to GraphicsContext::Traits to indicate wether to use the
...
multithreaded-opengl-engine on os x or not. I set its default to false,
perhaps other os x users can test this setting with their data/apps, to
see if we can enable it by default.
I changed also the borderless-window-type, so expos?works correctly."
2007-02-16 13:33:29 +00:00
Robert Osfield
89fdc9fa37
Removed debugging readImageFile, and done further work on RTT setup.
2007-02-16 13:17:04 +00:00
Robert Osfield
fd3a0c25ba
Fleshed out a bit more of the ShadowTexture implementation
2007-02-16 10:20:10 +00:00
Robert Osfield
8d8f15cf72
Fixed typo that was breaking the build
2007-02-16 05:46:50 +00:00
Robert Osfield
dbb7c3c74c
Added support for using the new osgShadow plugin as a psuedo loader such that:
...
osgviewer cow.osg.shadow
Or to ShadowVolume rechnique specifically:
osgviewer cow.osg.sv.shadow
2007-02-15 22:28:32 +00:00
Robert Osfield
1da57c124f
Added .osg support for osgShadow NodeKit
2007-02-15 17:31:30 +00:00
Robert Osfield
166d624c7f
Added support for using the scenes light source setting to set up the
...
ShadowVolume's effect light parameters
2007-02-15 17:25:14 +00:00
Robert Osfield
644c92218d
Addd an #ifdef _WIN32 to force SingleThreaded usage under Windows when no
...
threading model is specified.
2007-02-15 15:06:18 +00:00
Robert Osfield
272ab99767
Reorganised the text comments so that they are shorter length, and hopefully will
...
avoid VS2003's silly text string limits when compiling osgIntrospection wrappers
2007-02-15 14:53:54 +00:00
Robert Osfield
3eb833c8b8
Twaaked comments
2007-02-15 14:47:06 +00:00
Robert Osfield
ed01ae9387
From André Garneau, Win32 build fixes
2007-02-15 14:04:22 +00:00
Robert Osfield
3fe4be6e70
Added context sharing support.
2007-02-15 12:24:04 +00:00
Robert Osfield
4f2474ece8
Fixed handling of warp pointer for when its called at startup and the
...
event queue isn't yet initialized the window range.
2007-02-15 12:11:16 +00:00
Robert Osfield
36b8ccacdd
Fixed warnings
2007-02-15 09:31:00 +00:00
Robert Osfield
b0ab6b49bf
Updated wrappers
2007-02-15 08:29:27 +00:00
Robert Osfield
91ab187ee1
Added checks into Viewer set up of Camera stats so that stats are reused if already present.
...
Added use of ref_ptr<osg::Stats> into StatsHandler's callbacks
2007-02-15 01:45:44 +00:00
Robert Osfield
6edca062b8
Improved the update of the shadow volume.
2007-02-15 01:23:00 +00:00
Robert Osfield
1eea407ee0
Added support for osg::State::DynamicObjectCount into the RTT codes
2007-02-14 20:44:17 +00:00
Robert Osfield
87ff8e2b55
Added support for sharing context to GraphicsWindowX11
2007-02-14 20:14:45 +00:00
Robert Osfield
f82c34ff11
Added getState()->setGraphicsContext(this); to the various GrpahicsWindow implementations
2007-02-14 17:28:33 +00:00
Robert Osfield
810e7291fc
Added use of Mutex into osg::Stats to better handle multi-threaded usage
2007-02-14 16:24:49 +00:00
Robert Osfield
02ff109746
Changed the initialized osg Drager:::PointerInfo::hitIter to prevent compile problems under Windows
2007-02-14 16:16:38 +00:00
Robert Osfield
d068ffb63a
From Michael Platings, "I was getting a 0 byte memory leak reported when loading 3ds files, so
...
I've changed line 196 from:
viewport->layout.viewL=(Lib3dsView*)calloc(sizeof(Lib3dsView),views);
to:
viewport->layout.viewL= views ?
(Lib3dsView*)calloc(sizeof(Lib3dsView),views) : 0;"
2007-02-14 15:25:04 +00:00
Robert Osfield
d81d579f07
Changed the report of lack of WGL_SWAP_METHOD_ARB so that it is INFO rather than WARN.
2007-02-14 14:58:46 +00:00
Robert Osfield
ff126c3d1d
Added OSG_RUN_FRAME_COUNT env var which enables a limited run of specified
...
frame numbers when Viewer::run is called.
2007-02-14 14:36:38 +00:00
Robert Osfield
07411f3246
Introduced new osg::Object::DataVariance type of UNSPECIFIED, and changed the deafult
...
values of DataVariance to UNSPECIFIED to all types.
2007-02-14 13:18:58 +00:00
Robert Osfield
115cf528a1
Removed debugging run method.
2007-02-14 12:00:33 +00:00
Robert Osfield
89c99a88fa
Added computeDataVariance method into osg::Object and implementations in Drawable and StateSet,
...
and calling of osgUtil::StaticObjectDetectionVisitor in osgViewer::Viewer
2007-02-14 11:24:42 +00:00
Robert Osfield
e8d6cec990
Fixed warning
2007-02-13 22:22:35 +00:00
Robert Osfield
f85eda9c6a
Fixed warnings.
2007-02-13 22:16:18 +00:00
Robert Osfield
1138c312b7
Changed the DeleteHandler so by default it doesn't cache objects
2007-02-13 17:39:42 +00:00
Robert Osfield
fe67a91e83
Added OSG_THREADING environmental variable to osgViewer::Viewer::suggestBestThreadingModel
2007-02-13 16:03:35 +00:00
Robert Osfield
9c434274be
Added support for ColorMask to .ive plugin
2007-02-13 14:42:00 +00:00
Robert Osfield
927dfc0a52
From Brede Johansen,
...
"Geometry.cpp
Make sure number of normals match number of vertices when lit or
vertex-normal pairs are separated when geometries are merged by the
optimizer.
Ancillary.cpp
Improved support for multitexture effect field and use texture
environment from .attr file.
PaletteRecords.cpp
Use search path when looking for shader files.
PrimaryRecords.cpp
Added preset uniforms "TextureUnit0", "TextureUnit1", "TextureUnit2"
and "TextureUnit3" for GLSL shaders."
2007-02-13 14:19:39 +00:00
Robert Osfield
b695160483
Added support for osg::Stencil into .ive
2007-02-13 13:47:37 +00:00
Robert Osfield
e4ffa968a2
From Ulrich Hertlein, added support for osg::BlendColor to .ive format.
2007-02-13 12:17:33 +00:00
Robert Osfield
5fddbfe85c
Added support for osg::BlendColor to .osg plugin
2007-02-13 12:11:32 +00:00
Robert Osfield
264d69e0c9
From Mike Wittman, support for reference parameters
2007-02-13 09:33:35 +00:00
Robert Osfield
3a48c95fc5
Updated wrappers
2007-02-12 18:02:15 +00:00
Robert Osfield
a725e0af7d
From Mike Wittman, "These changes add support for reflection of reference and const reference type representations via osgIntrospection::Type. This covers just the static type information; the dynamic behavior via Type::createInstance/Type::InvokeMethod should not be affected."
2007-02-12 17:14:46 +00:00
Robert Osfield
4ed84daf2f
Updated wrappers
2007-02-12 15:59:53 +00:00
Robert Osfield
d5f2a35a20
Added automatic scaling and translation of help to make sure it always
...
fits on screen
2007-02-12 13:51:24 +00:00
Robert Osfield
fe177e42d5
Added osgViewer::HelpHandler
2007-02-12 13:39:18 +00:00
Robert Osfield
4e97901622
Updated wrappers
2007-02-11 22:01:57 +00:00
Robert Osfield
320599b3d5
Incresed the resolution of the trackball dragger geometry
2007-02-11 21:24:38 +00:00
Robert Osfield
3006bb14f4
Changed osgManipulator::Dragger::handle(..) method to use a nested PointerInfo
...
class to encapsulate the pixel coords, SceneView and picking operations in prep for
making the code more general purpose, and less reliant on classes like osgUtil::SceneView and osgUtil::IntersectVisitor.
2007-02-11 21:12:34 +00:00
Robert Osfield
29e2abca64
Updated wrappers
2007-02-11 12:23:19 +00:00
Robert Osfield
1484ab515e
Changed the osg::Shape related projectors so that they used pointers rather
...
than references.
2007-02-11 12:22:58 +00:00
Robert Osfield
19db0c1674
From Vivek Rajan, new osgManipulator library, with a few minor tweaks and rename for osgDragger to osgManipulator for build by Robert Osfield.
...
Vivek's email to osg-submissions:
"I'm happy to release the osgdragger nodekit to the OSG community. I
implemented the nodekit for my company, Fugro-Jason Inc., and they
have kindly agreed to open source it.
The nodekit contains a few draggers but it should be easy to build new
draggers on top of it. The design of the nodekit is based on a
SIGGRAPH 2002 course - "Design and Implementation of Direct
Manipulation in 3D". You can find the course notes at
http://www.pauliface.com/Sigg02/index.html . Reading pages 20 - 29 of
the course notes should give you a fair understanding of how the
nodekit works.
The source code also contains an example of how to use the draggers."
2007-02-11 10:33:59 +00:00
Robert Osfield
f1a82f35b2
From Vivek Rajan, MatrixDecomposition implementaion, adapted by Robert Osfield
...
to be part of osg::Matrixf and osg::Matrixd classes.
2007-02-10 18:01:37 +00:00
Robert Osfield
760cfeaadb
Cleaned up osgshadow example so that it now relies upon osgShadow for its
...
shadow implementation
2007-02-09 21:31:29 +00:00
Robert Osfield
d6f3befdcf
From Carlo Camporesi, "In attach there is a little bug fix to net plugin. The modify allow the plugin to accept url with port number in this way:
...
http://"address ":"portnumber"/
"
2007-02-09 16:31:27 +00:00
Robert Osfield
7a6d68e9d3
Updated wrappers
2007-02-09 16:27:43 +00:00
Robert Osfield
9aae37e357
Moved the basic ShadowVolume code into osgShadow
2007-02-09 16:03:29 +00:00
Robert Osfield
7b8483e1be
From Paul Martz, "Make DelaunayTriangulator less verbose - It was outputting a non-warning with notify level set to WARN; changed it to INFO to make it less verbose."
2007-02-09 14:21:03 +00:00
Robert Osfield
2a9d2bb25a
Changed GraphicsWindowX11 so that it creates two Display* connextions to the Xserver,
...
one for the graphics thread, one for the main thread that querries events
2007-02-09 13:51:28 +00:00
Robert Osfield
162d08f541
Added #if #else #endif blocks to Viewer::realize() and run() for the purposes of testing
2007-02-09 13:36:44 +00:00
Robert Osfield
a3832d9b78
Removed debug message
2007-02-09 12:08:46 +00:00
Robert Osfield
4f79634bcd
From André Garneau, "Attached is a fix for the hang occuring on Win32 when the thread model is changed.
...
The issue was caused by the mutex in the ViewerDoubleBufferRenderingOperation being released even though they were not owned. This was causing the underlying critical section object lock count values becoming negative; the next time the lock was acquired it would block because of that."
2007-02-08 22:36:16 +00:00
Robert Osfield
2f1bad5b2b
From Brian Keener, fixes for Cygwin filename handling
2007-02-08 22:31:02 +00:00
Robert Osfield
d03e9aee0b
Updated wrappers
2007-02-08 20:27:02 +00:00
Robert Osfield
c2665963bb
Further work on osgShadow::ShadowTechnique API
2007-02-08 19:34:38 +00:00
Robert Osfield
95befaf1ed
Flesh out more of basic ShadowTechnique and ShadowedScene API.
2007-02-08 17:23:40 +00:00
Robert Osfield
47622e6134
Fixed the FlattenStaticTransform visitor so that it excludes subgraphs that
...
contain PagedLOD nodes
2007-02-08 15:47:05 +00:00
Robert Osfield
0d48e62811
Cleaned up readString
2007-02-08 15:01:27 +00:00
Robert Osfield
4f1a1c8b16
Fixed return in readString.
2007-02-08 14:59:20 +00:00
Robert Osfield
19608966d0
Added the threading model to stats
2007-02-08 12:47:35 +00:00
Robert Osfield
0c59589038
Added check in setThreadingModel so that it only sets up threading if the viewer is realized
2007-02-08 12:21:37 +00:00
Robert Osfield
9eb4beea52
Fixed setThreadModel method so that is doesn't try to set up threading unless
...
the viewer is realized
2007-02-08 12:20:40 +00:00
Robert Osfield
b3b420de5d
Updated the handling of closing of windows
2007-02-08 12:14:26 +00:00
Robert Osfield
34847e4135
Added better clean up of paramters on X display in GraphicsWindowX11:closeImplementation
2007-02-08 11:30:57 +00:00
Robert Osfield
10593edfd0
From Stefan Eilemann, addd more extensive XErrorHandler output
2007-02-08 11:26:04 +00:00
Robert Osfield
6d323f235a
Added setting of the DatabasePager's affinity.
2007-02-08 11:24:29 +00:00
Robert Osfield
0f4cd568f6
From Donn Mielcarek, "We generated some bad ive files in our database. In
...
some of the files, the function readInt() would return
a 0 size. While linux will happily continue on,
creating 0 sized arrays, Windows immediately
blows up, with sparks sometimes flying out the
side of the machine!
I added a simple check for zero size in
each of the functions that allocates arrays
based on the size variable, and I thought
I'd pass it along. Now the program will
not die if it encounters an ive file with bad
data."
2007-02-08 10:46:58 +00:00
Robert Osfield
614331ce63
Updated wrappers
2007-02-07 21:56:36 +00:00
Robert Osfield
958b8d74dd
Changed the setting of need to traverse during the update traverse so it is only enabled when animation is switched on.
2007-02-07 21:48:53 +00:00
Robert Osfield
c52207b637
Added new Transform::ReferenceType enum ABSOLUTE_RF_INHERIT_VIEWPOINT to support
...
internal RTT cameras that wish to use the main cameras view/eye point for LOD and other
distance based tests.
2007-02-07 16:32:14 +00:00
Robert Osfield
945faf0133
Fixed bug in AutoTransform::accept() that was related to the accept() method
...
checking the nodemask as it should.
2007-02-07 14:53:58 +00:00
Robert Osfield
2826dafa80
From Stephan Huber, "thomas kirk schrieb:
...
> I put this at the end of realizeImplementation; someone with better knowledge
> of Carbon programming may see a more appropriate place for the call.
I moved your code into the ctor of the OSXCarbonWindowingSystemInterface
so it get called only once. Can you test it again, if it works on your side?
I also disabled multithreaded-rendering because it slowed down the
rendering on my machine by a factor of 3. Perhaps we can make it
optional to test it on other machines.
I had some problems implementing pbuffer-support for os x and stopped it
for now until I have more time to investigate the issues.
"
2007-02-06 20:03:13 +00:00
Robert Osfield
e0163c6ae5
From André Garneau, "Attached is an improved Win32 keyboard handler that should now map key events similarly to the X11 implementation:
...
* Key event handler now reports left or right SHIFT, CTRL and ALT key variants on key press and release events."
2007-02-06 17:34:28 +00:00
Robert Osfield
c5776b1bf3
From Stefan Eileman, fixes for OSX gmake build to allow AGL or X11 implementation of osgViewer
2007-02-06 17:01:20 +00:00
Robert Osfield
f81251bc77
Updated wrappers
2007-02-06 17:00:20 +00:00
Robert Osfield
2236c0576e
Re-enabled processor affinity
2007-02-06 16:23:19 +00:00
Robert Osfield
3de205ec45
Added new Viewer threading model options
2007-02-06 14:38:08 +00:00
Robert Osfield
eeaad74021
Updated wrappers
2007-02-06 14:20:21 +00:00
Robert Osfield
4f441771f0
Fixed Suse9.3 build problem due to different handling Quat copy constuctor
2007-02-06 13:44:20 +00:00
Robert Osfield
bad2a4cc7c
Further work on support for ThreadPerCamera, and improved the efficiency of SingleThraeded
2007-02-06 11:03:13 +00:00
Robert Osfield
cfe737c552
Tweak API and updated wrappers to get wrappers to build
2007-02-05 14:56:41 +00:00
Robert Osfield
ebd68ba063
Added Camera's s/getCameraThread() and updated wrappers
2007-02-05 13:44:16 +00:00
Robert Osfield
ea67cc7a50
Updated wrappers
2007-02-05 12:13:52 +00:00
Robert Osfield
246b28e752
From Gordon Tomlinson, "I have attached the 3 files we had to change to fix a proble we were seeing with using Symbol Fonts
...
// GT: fix for symbol fonts (i.e. the Webdings font) as the wrong character are being
// returned, for symbol fonts in windows (FT_ENCONDING_MS_SYMBOL in freetype) the correct
// values are from 0xF000 to 0xF0FF not from 0x000 to 0x00FF (0 to 255) as you would expect.
// becuase Microsoft uses a private field for its symbol fonts ........
"
2007-02-05 11:48:02 +00:00
Robert Osfield
3c5c4ae242
From Brede Johansen, "I have made some changes to support light sources in the new
...
OpenFlight loader."
2007-02-05 11:14:23 +00:00
Robert Osfield
4914d3974a
From Paul Martz, "Here's my changes to Registry to allow extension alias mapping via a config file. I also attached a sample file that tests the parsing, but this is just FYI and not for inclusion in CVS.
...
To set up extension aliases using a config file, an app calls:
osgDB::Registry::instance()->readPluginAliasConfigurationFile(), passing in the file name as the parameter. (Of course this should be done before loading any files whose names depend on the mapping.) osgDB will search for the file using OSG_FILE_PATH.
The file should contain a line for each mapping, with the "map" extension first, followed by a space or tab, then the plugin identifier. For example, a file containing this line:
flt OpenFlight
would map the ".flt" extension to the OpenFlight plugin."
2007-02-05 10:44:10 +00:00
Robert Osfield
69da91620f
Convert GraphicsThread/GraphicsOperation to more generic OperationsThread/Operation.
...
This paves the way to running cull traversals in seperate threads.
Updated wrappers
2007-02-02 22:30:36 +00:00
Robert Osfield
bee545b82d
From Eric Sokolowski, added support for the new Text line spacing parameter to the .osg and .ive formats.
2007-02-02 16:51:59 +00:00
Robert Osfield
6d9641a78b
Added a concrete osg::DeleteHandler implementation which provides support for
...
retain objects for several frames before deleting them. Also added RenderStageCache
into CullVistor.cpp that is used for handling RTT osg::Camera's that are being
used in double buffered SceneView usage.
2007-02-02 12:41:13 +00:00
Robert Osfield
158921574c
Improved the toggling on/off of thrading modes
2007-02-01 11:07:53 +00:00
Robert Osfield
a7c448a585
Moved the init traversal from cull() to the draw() to prevent graphics context
...
calls being made during the cull traversal - something that breaks the
ThreadPerCamera model in osgViewer
2007-02-01 11:07:26 +00:00
Robert Osfield
8dfc5155f4
Further work on new threading model.
2007-01-31 22:24:20 +00:00
Robert Osfield
019cdd9116
Removed old #if #else #end block
2007-01-31 11:12:58 +00:00
Robert Osfield
493f799a6e
Refactored the ViewerRenderingOperation so that the timer querry code is in a separate ViewerQuerySupport class
2007-01-30 17:38:02 +00:00
Robert Osfield
03dbbd5048
Added automatic aspect ratio adjustmeent to View::setUpViewAcrossAllScreens() and setUpViewOnSingleScreen.
2007-01-30 15:37:30 +00:00
Robert Osfield
f8213d1c53
Updated wrappers
2007-01-30 14:47:13 +00:00
Robert Osfield
77b9a7ae19
From Eric Sokolwsky, "osgText is a useful node kit, but when longer paragraphs are displayed
...
on the screen, it looks more aesthetically pleasing to have a larger
gap between lines than is given by default. I added a new parameter,
lineSpacing, in the Text class to allow the line spacing to be adjustable
by the application. The default value is 0 meaning there is no extra
spacing given. The value should be given as a percentage of the character
height. A good value for longer paragraphs is 0.25 (25%) or more."
2007-01-30 14:32:12 +00:00
Robert Osfield
b8d98a2cfe
Added support for compute average stats attributes in inverse space to improve
...
the quality of frame rate reporting.
2007-01-30 13:48:04 +00:00
Robert Osfield
6acd0e89a1
Disabled the alternating directions of drawing of state sorted render leaves as it
...
was interferring with anaglyphic stereo used in the osgstereimage example.
2007-01-30 12:09:30 +00:00
Robert Osfield
116e7f49a4
Updated wrappers
2007-01-30 11:47:44 +00:00
Robert Osfield
ecedc8d86a
Added Stats::collectStats(string,bool) controls, getAveragedAttribute methods into osg::Stats class, and
...
related support into osgViewer::Viewer and osgViewer::StatsHandler.
Added lazy updating of text in StatsHandler HUD to minimize the impact of
slow text updating on observed frame rates.
2007-01-30 11:40:23 +00:00
Robert Osfield
7b9b13b6c0
Added support for per frame alternating the direction that SORT_BY_STATE bins are
...
rendered. The alternation makes it more likely that OpenGL objects will still
be in video ram.
2007-01-30 09:55:34 +00:00
Robert Osfield
b887226775
Made _useMainThreadForRenderingalTraversal(false)
2007-01-29 22:59:04 +00:00
Robert Osfield
fd0ea388c2
Began work on providing support for threading camera cull traversals in parallel with
...
the previous frames draw traversal. Changes range from osg::State, through osgUtil::RenderBin, through to osgViewer
2007-01-29 22:44:29 +00:00
Robert Osfield
6835996c21
Added very simple relaxing of traits by dividing required red, green, blue, alpha and depth by 2.
2007-01-28 17:32:41 +00:00
Robert Osfield
af6de09ab4
Added set/getRealizeOperation() to Viewer and CompositeViewer
2007-01-28 17:11:21 +00:00
Robert Osfield
25e4fd32ac
Updated wrappers
2007-01-28 09:53:02 +00:00
Robert Osfield
689578c13a
Added osg::PolygonMode to local StateSet to protect it from being affected by
...
stateset manipulator.
2007-01-27 17:57:58 +00:00
Robert Osfield
b8994d4707
Updated wrappers
2007-01-27 17:52:11 +00:00
Robert Osfield
5bf2dfe3b1
Added _sorted flag into RenderBin to prevent a bin being sorted twice in one frame
2007-01-27 12:54:33 +00:00
Robert Osfield
36330f7e40
Changed osgUtil::RenderBin and osg::State to allow nesting of StateSet's associated with RenderBin's.
2007-01-27 11:13:01 +00:00
Robert Osfield
7232a831da
Added osg::FrameStamp::set/getSimulationTime().
...
Added setting of osg_SimulationTime and osg_DeltaSimulationTime to the uniforms set by SceneView
Added frame(double simulationTime) and advance(double simulationTime) parameters to
osgViewer::SimpleViewer, Vewer and CompositeViewer.
Updated various examples and Nodes to use SimulationTime where appropriate.
2007-01-25 12:02:51 +00:00
Robert Osfield
13dd5acb63
From Gordon Tomlinson, fixes to BoundingSphere::expandBy(BoundingSphere&)
2007-01-25 10:02:20 +00:00
Robert Osfield
577313ae7d
Updated wrappers
2007-01-24 12:59:11 +00:00
Robert Osfield
fd6f5c87b8
Added support for GUIEventAdapter::setHandled
2007-01-24 12:28:18 +00:00
Robert Osfield
a01cade782
Added setHandled/getHandled to osgGA::GUIEventAdapter
2007-01-24 12:21:29 +00:00
Robert Osfield
056ce866b0
From André Garneau, "
...
* Setup proper pixel format for ATI boards (removal of WGL_SWAP_METHOD_ARB specification from the requested pixel format since unsupported by the ATI driver)
* Fix to create sample OpenGL window on the proper display device. This is the temporary window used to choose the desired pixel format. In the previous version, this window was always created on the primary display device, even though it had potentially different pixel formats compared to the target display device containing the window to be created.
* Implementation of WindowingSystemInterface::setScreenResolution() method
* Implementation of WindowingSystemInterface::setScreenRefreshRate() method
* Implementation of GraphicsWindow::requestWarpPointer() method
* Implementation of GraphicsWindow::useCursor() method and associated trait support. This can be used in two ways; first, when the graphics trait requested indicates that no cursor should be present, a new cursor-less window class is used to create the window. When a cursor-enabled window creation is requested, another window class is used. After creation of a window, it is also possible to toggle the cursor state by using the GraphicsWindow::useCursor method.
* The way the mouse behaves is now compatible with the behaviour seen on X11; i.e. when pressing a mouse button, the window where the pointer is located will capture the mouse input and release it only after the button has been released. This results in all mouse movement events being dispatched to the window where the button was pressed initially until it is released. This improves the interaction with graphics windows.
* Preparation work has been done to support the ability of moving a window from one screen to another screen and recreating its rendering context when this happens. This has been tested with a mix of NVIDIA and ATI cards and works properly. For the moment being, this feature is commented out due to changes in the core OSG libraries that have been done but need to be submitted later this week for approval by Robert.
Upcoming features
* Support for moving windows from one screen to another screen seamlessly
* Ability to set the window (i.e. the application itself creates the rendering window and passes it to the GraphicsWindowWin32 class)
* Other miscellaneous items"
---------------------------------------------------
2007-01-24 10:02:04 +00:00
Robert Osfield
9e91e6410b
Fixed tabbing
2007-01-23 16:32:17 +00:00
Robert Osfield
3c6eec78f9
Updated wrappers
2007-01-23 16:28:59 +00:00
Robert Osfield
055abec7a3
Added osg::StateSet* parameter to constructor to make it more convinient to set
...
up the StateSetManipulator and moved the initialization of locally cached states
into the handle method to ensure a representative version of the StateSet is captured
2007-01-23 16:26:15 +00:00
Robert Osfield
a7dcd3e9b6
Adde osgText dependency to osgViewer
2007-01-23 13:54:32 +00:00
Robert Osfield
781b3bd5c9
Made stats bars transparent and improved positioning
2007-01-23 13:28:49 +00:00
Robert Osfield
691e4d7b88
Added ability to customize the keys used to control stats
2007-01-23 11:56:10 +00:00
Robert Osfield
affb8f1289
Moved StatsHandler into its own seperate header/source in osgViewer.
2007-01-23 11:01:20 +00:00
Robert Osfield
71f307c5b2
Further work on GPU stats
2007-01-22 21:16:51 +00:00
Robert Osfield
52e86aaea3
Further work on stats
2007-01-22 17:39:32 +00:00
Robert Osfield
d6ecce6f5f
Improvements to stats
2007-01-22 11:22:37 +00:00
Robert Osfield
24bc488205
From Mathias Fröhlich, "Attached is a small change that makes the txf loader render the same resulting
...
text than an other well known txf loader. That means drawing them one on top
of the other I can only see differences due to different mipmapping ...
That is it introduces an additional gap of 0.1*height between the glyphs.
There is an additional mapping between upper and lowercase characters if one
of them is not available in the txf file.
And we have an artificial blank character that is very often missing in txf
files."
2007-01-22 09:28:31 +00:00
Robert Osfield
8e20956511
Changed the camera with focus code to only accept cameras with valid views
...
as ones that can recieve focus.
2007-01-21 18:34:26 +00:00
Robert Osfield
b47ef11d74
Initial on screen stats support
2007-01-21 18:24:54 +00:00
Robert Osfield
d3ce4825d8
Removed gl includes
2007-01-21 11:18:07 +00:00
Robert Osfield
2e7e114aba
Updated wrappers
2007-01-20 09:48:50 +00:00
Robert Osfield
f5d425cd11
Fixed the output of texture files
2007-01-20 09:44:05 +00:00
Robert Osfield
41a0226a8f
Added stats for update, event and rendering traversals
2007-01-19 20:25:17 +00:00
Robert Osfield
f0e2404541
Added new osg::Stats class for collecting frame stats of different sorts.
...
Added s/getStats() to osg::View and osg::Camera.
Added population of View::getStats() with frame stats in osgViewer/Viewer.
Added Basic StatsHandler to osgviewer example.
2007-01-19 19:53:23 +00:00
Robert Osfield
a90206bcbb
Added EXT_timer_query support
2007-01-19 14:41:29 +00:00
Robert Osfield
ccc8a922a6
Added osg::StencilTwoSided state attribute to wrap up the stencil_two_sided extension.
...
Added path in osgShadow work for using StencilTwoSided to accelerate shadow volume rendering.
2007-01-18 22:32:18 +00:00
Robert Osfield
ba9e355550
Added support for stencil GL_INCR_WRAP and GL_DECR_WRAP operations
2007-01-18 17:00:42 +00:00
Robert Osfield
d60d04c8c4
From André Garneau, "Attached is a fix in the GraphicsWindowWin32 class to allow the following usage pattern to work properly; create window, delete window, create window, etc. In all the tests I made I was always creating-deleting and then shutting down the application so this pattern was untested. The osgtexture3d & osgsimulation examples were also using this pattern so would not work. They are working fine now."
2007-01-18 09:56:23 +00:00
Robert Osfield
fdc5ebc900
Build fix for Win32
2007-01-18 09:03:08 +00:00
Robert Osfield
552293eb03
Added extra methods WindowSystemInterface for controlling frame rate and resolution, and adde useCursor flag.
2007-01-17 21:11:57 +00:00
Robert Osfield
3ebc5efe05
From Joakim Simonsson, added osgDB::concateFile and osgDB::getRealPath.
...
Tweaks by Robert Osfield - Moved methods to FileNameUtils, added unix
implementation of getRealPath add extern and OSGDB_EXPORT to function declarations.
2007-01-17 15:59:29 +00:00
Robert Osfield
d63b351137
From André Garneau, threading bug fixes - moving scoped statics out of scope to be global statics
2007-01-17 14:40:03 +00:00
Robert Osfield
3ce53da0e1
From André Garneau, Implementation osg GraphicsWindowWin32
2007-01-17 14:21:18 +00:00
Robert Osfield
65e1a5cda3
Updaed wrappers
2007-01-16 22:10:52 +00:00
Robert Osfield
578a5a3b9b
Removed the automatic registration of GraphicsContextImplementation.
2007-01-16 22:00:56 +00:00
Robert Osfield
6cf85cb953
Cleaned up CompositeViewer interface and added event traversal of views
2007-01-16 19:18:32 +00:00
Robert Osfield
dad3deec38
Added debug messages
2007-01-16 17:08:47 +00:00
Robert Osfield
1ee2af9f41
Further work on CompositeViewer
2007-01-16 16:01:01 +00:00
Robert Osfield
0b40a6fc82
Added mouseWarped call into View::requestWarpPointer
2007-01-16 15:05:44 +00:00
Robert Osfield
46b9c19fb5
Further work on event handling in CompositeViewer
2007-01-16 14:15:49 +00:00
Robert Osfield
0873a8cea0
Work on CompositeViewer and related calsses to implement viewers with multiple views
2007-01-16 08:56:33 +00:00
Robert Osfield
6fda4a927a
Updated wrappers
2007-01-15 16:12:34 +00:00
Robert Osfield
91968a9bec
Improved handling of intersection computations on datasets with multiple cameras
2007-01-15 16:09:32 +00:00
Robert Osfield
b06dbda224
Added FramStamp into osgViewer::Viewer and added ability to handle setSceneData
...
during during the application running.
2007-01-15 14:46:16 +00:00
Robert Osfield
3cb9af0dd6
From Brede Johansen, "The OpenFlight loader already have a caching mechanism for externals.
...
The cache works for nested externals but is cleared before the master
flight file is returned. I implemented texture caching using the same
mechanism."
2007-01-15 10:11:23 +00:00
Robert Osfield
c53b597795
From Paul Martz and Geoff Michel, Paul updated Geoff's bug fixes to DelaunaryTraingulator.cpp to reflect recent tessellator spelling changes
2007-01-15 09:56:36 +00:00
Robert Osfield
0d8efac569
Added setting of the update visitors' traversal number
2007-01-15 09:30:48 +00:00
Robert Osfield
09cef410ec
Added releaseContext to end of GraphicsThread::run()
2007-01-14 20:23:47 +00:00
Robert Osfield
35ec6cee40
From Riccardo Corsi, "this should be the final version of the qt-plugin ported to windows and cleaned up to avoid crashes on exit.
...
Stephan and I tested it on Mac and Win.
Just a couple of notes:
* the plugin is able to load both regular 2D images and movie stream. There is a #define QT_HANDLE_IMAGES_ALSO mechanism to indicate whether to use it for images or not. This is defined by default on Mac only, to avoid conflicts with the standard windows plugins. See comments on QTUtils.h
* de-initialization of quicktime before exit is now left to an observer, which calls exitQuicktime() when last media loaded with the plugin is released. This prevent a crash on exit without need of any extra call external to the plugin."
2007-01-12 22:07:33 +00:00
Robert Osfield
785fd5c0d9
From Stephan Huber, "New features:
...
+ Multi-display-support
+ automatic hiding of the menubar/dock if one of the windows intersects
the menubar/dock
Bugfixes:
+ event-handling was done by the first opened window, other windows did
not receive events -- fixed
+ mouse-coordinates were absolute, now they are relative to the window.
known bugs:
+ windows with decoration and in fullscreen-size are moved by the system
a little bit, so that the titlebar is accessible/visible. So if you want
real fullscreen-windows, don't decorate the window :)
I updated the XCode-project-file so all ported examples are linked
against osgViewer."
2007-01-12 21:33:19 +00:00
Robert Osfield
694b304c00
Added Viewer::setEndBarrierPosition method, change Viewer::setKeySetsDone(int) to setKeyEventSetDone(int),
...
added support for toggling threading model and end barrier position into osgviewer
2007-01-12 21:05:39 +00:00
Robert Osfield
5a515914bc
Moved the signalBeginFrame to the start of the rendering traversal.
2007-01-12 19:09:24 +00:00
Robert Osfield
509ac7fb1a
Add manually sync of the EventQueue's startTick with the osg::Timer::startTick
2007-01-12 14:45:10 +00:00
Robert Osfield
5c78d06dad
Added a default StateSet to osg::View's master Camera. Wired up osgViewer::Viewer so
...
that the master Camera's StateSet is passed to osgUtil::SceneView to use as its global StateSet.
2007-01-12 12:10:06 +00:00
Robert Osfield
b961179d83
Added setting of DisplaySettings
2007-01-11 17:00:09 +00:00
Robert Osfield
7249d5c122
Updated wrappers
2007-01-11 15:54:11 +00:00
Robert Osfield
ab2d9520a6
Fixed the setWindowSize so that it sets the input range to 0,0,width,height rather
...
than x,y,x+width,y+height as mouse coordinates move relative to the window, not the
screens origin.
2007-01-11 14:53:34 +00:00
Robert Osfield
374f8e30a4
Added DisplaySettings support into osgViewer::Viewer
2007-01-11 12:06:24 +00:00
Robert Osfield
5ee30edbea
Added support for setThreadSafeRefUnref into TexGenNode
2007-01-11 10:35:03 +00:00
Robert Osfield
dd958be8a4
Added setThreadSafeRefUnref, resizeGLObjectBuffers and releaseGLObjects to OverlayNode
2007-01-11 10:21:11 +00:00
Robert Osfield
c4279bd5f1
Ported following examples to osgViewer:
...
osgparticleeffects
osgphotoalbum
osgpick
osgpoints
osgpointsprite
osgprecipitation
osgprerender
osgprerendercubemap
osgreflect
osgscalarbar
osgscribe
osgsequence
osgplanets
2007-01-10 13:52:22 +00:00
Robert Osfield
c5082cb85c
Added support for vertex ratios into LineSegmentIntersector.
2007-01-10 10:40:12 +00:00
Robert Osfield
4954262eb0
Added View::computeIntersection implementation for a node withing a scene graph.
2007-01-10 10:09:05 +00:00
Robert Osfield
4d4b342e97
Added View::computeIntersections methods
2007-01-09 17:35:46 +00:00
Robert Osfield
7626169283
From Jan Ciger, Tolga Abaci, Bruno Herbelin : OpenVRML 0.14.3 based .wrl/VRML plugin
2007-01-09 14:35:59 +00:00
Robert Osfield
77e300100c
From Geoff Michel, "New delaunay triangulator attached. I hadn't realised that the erase() method was not erase (first, last) but erase (first, one after the last one you want deleted). This made a big difference; however some of the edges of the terrain were not included as edges in the terrain so I increased the size of the supertriangle, which works but reduces accuracy due to the larger range of coordinates in the supertriangle. (A larger supertriangle forces the triangles using supertriangle vertices to be long and thin, making the triangulation fit the convex hull of the terrain.)
...
The loss of accuracy should not affect 'normal' users with terrains that are roughly square (say up to 100:1 aspect ratio) and where the Z range is comparable to the X-Y range. Retested with Pauls data, amalric's strange polygon constraint and the standard test constraints.
I also added 2 tests for routines with a NULL argument passed to them (no-one would usually pass a NULL pointer to these routines unless - as I did in testing- you remove some of the constraints but still pass their pointer to the routine). And I removed 3 tests for triangles which are already removed when generating the geometry.
NB Paul - the previous delaunay triangulator fails under VS8 IF it has any constraints as it attempts to use some vertices that have already been deleted when applying the constraints to edges. Under VS6 and less rigorous compilers it works as the deleted vertices are still in the points stl::Vector; however any added vertices would replace one of the supertriangle vertices with non-disastrous but wrong results."
Note, merged with latest name changes in CVS.
2007-01-09 11:42:49 +00:00
Robert Osfield
d6d1a46db9
From Stephan Huber, GraphicsWindowCarbon implementation
2007-01-09 10:06:20 +00:00
Robert Osfield
b039728bf1
Fixed typo
2007-01-09 09:14:25 +00:00
Robert Osfield
96b2b93edc
Build fixes
2007-01-08 22:54:02 +00:00
Robert Osfield
9454bafc8c
Removed debug messages
2007-01-08 22:40:56 +00:00
Robert Osfield
3c79e82fc7
Fixed comment
2007-01-08 21:57:37 +00:00
Robert Osfield
462803fd57
From Paul Martz, speeling fixes for Tessellator/Tessellation.
2007-01-08 21:29:49 +00:00
Robert Osfield
7f5aaa8424
Improved resizeGLObjectBuffers support
2007-01-08 20:46:56 +00:00
Robert Osfield
709d2fa435
Improved the handling a releaseGLObjects() and add setThreadSafeRefUnref and resizeGLObjectsBuffers methods
2007-01-08 20:40:29 +00:00
Robert Osfield
77f0f74920
Added releaseContextImplementation method
2007-01-08 19:58:58 +00:00
Robert Osfield
536f9d65b1
Updated wrappers
2007-01-08 19:33:31 +00:00
Robert Osfield
16d1c00a3d
Changed the return types of makeCurrent to bool, and added a bool GraphicsContext::releaseContext method
...
along with implementations in osgViewer.
2007-01-08 19:29:59 +00:00
Robert Osfield
4a5eda6522
Added GraphicsContext::ResizedCallback and GraphicsContext::resizedImplementation.
...
Added message on non implementation of GraphicsContext::valid().
Added prelimary GraphicsContext clean up support.
2007-01-08 16:20:10 +00:00
Robert Osfield
b9f629f0cb
From Mathias Fröhlich, txf plugin for reading .txf textured texture files.
2007-01-08 12:04:04 +00:00
Robert Osfield
fdc6e675aa
Updated wrappers
2007-01-08 11:37:09 +00:00
Robert Osfield
02bda82b55
From Paul Martz and Robert Osfield, renamed include/osgUtil/Tesselator and associated classes/references to Tessellator etc.
2007-01-08 11:23:52 +00:00
Robert Osfield
773fbd1b16
Added setThreadSafeRefUnref to LightSource
2007-01-07 10:00:50 +00:00
Robert Osfield
0cd64c8c4f
Added View::setUpViewOnSingleScreen(uint) method to help set up view on
...
a single full screen window
2007-01-06 21:06:35 +00:00
Robert Osfield
fea694a0bf
Ported osgcluster to osgViewer.
2007-01-05 21:19:01 +00:00
Robert Osfield
ee5adcdae5
Fixed genwrapper to add include of osg/Camera.
2007-01-05 20:28:35 +00:00
Robert Osfield
2913cb9422
Updated wrappers
2007-01-05 17:21:35 +00:00
Robert Osfield
9a4209c61b
Simplified the nameing of updateTraversal etc methods
2007-01-05 16:48:04 +00:00
Robert Osfield
9fcace0e73
Added GraphicsContext support for clearing the graphis context. The clearing
...
is off by default (ClearMask is 0), but can be switched on when ClearMask is
non zero. GraphicsContext::clear() is called after each swap buffers
2007-01-05 15:24:06 +00:00
Robert Osfield
fc07efa656
Added int return type of Viewer::run().
2007-01-05 13:16:24 +00:00
Robert Osfield
23ac972d4e
Added a workaround for computing the time of an event.
2007-01-05 13:01:08 +00:00
Robert Osfield
3d1c971bca
Removed commented out checkEvents calls
2007-01-05 12:22:24 +00:00
Robert Osfield
552bda4cc5
Added Viewer::isRealized() and run() methods to make it easier to
...
set up and run a viewer, taking care of realized() calls if not already
done, and assigning trackball manipulator if not already assigned.
2007-01-05 10:59:23 +00:00
Robert Osfield
0985a06572
Moved the set of GraphicsContext RenderingOperations into Viewer.
2007-01-04 21:49:02 +00:00
Robert Osfield
fc061f7b15
In Viewer::realize() added default fallback of calling setUpViewAcrossAllScreens()
...
when no windows have previously been set up.
2007-01-04 21:35:11 +00:00
Robert Osfield
1fd2047cf5
Added Viewer::setKeySetsDone(int) to allow developers to specify which
...
key should set done and cause the main loop to exit.
2007-01-04 21:28:16 +00:00
Robert Osfield
cb65524851
Changed debug messages to INFO
2007-01-04 21:18:03 +00:00
Robert Osfield
9a31b7652e
Added mutex to lock of ReentrantMutex
2007-01-04 20:50:35 +00:00
Robert Osfield
778fbc78e5
Fixed compile warning
2007-01-04 20:49:39 +00:00
Robert Osfield
73fffe1800
Made Refernced::setThreadSafeReferenceCounting(bool) a virtual then overrode
...
this in various scene graph classes to ensure that the scene graph gets
updated as well as the objects that the initialial call is made from.
2007-01-04 16:49:58 +00:00
Robert Osfield
cce656a19b
Fixed warnings
2007-01-04 16:48:23 +00:00
Robert Osfield
a0374d7c85
Added glXDestryContext to help clean up OpenGL.
2007-01-04 14:34:53 +00:00
Robert Osfield
ff195bddf5
Added Object::resizeGLObjectBuffers(uint) method to help improve the ability
...
to change the number of active graphics contexts on the fly during an applications
life.
2007-01-04 14:11:51 +00:00
Robert Osfield
0ec854a365
Added support for starting and stopping osgViewer::Viewer threading and
...
automatic handling of windows being closed.
2007-01-04 11:49:15 +00:00
Robert Osfield
23206270e0
Added catch of window close
2007-01-03 23:00:05 +00:00
Robert Osfield
1de65ddedc
Added setting of default backgroud colour of View's master colour to be
...
consistent with the previous default colour used by SceneView
2007-01-03 17:26:24 +00:00
Robert Osfield
3eaa9ff05b
Changed the View's master camera projection matrix setting so that it is
...
consistent with osgProducer::Viewer default setting.
2007-01-03 16:32:44 +00:00
Robert Osfield
4f87afdbf5
Improved the robustness of thread start and cancellation
2007-01-03 16:06:12 +00:00
Robert Osfield
740363133f
Fixed the COPY_OP( Array, DEEP_COPY_ARRAYS); entry.
2007-01-02 20:26:49 +00:00
Robert Osfield
f14aa7ef66
Added support for different threading models in osgViewer::Viewer
2007-01-02 17:39:31 +00:00
Robert Osfield
d068f7025a
Added support for getting all windows and hiding the cursor
2007-01-02 12:50:57 +00:00
Robert Osfield
dda72a16e8
Changed default multi-screen setup to set up for a flat wall configuration
2007-01-02 12:03:48 +00:00
Robert Osfield
453cd7a4ef
Fixed version function names and comment strings
2007-01-02 10:31:38 +00:00
Robert Osfield
9004aa7f8b
Added missing init() implementation
2007-01-02 10:11:53 +00:00
Robert Osfield
8ce8061dbe
Added mouseWarped update
2007-01-01 20:01:45 +00:00
Robert Osfield
7155f7d1b0
Various work on osgViewer library, including warp point and graphics window resize support
2007-01-01 18:20:10 +00:00
Robert Osfield
96071fd1b1
Removed osgViewer::GraphicsWindowProxy as its was causing wrapper compile
...
problems and also no longer has a key role in osgViewer.
2006-12-28 08:16:36 +00:00
Robert Osfield
640e3b623d
Updated wrappers
2006-12-27 23:32:49 +00:00
Robert Osfield
d7e3ed3fb2
Updated wrappers
2006-12-27 23:19:37 +00:00
Robert Osfield
11fef2d75e
Tweaks from using a ReadWriteMutex& to a ReadWriteMutex* parameter to avoid
...
problems with osgIntrospection generation.
2006-12-27 23:19:17 +00:00
Robert Osfield
b2a0b50a5a
Improved handling of window input ranges for single window apps
2006-12-27 20:23:34 +00:00
Robert Osfield
c8957b58c8
Removed old hack to disable multi-threaded cameras when particle systems are present,
...
this is no longer required as osgParticle has now been made thread safe.
2006-12-27 16:44:18 +00:00
Robert Osfield
30cb8735d3
Added an osgDB::ReadWriteMutex to help manage the ability to have serialize
...
write to objects but allow multiple threads to read at once in a read only way.
2006-12-27 16:40:34 +00:00
Robert Osfield
cd133e5f2c
Updated to reflect changes to osgGA::EventQueue.
2006-12-27 15:15:23 +00:00
Robert Osfield
791d884b44
Added GraphicsWindowWin32 and GraphicsWindowCocoa classes, curently not implmented,
...
but added as a placeholder for members of the community to step forward and implement.
2006-12-27 15:04:04 +00:00
Robert Osfield
6a74240d22
Various tweaks to keep in sync with new changes to osg::Timer and osgGA::EventQueue
2006-12-26 17:38:47 +00:00
Robert Osfield
84d22f9999
Added new adapter methods to EventQueue to allow the time value of the
...
event to be specified.
2006-12-26 17:37:58 +00:00
Robert Osfield
93dbfa04b7
Aded new convinience methods to osg::Timer - s/getStartTick and time_s(), time_m() etc
...
to help get time reletive the new start tick.
2006-12-26 17:37:06 +00:00
Robert Osfield
39c0c2df76
Unified the osg::GraphicsThread::Operation and osg::GraphicsContext::Operation classes
...
as osg::GraphicsOperation. Unpdated parts of OSG depending upon these.
Added a virtaul bool valid() method to osg::GraphicsContext to allow apps to
test whether a valid graphis context has been created or not.
2006-12-24 16:40:19 +00:00
Robert Osfield
76461b3ab2
Added support for sample and sampleBuffers to osg::GraphicsContext::Traits and
...
cleaned up the Traits naming
2006-12-22 21:53:44 +00:00
Robert Osfield
401f3bcd43
Added mutexes to ParticleProcessor and ParticleSystemUpdater to improve the thread safety of osgParticle
2006-12-22 21:52:53 +00:00
Robert Osfield
bd6b7d581e
Implemented perliminary multi-threading support in osgViewer::Viewer
2006-12-22 17:46:21 +00:00
Robert Osfield
28fb22568c
Added basic support for DatabasePager into osgViewer::Viewer
2006-12-21 17:23:07 +00:00
Robert Osfield
4fc9af7ea0
Moved rendering support into GraphisContext, osgViewer::Viewer/View, and
...
added frame stamp updating and update traversal to osgViewer::Scene/Viewer.
Updated osgcamera example to use new Viewer API calls instead of using local
rendering calls.
2006-12-21 16:56:20 +00:00
Robert Osfield
8f9d2eeb46
Cleaned up the includes in the GraphicsWindowX11 header
2006-12-21 12:24:20 +00:00
Robert Osfield
a56d273fe3
Moved the implementation of GraphicsWindowX11 from the head into the src/osgViewer directory.
2006-12-21 12:19:14 +00:00
Robert Osfield
7772da71eb
Improved the handling of moving the mouse pointer across screens, and add
...
grab focus support that honours where the mouse pointer was originally.
2006-12-21 11:20:42 +00:00
Robert Osfield
21de9e4acc
Removed erroneous double GraphicsContext::
2006-12-21 09:01:56 +00:00
Robert Osfield
2255771b74
Further work osgViewer::Viewer and related classes.
2006-12-20 21:13:29 +00:00
Robert Osfield
32821ebe4e
From Roger James, "Here is the version of daeWMaterials.cpp with fixes for case insensitive path names on Windows. Nobody has complained to me about them since I posted them on the users list last week."
2006-12-19 17:40:40 +00:00
Robert Osfield
4f32039f24
From Mathias Fröhlich, "I have a small update to the 'non convex polygon detection' in the ac3d loader
...
that is used to tell if tesselation is required or if we will better leave a
polygon as is. It is still not perfect but catches some more cases."
2006-12-19 17:30:22 +00:00
Robert Osfield
c9c2950759
Moved UnitTestFramework from core osg lib into osgunittests example
2006-12-19 17:06:59 +00:00
Robert Osfield
bcda53acb1
Updated wrappers
2006-12-19 16:47:34 +00:00
Robert Osfield
e9a7225db1
Added support for traversal mask into ElevationSlice, HeightAboveTerrain and LineOfSight classes
2006-12-19 16:45:09 +00:00
Robert Osfield
dcebe4daa0
Added initial GraphicsWindowX11 implementation, and fleshed out more of the
...
osgViewer and osg::GraphicsContext/osg::View infrastructure.
2006-12-19 16:00:51 +00:00
Robert Osfield
afc77f9b39
Added support WindowingSystemInterface for querring the number of screens, the screen size and creating GraphicsContexts.
2006-12-17 20:49:01 +00:00
Robert Osfield
982a4db9e2
Added ViewPoint support into NodeVistor/CullStack/CullVisitor/LOD/PagedLOD etc to facilate
...
management of LOD settings for RTT cameras.
2006-12-15 17:27:18 +00:00
Robert Osfield
d88b996df1
From Brede Johansen, "New option "cloneExternalReferences" for OpenFlight plugin"
2006-12-14 21:15:40 +00:00
Robert Osfield
0db9fc45dd
From Orhun Birsoy, "In SimpleViewer::frameUpdateTraversal function, orthographicCamera calculation has some typos. It should read
...
bool orthographicCamera = (pm(0,3)==0.0) && (pm(1,3)==0.0) && (pm(2,3)==0.0) && (pm(3,3)== 1.0); "
2006-12-14 16:13:27 +00:00
Robert Osfield
21bf3e8762
Removed debug output files
2006-12-13 21:15:22 +00:00
Robert Osfield
0d399adf46
Commented out debug messages
2006-12-13 17:39:30 +00:00
Robert Osfield
97a5ca8a54
Further improvements to handling of multiple z values
2006-12-13 16:41:06 +00:00
Robert Osfield
71bf5371a7
Improvements to handling of multiple z value regions
2006-12-12 21:48:59 +00:00
Robert Osfield
e2481bf1ba
Improved the filtering of overlapping and vertical line segments
2006-12-07 22:20:48 +00:00
Robert Osfield
cb77bbf7f6
Fixed copyright notice
2006-12-07 15:48:17 +00:00
Robert Osfield
db163de91c
From Luigi Calori, "In order to effectively use --image-ext and to add -O "plugin options",
...
some fix to osgdem.cpp and osgTerrain/DataSet.cpp
These mods should allow to build terrains controlling jpeg compressed
imagery embedded in ive files, using something like:
osgdemd --image-ext jpeg --RGB_24 -O "JPEG_QUALITY 20
compressImageData" ......."
2006-12-07 10:16:43 +00:00
Robert Osfield
1a7a1704fd
From Geoff Michel, "I was getting triangulations with the previous delaunay triangulator, but it seems I may have been picking up the wrong coordinates or an old version of my test file (that version is OK when no coordinates lie outside the 'terrain' zone). This version is much stricter about memory handling and insertion of extra points."
2006-12-07 10:09:48 +00:00
Robert Osfield
11de6ae8ef
From Gerrick Bivins, fixed newly introduced texture setup bug.
2006-12-06 21:39:09 +00:00
Robert Osfield
eb4a5ffe25
Improved the handling of overlapping line segments.
2006-12-06 21:29:10 +00:00
Robert Osfield
49cd96cd44
From Rick Pingry, "n my application I am walking through the scene graph looking for nodes of a specific name. I noticed there were times when some of the nodes were not named what I had expected. Upon reviewing the code, I noticed this was happening when there was a forward reference to a parented object.
...
The existing code uses a map with object ID's. The original code only applied the name to a node for a new ID only if the node did not already exist in the map. The problem was that there was another part of the code (when a parent was forward declared) that also created the node with the ID in the map, but it did not know its name. I simply made sure that the name was set regardless of whether or not the node was already in the map. "
2006-12-06 14:17:55 +00:00
Robert Osfield
152c999f99
Updated wrappers
2006-12-05 22:10:36 +00:00
Robert Osfield
3cab169b0d
Checked in remaining element from Brede Johansen changes for clmapToEdge reader option.
2006-12-05 20:30:46 +00:00
Robert Osfield
caa27618fc
From Stephan Huber, "minor bugfixes for the quicktime-plugin"
2006-12-05 17:30:36 +00:00
Robert Osfield
2b8bcb9bb0
From Gerrick Bivins, "Changes:
...
--merged with fixes for texture coordinates(is this in CVS/SVN already)?
--changed above mentioned fix output level from osg::NOTIFY to osg::DEBUG_INFO
--added support for VRML97 ImageTextures.
--changed pointers to ref_pointers where possible.
--added format (method separated by "//////") for easier reading."
2006-12-05 17:27:31 +00:00
Robert Osfield
ae93f08492
From Roger James,"I have had another go at the windows specific file name handling in daeWMaterials.cpp. I think I have arrived at a temporary compromise.
...
I have decided to just normalise the drive letter part of file names for the time being and also ensure that names of the format x:/xxxxx are treated as absolute paths. This will cover a lot of cases.
I have raised a bug against collada which hopefully should resolve some others. However there are some pathological cases which I have commented on in the code, these will probably never work properly unless there is a significant rewrite of the daeURI functionality. Hopefully they are rare."
2006-12-05 17:10:39 +00:00
Robert Osfield
693302574d
From Rein Kadijk, "While displaying a certain scene, OsgEdit crashed in ProxyNode::traverse() in file OSG_OP_OT-1.2\OpenSceneGraph\src\osg\proxynode.cpp.
...
It turned out that nv.getDatabaseRequestHandler() returned NULL; using this pointer to call one of DatabaseRequestHandler's methods is of course illegal.
I patched it by adding: if (nv.getDatabaseRequestHandler())"
From Robert Osfield, reordered the addition of the nv.getDatabaseRequestHandler() check to allow the
default traverse() to be called when no database handling is attached to the visitor.
2006-12-05 16:45:27 +00:00
Robert Osfield
875668b84d
From Stephan Huber and Riccardo Corsi, port of QuickTime plugin to Windows
2006-12-05 16:29:11 +00:00
Robert Osfield
905857acd7
Added use of typedef to help clean up the readability a little and replaced a copy list with a reference.
2006-12-05 15:41:03 +00:00
Robert Osfield
d70cf68ae6
From Sylvain Marie, "changed raw pointers to smart pointers in the dxfBlock, dxfTables and
...
dxfSection classes, so their members data are correctly deleted.
- changed some methods signatures to pass arguments by reference instead of
by value. The performance and memory usage are enhanced (the reader was
clogging the heap when reading some large DXF files)
The updated files have been compiled and tested with a variety of DXF files
on XP with VS2003, but the changes should not disturb any other compiler."
2006-12-05 15:31:07 +00:00
Robert Osfield
8e0bb5f6ef
From Chris McGlone, "PlygonZ copy constructor: added allocation and copying of zarray"
2006-12-05 14:58:38 +00:00
Robert Osfield
3177494aa4
From Bryan Thrall, "Currently, the DatabasePager always loads requested Nodes using the
...
default Registry Options object, but it would be useful to be able to
request loading with a different Options object. The attached files
allow you to do that (based off the OSG 1.2 source).
For example, I'm implementing a loader that requires context information
when it pages in subgraphs, which becomes significantly complicated when
multiple scenegraphs are requesting subgraph loads with different
contexts (the loader needs to know which context to use, and the
Registry Options needs to be carefully managed so the context settings
don't clobber each other, especially in multithreaded situations). Being
able to pass an Options instance along with the Node request resolves
this problem."
2006-12-05 14:50:46 +00:00
Robert Osfield
289331569d
From Brede Johansen, "added a new reader option to replace the texture
...
wrap mode CLAMP with CLAMP_TO_EDGE."
2006-12-05 14:28:07 +00:00
Robert Osfield
cf41b3128c
Updated wrappers
2006-12-05 13:06:02 +00:00
Robert Osfield
afa96fff0e
Added more accurate computation of local height above sea level in the plane intersections routines
2006-12-05 12:58:29 +00:00
Robert Osfield
ba3fe2844f
Improved the calculation of distance around the globe within the ElevationSlice routine.
2006-12-04 17:31:20 +00:00
Robert Osfield
0f5aeb5fa3
Added preliminary support for generating distance, height lists for ElevationSlice.
2006-12-04 12:36:13 +00:00
Robert Osfield
fd8d6b7f3b
Cleaned up debugging info.
2006-12-03 12:52:38 +00:00
Robert Osfield
56b7268c72
Added copying of plane to surface intersections in the osgUtil::PlaneIntersector class, and update wrappers.
2006-12-03 11:44:12 +00:00
Robert Osfield
8d85636b50
Fixed typo and updated wrappers
2006-11-30 18:42:38 +00:00
Robert Osfield
54610429e9
Improved the edge normal computation
2006-11-30 18:33:36 +00:00
Robert Osfield
a9d18d01db
Basic shadow volume alogirthm implemented in example.
2006-11-30 16:30:24 +00:00
Robert Osfield
f022f79436
Fixed shadow volume geometry handling of direcitonal lights
2006-11-30 12:04:36 +00:00