From 3735b5308d3aef0055e4b039b3cd43b86098e75a Mon Sep 17 00:00:00 2001 From: hybrid Date: Wed, 28 Jan 2009 23:45:59 +0000 Subject: [PATCH] SMaterial deserialization patch by pc0de git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@2164 dfc29bdd-3216-0410-991c-e03cc46cb475 --- source/Irrlicht/CNullDriver.cpp | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/source/Irrlicht/CNullDriver.cpp b/source/Irrlicht/CNullDriver.cpp index b98bf167..93c737b1 100644 --- a/source/Irrlicht/CNullDriver.cpp +++ b/source/Irrlicht/CNullDriver.cpp @@ -1502,6 +1502,8 @@ io::IAttributes* CNullDriver::createAttributesFromMaterial(const video::SMateria attr->addBool("FrontfaceCulling", material.FrontfaceCulling); attr->addBool("FogEnable", material.FogEnable); attr->addBool("NormalizeNormals", material.NormalizeNormals); + attr->addInt("AntiAliasing", material.AntiAliasing); + attr->addInt("ColorMask", material.ColorMask); prefix = "BilinearFilter"; for (i=0; iaddEnum((prefix+core::stringc(i+1)).c_str(), material.TextureLayer[i].TextureWrap, aTextureClampNames); + prefix="LODBias"; + for (i=0; iaddInt((prefix+core::stringc(i+1)).c_str(), material.TextureLayer[i].LODBias); return attr; } @@ -1558,6 +1563,8 @@ void CNullDriver::fillMaterialStructureFromAttributes(video::SMaterial& outMater outMaterial.FrontfaceCulling = attr->getAttributeAsBool("FrontfaceCulling"); outMaterial.FogEnable = attr->getAttributeAsBool("FogEnable"); outMaterial.NormalizeNormals = attr->getAttributeAsBool("NormalizeNormals"); + outMaterial.AntiAliasing = attr->getAttributeAsInt("AntiAliasing"); + outMaterial.ColorMask = attr->getAttributeAsInt("ColorMask"); prefix = "BilinearFilter"; if (attr->existsAttribute(prefix.c_str())) // legacy outMaterial.setFlag(EMF_BILINEAR_FILTER, attr->getAttributeAsBool(prefix.c_str())); @@ -1582,6 +1589,10 @@ void CNullDriver::fillMaterialStructureFromAttributes(video::SMaterial& outMater prefix = "TextureWrap"; for (i=0; igetAttributeAsEnumeration((prefix+core::stringc(i+1)).c_str(), aTextureClampNames); + + prefix="LODBias"; + for (i=0; igetAttributeAsInt((prefix+core::stringc(i+1)).c_str()); }