Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 08:46:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added scale field, fixed height/color extraction.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-07-29 16:33:36 -07:00
parent 6824479762
commit 436727dfdb
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
interface/src/ui/MetavoxelEditor.cpp
View file

@ -906,6 +906,11 @@ ImportHeightfieldTool::ImportHeightfieldTool(MetavoxelEditor* editor) :
connect(_height, &QAbstractButton::clicked, this, &ImportHeightfieldTool::selectHeightFile);
form->addRow("Color:", _color = new QPushButton());
connect(_color, &QAbstractButton::clicked, this, &ImportHeightfieldTool::selectColorFile);
form->addRow("Scale:", _scale = new QDoubleSpinBox());
_scale->setMinimum(-FLT_MAX);
_scale->setMaximum(FLT_MAX);
_scale->setPrefix("2^");
_scale->setValue(1.0);
}
bool ImportHeightfieldTool::appliesTo(const AttributePointer& attribute) const {
@ -913,7 +918,7 @@ bool ImportHeightfieldTool::appliesTo(const AttributePointer& attribute) const {
}
void ImportHeightfieldTool::render() {
_preview.render(glm::vec3(), 1.0f);
_preview.render(glm::vec3(), pow(2.0, _scale->value()));
}
void ImportHeightfieldTool::selectHeightFile() {
@ -944,7 +949,7 @@ void ImportHeightfieldTool::selectColorFile() {
updatePreview();
}
const int BLOCK_SIZE = 64;
const int BLOCK_SIZE = 32;
const int BLOCK_ADVANCEMENT = BLOCK_SIZE - 1;
void ImportHeightfieldTool::updatePreview() {
@ -959,7 +964,7 @@ void ImportHeightfieldTool::updatePreview() {
int columns = qMin(BLOCK_SIZE, _heightImage.width() - j);
const int BYTES_PER_COLOR = 3;
for (int y = 0; y < rows; y++) {
uchar* src = _heightImage.scanLine(i + y);
uchar* src = _heightImage.scanLine(i + y) + j * BYTES_PER_COLOR;
char* dest = height.data() + y * BLOCK_SIZE;
for (int x = 0; x < columns; x++) {
*dest++ = *src;
@ -973,8 +978,8 @@ void ImportHeightfieldTool::updatePreview() {
rows = qMax(0, qMin(BLOCK_SIZE, _colorImage.height() - i));
columns = qMax(0, qMin(BLOCK_SIZE, _colorImage.width() - j));
for (int y = 0; y < rows; y++) {
memcpy(color.data() + y * BLOCK_SIZE * BYTES_PER_COLOR, _colorImage.scanLine(i + y),
columns * BYTES_PER_COLOR);
memcpy(color.data() + y * BLOCK_SIZE * BYTES_PER_COLOR,
_colorImage.scanLine(i + y) + j * BYTES_PER_COLOR, columns * BYTES_PER_COLOR);
}
}
buffers.append(BufferDataPointer(new HeightfieldBuffer(glm::vec3(x, 0.0f, z), 1.0f, height, color)));

1
interface/src/ui/MetavoxelEditor.h
View file

@ -247,6 +247,7 @@ private:
QPushButton* _height;
QPushButton* _color;
QDoubleSpinBox* _scale;
QImage _heightImage;
QImage _colorImage;