SHS/qad
4
1
Fork 0
Code Issues 5 Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Бычков Андрей
2019-12-06 13:38:17 +00:00
parent 9427d429c1
commit c5bbf5ef8f
7 changed files with 471 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
qglengine/qglview_test/qglview_window.cpp
View File

@@ -23,6 +23,7 @@
#include <QGraphicsRectItem>
#include <QImageReader>
#include <QMessageBox>
#include "qad_types.h"
QGLViewWindow::QGLViewWindow(QWidget * parent): QMainWindow(parent), Ui::QGLViewWindow() {
@@ -91,7 +92,7 @@ QGLViewWindow::QGLViewWindow(QWidget * parent): QMainWindow(parent), Ui::QGLView
session.load();
loadFile("axis.DAE.qgl");
//loadFile("axis.DAE.qgl");
//matEditor->setMaterial(const_cast<ObjectBase*>(view->view()->scene()->rootObject()->child(0))->material());
/*Scene * sc = loadScene("truck.obj");
//view->view()->scene()->addScene(sc);

33
qglengine/qglview_test/qglview_window.ui
View File

@@ -57,7 +57,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>1</number>
<number>3</number>
</property>
<widget class="QWidget" name="tab">
<attribute name="title">
@@ -440,8 +440,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>960</width>
<height>737</height>
<width>968</width>
<height>636</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
@@ -1079,8 +1079,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>999</width>
<height>853</height>
<width>1009</width>
<height>877</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_8">
@@ -1107,17 +1107,11 @@
</widget>
<widget class="QWidget" name="tab_4">
<attribute name="title">
<string>Страница</string>
<string>Primitives</string>
</attribute>
<layout class="QVBoxLayout" name="verticalLayout_6">
<item>
<widget class="PropertyEditor" name="treeProps">
<column>
<property name="text">
<string notr="true">1</string>
</property>
</column>
</widget>
<widget class="PrimitiveEditor" name="primitiveEditor" native="true"/>
</item>
</layout>
</widget>
@@ -1169,7 +1163,7 @@
<x>0</x>
<y>0</y>
<width>1125</width>
<height>24</height>
<height>21</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -1391,11 +1385,6 @@
<header>widgets/object_editor.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>PropertyEditor</class>
<extends>QTreeWidget</extends>
<header>widgets/propertyeditor.h</header>
</customwidget>
<customwidget>
<class>SceneTree</class>
<extends>QWidget</extends>
@@ -1408,6 +1397,12 @@
<header>widgets/materials_editor.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>PrimitiveEditor</class>
<extends>QWidget</extends>
<header>primitiveeditor.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<resources>
<include location="../../qad/utils/qad_utils.qrc"/>