teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours

Browse source
This commit is contained in:
Jacob Essex 2012-02-29 23:38:21 +00:00
parent 6924348696
commit 611f336d07
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwrender/terrain.cpp
View file

@ -300,15 +300,18 @@ namespace MWRender
} }
//add the vertex colour overlay //add the vertex colour overlay
//TODO sort the *4 bit if ( store->land[1][1]->landData->usingColours )
Ogre::TexturePtr vclr = getVertexColours(store, vertexColourAlpha, fromX*4, fromY*4, mLandSize); {
Ogre::TexturePtr normDisp = getNormalDisp("DOES_NOT_EXIST"); //TODO sort the *4 bit
Ogre::TexturePtr vclr = getVertexColours(store, vertexColourAlpha, fromX*4, fromY*4, mLandSize);
Ogre::TexturePtr normDisp = getNormalDisp("DOES_NOT_EXIST");
const size_t position = terrainData->layerList.size(); const size_t position = terrainData->layerList.size();
terrainData->layerList.push_back(Ogre::Terrain::LayerInstance()); terrainData->layerList.push_back(Ogre::Terrain::LayerInstance());
terrainData->layerList[position].worldSize = mRealSize; terrainData->layerList[position].worldSize = mRealSize;
terrainData->layerList[position].textureNames.push_back(vclr->getName()); terrainData->layerList[position].textureNames.push_back(vclr->getName());
terrainData->layerList[position].textureNames.push_back(normDisp->getName()); terrainData->layerList[position].textureNames.push_back(normDisp->getName());
}
} }
//---------------------------------------------------------------------------------------------- //----------------------------------------------------------------------------------------------
@ -343,6 +346,7 @@ namespace MWRender
memset(pBlend, 0, sizeof(float) * blendSize * blendSize); memset(pBlend, 0, sizeof(float) * blendSize * blendSize);
} }
//except the overlay, which we will just splat over the top //except the overlay, which we will just splat over the top
if ( store->land[1][1]->landData->usingColours )
{ {
//the overlay is always the last texture layer //the overlay is always the last texture layer
float* pBlend = terrain->getLayerBlendMap(terrain->getLayerCount() - 1) float* pBlend = terrain->getLayerBlendMap(terrain->getLayerCount() - 1)