mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-04-26 14:55:39 +00:00
virtuals removed
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7
parent
88a43f3137
commit
efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
|
|
@ -58,8 +58,8 @@ public:
|
|||
//
|
||||
// SimObject interface
|
||||
//
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
//
|
||||
// ConsoleObject interface
|
||||
|
|
@ -72,7 +72,7 @@ protected:
|
|||
U32 mFlags[MAX_TEX_PER_PASS];
|
||||
GFXStateBlockData* mStateBlockData;
|
||||
|
||||
virtual void _mapMaterial();
|
||||
void _mapMaterial() override;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -53,48 +53,48 @@ public:
|
|||
virtual ~MatInstance();
|
||||
|
||||
// BaseMatInstance
|
||||
virtual bool init( const FeatureSet &features,
|
||||
const GFXVertexFormat *vertexFormat );
|
||||
virtual bool reInit();
|
||||
virtual void addStateBlockDesc(const GFXStateBlockDesc& desc);
|
||||
virtual void updateStateBlocks();
|
||||
virtual void addShaderMacro( const String &name, const String &value );
|
||||
virtual MaterialParameters* allocMaterialParameters();
|
||||
virtual void setMaterialParameters(MaterialParameters* param);
|
||||
virtual MaterialParameters* getMaterialParameters();
|
||||
virtual MaterialParameterHandle* getMaterialParameterHandle(const String& name);
|
||||
virtual bool setupPass(SceneRenderState *, const SceneData &sgData );
|
||||
virtual void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state);
|
||||
virtual void setNodeTransforms(const MatrixF *address, const U32 numTransforms);
|
||||
virtual void setCustomShaderData(Vector<CustomShaderBindingData> &shaderData);
|
||||
virtual void setSceneInfo(SceneRenderState *, const SceneData& sgData);
|
||||
virtual void setTextureStages(SceneRenderState * state, const SceneData &sgData );
|
||||
virtual void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer);
|
||||
virtual bool isInstanced() const;
|
||||
virtual bool stepInstance();
|
||||
virtual bool isForwardLit() const { return mIsForwardLit; }
|
||||
bool init( const FeatureSet &features,
|
||||
const GFXVertexFormat *vertexFormat ) override;
|
||||
bool reInit() override;
|
||||
void addStateBlockDesc(const GFXStateBlockDesc& desc) override;
|
||||
void updateStateBlocks() override;
|
||||
void addShaderMacro( const String &name, const String &value ) override;
|
||||
MaterialParameters* allocMaterialParameters() override;
|
||||
void setMaterialParameters(MaterialParameters* param) override;
|
||||
MaterialParameters* getMaterialParameters() override;
|
||||
MaterialParameterHandle* getMaterialParameterHandle(const String& name) override;
|
||||
bool setupPass(SceneRenderState *, const SceneData &sgData ) override;
|
||||
void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state) override;
|
||||
void setNodeTransforms(const MatrixF *address, const U32 numTransforms) override;
|
||||
void setCustomShaderData(Vector<CustomShaderBindingData> &shaderData) override;
|
||||
void setSceneInfo(SceneRenderState *, const SceneData& sgData) override;
|
||||
void setTextureStages(SceneRenderState * state, const SceneData &sgData ) override;
|
||||
void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer) override;
|
||||
bool isInstanced() const override;
|
||||
bool stepInstance() override;
|
||||
bool isForwardLit() const override { return mIsForwardLit; }
|
||||
virtual bool isHardwareSkinned() const { return mIsHardwareSkinned; }
|
||||
virtual void setUserObject( SimObject *userObject ) { mUserObject = userObject; }
|
||||
virtual SimObject* getUserObject() const { return mUserObject; }
|
||||
virtual Material *getMaterial() { return mMaterial; }
|
||||
virtual bool hasGlow();
|
||||
virtual bool hasAccumulation();
|
||||
virtual U32 getCurPass() { return getMax( mCurPass, 0 ); }
|
||||
virtual U32 getCurStageNum();
|
||||
virtual RenderPassData *getPass(U32 pass);
|
||||
virtual const MatStateHint& getStateHint() const;
|
||||
virtual const GFXVertexFormat* getVertexFormat() const { return mVertexFormat; }
|
||||
virtual const FeatureSet& getFeatures() const;
|
||||
virtual const FeatureSet& getRequestedFeatures() const { return mFeatureList; }
|
||||
virtual void dumpShaderInfo() const;
|
||||
virtual void getShaderInfo(GuiTreeViewCtrl* tree, U32 item) const;
|
||||
void setUserObject( SimObject *userObject ) override { mUserObject = userObject; }
|
||||
SimObject* getUserObject() const override { return mUserObject; }
|
||||
Material *getMaterial() override { return mMaterial; }
|
||||
bool hasGlow() override;
|
||||
bool hasAccumulation() override;
|
||||
U32 getCurPass() override { return getMax( mCurPass, 0 ); }
|
||||
U32 getCurStageNum() override;
|
||||
RenderPassData *getPass(U32 pass) override;
|
||||
const MatStateHint& getStateHint() const override;
|
||||
const GFXVertexFormat* getVertexFormat() const override { return mVertexFormat; }
|
||||
const FeatureSet& getFeatures() const override;
|
||||
const FeatureSet& getRequestedFeatures() const override { return mFeatureList; }
|
||||
void dumpShaderInfo() const override;
|
||||
void getShaderInfo(GuiTreeViewCtrl* tree, U32 item) const override;
|
||||
|
||||
|
||||
ProcessedMaterial *getProcessedMaterial() const { return mProcessedMaterial; }
|
||||
|
||||
virtual const GFXStateBlockDesc &getUserStateBlock() const { return mUserDefinedState; }
|
||||
const GFXStateBlockDesc &getUserStateBlock() const override { return mUserDefinedState; }
|
||||
|
||||
virtual bool isCustomMaterial() const { return mCreatedFromCustomMaterial; }
|
||||
bool isCustomMaterial() const override { return mCreatedFromCustomMaterial; }
|
||||
protected:
|
||||
|
||||
friend class Material;
|
||||
|
|
@ -152,33 +152,33 @@ public:
|
|||
void loadParameters(ProcessedMaterial* pmat);
|
||||
|
||||
/// Returns our list of shader constants, the material can get this and just set the constants it knows about
|
||||
virtual const Vector<GFXShaderConstDesc>& getShaderConstDesc() const;
|
||||
const Vector<GFXShaderConstDesc>& getShaderConstDesc() const override;
|
||||
|
||||
/// @name Set shader constant values
|
||||
/// @{
|
||||
/// Actually set shader constant values
|
||||
/// @param name Name of the constant, this should be a name contained in the array returned in getShaderConstDesc,
|
||||
/// if an invalid name is used, it is ignored.
|
||||
virtual void set(MaterialParameterHandle* handle, const F32 f);
|
||||
virtual void set(MaterialParameterHandle* handle, const Point2F& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const Point3F& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const Point4F& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const LinearColorF& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const S32 f);
|
||||
virtual void set(MaterialParameterHandle* handle, const Point2I& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const Point3I& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const Point4I& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<F32>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point2F>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point3F>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point4F>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<S32>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point2I>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point3I>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const AlignedArray<Point4I>& fv);
|
||||
virtual void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4);
|
||||
virtual void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4);
|
||||
virtual U32 getAlignmentValue(const GFXShaderConstType constType);
|
||||
void set(MaterialParameterHandle* handle, const F32 f) override;
|
||||
void set(MaterialParameterHandle* handle, const Point2F& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const Point3F& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const Point4F& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const LinearColorF& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const S32 f) override;
|
||||
void set(MaterialParameterHandle* handle, const Point2I& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const Point3I& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const Point4I& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<F32>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<Point2F>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<Point3F>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<Point4F>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<S32>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<Point2I>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<Point3I>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const AlignedArray<Point4I>& fv) override;
|
||||
void set(MaterialParameterHandle* handle, const MatrixF& mat, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override;
|
||||
void set(MaterialParameterHandle* handle, const MatrixF* mat, const U32 arraySize, const GFXShaderConstType matrixType = GFXSCT_Float4x4) override;
|
||||
U32 getAlignmentValue(const GFXShaderConstType constType) override;
|
||||
private:
|
||||
MaterialParameters* mParameters;
|
||||
bool mOwnParameters;
|
||||
|
|
|
|||
|
|
@ -393,14 +393,14 @@ public:
|
|||
|
||||
/// Allocates and returns a BaseMatInstance for this material. Caller is responsible
|
||||
/// for freeing the instance
|
||||
virtual BaseMatInstance* createMatInstance();
|
||||
virtual bool isTranslucent() const { return mTranslucent && mTranslucentBlendOp != Material::None; }
|
||||
virtual bool isAlphatest() const { return mAlphaTest; }
|
||||
virtual bool isDoubleSided() const { return mDoubleSided; }
|
||||
BaseMatInstance* createMatInstance() override;
|
||||
bool isTranslucent() const override { return mTranslucent && mTranslucentBlendOp != Material::None; }
|
||||
bool isAlphatest() const override { return mAlphaTest; }
|
||||
bool isDoubleSided() const override { return mDoubleSided; }
|
||||
virtual bool isAutoGenerated() const { return mAutoGenerated; }
|
||||
virtual void setAutoGenerated(bool isAutoGenerated) { mAutoGenerated = isAutoGenerated; }
|
||||
virtual bool isLightmapped() const;
|
||||
virtual bool castsShadows() const { return mCastShadows; }
|
||||
bool isLightmapped() const override;
|
||||
bool castsShadows() const override { return mCastShadows; }
|
||||
const String& getPath() const { return mPath; }
|
||||
|
||||
void flush();
|
||||
|
|
@ -414,10 +414,10 @@ public:
|
|||
void updateTimeBasedParams();
|
||||
|
||||
// SimObject
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
virtual void inspectPostApply();
|
||||
virtual bool writeField(StringTableEntry fieldname, const char* value);
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
void inspectPostApply() override;
|
||||
bool writeField(StringTableEntry fieldname, const char* value) override;
|
||||
|
||||
//
|
||||
// ConsoleObject interface
|
||||
|
|
|
|||
|
|
@ -127,8 +127,8 @@ public:
|
|||
ShaderConstHandles shaderHandles;
|
||||
Vector<ShaderFeatureConstHandles*> featureShaderHandles;
|
||||
|
||||
virtual void reset();
|
||||
virtual String describeSelf() const;
|
||||
void reset() override;
|
||||
String describeSelf() const override;
|
||||
};
|
||||
|
||||
class ProcessedShaderMaterial : public ProcessedMaterial
|
||||
|
|
@ -141,23 +141,23 @@ public:
|
|||
~ProcessedShaderMaterial();
|
||||
|
||||
// ProcessedMaterial
|
||||
virtual bool init( const FeatureSet &features,
|
||||
bool init( const FeatureSet &features,
|
||||
const GFXVertexFormat *vertexFormat,
|
||||
const MatFeaturesDelegate &featuresDelegate );
|
||||
virtual bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass);
|
||||
virtual void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass );
|
||||
virtual void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state, const U32 pass);
|
||||
virtual void setNodeTransforms(const MatrixF *address, const U32 numTransforms, const U32 pass);
|
||||
virtual void setCustomShaderData(Vector<CustomShaderBindingData> &shaderData, const U32 pass);
|
||||
virtual void setSceneInfo(SceneRenderState *, const SceneData& sgData, U32 pass);
|
||||
virtual void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer);
|
||||
virtual bool stepInstance();
|
||||
virtual void dumpMaterialInfo();
|
||||
virtual void getMaterialInfo(GuiTreeViewCtrl* tree, U32 item);
|
||||
virtual MaterialParameters* allocMaterialParameters();
|
||||
virtual MaterialParameters* getDefaultMaterialParameters() { return mDefaultParameters; }
|
||||
virtual MaterialParameterHandle* getMaterialParameterHandle(const String& name);
|
||||
virtual U32 getNumStages();
|
||||
const MatFeaturesDelegate &featuresDelegate ) override;
|
||||
bool setupPass(SceneRenderState *, const SceneData& sgData, U32 pass) override;
|
||||
void setTextureStages(SceneRenderState *, const SceneData &sgData, U32 pass ) override;
|
||||
void setTransforms(const MatrixSet &matrixSet, SceneRenderState *state, const U32 pass) override;
|
||||
void setNodeTransforms(const MatrixF *address, const U32 numTransforms, const U32 pass) override;
|
||||
void setCustomShaderData(Vector<CustomShaderBindingData> &shaderData, const U32 pass) override;
|
||||
void setSceneInfo(SceneRenderState *, const SceneData& sgData, U32 pass) override;
|
||||
void setBuffers(GFXVertexBufferHandleBase* vertBuffer, GFXPrimitiveBufferHandle* primBuffer) override;
|
||||
bool stepInstance() override;
|
||||
void dumpMaterialInfo() override;
|
||||
void getMaterialInfo(GuiTreeViewCtrl* tree, U32 item) override;
|
||||
MaterialParameters* allocMaterialParameters() override;
|
||||
MaterialParameters* getDefaultMaterialParameters() override { return mDefaultParameters; }
|
||||
MaterialParameterHandle* getMaterialParameterHandle(const String& name) override;
|
||||
U32 getNumStages() override;
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
class GFXTexHandle;
|
||||
class GFXCubemap;
|
||||
class CustomShaderBindingData;
|
||||
struct CustomShaderBindingData;
|
||||
|
||||
struct SceneData
|
||||
{
|
||||
|
|
|
|||
|
|
@ -126,8 +126,8 @@ public:
|
|||
F32 getPixVersion() const { return mPixVersion; }
|
||||
|
||||
// SimObject
|
||||
virtual bool onAdd();
|
||||
virtual void onRemove();
|
||||
bool onAdd() override;
|
||||
void onRemove() override;
|
||||
|
||||
// ConsoleObject
|
||||
static void initPersistFields();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue