Commit Graph

4374 Commits

Author SHA1 Message Date
Robert Osfield
6c74589014 Added signOrZero template method, and to Matrix_implementation.cpp usage of this
method in the get(Quat&) code.
2007-05-09 09:26:33 +00:00
Robert Osfield
681bf12333 Added imageData block initialized to 0 for first construction of GlyphTexture 2007-05-09 07:54:32 +00:00
Robert Osfield
5b9883516a Added CullSettings inheritance mask for LIGHTING_MODE and LIGHT 2007-05-08 10:02:07 +00:00
Robert Osfield
963cd837e3 Added s/getLightingMode and s/getLight to osg::View to allow control of the viewers
global light source.
2007-05-07 22:07:23 +00:00
Robert Osfield
6716f0d845 Added missing HelpHandler::reset() implementation 2007-05-07 19:48:46 +00:00
Robert Osfield
d59c884a79 Added extra external libs 2007-05-05 17:05:07 +00:00
Robert Osfield
f9b348620e Added extra libs to COLLADA plugin, but still need to set LD_LIBRARY to libs even though they are static!?#!? 2007-05-05 17:02:21 +00:00
Robert Osfield
b8841f211d Added preliminary Performer plugin support, note, still missing are a range of Performer database libs that will be required. 2007-05-05 16:24:07 +00:00
Robert Osfield
52b5b468d5 Added OpenVRML support 2007-05-05 16:11:30 +00:00
Robert Osfield
02e6deba15 Added CMake support for pnm plugin 2007-05-05 15:36:03 +00:00
Robert Osfield
2c2fefce5a Added support for normals plugin 2007-05-05 08:22:06 +00:00
Robert Osfield
a9f6263601 Added ToPortToCmake.txt to record what modules need port to CMake. 2007-05-05 08:18:04 +00:00
Robert Osfield
0603483c1a Added first cut a Xine support 2007-05-04 19:17:49 +00:00
Robert Osfield
0dfd619138 Added first cut of Cmake COLLADA support 2007-05-04 14:25:02 +00:00
Robert Osfield
3501f0ac0c Added COLLADA CMAkeLists.txt, doesn't work yet as we done yet have a FindCOLLADA.cmake but it is a start 2007-05-04 13:41:27 +00:00
Robert Osfield
07322ce9a1 Added support for jp2 plugin 2007-05-04 13:20:48 +00:00
Robert Osfield
198c3d3e5a Removed margin 2007-05-04 12:06:31 +00:00
Robert Osfield
dadb92ea64 Reorganised the managment of margins around glyphs so that is done entirely
with src/osgText/Font.cpp rather than the font plugins or Text.cpp
2007-05-04 12:05:29 +00:00
Robert Osfield
0ad6aae023 From Luigi Calori, Win32 build fix 2007-05-04 08:48:59 +00:00
Robert Osfield
eccc1f45e0 From Mathias Froehlich, "Attached is a change that does no longer set the render bin details in nodes
other than drawables. I guess that this way I am sure to not introduce
hierarchical render bins in loaded models."
2007-05-04 08:45:21 +00:00
Robert Osfield
a259e97634 From David Callu, fixed incorrect array usage. 2007-05-04 08:40:20 +00:00
Robert Osfield
af5b6aa43e Added CartizianLocator 2007-05-03 16:23:19 +00:00
Robert Osfield
9a74282767 Updated wrappers 2007-05-03 15:21:30 +00:00
Robert Osfield
217e8d6f35 Added osgUtil into lib list 2007-05-03 14:47:52 +00:00
Robert Osfield
65811d0233 Added virtual orientationOpenGL() method into osgTerrain::Locator. 2007-05-03 11:11:03 +00:00
Robert Osfield
8c9ec06447 Added OpenThreads to TARGET_COMMON_LIBRARIES 2007-05-03 10:10:23 +00:00
Robert Osfield
3809d0dad0 Moved the OpenThreads link locally to each lib 2007-05-03 10:06:38 +00:00
Robert Osfield
85e5ec7579 Added OpenThreads wrappers 2007-05-02 19:57:05 +00:00
Robert Osfield
958c3efa3a Added CMake support for local OpenThreads build 2007-05-02 18:07:41 +00:00
Robert Osfield
80c42a7cf7 Introduced new tesslation technique that adjusts the triangulation so that the
diagonal goes between the corners with least vertical deviation.
2007-05-02 13:58:38 +00:00
Robert Osfield
859bcf3c4b Further perfomrmance optimizations and clean up on new VBO/EBO/PBO API. 2007-05-01 18:03:32 +00:00
Robert Osfield
fe85a439fb Cleaned up the optional code paths in new VBO code 2007-05-01 09:29:30 +00:00
Robert Osfield
914763b77a Updated wrappers 2007-05-01 07:31:30 +00:00
Robert Osfield
40db1a8934 Moved VBO switching code into inline methods into osg::State to speed performance 2007-05-01 06:28:20 +00:00
Robert Osfield
0742975f9b Added initalization of _startTick to CompositeViewer 2007-04-30 15:10:57 +00:00
Robert Osfield
367ab032b1 From Jeremy Moles, fixed missing intialization of _startTick member variable. 2007-04-30 14:49:05 +00:00
Robert Osfield
d625a5e114 Implementated new dirty buffer mechansim for BufferObjects to make it more efficient 2007-04-30 12:18:27 +00:00
Robert Osfield
efb52dfab9 Added TerrainNode::setColorFilter(layerNum,Filter) to allow developers to set
what type of texture filter to use, either LINEAER and NEAREST.
2007-04-30 09:47:35 +00:00
Robert Osfield
3054dd166c Updated wrappers 2007-04-29 20:19:12 +00:00
Robert Osfield
9e07a72119 Added temporary code (but comment out) for testing VBO performance 2007-04-29 20:13:53 +00:00
Robert Osfield
aa56bddefc Added a MatrixTransform set up to provide a local origin for better precision. 2007-04-29 20:10:43 +00:00
Robert Osfield
921eb0fdd0 Further work on new VertexBufferObject/ElementsBufferObject support 2007-04-29 08:12:29 +00:00
Robert Osfield
47598ce1a9 Added back in osg::Geometry path 2007-04-27 17:03:06 +00:00
Robert Osfield
4968eb7136 Further work on the new VBO support 2007-04-27 14:52:30 +00:00
Robert Osfield
a3e6d8283d Further work VertexBufferObject and ElementsBufferObject classes 2007-04-26 16:50:06 +00:00
Robert Osfield
0df82ba60f Updated wrappers 2007-04-26 08:26:10 +00:00
Robert Osfield
a1639c3d2d From Brad Colbert, "Added a new method to ImageStream called getLength that is used to
return the length of the stream.

