luanti-org/irrlicht-archive
Archived
1
0
Fork 0
Code Activity

Merging r6250 through r6254 from trunk to ogl-es branch

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6255 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2021-08-27 19:14:39 +00:00
parent 21302d038a
commit ee3579015b
275 changed files with 4166 additions and 3846 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/Irrlicht/CSoftware2MaterialRenderer.h
View File

@@ -2,8 +2,8 @@
// This file is part of the "Irrlicht Engine".
// For conditions of distribution and use, see copyright notice in irrlicht.h
#ifndef __C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED__
#define __C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED__
#ifndef IRR_C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED
#define IRR_C_SOFTWARE2_MATERIAL_RENDERER_H_INCLUDED
#include "SoftwareDriver2_compile_config.h"
@@ -27,7 +27,7 @@ public:
}
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,
bool resetAllRenderstates, IMaterialRendererServices* services) _IRR_OVERRIDE_
bool resetAllRenderstates, IMaterialRendererServices* services) IRR_OVERRIDE
{
if (Driver)
Driver->setFallback_Material(material.MaterialType);
@@ -46,7 +46,7 @@ public:
:CSoftware2MaterialRenderer ( driver ) {}
//! Returns if the material is transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_
virtual bool isTransparent() const IRR_OVERRIDE
{
return false;
}
@@ -63,7 +63,7 @@ public:
//! Returns if the material is transparent.
virtual bool isTransparent() const _IRR_OVERRIDE_
virtual bool isTransparent() const IRR_OVERRIDE
{
return true;
}
@@ -77,7 +77,7 @@ public:
CSoftware2MaterialRenderer_UNSUPPORTED ( video::CBurningVideoDriver* driver )
: CSoftware2MaterialRenderer ( driver ) {}
virtual s32 getRenderCapability() const _IRR_OVERRIDE_ { return 1; }
virtual s32 getRenderCapability() const IRR_OVERRIDE { return 1; }
};
@@ -87,4 +87,3 @@ public:
} // end namespace irr
#endif