mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-03 16:49:54 +00:00
Code Issues Releases Wiki Activity

fix #3876 and #3993

Browse source
This commit is contained in:
wareya 2018-06-08 17:52:46 -04:00
parent 3c2c0960d1
commit 6277f5511c
2 changed files with 30 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
components/esmterrain/storage.cpp
View file

@ -430,15 +430,23 @@ namespace ESMTerrain
// Second iteration - create and fill in the blend maps // Second iteration - create and fill in the blend maps
const int blendmapSize = (realTextureSize-1) * chunkSize + 1; const int blendmapSize = (realTextureSize-1) * chunkSize + 1;
// We need to upscale the blendmap 2x with nearest neighbor sampling to look like Vanilla
const int imageScaleFactor = 2;
const int blendmapImageSize = blendmapSize * imageScaleFactor;
const bool largeImage = true;
for (int i=0; i<numBlendmaps; ++i) for (int i=0; i<numBlendmaps; ++i)
{ {
GLenum format = pack ? GL_RGBA : GL_ALPHA; GLenum format = pack ? GL_RGBA : GL_ALPHA;
osg::ref_ptr<osg::Image> image (new osg::Image); osg::ref_ptr<osg::Image> image (new osg::Image);
image->allocateImage(blendmapSize, blendmapSize, 1, format, GL_UNSIGNED_BYTE); if(!largeImage)
image->allocateImage(blendmapSize, blendmapSize, 1, format, GL_UNSIGNED_BYTE);
else
image->allocateImage(blendmapImageSize, blendmapImageSize, 1, format, GL_UNSIGNED_BYTE);
unsigned char* pData = image->data(); unsigned char* pData = image->data();
for (int y=0; y<blendmapSize; ++y) for (int y=0; y<blendmapSize; ++y)
{ {
for (int x=0; x<blendmapSize; ++x) for (int x=0; x<blendmapSize; ++x)
@ -448,14 +456,26 @@ namespace ESMTerrain
int layerIndex = textureIndicesMap.find(id)->second; int layerIndex = textureIndicesMap.find(id)->second;
int blendIndex = (pack ? static_cast<int>(std::floor((layerIndex - 1) / 4.f)) : layerIndex - 1); int blendIndex = (pack ? static_cast<int>(std::floor((layerIndex - 1) / 4.f)) : layerIndex - 1);
int channel = pack ? std::max(0, (layerIndex-1) % 4) : 0; int channel = pack ? std::max(0, (layerIndex-1) % 4) : 0;
if (blendIndex == i) int alpha = (blendIndex == i) ? 255 : 0;
pData[(blendmapSize - y - 1)*blendmapSize*channels + x*channels + channel] = 255;
if(!largeImage)
pData[((blendmapSize - y - 1)*blendmapSize + x)*channels + channel] = alpha;
else else
pData[(blendmapSize - y - 1)*blendmapSize*channels + x*channels + channel] = 0; {
int realY = (blendmapSize - y - 1)*imageScaleFactor;
int realX = x*imageScaleFactor;
if(true)
pData[((realY+0)*blendmapImageSize + realX + 0)*channels + channel] = alpha;
if(realY+1 < blendmapImageSize)
pData[((realY+1)*blendmapImageSize + realX + 0)*channels + channel] = alpha;
if(realX+1 < blendmapImageSize)
pData[((realY+0)*blendmapImageSize + realX + 1)*channels + channel] = alpha;
if(realY+1 < blendmapImageSize && realX+1 < blendmapImageSize)
pData[((realY+1)*blendmapImageSize + realX + 1)*channels + channel] = alpha;
}
} }
} }
blendmaps.push_back(image); blendmaps.push_back(image);
} }
} }

3
components/terrain/material.cpp
View file

@ -25,6 +25,9 @@ namespace Terrain
matrix.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f)); matrix.preMultTranslate(osg::Vec3f(0.5f, 0.5f, 0.f));
matrix.preMultScale(osg::Vec3f(scale, scale, 1.f)); matrix.preMultScale(osg::Vec3f(scale, scale, 1.f));
matrix.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f)); matrix.preMultTranslate(osg::Vec3f(-0.5f, -0.5f, 0.f));
// We need to nudge the blendmap to look like vanilla.
// This causes visible seams unless the blendmap's resolution is doubled, but Vanilla also doubles the blendmap, apparently.
matrix.preMultTranslate(osg::Vec3f(1.0f/blendmapScale/4.0f, 1.0f/blendmapScale/4.0f, 0.f));
texMat = new osg::TexMat(matrix); texMat = new osg::TexMat(matrix);