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

This commit is contained in:
2015-12-09 20:57:38 +00:00
parent 0dcea8e214
commit 30ea938f38
11 changed files with 72 additions and 44 deletions

View File

@@ -69,15 +69,15 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
groupMotionBlur->setChecked(view->isFeatureEnabled(QGLView::qglMotionBlurEnabled));
groupReflections->setChecked(view->isFeatureEnabled(QGLView::qglDynamicReflectionsEnabled));
checkSoftShadows->setChecked(view->isFeatureEnabled(QGLView::qglShadowsSoftEnabled));
spinAccom->setValue(view->isFeatureEnabled(QGLView::qglEyeAccomodationTime));
spinAccomMS->setValue(view->isFeatureEnabled(QGLView::qglEyeAccomodationMaxSpeed));
spinCubemapSize->setValue(view->isFeatureEnabled(QGLView::qglDynamicReflectionsMapSize));
spinShadowmapSize->setValue(view->isFeatureEnabled(QGLView::qglShadowsMapSize));
spinMotionBlurFactor->setValue(view->isFeatureEnabled(QGLView::qglMotionBlurFactor));
spinMotionBlurSteps->setValue(view->isFeatureEnabled(QGLView::qglMotionBlurSteps));
spinBloomFactor->setValue(view->isFeatureEnabled(QGLView::qglBloomFactor));
spinBloomRadius->setValue(view->isFeatureEnabled(QGLView::qglBloomRadius));
spinBloomThreshold->setValue(view->isFeatureEnabled(QGLView::qglBloomThreshold));
spinAccom->setValue(view->feature(QGLView::qglEyeAccomodationTime).toDouble());
spinAccomMS->setValue(view->feature(QGLView::qglEyeAccomodationMaxSpeed).toDouble());
spinCubemapSize->setValue(view->feature(QGLView::qglDynamicReflectionsMapSize).toInt());
spinShadowmapSize->setValue(view->feature(QGLView::qglShadowsMapSize).toInt());
spinMotionBlurFactor->setValue(view->feature(QGLView::qglMotionBlurFactor).toDouble());
spinMotionBlurSteps->setValue(view->feature(QGLView::qglMotionBlurSteps).toInt());
spinBloomFactor->setValue(view->feature(QGLView::qglBloomFactor).toDouble());
spinBloomRadius->setValue(view->feature(QGLView::qglBloomRadius).toInt());
spinBloomThreshold->setValue(view->feature(QGLView::qglBloomThreshold).toDouble());
axis = new GLObjectBase();
GLObjectBase * obj;
@@ -93,9 +93,9 @@ MainWindow::MainWindow(QWidget * parent): QMainWindow(parent), Ui::MainWindow()
axis->addChild(obj);
view->addObject(axis);
cam_light = new Light(view->camera().pos());
cam_light = new Light();
cam_light->intensity = 0.5;
cam_light->setName("camera");
cam_light->setName("Camera_Light");
view->camera().addChild(cam_light);
view->start(-1);
startTimer(1000/60);
@@ -121,7 +121,7 @@ void MainWindow::changeEvent(QEvent * e) {
void MainWindow::timerEvent(QTimerEvent * ) {
//static double t = 0.;
cam_light->setVisible(checkCameraLight->isChecked());
cam_light->intensity = checkCameraLight->isChecked() ? 0.5 : 0.;
//((RendererSimple*)(view->renderer()))->mpos = view->mapFromGlobal(QCursor::pos());
statusBar()->showMessage(QString("FPS: %1").arg(QString::number(view->currentFPS(), 'f', 2)));
}