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

Removed deprecated API in preparation for 0.9.9 release.

Browse Source
This commit is contained in:
Robert Osfield
2005-05-09 13:09:07 +00:00
parent 5e23536683
commit 538ced579e
22 changed files with 8 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgforest/osgforest.cpp
View File

@@ -385,7 +385,7 @@ osg::Geode* ForestTechniqueManager::createTerrain(const osg::Vec3& origin, const
{
osg::HeightField* grid = new osg::HeightField;
grid->allocateGrid(numColumns,numRows);
grid->allocate(numColumns,numRows);
grid->setOrigin(origin);
grid->setXInterval(size.x()/(float)(numColumns-1));
grid->setYInterval(size.y()/(float)(numRows-1));

2
examples/osgparticleeffects/osgparticleeffects.cpp
View File

@@ -161,7 +161,7 @@ void build_world(osg::Group *root)
float z_scale = scale*3.0f;
osg::HeightField* grid = new osg::HeightField;
grid->allocateGrid(38,39);
grid->allocate(38,39);
grid->setXInterval(scale);
grid->setYInterval(scale);

2
examples/osgshadowtexture/osgshadowtexture.cpp
View File

@@ -69,7 +69,7 @@ osg::Node* createBase(const osg::Vec3& center,float radius)
osg::HeightField* grid = new osg::HeightField;
grid->allocateGrid(38,39);
grid->allocate(38,39);
grid->setOrigin(center+osg::Vec3(-radius,-radius,0.0f));
grid->setXInterval(radius*2.0f/(float)(38-1));
grid->setYInterval(radius*2.0f/(float)(39-1));

2
examples/osgshape/osgshape.cpp
View File

@@ -46,7 +46,7 @@ osg::Geode* createShapes( char* img_filename )
geode->addDrawable(new osg::ShapeDrawable(new osg::Capsule(osg::Vec3(8.0f,0.0f,0.0f),radius,height),hints));
osg::HeightField* grid = new osg::HeightField;
grid->allocateGrid(38,39);
grid->allocate(38,39);
grid->setXInterval(0.28f);
grid->setYInterval(0.28f);

2
examples/osgspheresegment/osgspheresegment.cpp
View File

@@ -192,7 +192,7 @@ void build_world(osg::Group *root)
float z_scale = scale*3.0f;
osg::HeightField* grid = new osg::HeightField;
grid->allocateGrid(38,39);
grid->allocate(38,39);
grid->setXInterval(scale);
grid->setYInterval(scale);

2
examples/osgspotlight/osgspotlight.cpp
View File

@@ -159,7 +159,7 @@ osg::Node* createBase(const osg::Vec3& center,float radius)
osg::HeightField* grid = new osg::HeightField;
grid->allocateGrid(38,39);
grid->allocate(38,39);
grid->setOrigin(center+osg::Vec3(-radius,-radius,0.0f));
grid->setXInterval(radius*2.0f/(float)(38-1));
grid->setYInterval(radius*2.0f/(float)(39-1));

3
include/osg/AnimationPath
View File

@@ -109,9 +109,8 @@ class OSG_EXPORT AnimationPath : public virtual osg::Object
matrix.preMult(osg::Matrixd::translate(-_position));
}
#ifdef USE_DEPRECATED_API
protected:
#endif
osg::Vec3d _position;
osg::Quat _rotation;
osg::Vec3d _scale;

7
include/osg/Billboard
View File

@@ -57,13 +57,6 @@ class OSG_EXPORT Billboard : public Geode
inline const Vec3& getNormal() const { return _normal; }
#ifdef USE_DEPRECATED_API
/** Set the specified child Drawable's position. */
inline void setPos(unsigned int i,const Vec3& pos) { _positionList[i] = pos; }
/** Get the specified child Drawable's position. */
inline const Vec3& getPos(unsigned int i) const { return _positionList[i]; }
#endif
/** Set the specified child Drawable's position. */
inline void setPosition(unsigned int i,const Vec3& pos) { _positionList[i] = pos; }
/** Get the specified child Drawable's position. */

5
include/osg/LightSource
View File

@@ -40,11 +40,6 @@ class OSG_EXPORT LightSource : public Group
{
RELATIVE_RF,
ABSOLUTE_RF
#ifdef USE_DEPRECATED_API
,
RELATIVE_TO_PARENTS=RELATIVE_RF,
RELATIVE_TO_ABSOLUTE=ABSOLUTE_RF,
#endif
};
/** Set the light sources's ReferenceFrame, either to be relative to its

3
include/osg/Shape
View File

@@ -504,9 +504,6 @@ class OSG_EXPORT HeightField : public Shape
void allocate(unsigned int numColumns,unsigned int numRows);
// deprecated.
void allocateGrid(unsigned int numColumns,unsigned int numRows) { allocate(numColumns,numRows); }
inline unsigned int getNumColumns() const { return _columns; }
inline unsigned int getNumRows() const { return _rows; }

27
include/osg/StateSet
View File

@@ -96,12 +96,6 @@ class OSG_EXPORT StateSet : public Object
complete state, typically used for a default global state.*/
void setGlobalDefaults();
#ifdef USE_DEPRECATED_API
/** Set all the modes to inherit, typically used to signify
nodes which inherit all of their modes for the global state.*/
void setAllToInherit() { clear(); }
#endif
/** Clear the StateSet of all modes and attributes.*/
void clear();
@@ -123,11 +117,6 @@ class OSG_EXPORT StateSet : public Object
*/
void setMode(StateAttribute::GLMode mode, StateAttribute::GLModeValue value);
#ifdef USE_DEPRECATED_API
/** Set this StateSet to inherit specified GLMode type from parents.
* Has the effect of deleting any GLMode of specified type from StateSet.*/
void setModeToInherit(StateAttribute::GLMode mode) { removeMode(mode); }
#endif
/** Remove \c mode from this \c StateSet.
* @note Don't use this method to remove modes related to textures. For
* this purpose, use \c removeTextureMode(), that accepts an extra
@@ -173,11 +162,6 @@ class OSG_EXPORT StateSet : public Object
/** Set this StateSet to contain specified attribute and set the associated GLMode's to specified value.*/
void setAttributeAndModes(StateAttribute *attribute, StateAttribute::GLModeValue value=StateAttribute::ON);
#ifdef USE_DEPRECATED_API
/** Set this StateSet to inherit specified attribute type from parents.
* has the effect of deleting any state attributes of specified type from StateSet.*/
void setAttributeToInherit(StateAttribute::Type type) { removeAttribute(type); }
#endif
/** remove attribute of specified type from StateSet.*/
void removeAttribute(StateAttribute::Type type, unsigned int member=0);
@@ -218,11 +202,6 @@ class OSG_EXPORT StateSet : public Object
*/
void setTextureMode(unsigned int unit,StateAttribute::GLMode mode, StateAttribute::GLModeValue value);
#ifdef USE_DEPRECATED_API
/** Set this StateSet to inherit specified GLMode type from parents.
* has the effect of deleting any GLMode of specified type from StateSet.*/
void setTextureModeToInherit(unsigned int unit,StateAttribute::GLMode mode) { removeTextureMode(unit,mode); }
#endif
/** Remove texture mode from StateSet.*/
void removeTextureMode(unsigned int unit,StateAttribute::GLMode mode);
@@ -247,12 +226,6 @@ class OSG_EXPORT StateSet : public Object
/** Set this StateSet to contain specified attribute and set the associated GLMode's to specified value.*/
void setTextureAttributeAndModes(unsigned int unit,StateAttribute *attribute, StateAttribute::GLModeValue value=StateAttribute::ON);
#ifdef USE_DEPRECATED_API
/** Set this StateSet to inherit specified attribute type from parents.
* Has the effect of deleting any state attributes of specified type from StateSet.*/
void setTextureAttributeToInherit(unsigned int unit,StateAttribute::Type type) { removeTextureAttribute(unit,type); }
#endif
/** remove texture attribute of specified type from StateSet.*/
void removeTextureAttribute(unsigned int unit, StateAttribute::Type type);

8
include/osg/Texture2D
View File

@@ -87,14 +87,6 @@ class OSG_EXPORT Texture2D : public Texture
void setTextureHeight(int height) { _textureHeight=height; }
int getTextureHeight() const { return _textureHeight; }
/** Deprecated. */
inline void getTextureSize(int& width, int& height) const
{
width = _textureWidth;
height = _textureHeight;
}
class OSG_EXPORT SubloadCallback : public Referenced
{
public:

5
include/osg/Transform
View File

@@ -91,11 +91,6 @@ class OSG_EXPORT Transform : public Group
{
RELATIVE_RF,
ABSOLUTE_RF
#ifdef USE_DEPRECATED_API
,
RELATIVE_TO_PARENTS=RELATIVE_RF,
RELATIVE_TO_ABSOLUTE=ABSOLUTE_RF,
#endif
};
/** Set the transform's ReferenceFrame, either to be relative to its

6
include/osgProducer/OsgCameraGroup
View File

@@ -120,12 +120,6 @@ class OSGPRODUCER_EXPORT OsgCameraGroup : public Producer::CameraGroup
const osg::StateSet *getGlobalStateSet() const { return _global_stateset.get(); }
#ifdef USE_DEPRECATED_API
void setBackgroundColor( const osg::Vec4& backgroundColor) { setClearColor(backgroundColor); }
const osg::Vec4& getBackgroundColor() const { return getClearColor(); }
#endif
void setClearColor( const osg::Vec4& clearColor );
const osg::Vec4& getClearColor() const;

7
include/osgText/Font
View File

@@ -64,13 +64,6 @@ public:
virtual std::string getFileName() const;
#ifdef USE_DEPRECATED_API
virtual void setSize(unsigned int width, unsigned int height) { setFontResolution(width,height); }
unsigned int getWidth() const { return getFontWidth(); }
unsigned int getHeight() const { return getFontHeight(); }
#endif
/** Set the pixel width and height hint.*/
virtual void setFontResolution(unsigned int width, unsigned int height);

8
include/osgText/Text
View File

@@ -48,14 +48,6 @@ public:
/** Get the font. Return 0 if default is being used.*/
const Font* getFont() const { return _font.get(); }
#ifdef USE_DEPRECATED_API
/* deprecated */
void setFontSize(unsigned int width, unsigned int height)
{
setFontResolution(width,height);
}
#endif
/** Set the Font reference width and height resolution in texels.
* Note, the size may not be supported by current font,

2
include/osgUtil/RenderBin
View File

@@ -130,9 +130,7 @@ class OSGUTIL_EXPORT RenderBin : public osg::Object
void getPrims(Statistics* primStats);
bool getPrims(Statistics* primStats, int nbin);
#ifndef USE_DEPRECATED_API
protected:
#endif
virtual ~RenderBin();

2
include/osgUtil/RenderStage
View File

@@ -133,9 +133,7 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
/** Extract stats for current draw list. */
bool getStats(Statistics* primStats);
#ifndef USE_DEPRECATED_API
protected:
#endif
virtual ~RenderStage();

8
include/osgUtil/SceneView
View File

@@ -108,14 +108,6 @@ class OSGUTIL_EXPORT SceneView : public osg::Referenced, public osg::CullSetting
inline osg::DisplaySettings* getDisplaySettings() { return _displaySettings.get(); }
#ifdef USE_DEPRECATED_API
/** Set the background color used in glClearColor().
Defaults to an off blue color.*/
void setBackgroundColor(const osg::Vec4& color) { _clearColor=color; }
/** Get the background color.*/
const osg::Vec4& getBackgroundColor() const { return _clearColor; }
#endif
/** Set the color used in glClearColor().
Defaults to an off blue color.*/
void setClearColor(const osg::Vec4& color) { _clearColor=color; }

2
src/osgPlugins/osg/Shape.cpp
View File

@@ -473,7 +473,7 @@ bool HeightField_readLocalData(Object& obj, Input& fr)
int numcolumns,numrows;
fr[1].getInt(numcolumns);
fr[2].getInt(numrows);
heightfield.allocateGrid(numcolumns,numrows);
heightfield.allocate(numcolumns,numrows);
fr+=3;
iteratorAdvanced = true;
}

1
src/osgWrappers/osg/Shape.cpp
View File

@@ -206,7 +206,6 @@ BEGIN_OBJECT_REFLECTOR(osg::HeightField)
Method1(void, accept, IN, osg::ShapeVisitor &, sv);
Method1(void, accept, IN, osg::ConstShapeVisitor &, csv);
Method2(void, allocate, IN, unsigned int, numColumns, IN, unsigned int, numRows);
Method2(void, allocateGrid, IN, unsigned int, numColumns, IN, unsigned int, numRows);
Method0(unsigned int, getNumColumns);
Method0(unsigned int, getNumRows);
Method1(void, setOrigin, IN, const osg::Vec3 &, origin);

1
src/osgWrappers/osg/Texture2D.cpp
View File

@@ -42,7 +42,6 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture2D)
Method0(int, getTextureWidth);
Method1(void, setTextureHeight, IN, int, height);
Method0(int, getTextureHeight);
Method2(void, getTextureSize, IN, int &, width, IN, int &, height);
Method1(void, setSubloadCallback, IN, osg::Texture2D::SubloadCallback *, cb);
Method0(osg::Texture2D::SubloadCallback *, getSubloadCallback);
Method0(const osg::Texture2D::SubloadCallback *, getSubloadCallback);