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

4
source/Irrlicht/CTRParallaxMap.cpp
View File

@@ -108,7 +108,7 @@ public:
//! draws an indexed triangle list
virtual void drawTriangle(const s4DVertex* burning_restrict a, const s4DVertex* burning_restrict b, const s4DVertex* burning_restrict c) IRR_OVERRIDE;
virtual void OnSetMaterial(const SBurningShaderMaterial& material) IRR_OVERRIDE;
virtual void OnSetMaterialBurning(const SBurningShaderMaterial& material) IRR_OVERRIDE;
virtual void OnSetMaterial(const video::SMaterial& material,
const video::SMaterial& lastMaterial,
bool resetAllRenderstates, video::IMaterialRendererServices* services) IRR_OVERRIDE;
@@ -138,7 +138,7 @@ CBurningParallaxMap::~CBurningParallaxMap()
CallBack = 0;
}
void CBurningParallaxMap::OnSetMaterial(const SBurningShaderMaterial& material)
void CBurningParallaxMap::OnSetMaterialBurning(const SBurningShaderMaterial& material)
{
CurrentScale = material.org.MaterialTypeParam;
}