Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 20:11:13 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

More voxel edit bits.

Browse source
This commit is contained in:
Andrzej Kapolka 2014-08-26 18:02:55 -07:00
parent 9c0888afff
commit e87556450e
2 changed files with 66 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -219,6 +219,7 @@ void MetavoxelEditor::selectedAttributeChanged() {
editor->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Preferred); editor->setSizePolicy(QSizePolicy::Ignored, QSizePolicy::Preferred);
_valueArea->setWidget(editor); _valueArea->setWidget(editor);
} }
updateTool();
} }
void MetavoxelEditor::createNewAttribute() { void MetavoxelEditor::createNewAttribute() {

66
libraries/metavoxels/src/MetavoxelMessages.cpp
View file

@ -649,7 +649,38 @@ VoxelColorBoxEdit::VoxelColorBoxEdit(const Box& region, float granularity, const
color(color) { color(color) {
} }
class VoxelColorBoxEditVisitor : public MetavoxelVisitor {
public:
VoxelColorBoxEditVisitor(const VoxelColorBoxEdit& edit);
virtual int visit(MetavoxelInfo& info);
private:
const VoxelColorBoxEdit& _edit;
};
VoxelColorBoxEditVisitor::VoxelColorBoxEditVisitor(const VoxelColorBoxEdit& edit) :
MetavoxelVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getVoxelColorAttribute(),
QVector<AttributePointer>() << AttributeRegistry::getInstance()->getVoxelColorAttribute()),
_edit(edit) {
}
int VoxelColorBoxEditVisitor::visit(MetavoxelInfo& info) {
if (!info.isLeaf) {
return DEFAULT_ORDER;
}
return STOP_RECURSION;
}
void VoxelColorBoxEdit::apply(MetavoxelData& data, const WeakSharedObjectHash& objects) const { void VoxelColorBoxEdit::apply(MetavoxelData& data, const WeakSharedObjectHash& objects) const {
// expand to fit the entire edit
while (!data.getBounds().contains(region)) {
data.expand();
}
VoxelColorBoxEditVisitor setVisitor(*this);
data.guide(setVisitor);
} }
VoxelMaterialBoxEdit::VoxelMaterialBoxEdit(const Box& region, float granularity, VoxelMaterialBoxEdit::VoxelMaterialBoxEdit(const Box& region, float granularity,
@ -660,5 +691,38 @@ VoxelMaterialBoxEdit::VoxelMaterialBoxEdit(const Box& region, float granularity,
averageColor(averageColor) { averageColor(averageColor) {
} }
void VoxelMaterialBoxEdit::apply(MetavoxelData& data, const WeakSharedObjectHash& objects) const { class VoxelMaterialBoxEditVisitor : public MetavoxelVisitor {
public:
VoxelMaterialBoxEditVisitor(const VoxelMaterialBoxEdit& edit);
virtual int visit(MetavoxelInfo& info);
private:
const VoxelMaterialBoxEdit& _edit;
};
VoxelMaterialBoxEditVisitor::VoxelMaterialBoxEditVisitor(const VoxelMaterialBoxEdit& edit) :
MetavoxelVisitor(QVector<AttributePointer>() << AttributeRegistry::getInstance()->getVoxelMaterialAttribute() <<
AttributeRegistry::getInstance()->getVoxelColorAttribute(), QVector<AttributePointer>() <<
AttributeRegistry::getInstance()->getVoxelMaterialAttribute() <<
AttributeRegistry::getInstance()->getVoxelColorAttribute()),
_edit(edit) {
}
int VoxelMaterialBoxEditVisitor::visit(MetavoxelInfo& info) {
if (!info.isLeaf) {
return DEFAULT_ORDER;
}
return STOP_RECURSION;
}
void VoxelMaterialBoxEdit::apply(MetavoxelData& data, const WeakSharedObjectHash& objects) const {
// expand to fit the entire edit
while (!data.getBounds().contains(region)) {
data.expand();
}
VoxelMaterialBoxEditVisitor setVisitor(*this);
data.guide(setVisitor);
} }