cleanup: get rid of the legacy #ifndef #define craziness

This commit is contained in:
Loic Blot
2023-06-25 21:15:14 +02:00
committed by sfan5
parent fb7a0e4298
commit e0d4d7d8b4
96 changed files with 106 additions and 456 deletions

View File

@ -2,9 +2,7 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
#define __C_OPENGL_SHADER_MATERIAL_RENDERER_H_INCLUDED__
#pragma once
#ifdef _IRR_COMPILE_WITH_OPENGL_
@ -45,7 +43,7 @@ public:
//! Access the callback provided by the users when creating shader materials
IShaderConstantSetCallBack* getShaderConstantSetCallBack() const override
{
{
return CallBack;
}
@ -69,10 +67,10 @@ protected:
IShaderConstantSetCallBack* CallBack;
// I didn't write this, but here's my understanding:
// Those flags seem to be exclusive so far (so could be an enum).
// Those flags seem to be exclusive so far (so could be an enum).
// Maybe the idea was to make them non-exclusive in future (basically having a shader-material)
// Actually currently there's not even any need to cache them (probably even slower than not doing so).
// They seem to be mostly for downward compatibility.
// They seem to be mostly for downward compatibility.
// I suppose the idea is to use SMaterial.BlendOperation + SMaterial.BlendFactor and a simple non-transparent type as base for more flexibility in the future.
// Note that SMaterial.BlendOperation + SMaterial.BlendFactor are in some drivers already evaluated before OnSetMaterial.
bool Alpha;
@ -91,5 +89,3 @@ protected:
} // end namespace irr
#endif
#endif