Standardised the tabbing so that 4 spaces are used instead of hardware tabs.
This commit is contained in:
@@ -24,7 +24,7 @@
|
||||
namespace osgFX
|
||||
{
|
||||
|
||||
/**
|
||||
/**
|
||||
This effect makes surfaces appear bumpy. Children nodes must use two textures,
|
||||
one for diffuse color and one for the normal map (which can be created
|
||||
from a height map with tools like nVIDIA's normal map generator). Furthermore,
|
||||
@@ -120,10 +120,10 @@ namespace osgFX
|
||||
|
||||
private:
|
||||
int lightnum_;
|
||||
int diffuseunit_;
|
||||
int normalunit_;
|
||||
osg::ref_ptr<osg::Texture2D> diffuse_tex_;
|
||||
osg::ref_ptr<osg::Texture2D> normal_tex_;
|
||||
int diffuseunit_;
|
||||
int normalunit_;
|
||||
osg::ref_ptr<osg::Texture2D> diffuse_tex_;
|
||||
osg::ref_ptr<osg::Texture2D> normal_tex_;
|
||||
};
|
||||
|
||||
// INLINE METHODS
|
||||
@@ -141,56 +141,56 @@ namespace osgFX
|
||||
|
||||
inline int BumpMapping::getDiffuseTextureUnit() const
|
||||
{
|
||||
return diffuseunit_;
|
||||
return diffuseunit_;
|
||||
}
|
||||
|
||||
inline void BumpMapping::setDiffuseTextureUnit(int n)
|
||||
{
|
||||
diffuseunit_ = n;
|
||||
dirtyTechniques();
|
||||
diffuseunit_ = n;
|
||||
dirtyTechniques();
|
||||
}
|
||||
|
||||
inline int BumpMapping::getNormalMapTextureUnit() const
|
||||
{
|
||||
return normalunit_;
|
||||
return normalunit_;
|
||||
}
|
||||
|
||||
inline void BumpMapping::setNormalMapTextureUnit(int n)
|
||||
{
|
||||
normalunit_ = n;
|
||||
dirtyTechniques();
|
||||
normalunit_ = n;
|
||||
dirtyTechniques();
|
||||
}
|
||||
|
||||
inline osg::Texture2D *BumpMapping::getOverrideDiffuseTexture()
|
||||
{
|
||||
return diffuse_tex_.get();
|
||||
return diffuse_tex_.get();
|
||||
}
|
||||
|
||||
inline const osg::Texture2D *BumpMapping::getOverrideDiffuseTexture() const
|
||||
{
|
||||
return diffuse_tex_.get();
|
||||
return diffuse_tex_.get();
|
||||
}
|
||||
|
||||
inline void BumpMapping::setOverrideDiffuseTexture(osg::Texture2D *texture)
|
||||
{
|
||||
diffuse_tex_ = texture;
|
||||
dirtyTechniques();
|
||||
diffuse_tex_ = texture;
|
||||
dirtyTechniques();
|
||||
}
|
||||
|
||||
inline osg::Texture2D *BumpMapping::getOverrideNormalMapTexture()
|
||||
{
|
||||
return normal_tex_.get();
|
||||
return normal_tex_.get();
|
||||
}
|
||||
|
||||
inline const osg::Texture2D *BumpMapping::getOverrideNormalMapTexture() const
|
||||
{
|
||||
return normal_tex_.get();
|
||||
return normal_tex_.get();
|
||||
}
|
||||
|
||||
inline void BumpMapping::setOverrideNormalMapTexture(osg::Texture2D *texture)
|
||||
{
|
||||
normal_tex_ = texture;
|
||||
dirtyTechniques();
|
||||
normal_tex_ = texture;
|
||||
dirtyTechniques();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -113,7 +113,7 @@ namespace osgFX
|
||||
/** select a technique or enable automatic detection */
|
||||
inline void selectTechnique(int i = AUTO_DETECT);
|
||||
|
||||
/** custom traversal */
|
||||
/** custom traversal */
|
||||
virtual void traverse(osg::NodeVisitor &nv);
|
||||
|
||||
/** default traversal */
|
||||
@@ -208,8 +208,8 @@ namespace osgFX
|
||||
|
||||
inline void Effect::inherited_traverse(osg::NodeVisitor &nv)
|
||||
{
|
||||
typedef osg::Group inherited;
|
||||
inherited::traverse(nv);
|
||||
typedef osg::Group inherited;
|
||||
inherited::traverse(nv);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -37,7 +37,7 @@
|
||||
namespace osgFX
|
||||
{
|
||||
|
||||
class Effect;
|
||||
class Effect;
|
||||
|
||||
/**
|
||||
This is the base class for effect techniques. A technique represents one
|
||||
@@ -115,10 +115,10 @@ namespace osgFX
|
||||
*/
|
||||
virtual void define_passes() = 0;
|
||||
|
||||
/**
|
||||
traverse children with multipass if necessary. Don't call this method
|
||||
directly unless you are in a customized version of traverse().
|
||||
*/
|
||||
/**
|
||||
traverse children with multipass if necessary. Don't call this method
|
||||
directly unless you are in a customized version of traverse().
|
||||
*/
|
||||
void traverse_implementation(osg::NodeVisitor &nv, Effect *fx);
|
||||
|
||||
private:
|
||||
@@ -150,7 +150,7 @@ namespace osgFX
|
||||
|
||||
inline void Technique::traverse(osg::NodeVisitor &nv, Effect *fx)
|
||||
{
|
||||
traverse_implementation(nv, fx);
|
||||
traverse_implementation(nv, fx);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -34,10 +34,10 @@ namespace osgFX
|
||||
*/
|
||||
class OSGFX_EXPORT Validator: public osg::StateAttribute {
|
||||
public:
|
||||
enum {
|
||||
VALIDATOR = 0x56616C69
|
||||
};
|
||||
|
||||
enum {
|
||||
VALIDATOR = 0x56616C69
|
||||
};
|
||||
|
||||
Validator();
|
||||
Validator(Effect *effect);
|
||||
Validator(const Validator ©, const osg::CopyOp ©op = osg::CopyOp::SHALLOW_COPY);
|
||||
|
||||
Reference in New Issue
Block a user