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

Add SMaterial::IUserData to make it easier passing additional values to shaders

Browse Source 
Irrlicht generally avoided user pointers in the past, but after trying all kind of ugly workarounds - this is just easier and
not that much downsides really. Tiny speed costs due to additional SMaterial memory size and new comparison tests. 
But allows to keep SMaterial alive and useful for a while longer without needing a complete rewrite and it can now be used for stuff like writing PBR shaders.
Using a new interface io::IUserData for this which also allows serialization the user data (that part is untested so far, sorry)


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6567 dfc29bdd-3216-0410-991c-e03cc46cb475
This commit is contained in:
cutealien
2023-11-07 15:43:49 +00:00
parent d0605cf397
commit 3c9a856e6d
20 changed files with 155 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/SMaterial.h
View File

@@ -11,6 +11,7 @@
#include "EMaterialTypes.h"
#include "EMaterialFlags.h"
#include "SMaterialLayer.h"
#include "IUserData.h"
namespace irr
{
@@ -313,7 +314,8 @@ namespace video
PolygonOffsetFactor(0), PolygonOffsetDirection(EPO_FRONT),
Wireframe(false), PointCloud(false), GouraudShading(true),
Lighting(true), ZWriteEnable(EZW_AUTO), BackfaceCulling(true), FrontfaceCulling(false),
FogEnable(false), NormalizeNormals(false), UseMipMaps(true)
FogEnable(false), NormalizeNormals(false), UseMipMaps(true),
UserData(0)
{ }
//! Texture layer array.
@@ -493,6 +495,11 @@ namespace video
/** Sometimes, disabling mipmap usage can be useful. Default: true */
bool UseMipMaps:1;
//! Allow users to add their own material data
//! User is resonsible for the memory of this pointer
//! You should override IUserData::compare for user custom data, so SMaterial knows when it changes
io::IUserData* UserData;
//! Gets the texture transformation matrix for level i
/** \param i The desired level. Must not be larger than MATERIAL_MAX_TEXTURES
\return Texture matrix for texture level i. */
@@ -713,7 +720,8 @@ namespace video
PolygonOffsetSlopeScale != b.PolygonOffsetSlopeScale ||
PolygonOffsetFactor != b.PolygonOffsetFactor ||
PolygonOffsetDirection != b.PolygonOffsetDirection ||
UseMipMaps != b.UseMipMaps
UseMipMaps != b.UseMipMaps ||
UserData != b.UserData || (UserData && b.UserData && *UserData != *b.UserData)
;
for (u32 i=0; (i<MATERIAL_MAX_TEXTURES_USED) && !different; ++i)
{