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

Start the grid position off roughly at our feet.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-01-28 15:46:02 -08:00
parent e10ab8d546
commit f435f61467
2 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -58,19 +58,21 @@ MetavoxelEditor::MetavoxelEditor() :
_gridPlane->addItem("X/Z"); _gridPlane->addItem("X/Z");
_gridPlane->addItem("Y/Z"); _gridPlane->addItem("Y/Z");
_gridPlane->setCurrentIndex(GRID_PLANE_XZ); _gridPlane->setCurrentIndex(GRID_PLANE_XZ);
connect(_gridPlane, SIGNAL(currentIndexChanged(int)), SLOT(centerGridPosition()));
formLayout->addRow("Grid Spacing:", _gridSpacing = new QDoubleSpinBox()); formLayout->addRow("Grid Spacing:", _gridSpacing = new QDoubleSpinBox());
_gridSpacing->setMinimum(-FLT_MAX); _gridSpacing->setMinimum(-FLT_MAX);
_gridSpacing->setMaximum(FLT_MAX); _gridSpacing->setMaximum(FLT_MAX);
_gridSpacing->setPrefix("2^"); _gridSpacing->setPrefix("2^");
_gridSpacing->setValue(-3.0); _gridSpacing->setValue(-3.0);
connect(_gridSpacing, SIGNAL(valueChanged(double)), SLOT(updateGridPosition())); connect(_gridSpacing, SIGNAL(valueChanged(double)), SLOT(alignGridPosition()));
formLayout->addRow("Grid Position:", _gridPosition = new QDoubleSpinBox()); formLayout->addRow("Grid Position:", _gridPosition = new QDoubleSpinBox());
_gridPosition->setMinimum(-FLT_MAX); _gridPosition->setMinimum(-FLT_MAX);
_gridPosition->setMaximum(FLT_MAX); _gridPosition->setMaximum(FLT_MAX);
updateGridPosition(); alignGridPosition();
centerGridPosition();
_value = new QGroupBox(); _value = new QGroupBox();
_value->setTitle("Value"); _value->setTitle("Value");
topLayout->addWidget(_value); topLayout->addWidget(_value);
@ -182,7 +184,15 @@ void MetavoxelEditor::createNewAttribute() {
updateAttributes(nameText); updateAttributes(nameText);
} }
void MetavoxelEditor::updateGridPosition() { void MetavoxelEditor::centerGridPosition() {
const float CENTER_OFFSET = 0.5f;
float eyePosition = (glm::inverse(getGridRotation()) * Application::getInstance()->getCamera()->getPosition()).z -
Application::getInstance()->getAvatar()->getScale() * CENTER_OFFSET;
double step = getGridSpacing();
_gridPosition->setValue(step * floor(eyePosition / step));
}
void MetavoxelEditor::alignGridPosition() {
// make sure our grid position matches our grid spacing // make sure our grid position matches our grid spacing
double step = getGridSpacing(); double step = getGridSpacing();
_gridPosition->setSingleStep(step); _gridPosition->setSingleStep(step);

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

@ -32,7 +32,8 @@ private slots:
void updateValueEditor(); void updateValueEditor();
void createNewAttribute(); void createNewAttribute();
void updateGridPosition(); void centerGridPosition();
void alignGridPosition();
void render(); void render();