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

This commit is contained in:
2018-02-14 11:59:11 +00:00
parent 540b358a08
commit b58b8cd046
11 changed files with 36 additions and 4 deletions

View File

@@ -29,6 +29,8 @@
QGLViewWindow::QGLViewWindow(QWidget * parent): QMainWindow(parent), Ui::QGLViewWindow() {
setupUi(this);
session.setFile("session_qglview_test.conf");
session.addEntry(this);
icon_geo = QIcon(":/icons/type-geo.png");
icon_camera = QIcon(":/icons/type-camera.png");
icon_light = QIcon(":/icons/type-light.png");
@@ -113,10 +115,12 @@ QGLViewWindow::QGLViewWindow(QWidget * parent): QMainWindow(parent), Ui::QGLView
//view->addObject(&partsys);
partsys.material().color_diffuse = Qt::red;
treeProps->assignObject(&partsys);
session.load();
}
QGLViewWindow::~QGLViewWindow() {
session.save();
//delete ps;
}
@@ -132,7 +136,8 @@ void QGLViewWindow::changeEvent(QEvent * e) {
void QGLViewWindow::timerEvent(QTimerEvent * ) {
//static double t = 0.;
cam_light->intensity = checkCameraLight->isChecked() ? 0.5 : 0.;
//cam_light->intensity = checkCameraLight->isChecked() ? 0.5 : 0.;
cam_light->setVisible(checkCameraLight->isChecked());
//((RendererSimple*)(view->renderer()))->mpos = view->mapFromGlobal(QCursor::pos());
statusBar()->showMessage(QString("FPS: %1").arg(QString::number(view->currentFPS(), 'f', 2)));
}
@@ -215,7 +220,7 @@ void QGLViewWindow::selectionChanged(GLObjectBase * cur, GLObjectBase * prev) {
objectEditor->setObject(sel_obj);
if (sel_obj == 0) return;
matEditor->setMaterial(sel_obj->material());
qDebug() << sel_obj->boundingBox();
//qDebug() << sel_obj->boundingBox();
}
@@ -315,6 +320,7 @@ void QGLViewWindow::on_view_keyEvent(Qt::Key k, Qt::KeyboardModifiers m) {
void QGLViewWindow::on_treeObjects_itemClicked(QTreeWidgetItem * ti, int col) {
((GLObjectBase*)(ti->data(0, Qt::UserRole).toULongLong()))->select();
//qDebug() << ((GLObjectBase*)(ti->data(0, Qt::UserRole).toULongLong()))->type();
if (sel_obj->type() == GLObjectBase::glCamera)
view->setCamera(*(Camera*)sel_obj);
}