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

clang warnings (OnSetMaterial multiple inheritance IMaterialRendererServices,IShaderConstantSetCallBack)

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6378 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
engineer_apple
2022-05-04 10:29:41 +00:00
parent f0efd5857d
commit 83851413a6
17 changed files with 82 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/Irrlicht/IBurningShader.h
View File

@@ -20,7 +20,7 @@
#include "IMaterialRenderer.h"
#include "IMaterialRendererServices.h"
#include "IGPUProgrammingServices.h"
#include "IShaderConstantSetCallback.h"
#include "IShaderConstantSetCallBack.h"
burning_namespace_start
@@ -302,7 +302,7 @@ public:
void drawWireFrameTriangle(s4DVertex* a, s4DVertex* b, s4DVertex* c);
virtual void OnSetMaterial(const SBurningShaderMaterial& material) {};
virtual void OnSetMaterialBurning(const SBurningShaderMaterial& material) {};
void setEdgeTest(const int wireFrame, const int pointCloud)
{
@@ -317,6 +317,7 @@ public:
//IShaderConstantSetCallBack
virtual void OnSetConstants(IMaterialRendererServices* services, s32 userData) IRR_OVERRIDE {};
virtual void OnSetMaterial(const SMaterial& material) IRR_OVERRIDE { }
//IMaterialRenderer
virtual void OnSetMaterial(const SMaterial& material, const SMaterial& lastMaterial,