Implemented the virtual methods in QuicktimeImageStream, (getLength,
getReferenceTime, setTimeMultiplier), to return valid value for each.
"
2007-04-26 08:11:09 +00:00
Robert Osfield
8ef833c585 From Eric Wing, Added quicktime CMakeLists.txt 2007-04-26 08:07:25 +00:00
Robert Osfield
4b71e3948b Added VertexBufferObject and ElementBufferObject class interfaces, and wired
up osg::Array and osg::DrawElements* to these respectively.

Updated wrappers
2007-04-25 18:50:11 +00:00
Robert Osfield
e316a8617c Updated wrappers 2007-04-25 10:32:41 +00:00
Robert Osfield
5325653f30 Cleaned up numToTop method 2007-04-25 10:32:28 +00:00
Robert Osfield
c65278e9dc From Martin Aumueller, "
a collegue of mine noticed that on Windows and X11 the modifier state (such as
Alt or Ctrl) would be applied one key press too late: e.g. press & hold Alt,
press a, release Alt, press a, press a would generate the key sequence a,
Alt-a, a instead of Alt-a, a, a.

The problem is also present on Carbon. Moving the call to setModKeyMask in
front of the call to keyPress fixed it for me on Carbon and X11. I suppose
that this will fix the problem for Windows as well."
2007-04-25 09:32:12 +00:00
Robert Osfield
6405b7724d From Eric Wing, "lwo must link to osgFX or undefined symbols ensue." 2007-04-25 09:16:31 +00:00
Robert Osfield
20f8fedfcc From Jeremy Moles, Added check for image transluceny to image loaded code, placing
the image quad into the transparent bin for images with alpha values.
2007-04-24 19:08:52 +00:00
Robert Osfield
00a44eb636 From Martin Aumueller, "the new Inventor plugin needs some changes in order to compile against OpenInventor.
Just as in the pre-r6419 I used the COIN_BASIC_H define in order to discriminate
between the two versions of Inventor.

