TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-13 07:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

virtuals removed

Browse source 
virtuals removed and replaced with override where necessary, clang-tidy to the rescue.
This commit is contained in:
marauder2k7 2024-03-18 18:13:00 +00:00
parent 88a43f3137
commit efbe5e90f5
255 changed files with 2164 additions and 2164 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Engine/source/shaderGen/conditionerFeature.h
View file

@ -51,7 +51,7 @@ public:
ConditionerFeature( const GFXFormat bufferFormat );
virtual ~ConditionerFeature();
virtual Material::BlendOp getBlendOp()
Material::BlendOp getBlendOp() override
{
return Material::None;
}
@ -60,10 +60,10 @@ public:
virtual bool setBufferFormat(const GFXFormat bufferFormat) { bool ret = mBufferFormat == bufferFormat; mBufferFormat = bufferFormat; return ret; }
// zero-out these methods
virtual Var* getVertTexCoord( const String &name ) { AssertFatal( false, "don't use this." ); return NULL; }
virtual LangElement *setupTexSpaceMat( Vector<ShaderComponent*> &componentList, Var **texSpaceMat ) { AssertFatal( false, "don't use this." ); return NULL; }
virtual LangElement *expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) { AssertFatal( false, "don't use this." ); return NULL; }
virtual LangElement *assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) { AssertFatal( false, "don't use this." ); return NULL; }
Var* getVertTexCoord( const String &name ) override { AssertFatal( false, "don't use this." ); return NULL; }
LangElement *setupTexSpaceMat( Vector<ShaderComponent*> &componentList, Var **texSpaceMat ) override { AssertFatal( false, "don't use this." ); return NULL; }
LangElement *expandNormalMap( LangElement *sampleNormalOp, LangElement *normalDecl, LangElement *normalVar, const MaterialFeatureData &fd ) override { AssertFatal( false, "don't use this." ); return NULL; }
LangElement *assignColor( LangElement *elem, Material::BlendOp blend, LangElement *lerpElem = NULL, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget ) override { AssertFatal( false, "don't use this." ); return NULL; }
// conditioned output
virtual LangElement *assignOutput( Var *unconditionedOutput, ShaderFeature::OutputTarget outputTarget = ShaderFeature::DefaultTarget );
@ -128,7 +128,7 @@ public:
ConditionerMethodDependency( ConditionerFeature *conditioner, const ConditionerFeature::MethodType methodType ) :
mConditioner(conditioner), mMethodType(methodType) {}
virtual void print( Stream &s ) const;
void print( Stream &s ) const override;
// Auto insert information into a macro
virtual void createMethodMacro( const String &methodName, Vector<GFXShaderMacro> &macros );

2
Engine/source/shaderGen/shaderComp.h
View file

@ -91,7 +91,7 @@ public:
virtual void reset() = 0;
virtual void sortVars() = 0;
virtual void print( Stream &stream, bool isVerterShader ) = 0;
void print( Stream &stream, bool isVerterShader ) override = 0;
};
/// This is to provide common functionalty needed by vertex and pixel main defs

4
Engine/source/shaderGen/shaderDependency.h
View file

@ -59,8 +59,8 @@ public:
ShaderIncludeDependency( const Torque::Path &pathToInclude );
virtual bool operator==( const ShaderDependency &cmpTo ) const;
virtual void print( Stream &s ) const;
bool operator==( const ShaderDependency &cmpTo ) const override;
void print( Stream &s ) const override;
};
#endif // _SHADER_DEPENDENCY_H_