FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Tree, changes to better support Java binding generation

Browse Source
This commit is contained in:
Robert Osfield 2004-09-28 09:14:04 +00:00
parent 0c24cf48b8
commit 5747773096
23 changed files with 40 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/osg/ArgumentParser
View File

@ -29,7 +29,7 @@ class SG_EXPORT ArgumentParser
{
public:
class Parameter
class SG_EXPORT Parameter
{
public:
enum ParameterType

2
include/osg/ClusterCullingCallback
View File

@ -30,7 +30,7 @@ class SG_EXPORT ClusterCullingCallback : public Drawable::CullCallback
ClusterCullingCallback(const osg::Vec3& controlPoint, const osg::Vec3& normal, float deviation);
ClusterCullingCallback(const osg::Drawable* drawable);
META_Object(osg,ClusterCullingCallback)
META_Object(osg,ClusterCullingCallback);
/** Computes the control point, normal, and deviation from the
* given drawable contents. */

6
include/osg/Drawable
View File

@ -278,7 +278,7 @@ class SG_EXPORT Drawable : public Object
UpdateCallback(const UpdateCallback&,const CopyOp&) {}
META_Object(osg,UpdateCallback)
META_Object(osg,UpdateCallback);
/** do customized update code.*/
virtual void update(osg::NodeVisitor*, osg::Drawable*) {}
@ -300,7 +300,7 @@ class SG_EXPORT Drawable : public Object
CullCallback(const CullCallback&,const CopyOp&) {}
META_Object(osg,CullCallback)
META_Object(osg,CullCallback);
/** do customized cull code, return true if drawable should be culled.*/
virtual bool cull(osg::NodeVisitor*, osg::Drawable*, osg::State*) const { return false; }
@ -329,7 +329,7 @@ class SG_EXPORT Drawable : public Object
DrawCallback(const DrawCallback&,const CopyOp&) {}
META_Object(osg,DrawCallback)
META_Object(osg,DrawCallback);
/** do customized draw code.*/
virtual void drawImplementation(osg::State&,const osg::Drawable*) const {}

2
include/osg/Endian
View File

@ -14,6 +14,8 @@
#ifndef OSG_ENDIAN
#define OSG_ENDIAN 1
#include <algorithm>
namespace osg {
enum Endian

4
include/osg/Geometry
View File

@ -53,7 +53,7 @@ class SG_EXPORT Geometry : public Drawable
BIND_PER_VERTEX
};
struct ArrayData
struct SG_EXPORT ArrayData
{
ArrayData():
binding(BIND_OFF),
@ -95,7 +95,7 @@ class SG_EXPORT Geometry : public Drawable
mutable unsigned int offset;
};
struct Vec3ArrayData
struct SG_EXPORT Vec3ArrayData
{
Vec3ArrayData():
binding(BIND_OFF),

2
include/osg/NodeCallback
View File

@ -33,7 +33,7 @@ class SG_EXPORT NodeCallback : public virtual Object {
_nestedCallback(_nestedCallback) {}
META_Object(osg,NodeCallback)
META_Object(osg,NodeCallback);
/** Callback method called by the NodeVisitor when visiting a node.*/

2
include/osg/PagedLOD
View File

@ -44,7 +44,7 @@ class SG_EXPORT PagedLOD : public LOD
virtual bool removeChild(Node *child);
struct PerRangeData
struct SG_EXPORT PerRangeData
{
PerRangeData();
PerRangeData(const PerRangeData& prd);

4
include/osg/PointSprite
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_POINT_SPRITE
#define OSG_POINT_SPRITE 1
#ifndef OSG_POINTSPRITE
#define OSG_POINTSPRITE 1
#include <osg/GL>
#include <osg/StateAttribute>

4
include/osg/PositionAttitudeTransform
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_POSITIONATTITIDETRANSFORM
#define OSG_POSITIONATTITIDETRANSFORM 1
#ifndef OSG_POSITIONATTITUDETRANSFORM
#define OSG_POSITIONATTITUDETRANSFORM 1
#include <osg/Group>
#include <osg/Transform>

4
include/osg/PrimitiveSet
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_PRIMTIVESET
#define OSG_PRIMTIVESET 1
#ifndef OSG_PRIMITIVESET
#define OSG_PRIMITIVESET 1
#include <osg/Drawable>

2
include/osg/Shape
View File

@ -498,7 +498,7 @@ class SG_EXPORT HeightField : public Shape
_borderWidth(mesh._borderWidth),
_heights(mesh._heights) {}
META_Shape(osg, HeightField)
META_Shape(osg, HeightField);
typedef std::vector<float> HeightList;

4
include/osg/TriangleIndexFunctor
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_TRIANGLINDEXEFUNCTOR
#define OSG_TRIANGLINDEXEFUNCTOR 1
#ifndef OSG_TRIANGLEINDEXFUNCTOR
#define OSG_TRIANGLEINDEXFUNCTOR 1
#include <osg/Drawable>
#include <osg/Notify>

4
include/osg/Version
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_VERSION_
#define OSG_VERSION_ 1
#ifndef OSG_VERSION
#define OSG_VERSION 1
#include <osg/Export>

4
include/osgDB/DynamicLibrary
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_DYNAMICLIBRARY
#define OSG_DYNAMICLIBRARY 1
#ifndef OSGDB_DYNAMICLIBRARY
#define OSGDB_DYNAMICLIBRARY 1
#include <osg/Referenced>
#include <osgDB/Export>

4
include/osgDB/Version
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSG_VERSION
#define OSG_VERSION 1
#ifndef OSGDB_VERSION
#define OSGDB_VERSION 1
#include <osgDB/Export>

2
include/osgGA/GUIEventHandler
View File

@ -56,7 +56,7 @@ public:
GUIEventHandler() {}
GUIEventHandler(const GUIEventHandler&,const osg::CopyOp&) {}
META_Object(osgGA,GUIEventHandler)
META_Object(osgGA,GUIEventHandler);
/** Returns 0 if this GUIEventHandler is not a CompositeGUIEventHandler. */

2
include/osgGL2/UniformValue
View File

@ -43,7 +43,7 @@ namespace osgGL2 {
* glProgramObjects during the next osgGL2::ProgramObject.apply().
*/
class UniformValue : public osg::Referenced
class OSGGL2_EXPORT UniformValue : public osg::Referenced
{
public:
virtual void apply( Extensions *ext, const GLhandleARB progObj ) const = 0;

2
include/osgSim/LightPointSystem
View File

@ -37,7 +37,7 @@ class LightPointSystem : public osg::Object
osg::Object( lps, copyop ), _intensity( lps._intensity ), _animationState( lps._animationState )
{ }
META_Object( osgSim, LightPointSystem )
META_Object( osgSim, LightPointSystem );
typedef enum {
ANIMATION_ON,

10
include/osgSim/Sector
View File

@ -137,7 +137,7 @@ class OSGSIM_EXPORT AzimSector : public Sector, public AzimRange
AzimSector(float minAzimuth,float maxAzimuth,float fadeAngle=0.0f);
META_Object(osgSim,AzimSector)
META_Object(osgSim,AzimSector);
virtual float operator() (const osg::Vec3& eyeLocal) const;
@ -162,7 +162,7 @@ class OSGSIM_EXPORT ElevationSector : public Sector, public ElevationRange
ElevationSector(float minElevation,float maxElevation,float fadeAngle=0.0f);
META_Object(osgSim,ElevationSector)
META_Object(osgSim,ElevationSector);
virtual float operator() (const osg::Vec3& eyeLocal) const;
@ -193,7 +193,7 @@ class OSGSIM_EXPORT AzimElevationSector : public Sector, public AzimRange, publi
AzimElevationSector(float minAzimuth,float maxAzimuth,float minElevation,float maxElevation,float fadeAngle=0.0f);
META_Object(osgSim,AzimElevationSector)
META_Object(osgSim,AzimElevationSector);
virtual float operator() (const osg::Vec3& eyeLocal) const;
@ -221,7 +221,7 @@ class OSGSIM_EXPORT ConeSector : public Sector
ConeSector(const osg::Vec3& axis,float angle,float fadeangle=0.0f);
META_Object(osgSim,ConeSector)
META_Object(osgSim,ConeSector);
void setAxis(const osg::Vec3& axis);
@ -275,7 +275,7 @@ class OSGSIM_EXPORT DirectionalSector : public Sector
DirectionalSector(const osg::Vec3& direction,float horizLobeAngle, float vertLobeAngle, float lobeRollAngle, float fadeAngle=0.0f);
META_Object(osgSim,DirectionalSector)
META_Object(osgSim,DirectionalSector);
void setDirection(const osg::Vec3& direction);

2
include/osgSim/SphereSegment
View File

@ -225,7 +225,7 @@ public:
/** Set color of all components. */
void setAllColors(const osg::Vec4& c);
META_Node(osgSim, SphereSegment)
META_Node(osgSim, SphereSegment);
private:

2
include/osgSim/VisibilityGroup
View File

@ -31,7 +31,7 @@ class OSGSIM_EXPORT VisibilityGroup : public osg::Group
/** Copy constructor using CopyOp to manage deep vs shallow copy.*/
VisibilityGroup(const VisibilityGroup&,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
META_Node(osgSim, VisibilityGroup)
META_Node(osgSim, VisibilityGroup);
virtual void traverse(osg::NodeVisitor& nv);

3
include/osgText/Font
View File

@ -228,7 +228,6 @@ public:
public:
Glyph();
virtual ~Glyph();
unsigned int getGlyphCode() const;
@ -268,6 +267,8 @@ public:
protected:
virtual ~Glyph();
Font* _font;
unsigned int _glyphCode;

4
include/osgUtil/Simplifier
View File

@ -11,8 +11,8 @@
* OpenSceneGraph Public License for more details.
*/
#ifndef OSGUTIL_SIMPLIYFIER
#define OSGUTIL_SIMPLIYFIER 1
#ifndef OSGUTIL_SIMPLIFIER
#define OSGUTIL_SIMPLIFIER 1
#include <osg/NodeVisitor>
#include <osg/Geode>