Additionally, I had to change the CMakeLists.txt to use the proper include path.
"
2007-04-24 19:03:51 +00:00
Robert Osfield
d35d8d0fa8 From Jan Peciva,
"I was working on a new version of Inventor plugin.
It was inspired by the need to get correct and high quality conversion,
so I verified the plugin on complex models and made number of serious fixes:

- the geometry is not two times on the output file (!)
- SoVRMLImageTexture: VRML texture support was rewritten according to
  Inventor programming practices, since it does not worked correctly on
  many models (Anyway, thanks for Gerrick Bivins to introduce it.)
- osg::ref wrong usage related crash fixed
- code cleaning and texture code overhaul
- LOD fixes
- appended README.txt with all the contributors I was able to get from
  SVN logs"
2007-04-24 13:12:40 +00:00
Robert Osfield
56188dde68 Added CMake support for lwo plugin. 2007-04-24 13:11:22 +00:00
Robert Osfield
4371d22682 Added compile path support for XINE, Inventor and LibXML 2007-04-24 12:59:23 +00:00
Robert Osfield
2bf836ea93 From Michael Platings, "In the "new method" 3DS loader, inverse matrices were applied to
vertices, but not normals, which caused some models to appear with
normals doubly rotated. I've now added some code to transform the
normals."
2007-04-22 21:18:20 +00:00
Robert Osfield
f242570269 Unified the setup of version numbers so that they all are based on the version
number setup in the include/osg/Version header file.
2007-04-22 20:19:43 +00:00
Robert Osfield
4248c0f8c8 Added osgSim dependency to txp plugin 2007-04-21 12:29:39 +00:00
Robert Osfield
b2261d84fe Added include directory to get txp plugin building 2007-04-21 11:24:26 +00:00
Robert Osfield
abd0c7fe67 Added support for sorting the graphics contexts so that the first context/window
returned from Viewer::getContexts/getWindows will be the left most window on the lowest screen number.

