mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-01 17:15:34 +00:00
Code Issues Releases Wiki Activity

Handle NiZBufferProperty

Browse source
This commit is contained in:
Chris Robinson 2013-03-02 18:30:28 -08:00
parent 03785f3ecd
commit 8c0326a49c
1 changed files with 24 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
components/nifogre/ogre_nif_loader.cpp
View file

@ -553,7 +553,8 @@ static Ogre::String getMaterial(const Nif::NiTriShape *shape, const Ogre::String
const Nif::NiTexturingProperty *texprop, const Nif::NiTexturingProperty *texprop,
const Nif::NiMaterialProperty *matprop, const Nif::NiMaterialProperty *matprop,
const Nif::NiAlphaProperty *alphaprop, const Nif::NiAlphaProperty *alphaprop,
const Nif::NiVertexColorProperty *vertprop) const Nif::NiVertexColorProperty *vertprop,
const Nif::NiZBufferProperty *zprop)
{ {
Ogre::MaterialManager &matMgr = Ogre::MaterialManager::getSingleton(); Ogre::MaterialManager &matMgr = Ogre::MaterialManager::getSingleton();
Ogre::MaterialPtr material = matMgr.getByName(name); Ogre::MaterialPtr material = matMgr.getByName(name);
@ -570,6 +571,7 @@ static Ogre::String getMaterial(const Nif::NiTriShape *shape, const Ogre::String
int alphaTest = 0; int alphaTest = 0;
int vertMode = 2; int vertMode = 2;
//int lightMode = 1; //int lightMode = 1;
int depthFlags = 3;
Ogre::String texName; Ogre::String texName;
bool vertexColour = (shape->data->colors.size() != 0); bool vertexColour = (shape->data->colors.size() != 0);
@ -628,6 +630,12 @@ static Ogre::String getMaterial(const Nif::NiTriShape *shape, const Ogre::String
//lightMode = vertprop->data.lightmode; //lightMode = vertprop->data.lightmode;
} }
if(zprop)
{
depthFlags = zprop->flags;
// Depth function???
}
// Material // Material
if(matprop) if(matprop)
{ {
@ -731,8 +739,11 @@ static Ogre::String getMaterial(const Nif::NiTriShape *shape, const Ogre::String
instance->setProperty("alpha_rejection", sh::makeProperty(new sh::StringValue(reject))); instance->setProperty("alpha_rejection", sh::makeProperty(new sh::StringValue(reject)));
} }
instance->setProperty("transparent_sorting", sh::makeProperty(new sh::StringValue(((alphaFlags>>13)&1) ? instance->setProperty("transparent_sorting", sh::makeProperty(new sh::BooleanValue(!((alphaFlags>>13)&1))));
"off" : "on")));
instance->setProperty("depth_check", sh::makeProperty(new sh::BooleanValue(depthFlags&1)));
instance->setProperty("depth_write", sh::makeProperty(new sh::BooleanValue((depthFlags>>1)&1)));
// depth_func???
sh::Factory::getInstance()._ensureMaterial(matname, "Default"); sh::Factory::getInstance()._ensureMaterial(matname, "Default");
return matname; return matname;
@ -769,7 +780,8 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
const Nif::NiTexturingProperty *texprop, const Nif::NiTexturingProperty *texprop,
const Nif::NiMaterialProperty *matprop, const Nif::NiMaterialProperty *matprop,
const Nif::NiAlphaProperty *alphaprop, const Nif::NiAlphaProperty *alphaprop,
const Nif::NiVertexColorProperty *vertprop) const Nif::NiVertexColorProperty *vertprop,
const Nif::NiZBufferProperty *zprop)
{ {
Ogre::SkeletonPtr skel; Ogre::SkeletonPtr skel;
const Nif::NiTriShapeData *data = shape->data.getPtr(); const Nif::NiTriShapeData *data = shape->data.getPtr();
@ -969,7 +981,7 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
std::string matname = NIFMaterialLoader::getMaterial(shape, mName, mGroup, std::string matname = NIFMaterialLoader::getMaterial(shape, mName, mGroup,
texprop, matprop, alphaprop, texprop, matprop, alphaprop,
vertprop); vertprop, zprop);
if(matname.length() > 0) if(matname.length() > 0)
sub->setMaterialName(matname); sub->setMaterialName(matname);
} }
@ -978,7 +990,8 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
const Nif::NiTexturingProperty *texprop=NULL, const Nif::NiTexturingProperty *texprop=NULL,
const Nif::NiMaterialProperty *matprop=NULL, const Nif::NiMaterialProperty *matprop=NULL,
const Nif::NiAlphaProperty *alphaprop=NULL, const Nif::NiAlphaProperty *alphaprop=NULL,
const Nif::NiVertexColorProperty *vertprop=NULL) const Nif::NiVertexColorProperty *vertprop=NULL,
const Nif::NiZBufferProperty *zprop=NULL)
{ {
// Scan the property list for material information // Scan the property list for material information
const Nif::PropertyList &proplist = node->props; const Nif::PropertyList &proplist = node->props;
@ -997,25 +1010,27 @@ class NIFMeshLoader : Ogre::ManualResourceLoader
alphaprop = static_cast<const Nif::NiAlphaProperty*>(pr); alphaprop = static_cast<const Nif::NiAlphaProperty*>(pr);
else if(pr->recType == Nif::RC_NiVertexColorProperty) else if(pr->recType == Nif::RC_NiVertexColorProperty)
vertprop = static_cast<const Nif::NiVertexColorProperty*>(pr); vertprop = static_cast<const Nif::NiVertexColorProperty*>(pr);
else if(pr->recType == Nif::RC_NiZBufferProperty)
zprop = static_cast<const Nif::NiZBufferProperty*>(pr);
else else
warn("Unhandled property type: "+pr->recName); warn("Unhandled property type: "+pr->recName);
} }
if(node->recType == Nif::RC_NiTriShape && mShapeIndex == node->recIndex) if(node->recType == Nif::RC_NiTriShape && mShapeIndex == node->recIndex)
{ {
handleNiTriShape(mesh, dynamic_cast<const Nif::NiTriShape*>(node), texprop, matprop, alphaprop, vertprop); handleNiTriShape(mesh, dynamic_cast<const Nif::NiTriShape*>(node), texprop, matprop, alphaprop, vertprop, zprop);
return true; return true;
} }
const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node); const Nif::NiNode *ninode = dynamic_cast<const Nif::NiNode*>(node);
if(ninode) if(ninode)
{ {
Nif::NodeList const &children = ninode->children; const Nif::NodeList &children = ninode->children;
for(size_t i = 0;i < children.length();i++) for(size_t i = 0;i < children.length();i++)
{ {
if(!children[i].empty()) if(!children[i].empty())
{ {
if(findTriShape(mesh, children[i].getPtr(), texprop, matprop, alphaprop, vertprop)) if(findTriShape(mesh, children[i].getPtr(), texprop, matprop, alphaprop, vertprop, zprop))
return true; return true;
} }
} }