Commit Graph

6352 Commits

Author SHA1 Message Date
Robert Osfield
abb72cc182 Removed OpenThreads reference 2007-04-04 08:06:22 +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
307a9a9a78 From Andy Skinner, warning fix for Windows 64-bit build 2007-04-03 19:42:43 +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
1032bc66b2 From Eric Wing, adding message w.r.t debug OpenThreads library for when its not available. 2007-04-03 11:04:09 +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
5ba0e5b930 Fixed missing initializer in Options constrctor 2007-03-29 19:39:20 +00:00
Robert Osfield
0f507e317d Removed the using to avoid VS 7.1 build problem 2007-03-29 15:41:59 +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
c996c545b7 From Eric Wing, "Added the conditionals for SDLMain." 2007-03-29 09:29:26 +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
11e3f45c58 Removed the Found OpenThreads message 2007-03-28 14:50:58 +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
d30a33247d Replaced the X11 Window by Carbon WindowRef in the WindowData structure. 2007-03-28 08:52:44 +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
8e49cfeaf4 From Luigi Calori, added Find3rdPartyDependencies.cmake 2007-03-28 07:34:46 +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
a77d3fe9d2 Fixed header files specification 2007-03-26 19:38:04 +00:00
Robert Osfield
404d583b3e Added return false; to default implementations of convert functions 2007-03-26 19:24:18 +00:00
Robert Osfield
0c4060674f Added GeometryTechnique 2007-03-26 16:32:31 +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
7013c12a0d From Mike Wittman, "This is another weirdo change to support code generation. It brings all the Drawable::supports and Drawable::accepts overloads into the ShapeDrawable scope to avoid errors invoking the ones that are not defined in ShapeDrawable. Currently you'll get compilation errors if you pass a Drawable::AttributeFunctor or PrimitiveIndexFunctor to the "accept" function invoked on a ShapeDrawable pointer or reference, since those overloads are only defined in the base class. You'll also get the same error passing a PrimitiveIndexFunctor to the "supports" function. These errors occur because C++ function overload resolution does not cross inheritance boundaries." 2007-03-26 13:00:29 +00:00
Robert Osfield
4e2eaf4d0d Changed the external library specification to use TARGET_EXTERNAL_LIBRARIES 2007-03-26 09:48:02 +00:00
Robert Osfield
aa73c4a00f Removed OpenThreads from the list of TARGET_COMMON_LIBRARIES to prevent double
linking of OpenThreadsd and OpenThreads during debug build.
2007-03-25 11:47:08 +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
6e0ea2bef9 Added automatic creation of lib bin and lib/osgPlugins 2007-03-23 08:53:06 +00:00