Added ability for StatsHandler and HelpHandler to support end users setting their
Camera's graphics context.
2007-04-20 16:17:48 +00:00
Robert Osfield
4637b78bd1 From Jason Howlett, using suggestion from Robert Osfield, "CullVisitor.cpp was modified, beginning at line 1115. Code was added to
check if the camera inherits its cull mask. If not, the CullVisitor sets
its traversal mask to the camera's cull mask."
2007-04-16 19:40:36 +00:00
Robert Osfield
835e315494 Implement basic TerrainGeometry code 2007-04-16 19:34:25 +00:00
Robert Osfield
3d058d2fcf Added logo and txp CMakeLists.txt files. The txp build is temporarily commented out while the build is fixed. 2007-04-16 18:33:09 +00:00
Robert Osfield
c0bd295db2 Updated wrappers 2007-04-16 12:21:07 +00:00
Robert Osfield
47add5a42c Cleaned up state management code 2007-04-16 12:20:42 +00:00
Robert Osfield
9db23e0b22 Fixed bug associated with complex RenderBin setup. 2007-04-16 12:18:56 +00:00
Robert Osfield
68a6882d04 Bumbped the version number up to 1.9, in preperation for using odd release numbers
for development releases, odd versions for stable releases.
2007-04-16 06:03:22 +00:00
Robert Osfield
1fedab6b49 Fixed choice of display 2007-04-15 20:53:09 +00:00
Robert Osfield
84c4b86da8 Added an #include<unistd.h> and extern "C" around X11ErrorHandling to prevent Solaris build errros 2007-04-14 08:31:40 +00:00
Robert Osfield
d786be8d4c Added some debugging 2007-04-13 19:28:22 +00:00
Robert Osfield
b358a73d99 Updated wrappers 2007-04-13 19:28:11 +00:00
Robert Osfield
9e8e07b373 Added usleep's to avoid X11 errors when doing X11 calls to close to changes in
window size or decoration.
2007-04-13 14:54:22 +00:00
Robert Osfield
934ed30314 Added setWindowRectangle implementation for GraphicsWindowWin32, and
place holder for setWindowRectangle implementation for GraphicsWindowCarbon.
2007-04-13 14:23:10 +00:00
Robert Osfield
3deda9f2a7 Updated wrappers 2007-04-13 13:28:10 +00:00
Robert Osfield
035b98993f Added s/getWindowRectangle to GraphicsWindow and implementation in GraphicsWindowX11 2007-04-13 13:22:52 +00:00
Robert Osfield
0d4dd3da8e Updated wrappers 2007-04-12 09:32:48 +00:00
Robert Osfield
73f980bd49 Prep work on new TerrainGeometry Drawable which supports selective display list/VBO's usage.
Updated wrappers
2007-04-11 17:39:13 +00:00
Robert Osfield
557fdacba2 Added support for multiple colour layers, and fixed handling of elevation
and colour layers having different locator
2007-04-11 11:20:04 +00:00
Robert Osfield
2e6ee4bb39 Removed old gmake and VisualStudio build files 2007-04-10 13:10:25 +00:00
Robert Osfield
cc1ab2c711 Create new incliude/osgViewer/api directory to hold platform specific classes such as GraphicsWindow implementations.
Moved GraphicsWindowWin32,X11 and Carbon into their api/Win32, api/X11 and api/Carbon directories.
2007-04-10 11:03:37 +00:00
Robert Osfield
a78e8d2b6b Fixed the handle of triangle fan. 2007-04-06 19:51:20 +00:00
Robert Osfield
6d7b5e7ebd From Eric Wing, pedantic warning fixes 2007-04-06 15:36:13 +00:00
Robert Osfield
0909bd04e4 Updated wrappers 2007-04-06 15:35:27 +00:00
Robert Osfield
11d74fd54e From Eric Wing, pedantic warning fixes 2007-04-06 15:13:02 +00:00
Robert Osfield
acee7ccaee From Laurens Voerman, "I've added the code to set up quad_stereo properly. I have tested with
WinXP / VC8, stereo is working. I also added code to set sampleBuffers
and samples. These cannot yet be properly set, tested (windows only ) by
changing _numMultiSamples in DisplaySettings::setDefaults() and
recompiling."
2007-04-06 14:40:39 +00:00
Robert Osfield
511bc9d571 From Laurens Voerman, "attached is OpenSceneGraph\src\osgViewer\GraphicsWindowWin32.cpp
I've added the code to get the osgViewer working on windows displays
with less than 32 bit color. Only tested with 16 bit color."
2007-04-06 14:36:59 +00:00
Robert Osfield
31ac332b1f Add setting of ShadowVolumeGeometry draw mode 2007-04-06 14:33:55 +00:00
Robert Osfield
6c12c71337 Added constructor argument to ShadeModel 2007-04-05 16:12:10 +00:00
Robert Osfield
561dc02da5 Commented out superfluous debug messages 2007-04-05 15:04:05 +00:00
Robert Osfield
811d0e465a Added better handling of colour layer/elevation layer/transfer function combinations and
use of 16bit luminance format for colour layers used as input to transfer functions
2007-04-05 14:56:30 +00:00
Robert Osfield
538a83dad4 Added support for flushing buffer objects 2007-04-04 09:07:46 +00:00
Robert Osfield
62ce8b72c1 Updated wrappers 2007-04-04 08:05:45 +00:00
Robert Osfield
9b5bbe862d From Mike Wittman, C# build fixes 2007-04-04 08:05:23 +00:00
Robert Osfield
86e20e1659 Added assignment of hieghts texture coords 2007-04-03 19:18:20 +00:00
Robert Osfield
31d9f40a2f Preliminary work on TransferFunction support 2007-04-03 15:39:05 +00:00
Robert Osfield
43c24da12d Added setValue method and osg::Image setup to osg::TransferFunction1D, and setup
of TransferFunction1D into osgterrain example.
2007-04-02 13:06:59 +00:00
Robert Osfield
826be748e8 Added support for texture layer. 2007-04-01 11:19:46 +00:00
Robert Osfield
0f76021fd0 Added debugging code 2007-03-30 15:16:29 +00:00
Robert Osfield
d434ee0db8 Added support for reading values from an ImageLayer, and building of the
elevation data in GeometryTechnique.
2007-03-30 14:57:57 +00:00
Robert Osfield
192dbe919b Added support 16bit intensity formats 2007-03-30 14:57:01 +00:00
Robert Osfield
a2ecb93c2b Converted osg::HeightField across to using a osg::FloatArray internally to enable
it to be assigned as a vertex attribute array to an osg::Geometry.

Removed the osgTerrain::ArrayLayer as its no longer required thanks to the above change
which makes the osgTerrain::HeightFieldLayer more flexible.  

