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/CTRTextureGouraud.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_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__
#define __C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED__
#ifndef IRR_C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED
#define IRR_C_TRIANGLE_RENDERER_TEXTURE_GOURAUD_H_INCLUDED
#include "IrrCompileConfig.h"
@@ -39,16 +39,16 @@ namespace video
virtual ~CTRTextureGouraud();
//! sets a render target
virtual void setRenderTarget(video::IImage* surface, const core::rect<s32>& viewPort) _IRR_OVERRIDE_;
virtual void setRenderTarget(video::IImage* surface, const core::rect<s32>& viewPort) IRR_OVERRIDE;
//! draws an indexed triangle list
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) _IRR_OVERRIDE_;
virtual void drawIndexedTriangleList(S2DVertex* vertices, s32 vertexCount, const u16* indexList, s32 triangleCount) IRR_OVERRIDE;
//! en or disables the backface culling
virtual void setBackfaceCulling(bool enabled = true) _IRR_OVERRIDE_;
virtual void setBackfaceCulling(bool enabled = true) IRR_OVERRIDE;
//! sets the Texture
virtual void setTexture(video::IImage* texture) _IRR_OVERRIDE_;
virtual void setTexture(video::IImage* texture) IRR_OVERRIDE;
protected:
@@ -82,4 +82,3 @@ namespace video
#endif
#endif