Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXELFORMAT: use the PaletteLookup helper for qbcl

master
Martin Gerhardy 2022-05-18 18:45:34 +02:00
parent ae10717297
commit c1d613ab34
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/modules/voxelformat/QBCLFormat.cpp
View File

@ -20,6 +20,7 @@
#include "voxel/Palette.h"
#include "voxel/RawVolume.h"
#include "voxel/Voxel.h"
#include "voxelformat/private/PaletteLookup.h"
namespace voxelformat {
@ -323,9 +324,7 @@ bool QBCLFormat::readMatrix(const core::String &filename, io::SeekableReadStream
voxel::RawVolume* volume = new voxel::RawVolume(region);
uint32_t index = 0;
const voxel::Palette &palette = voxel::getPalette();
core::DynamicArray<glm::vec4> materialColors;
palette.toVec4f(materialColors);
PaletteLookup palLookup;
while (!zipStream.eos()) {
int y = 0;
@ -354,7 +353,7 @@ bool QBCLFormat::readMatrix(const core::String &filename, io::SeekableReadStream
y += rleLength;
} else {
const core::RGBA color = core::Color::getRGBA(red, green, blue, alpha);
const uint8_t palIndex = palette.getClosestMatch(color);
const uint8_t palIndex = palLookup.findClosestIndex(color);
const voxel::Voxel& voxel = voxel::createVoxel(voxel::VoxelType::Generic, palIndex);
for (int j = 0; j < rleLength; ++j) {
const uint32_t x = (index / size.z);
@ -372,7 +371,7 @@ bool QBCLFormat::readMatrix(const core::String &filename, io::SeekableReadStream
const uint32_t x = (index / size.z);
const uint32_t z = index % size.z;
const core::RGBA color = core::Color::getRGBA(red, green, blue);
const uint8_t palIndex = palette.getClosestMatch(color);
const uint8_t palIndex = palLookup.findClosestIndex(color);
const voxel::Voxel& voxel = voxel::createVoxel(voxel::VoxelType::Generic, palIndex);
volume->setVoxel(position.x + (int)x, position.y + y, position.z + (int)z, voxel);
++y;