Updated wrappers
2007-03-29 19:42:07 +00:00
Robert Osfield
0c44e9ac19 Added creation of basic geoemtry to test Locator and extents 2007-03-29 14:45:35 +00:00
Robert Osfield
e8ede168c9 Updated wrappers 2007-03-29 12:41:18 +00:00
Robert Osfield
0a43ff6571 From Eric Wing, added handling of CMAKE_THREAD_LIBS_INIT 2007-03-29 10:56:07 +00:00
Robert Osfield
e2e0897a1b Added missing return value 2007-03-29 10:13:36 +00:00
Robert Osfield
cb811aa7cd Added support for compute the extents on local NDC coordiantes of the
elevation and colour layers
2007-03-28 16:28:20 +00:00
Robert Osfield
b7967b7007 From Mike Wittman, "Here is a change to the .cpp file to fix it by disambiguating the cull invocation." 2007-03-28 15:05:49 +00:00
Robert Osfield
677358c049 Removed the d during debug build of wrappers on non MSVC platforms 2007-03-28 14:50:35 +00:00
Robert Osfield
7fc714ada1 Removed deprecated drawImplementation(State&) method from Drawable and Drawable::DrawCallback 2007-03-28 11:30:38 +00:00
Robert Osfield
7fb38ff42f From Martin Amueller, Add libosgGA and libosgText for OSX build 2007-03-28 08:53:18 +00:00
Robert Osfield
b331b77269 From Martin Aumueller, "in order to remove a dependency on Coin3D (which is GPLed) and make it work
with SGI's OpenInventor, I had to change
OpenSceneGraph/src/osgPlugins/Inventor, as SoVRMLImageTexture is not avaible
in SGI's Inventor. "

From Robert Osfield, tweaked the above so that it uses Coin headers to switch on coin features:

#ifdef COIN_SOCALLBACKACTION_H
    #define USE_COIN 1
#endif
2007-03-28 08:43:05 +00:00
Robert Osfield
5c780aada0 From Luigi Calori, "here is a patch to use Mike 3rdParty dependencies
It should not be introusive to any other palatform apart MSVC, but in order to link to debug-specific libs
I had to change plugins CMakeLists to differentiate debug/release linkage, I have used the same macro used in core libs
Now the macro used for plugin and examples linking test for existance of TARGET_LIBRARIES_VARS
that holds the names of the variables that have to be used for linking"
2007-03-27 21:44:02 +00:00
Robert Osfield
90f355bd4e Updated wrappers 2007-03-27 19:39:00 +00:00
Robert Osfield
78ed8f9219 Add computeBound support to TerrainNode and Layer. 2007-03-27 19:27:36 +00:00
Robert Osfield
87461c2077 Removed the flt plugin from OpenSceneGraph/trunk, this project can now be found in the deprecated directory. 2007-03-27 16:05:13 +00:00
Robert Osfield
4688d5ae8e Rearranged the traversal and initialization of TerrainTechnique 2007-03-27 16:01:01 +00:00
Robert Osfield
e76e4e82db Added EllipsoidLocator. 2007-03-27 11:23:57 +00:00
Robert Osfield
37dd2851e9 Added #include <unistd.h> for non Win32/Mingw build 2007-03-27 08:43:59 +00:00
Robert Osfield
ee563ee5c3 Added -lgdi32 to CYGWIN path 2007-03-27 08:40:25 +00:00
Robert Osfield
8dc2a28945 Removed WindowData parameter from init(). 2007-03-26 16:28:26 +00:00
Robert Osfield
1cdda0654f Added Locator and layer setting to osgterrain example 2007-03-26 15:52:22 +00:00
Robert Osfield
b419fa93ef From Luigi Calori, "when we link against something that comes out from a Find... we ususally have a variable <LINK_VAR_NAME>available like OPENTHREADS_LIBRARY,
so I' ve set up a macro that uses the variable name expanded for linking, and  test if a variable ${LINK_VAR_NAME}_DEBUG
like OPENTHREADS_LIBRARY_DEBUG exists and in case uses it for linking in debug mode.
I' ve also set up FindOpenThreads to set up these variables.
I had to edit the core libraries CMakeLists to add the calls to the macros used.
I' ve tested under MSVC"
2007-03-26 13:02:38 +00:00
Robert Osfield
bfed1b784e From Mike Wittman, "This change fixes a couple bugs in the osgIntrospection protected function support. I missed adding the protected/public specifier on a couple recursive invocations, so those functions are not currently returning protected functions for base classes when they should." 2007-03-23 17:37:49 +00:00
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