git-svn-id: svn://db.shs.com.ru/libs@44 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2015-11-20 21:19:36 +00:00
parent cabaead1c6
commit 104a7f99ad
48 changed files with 1973 additions and 1273 deletions

View File

@@ -23,6 +23,7 @@
MaterialEditor::MaterialEditor(QWidget * parent): QWidget(parent) {
ui = new Ui::MaterialEditor();
ui->setupUi(this);
ui->frameReflection->hide();
active = true;
}
@@ -46,24 +47,24 @@ void MaterialEditor::setMaterial(const Material & m) {
ui->colorSpecular->setColor(m.color_specular);
ui->colorSelfIllum->setColor(m.color_self_illumination);
ui->checkGlass->setChecked(m.glass);
ui->comboModel->setCurrentIndex((int)m.light_model);
ui->spinShine->setValue(m.shine);
ui->spinShineStrength->setValue(m.shine_strength);
ui->spinRoughness->setValue(m.roughness);
ui->spinSpecular->setValue(m.specular);
ui->spinTransparent->setValue(m.transparency);
ui->spinReflect->setValue(m.reflectivity);
ui->spinBump->setValue(m.bump_scale);
ui->spinRelief->setValue(m.relief_scale);
ui->spinIOF->setValue(m.iof);
ui->spinDispersion->setValue(m.dispersion);
ui->lineDiffuse->setProperty("GLpath", m.diffuse.bitmap_path); ui->lineDiffuse->setText(QFileInfo(m.diffuse.bitmap_path).fileName());
ui->lineBump->setProperty("GLpath", m.bump.bitmap_path); ui->lineBump->setText(QFileInfo(m.bump.bitmap_path).fileName());
ui->lineRelief->setProperty("GLpath", m.relief.bitmap_path); ui->lineRelief->setText(QFileInfo(m.relief.bitmap_path).fileName());
ui->lineReflFront->setProperty("GLpath", m.reflection.path(0)); ui->lineReflFront->setText(QFileInfo(m.reflection.path(0)).fileName());
ui->lineReflBack->setProperty("GLpath", m.reflection.path(1)); ui->lineReflBack->setText(QFileInfo(m.reflection.path(1)).fileName());
ui->lineReflLeft->setProperty("GLpath", m.reflection.path(2)); ui->lineReflLeft->setText(QFileInfo(m.reflection.path(2)).fileName());
ui->lineReflRight->setProperty("GLpath", m.reflection.path(3)); ui->lineReflRight->setText(QFileInfo(m.reflection.path(3)).fileName());
ui->lineReflTop->setProperty("GLpath", m.reflection.path(4)); ui->lineReflTop->setText(QFileInfo(m.reflection.path(4)).fileName());
ui->lineReflBottom->setProperty("GLpath", m.reflection.path(5)); ui->lineReflBottom->setText(QFileInfo(m.reflection.path(5)).fileName());
ui->mapDiffuse->setMap(m.map_diffuse);
ui->mapSpecular->setMap(m.map_specular);
ui->mapSelfIllum->setMap(m.map_self_illumination);
ui->mapRoughness->setMap(m.map_roughness);
ui->mapBump->setMap(m.map_bump);
ui->mapRelief->setMap(m.map_relief);
ui->lineReflFront->setProperty("GLpath", m.map_reflection.path(0)); ui->lineReflFront->setText(QFileInfo(m.map_reflection.path(0)).fileName());
ui->lineReflBack->setProperty("GLpath", m.map_reflection.path(1)); ui->lineReflBack->setText(QFileInfo(m.map_reflection.path(1)).fileName());
ui->lineReflLeft->setProperty("GLpath", m.map_reflection.path(2)); ui->lineReflLeft->setText(QFileInfo(m.map_reflection.path(2)).fileName());
ui->lineReflRight->setProperty("GLpath", m.map_reflection.path(3)); ui->lineReflRight->setText(QFileInfo(m.map_reflection.path(3)).fileName());
ui->lineReflTop->setProperty("GLpath", m.map_reflection.path(4)); ui->lineReflTop->setText(QFileInfo(m.map_reflection.path(4)).fileName());
ui->lineReflBottom->setProperty("GLpath", m.map_reflection.path(5)); ui->lineReflBottom->setText(QFileInfo(m.map_reflection.path(5)).fileName());
active = true;
}
@@ -74,55 +75,28 @@ Material MaterialEditor::material() {
m.color_specular = ui->colorSpecular->color();
m.color_self_illumination = ui->colorSelfIllum->color();
m.glass = ui->checkGlass->isChecked();
m.light_model = (Material::LightModel)ui->comboModel->currentIndex();
m.shine = ui->spinShine->value();
m.shine_strength = ui->spinShineStrength->value();
m.roughness = ui->spinRoughness->value();
m.specular = ui->spinSpecular->value();
m.transparency = ui->spinTransparent->value();
m.reflectivity = ui->spinReflect->value();
m.bump_scale = ui->spinBump->value();
m.relief_scale = ui->spinRelief->value();
m.iof = ui->spinIOF->value();
m.dispersion = ui->spinDispersion->value();
m.diffuse.bitmap_path = ui->lineDiffuse->property("GLpath").toString();
m.bump.bitmap_path = ui->lineBump->property("GLpath").toString();
m.relief.bitmap_path = ui->lineRelief->property("GLpath").toString();
m.reflection.setPath(0, ui->lineReflFront->property("GLpath").toString());
m.reflection.setPath(1, ui->lineReflBack->property("GLpath").toString());
m.reflection.setPath(2, ui->lineReflLeft->property("GLpath").toString());
m.reflection.setPath(3, ui->lineReflRight->property("GLpath").toString());
m.reflection.setPath(4, ui->lineReflTop->property("GLpath").toString());
m.reflection.setPath(5, ui->lineReflBottom->property("GLpath").toString());
m.map_diffuse = ui->mapDiffuse->map();
m.map_specular = ui->mapSpecular->map();
m.map_self_illumination = ui->mapSelfIllum->map();
m.map_roughness = ui->mapRoughness->map();
m.map_bump = ui->mapBump->map();
m.map_relief = ui->mapRelief->map();
m.map_reflection.setPath(0, ui->lineReflFront->property("GLpath").toString());
m.map_reflection.setPath(1, ui->lineReflBack->property("GLpath").toString());
m.map_reflection.setPath(2, ui->lineReflLeft->property("GLpath").toString());
m.map_reflection.setPath(3, ui->lineReflRight->property("GLpath").toString());
m.map_reflection.setPath(4, ui->lineReflTop->property("GLpath").toString());
m.map_reflection.setPath(5, ui->lineReflBottom->property("GLpath").toString());
return m;
}
void MaterialEditor::on_buttonDiffuseSelect_clicked() {
QString str = QFileDialog::getOpenFileName(this, "Select image", ui->lineDiffuse->property("GLpath").toString(), "Images(*.bmp *.jpg *.jpeg *.png *.tif *.tiff *.tga);;All files(*)");
if (str.isEmpty()) return;
ui->lineDiffuse->setProperty("GLpath", str);
ui->lineDiffuse->setText(QFileInfo(str).fileName());
materialChanged();
}
void MaterialEditor::on_buttonBumpSelect_clicked() {
QString str = QFileDialog::getOpenFileName(this, "Select image", ui->lineBump->property("GLpath").toString(), "Images(*.bmp *.jpg *.jpeg *.png *.tif *.tiff *.tga);;All files(*)");
if (str.isEmpty()) return;
ui->lineBump->setProperty("GLpath", str);
ui->lineBump->setText(QFileInfo(str).fileName());
materialChanged();
}
void MaterialEditor::on_buttonReliefSelect_clicked() {
QString str = QFileDialog::getOpenFileName(this, "Select image", ui->lineRelief->property("GLpath").toString(), "Images(*.bmp *.jpg *.jpeg *.png *.tif *.tiff *.tga);;All files(*)");
if (str.isEmpty()) return;
ui->lineRelief->setProperty("GLpath", str);
ui->lineRelief->setText(QFileInfo(str).fileName());
materialChanged();
}
void MaterialEditor::on_buttonReflFrontSelect_clicked() {
QString str = QFileDialog::getOpenFileName(this, "Select image", ui->lineReflFront->property("GLpath").toString(), "Images(*.bmp *.jpg *.jpeg *.png *.tif *.tiff *.tga);;All files(*)");
if (str.isEmpty()) return;
@@ -177,27 +151,6 @@ void MaterialEditor::on_buttonReflBottomSelect_clicked() {
}
void MaterialEditor::on_buttonDiffuseClear_clicked() {
ui->lineDiffuse->setText("");
ui->lineDiffuse->setProperty("GLpath", "");
materialChanged();
}
void MaterialEditor::on_buttonBumpClear_clicked() {
ui->lineBump->setText("");
ui->lineBump->setProperty("GLpath", "");
materialChanged();
}
void MaterialEditor::on_buttonReliefClear_clicked() {
ui->lineRelief->setText("");
ui->lineRelief->setProperty("GLpath", "");
materialChanged();
}
void MaterialEditor::on_buttonReflFrontClear_clicked() {
ui->lineReflFront->setText("");
ui->lineReflFront->setProperty("GLpath", "");