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

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