Pressing 't' now toggles wireframe mode.

This commit is contained in:
David Williams 2007-10-05 00:47:11 +00:00
parent 6cafc64e24
commit f730438f21
2 changed files with 9 additions and 3 deletions

View File

@ -722,11 +722,11 @@ namespace Ogre
} }
uint noOfRemovedVertices = 0; uint noOfRemovedVertices = 0;
//do do
{ {
//noOfRemovedVertices = iterPatch->second.decimate(); noOfRemovedVertices = iterPatch->second.decimate();
} }
//while(noOfRemovedVertices > 10); //We don't worry about the last few vertices - it's not worth the overhead of calling the function. while(noOfRemovedVertices > 10); //We don't worry about the last few vertices - it's not worth the overhead of calling the function.
} }
//LogManager::getSingleton().logMessage("Finished Generating Mesh Data"); //LogManager::getSingleton().logMessage("Finished Generating Mesh Data");

View File

@ -137,6 +137,7 @@ namespace Ogre
bool allXMatch = true; bool allXMatch = true;
bool allYMatch = true; bool allYMatch = true;
bool allZMatch = true; bool allZMatch = true;
bool allAlphaMatch = true;
bool allNormalsMatch = true; bool allNormalsMatch = true;
bool twoEdgesMatch = true; bool twoEdgesMatch = true;
@ -154,6 +155,10 @@ namespace Ogre
{ {
allZMatch = false; allZMatch = false;
} }
if((*connectedIter)->getAlpha() != vertexIter->getAlpha())
{
allAlphaMatch = false;
}
if((*connectedIter)->getNormal().dotProduct(vertexIter->getNormal()) < 0.99) if((*connectedIter)->getNormal().dotProduct(vertexIter->getNormal()) < 0.99)
{ {
return false; return false;
@ -173,6 +178,7 @@ namespace Ogre
} }
return (allXMatch || allYMatch || allZMatch) return (allXMatch || allYMatch || allZMatch)
&& (allAlphaMatch)
&& (twoEdgesMatch); && (twoEdgesMatch);
} }