Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-18 07:56:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Color/material fix.

Browse source
This commit is contained in:
Andrzej Kapolka 2015-01-08 14:13:23 -08:00
parent ec32739689
commit 8b2baf65e8
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interface/src/MetavoxelSystem.cpp
View file

@ -1884,17 +1884,18 @@ void HeightfieldNodeRenderer::render(const HeightfieldNodePointer& node, const g
quint8 red = numeric_limits<quint8>::max();
quint8 green = numeric_limits<quint8>::max();
quint8 blue = numeric_limits<quint8>::max();
int clampedOffsetX = clampedX + offsetX, clampedOffsetZ = clampedZ + offsetZ;
if (colorSrc) {
const uchar* color = colorSrc + ((int)(clampedZ * colorStepZ) * colorWidth +
(int)(clampedX * colorStepX)) * DataBlock::COLOR_BYTES;
const uchar* color = colorSrc + ((int)(clampedOffsetZ * colorStepZ) * colorWidth +
(int)(clampedOffsetX * colorStepX)) * DataBlock::COLOR_BYTES;
red = color[0];
green = color[1];
blue = color[2];
}
quint8 material = 0;
if (materialSrc) {
material = materialSrc[(int)(clampedZ * materialStepZ) * materialWidth +
(int)(clampedX * materialStepX)];
material = materialSrc[(int)(clampedOffsetZ * materialStepZ) * materialWidth +
(int)(clampedOffsetX * materialStepX)];
if (material != 0) {
int& mapping = materialMap[material];
if (mapping == 0) {