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

This commit is contained in:
2016-01-18 14:41:29 +00:00
parent 5b523a65ae
commit d88b341070
28 changed files with 539 additions and 112 deletions

View File

@@ -45,8 +45,8 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
view->setHoverHaloFillAlpha(0.);
view->setSelectionHaloFillAlpha(0.);
view->setBackColor(Qt::lightGray);
view->setDepthStart(1.);
view->setDepthEnd(10000.);
view->setDepthStart(0.001);
view->setDepthEnd(100000.);
spinFOV->setValue(view->FOV());
spinDepthStart->setValue(view->depthStart());
@@ -80,6 +80,11 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
spinBloomRadius->setValue(view->feature(QGLView::qglBloomRadius).toInt());
spinBloomThreshold->setValue(view->feature(QGLView::qglBloomThreshold).toDouble());
spinSSAORadius->setValue(view->feature(QGLView::qglSSAORadius).toInt());
groupDOF->setChecked(view->isFeatureEnabled(QGLView::qglDepthOfFieldEnabled));
checkDOFAutoFocus->setChecked(view->isFeatureEnabled(QGLView::qglDepthOfFieldAutoFocusEnabled));
spinDOFFocus->setValue(view->feature(QGLView::qglDepthOfFieldFocus).toDouble());
spinDOFDiaphragm->setValue(view->feature(QGLView::qglDepthOfFieldDiaphragm).toDouble());
spinDOFSpeed->setValue(view->feature(QGLView::qglDepthOfFieldAutoFocusSpeed).toDouble());
axis = new GLObjectBase();
GLObjectBase * obj;
@@ -104,6 +109,10 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
connect(view, SIGNAL(selectionChanged(GLObjectBase*,GLObjectBase*)), this, SLOT(selectionChanged(GLObjectBase*,GLObjectBase*)));
connect(matEditor, SIGNAL(changed()), this, SLOT(materialChanged()));
//view->addObject(&partsys);
partsys.material().color_diffuse = Qt::red;
treeProps->assignObject(&partsys);
}
@@ -140,6 +149,11 @@ void MainWindow::on_view_glKeyPressEvent(QKeyEvent * e) {
}
void MainWindow::on_view_glInitializeDone() {
}
void MainWindow::loadFile(const QString & path) {
prev_path = path;
importFile(path);
@@ -216,6 +230,7 @@ void MainWindow::on_comboRenderer_currentIndexChanged(int val) {
switch (val) {
case 0: view->setRenderer(new RendererSimple(view), &pr); break;
case 1: view->setRenderer(new RendererDeferredShading(view), &pr); break;
case 2: view->setRenderer(new RendererRT(view), &pr); break;
}
if (pr != 0) delete pr;
}
@@ -250,7 +265,9 @@ void MainWindow::on_actionSave_triggered() {
f += ".qgl";
prev_path = f;
view->removeObject(axis);
QApplication::setOverrideCursor(Qt::WaitCursor);
saveToQGLFile(f, &(view->rootObject()));
QApplication::restoreOverrideCursor();
view->addObject(axis);
}
@@ -262,7 +279,9 @@ void MainWindow::on_actionSaveSelected_triggered() {
if (f.right(4).toLower() != ".qgl")
f += ".qgl";
prev_path = f;
QApplication::setOverrideCursor(Qt::WaitCursor);
saveToQGLFile(f, sel_obj);
QApplication::restoreOverrideCursor();
}