meshgen

changeset 1:7dac9d1bcae4 tip

foo
author John Tsiombikas <nuclear@member.fsf.org>
date Mon, 31 Aug 2015 01:55:24 +0300
parents 795217e82f3d
children
files .hgignore meshgen.pro src/glview.cc src/glview.h src/mainwindow.cc src/mainwindow.h ui/mainwindow.ui ui/prop_capsule.ui ui/prop_sphere.ui
diffstat 9 files changed, 536 insertions(+), 239 deletions(-) [+]
line diff
     1.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     1.2 +++ b/.hgignore	Mon Aug 31 01:55:24 2015 +0300
     1.3 @@ -0,0 +1,6 @@
     1.4 +\.o$
     1.5 +\.swp$
     1.6 +^Makefile$
     1.7 +\.pro\.user$
     1.8 +^build/
     1.9 +^meshgen$
     2.1 --- a/meshgen.pro	Sun Aug 30 05:54:32 2015 +0300
     2.2 +++ b/meshgen.pro	Mon Aug 31 01:55:24 2015 +0300
     2.3 @@ -13,11 +13,17 @@
     2.4  
     2.5  
     2.6  SOURCES += src/main.cc\
     2.7 -        src/mainwindow.cc
     2.8 +        src/mainwindow.cc \
     2.9 +    src/glview.cc
    2.10  
    2.11 -HEADERS  += src/mainwindow.h
    2.12 +HEADERS  += src/mainwindow.h \
    2.13 +    src/glview.h
    2.14  
    2.15 -FORMS    += ui/mainwindow.ui
    2.16 +FORMS    += ui/mainwindow.ui \
    2.17 +    ui/prop_sphere.ui \
    2.18 +    ui/prop_capsule.ui
    2.19 +
    2.20 +INCLUDEPATH += src
    2.21  
    2.22  CONFIG += mobility
    2.23  MOBILITY = 
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/src/glview.cc	Mon Aug 31 01:55:24 2015 +0300
     3.3 @@ -0,0 +1,34 @@
     3.4 +#include "glview.h"
     3.5 +
     3.6 +GLView::GLView()
     3.7 +{
     3.8 +}
     3.9 +
    3.10 +GLView::GLView(QWidget *w)
    3.11 +	: QOpenGLWidget(w)
    3.12 +{
    3.13 +}
    3.14 +
    3.15 +GLView::~GLView()
    3.16 +{
    3.17 +}
    3.18 +
    3.19 +void GLView::initializeGL()
    3.20 +{
    3.21 +	glEnable(GL_DEPTH_TEST);
    3.22 +	glEnable(GL_CULL_FACE);
    3.23 +	glEnable(GL_MULTISAMPLE);
    3.24 +	glEnable(GL_LIGHTING);
    3.25 +	glEnable(GL_LIGHT0);
    3.26 +}
    3.27 +
    3.28 +void GLView::resizeGL(int w, int h)
    3.29 +{
    3.30 +	glViewport(0, 0, w, h);
    3.31 +}
    3.32 +
    3.33 +void GLView::paintGL()
    3.34 +{
    3.35 +	glClearColor(0.5, 0.2, 0.1, 1.0);
    3.36 +	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
    3.37 +}
     4.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     4.2 +++ b/src/glview.h	Mon Aug 31 01:55:24 2015 +0300
     4.3 @@ -0,0 +1,17 @@
     4.4 +#ifndef GLVIEW_H
     4.5 +#define GLVIEW_H
     4.6 +
     4.7 +#include <QOpenGLWidget>
     4.8 +
     4.9 +class GLView : public QOpenGLWidget {
    4.10 +public:
    4.11 +	GLView();
    4.12 +	GLView(QWidget *w);
    4.13 +	virtual ~GLView();
    4.14 +
    4.15 +	virtual void initializeGL();
    4.16 +	virtual void resizeGL(int w, int h);
    4.17 +	virtual void paintGL();
    4.18 +};
    4.19 +
    4.20 +#endif // GLVIEW_H
     5.1 --- a/src/mainwindow.cc	Sun Aug 30 05:54:32 2015 +0300
     5.2 +++ b/src/mainwindow.cc	Mon Aug 31 01:55:24 2015 +0300
     5.3 @@ -6,9 +6,36 @@
     5.4  	ui(new Ui::MainWindow)
     5.5  {
     5.6  	ui->setupUi(this);
     5.7 +
     5.8 +	ui_prop_sphere = new Ui::frm_prop_sphere;
     5.9 +	ui_prop_capsule = new Ui::frm_prop_capsule;
    5.10  }
    5.11  
    5.12  MainWindow::~MainWindow()
    5.13  {
    5.14  	delete ui;
    5.15  }
    5.16 +
    5.17 +void MainWindow::on_bn_add_sphere_clicked()
    5.18 +{
    5.19 +	QWidget *w = new QWidget;
    5.20 +	ui_prop_sphere->setupUi(w);
    5.21 +	ui->area_add_prop->setWidget(w);
    5.22 +}
    5.23 +
    5.24 +void MainWindow::on_bn_add_capsule_clicked()
    5.25 +{
    5.26 +	QWidget *w = new QWidget;
    5.27 +	ui_prop_capsule->setupUi(w);
    5.28 +	ui->area_add_prop->setWidget(w);
    5.29 +
    5.30 +	QObject::connect(ui_prop_capsule->spin_radius1, SIGNAL(valueChanged(double)), this, SLOT(on_spin_radius1_valueChanged(double)));
    5.31 +}
    5.32 +
    5.33 +// in ui_prop_capsule
    5.34 +void MainWindow::on_spin_radius1_valueChanged(double arg1)
    5.35 +{
    5.36 +	if(ui_prop_capsule->chk_eqrad->isChecked()) {
    5.37 +		ui_prop_capsule->spin_radius2->setValue(arg1);
    5.38 +	}
    5.39 +}
     6.1 --- a/src/mainwindow.h	Sun Aug 30 05:54:32 2015 +0300
     6.2 +++ b/src/mainwindow.h	Mon Aug 31 01:55:24 2015 +0300
     6.3 @@ -2,6 +2,8 @@
     6.4  #define MAINWINDOW_H
     6.5  
     6.6  #include <QMainWindow>
     6.7 +#include "ui_prop_sphere.h"
     6.8 +#include "ui_prop_capsule.h"
     6.9  
    6.10  namespace Ui {
    6.11  class MainWindow;
    6.12 @@ -15,8 +17,17 @@
    6.13  	explicit MainWindow(QWidget *parent = 0);
    6.14  	~MainWindow();
    6.15  
    6.16 +private slots:
    6.17 +	void on_bn_add_sphere_clicked();
    6.18 +
    6.19 +	void on_bn_add_capsule_clicked();
    6.20 +
    6.21 +	void on_spin_radius1_valueChanged(double arg1);
    6.22 +
    6.23  private:
    6.24  	Ui::MainWindow *ui;
    6.25 +	Ui::frm_prop_sphere *ui_prop_sphere;
    6.26 +	Ui::frm_prop_capsule *ui_prop_capsule;
    6.27  };
    6.28  
    6.29  #endif // MAINWINDOW_H
     7.1 --- a/ui/mainwindow.ui	Sun Aug 30 05:54:32 2015 +0300
     7.2 +++ b/ui/mainwindow.ui	Mon Aug 31 01:55:24 2015 +0300
     7.3 @@ -6,10 +6,16 @@
     7.4     <rect>
     7.5      <x>0</x>
     7.6      <y>0</y>
     7.7 -    <width>800</width>
     7.8 -    <height>480</height>
     7.9 +    <width>910</width>
    7.10 +    <height>591</height>
    7.11     </rect>
    7.12    </property>
    7.13 +  <property name="sizePolicy">
    7.14 +   <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
    7.15 +    <horstretch>0</horstretch>
    7.16 +    <verstretch>0</verstretch>
    7.17 +   </sizepolicy>
    7.18 +  </property>
    7.19    <property name="windowTitle">
    7.20     <string>MainWindow</string>
    7.21    </property>
    7.22 @@ -17,249 +23,199 @@
    7.23     <layout class="QHBoxLayout" name="horizontalLayout">
    7.24      <item>
    7.25       <widget class="QTabWidget" name="tabWidget">
    7.26 +      <property name="sizePolicy">
    7.27 +       <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
    7.28 +        <horstretch>0</horstretch>
    7.29 +        <verstretch>0</verstretch>
    7.30 +       </sizepolicy>
    7.31 +      </property>
    7.32        <property name="currentIndex">
    7.33 -       <number>1</number>
    7.34 +       <number>0</number>
    7.35        </property>
    7.36        <widget class="QWidget" name="tab_create">
    7.37         <attribute name="title">
    7.38 -        <string>Tab 1</string>
    7.39 +        <string>Create</string>
    7.40         </attribute>
    7.41 -       <widget class="QPushButton" name="bn_add_sphere">
    7.42 -        <property name="geometry">
    7.43 -         <rect>
    7.44 -          <x>10</x>
    7.45 -          <y>10</y>
    7.46 -          <width>115</width>
    7.47 -          <height>32</height>
    7.48 -         </rect>
    7.49 -        </property>
    7.50 -        <property name="text">
    7.51 -         <string>Sphere</string>
    7.52 -        </property>
    7.53 -       </widget>
    7.54 -       <widget class="QPushButton" name="bn_add_box">
    7.55 -        <property name="geometry">
    7.56 -         <rect>
    7.57 -          <x>10</x>
    7.58 -          <y>40</y>
    7.59 -          <width>115</width>
    7.60 -          <height>32</height>
    7.61 -         </rect>
    7.62 -        </property>
    7.63 -        <property name="text">
    7.64 -         <string>Box</string>
    7.65 -        </property>
    7.66 -       </widget>
    7.67 -       <widget class="QPushButton" name="bn_add_capsule">
    7.68 -        <property name="geometry">
    7.69 -         <rect>
    7.70 -          <x>180</x>
    7.71 -          <y>70</y>
    7.72 -          <width>115</width>
    7.73 -          <height>32</height>
    7.74 -         </rect>
    7.75 -        </property>
    7.76 -        <property name="text">
    7.77 -         <string>Capsule</string>
    7.78 -        </property>
    7.79 -       </widget>
    7.80 -       <widget class="QPushButton" name="bn_add_rbox">
    7.81 -        <property name="geometry">
    7.82 -         <rect>
    7.83 -          <x>180</x>
    7.84 -          <y>40</y>
    7.85 -          <width>115</width>
    7.86 -          <height>32</height>
    7.87 -         </rect>
    7.88 -        </property>
    7.89 -        <property name="text">
    7.90 -         <string>Rounded Box</string>
    7.91 -        </property>
    7.92 -       </widget>
    7.93 -       <widget class="QPushButton" name="bn_add_cylinder">
    7.94 -        <property name="geometry">
    7.95 -         <rect>
    7.96 -          <x>10</x>
    7.97 -          <y>70</y>
    7.98 -          <width>115</width>
    7.99 -          <height>32</height>
   7.100 -         </rect>
   7.101 -        </property>
   7.102 -        <property name="text">
   7.103 -         <string>Cylinder</string>
   7.104 -        </property>
   7.105 -       </widget>
   7.106 -       <widget class="QPushButton" name="bn_add_cone">
   7.107 -        <property name="geometry">
   7.108 -         <rect>
   7.109 -          <x>10</x>
   7.110 -          <y>100</y>
   7.111 -          <width>115</width>
   7.112 -          <height>32</height>
   7.113 -         </rect>
   7.114 -        </property>
   7.115 -        <property name="text">
   7.116 -         <string>Cone</string>
   7.117 -        </property>
   7.118 -       </widget>
   7.119 -       <widget class="QPushButton" name="bn_add_revol">
   7.120 -        <property name="geometry">
   7.121 -         <rect>
   7.122 -          <x>180</x>
   7.123 -          <y>10</y>
   7.124 -          <width>115</width>
   7.125 -          <height>32</height>
   7.126 -         </rect>
   7.127 -        </property>
   7.128 -        <property name="text">
   7.129 -         <string>Revolution</string>
   7.130 -        </property>
   7.131 -       </widget>
   7.132 -       <widget class="QPushButton" name="bn_add_heightfield">
   7.133 -        <property name="geometry">
   7.134 -         <rect>
   7.135 -          <x>180</x>
   7.136 -          <y>130</y>
   7.137 -          <width>115</width>
   7.138 -          <height>32</height>
   7.139 -         </rect>
   7.140 -        </property>
   7.141 -        <property name="text">
   7.142 -         <string>Heightfield</string>
   7.143 -        </property>
   7.144 -       </widget>
   7.145 -       <widget class="QPushButton" name="bn_add_sweep">
   7.146 -        <property name="geometry">
   7.147 -         <rect>
   7.148 -          <x>180</x>
   7.149 -          <y>100</y>
   7.150 -          <width>115</width>
   7.151 -          <height>32</height>
   7.152 -         </rect>
   7.153 -        </property>
   7.154 -        <property name="text">
   7.155 -         <string>Sweep</string>
   7.156 -        </property>
   7.157 -       </widget>
   7.158 -       <widget class="QPushButton" name="bn_add_plane">
   7.159 -        <property name="geometry">
   7.160 -         <rect>
   7.161 -          <x>20</x>
   7.162 -          <y>130</y>
   7.163 -          <width>115</width>
   7.164 -          <height>32</height>
   7.165 -         </rect>
   7.166 -        </property>
   7.167 -        <property name="text">
   7.168 -         <string>Inf. Plane</string>
   7.169 -        </property>
   7.170 -       </widget>
   7.171 -       <widget class="QScrollArea" name="area_add_prop">
   7.172 -        <property name="geometry">
   7.173 -         <rect>
   7.174 -          <x>10</x>
   7.175 -          <y>180</y>
   7.176 -          <width>351</width>
   7.177 -          <height>251</height>
   7.178 -         </rect>
   7.179 -        </property>
   7.180 -        <property name="widgetResizable">
   7.181 -         <bool>true</bool>
   7.182 -        </property>
   7.183 -        <widget class="QWidget" name="addprop_null">
   7.184 -         <property name="enabled">
   7.185 -          <bool>true</bool>
   7.186 -         </property>
   7.187 -         <property name="geometry">
   7.188 -          <rect>
   7.189 -           <x>0</x>
   7.190 -           <y>0</y>
   7.191 -           <width>349</width>
   7.192 -           <height>249</height>
   7.193 -          </rect>
   7.194 -         </property>
   7.195 -        </widget>
   7.196 -       </widget>
   7.197 +       <layout class="QVBoxLayout" name="verticalLayout">
   7.198 +        <item>
   7.199 +         <layout class="QGridLayout" name="gridLayout">
   7.200 +          <item row="0" column="0">
   7.201 +           <widget class="QPushButton" name="bn_add_sphere">
   7.202 +            <property name="text">
   7.203 +             <string>Sphere</string>
   7.204 +            </property>
   7.205 +            <property name="checkable">
   7.206 +             <bool>false</bool>
   7.207 +            </property>
   7.208 +            <property name="checked">
   7.209 +             <bool>false</bool>
   7.210 +            </property>
   7.211 +           </widget>
   7.212 +          </item>
   7.213 +          <item row="0" column="1">
   7.214 +           <widget class="QPushButton" name="bn_add_revol">
   7.215 +            <property name="text">
   7.216 +             <string>Revolution</string>
   7.217 +            </property>
   7.218 +           </widget>
   7.219 +          </item>
   7.220 +          <item row="1" column="0">
   7.221 +           <widget class="QPushButton" name="bn_add_box">
   7.222 +            <property name="text">
   7.223 +             <string>Box</string>
   7.224 +            </property>
   7.225 +           </widget>
   7.226 +          </item>
   7.227 +          <item row="1" column="1">
   7.228 +           <widget class="QPushButton" name="bn_add_rbox">
   7.229 +            <property name="text">
   7.230 +             <string>Rounded Box</string>
   7.231 +            </property>
   7.232 +           </widget>
   7.233 +          </item>
   7.234 +          <item row="2" column="0">
   7.235 +           <widget class="QPushButton" name="bn_add_cylinder">
   7.236 +            <property name="text">
   7.237 +             <string>Cylinder</string>
   7.238 +            </property>
   7.239 +           </widget>
   7.240 +          </item>
   7.241 +          <item row="2" column="1">
   7.242 +           <widget class="QPushButton" name="bn_add_capsule">
   7.243 +            <property name="text">
   7.244 +             <string>Capsule</string>
   7.245 +            </property>
   7.246 +           </widget>
   7.247 +          </item>
   7.248 +          <item row="3" column="0">
   7.249 +           <widget class="QPushButton" name="bn_add_cone">
   7.250 +            <property name="text">
   7.251 +             <string>Cone</string>
   7.252 +            </property>
   7.253 +           </widget>
   7.254 +          </item>
   7.255 +          <item row="3" column="1">
   7.256 +           <widget class="QPushButton" name="bn_add_sweep">
   7.257 +            <property name="text">
   7.258 +             <string>Sweep</string>
   7.259 +            </property>
   7.260 +           </widget>
   7.261 +          </item>
   7.262 +          <item row="4" column="0">
   7.263 +           <widget class="QPushButton" name="bn_add_plane">
   7.264 +            <property name="text">
   7.265 +             <string>Inf. Plane</string>
   7.266 +            </property>
   7.267 +           </widget>
   7.268 +          </item>
   7.269 +          <item row="4" column="1">
   7.270 +           <widget class="QPushButton" name="bn_add_heightfield">
   7.271 +            <property name="text">
   7.272 +             <string>Heightfield</string>
   7.273 +            </property>
   7.274 +           </widget>
   7.275 +          </item>
   7.276 +         </layout>
   7.277 +        </item>
   7.278 +        <item>
   7.279 +         <widget class="QScrollArea" name="area_add_prop">
   7.280 +          <property name="sizePolicy">
   7.281 +           <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
   7.282 +            <horstretch>0</horstretch>
   7.283 +            <verstretch>0</verstretch>
   7.284 +           </sizepolicy>
   7.285 +          </property>
   7.286 +          <property name="widgetResizable">
   7.287 +           <bool>true</bool>
   7.288 +          </property>
   7.289 +          <widget class="QWidget" name="addprop_null">
   7.290 +           <property name="enabled">
   7.291 +            <bool>true</bool>
   7.292 +           </property>
   7.293 +           <property name="geometry">
   7.294 +            <rect>
   7.295 +             <x>0</x>
   7.296 +             <y>0</y>
   7.297 +             <width>344</width>
   7.298 +             <height>357</height>
   7.299 +            </rect>
   7.300 +           </property>
   7.301 +          </widget>
   7.302 +         </widget>
   7.303 +        </item>
   7.304 +       </layout>
   7.305        </widget>
   7.306        <widget class="QWidget" name="tab_2">
   7.307         <attribute name="title">
   7.308 -        <string>Tab 2</string>
   7.309 +        <string>Modify</string>
   7.310         </attribute>
   7.311 -       <widget class="QScrollArea" name="area_mod_prop">
   7.312 -        <property name="geometry">
   7.313 -         <rect>
   7.314 -          <x>10</x>
   7.315 -          <y>180</y>
   7.316 -          <width>351</width>
   7.317 -          <height>241</height>
   7.318 -         </rect>
   7.319 -        </property>
   7.320 -        <property name="widgetResizable">
   7.321 -         <bool>true</bool>
   7.322 -        </property>
   7.323 -        <widget class="QWidget" name="addprop_null_2">
   7.324 -         <property name="enabled">
   7.325 -          <bool>true</bool>
   7.326 -         </property>
   7.327 -         <property name="geometry">
   7.328 -          <rect>
   7.329 -           <x>0</x>
   7.330 -           <y>0</y>
   7.331 -           <width>349</width>
   7.332 -           <height>239</height>
   7.333 -          </rect>
   7.334 -         </property>
   7.335 -        </widget>
   7.336 -       </widget>
   7.337 -       <widget class="QListWidget" name="listWidget">
   7.338 -        <property name="geometry">
   7.339 -         <rect>
   7.340 -          <x>10</x>
   7.341 -          <y>0</y>
   7.342 -          <width>211</width>
   7.343 -          <height>171</height>
   7.344 -         </rect>
   7.345 -        </property>
   7.346 -       </widget>
   7.347 -       <widget class="QPushButton" name="bn_prim_dup">
   7.348 -        <property name="geometry">
   7.349 -         <rect>
   7.350 -          <x>240</x>
   7.351 -          <y>50</y>
   7.352 -          <width>115</width>
   7.353 -          <height>32</height>
   7.354 -         </rect>
   7.355 -        </property>
   7.356 -        <property name="text">
   7.357 -         <string>Duplicate</string>
   7.358 -        </property>
   7.359 -       </widget>
   7.360 -       <widget class="QPushButton" name="bn_prim_del">
   7.361 -        <property name="geometry">
   7.362 -         <rect>
   7.363 -          <x>240</x>
   7.364 -          <y>90</y>
   7.365 -          <width>115</width>
   7.366 -          <height>32</height>
   7.367 -         </rect>
   7.368 -        </property>
   7.369 -        <property name="text">
   7.370 -         <string>Delete</string>
   7.371 -        </property>
   7.372 -       </widget>
   7.373 -       <widget class="QPushButton" name="bn_prim_hide">
   7.374 -        <property name="geometry">
   7.375 -         <rect>
   7.376 -          <x>240</x>
   7.377 -          <y>10</y>
   7.378 -          <width>115</width>
   7.379 -          <height>32</height>
   7.380 -         </rect>
   7.381 -        </property>
   7.382 -        <property name="text">
   7.383 -         <string>Hide</string>
   7.384 -        </property>
   7.385 -       </widget>
   7.386 +       <layout class="QVBoxLayout" name="verticalLayout_3">
   7.387 +        <item>
   7.388 +         <layout class="QHBoxLayout" name="horizontalLayout_2">
   7.389 +          <item>
   7.390 +           <widget class="QListWidget" name="listWidget">
   7.391 +            <property name="sizePolicy">
   7.392 +             <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
   7.393 +              <horstretch>0</horstretch>
   7.394 +              <verstretch>0</verstretch>
   7.395 +             </sizepolicy>
   7.396 +            </property>
   7.397 +           </widget>
   7.398 +          </item>
   7.399 +          <item>
   7.400 +           <layout class="QVBoxLayout" name="verticalLayout_2">
   7.401 +            <item>
   7.402 +             <widget class="QPushButton" name="bn_prim_hide">
   7.403 +              <property name="text">
   7.404 +               <string>Hide</string>
   7.405 +              </property>
   7.406 +             </widget>
   7.407 +            </item>
   7.408 +            <item>
   7.409 +             <widget class="QPushButton" name="bn_prim_dup">
   7.410 +              <property name="text">
   7.411 +               <string>Duplicate</string>
   7.412 +              </property>
   7.413 +             </widget>
   7.414 +            </item>
   7.415 +            <item>
   7.416 +             <widget class="QPushButton" name="bn_prim_del">
   7.417 +              <property name="text">
   7.418 +               <string>Delete</string>
   7.419 +              </property>
   7.420 +             </widget>
   7.421 +            </item>
   7.422 +           </layout>
   7.423 +          </item>
   7.424 +         </layout>
   7.425 +        </item>
   7.426 +        <item>
   7.427 +         <widget class="QScrollArea" name="area_mod_prop">
   7.428 +          <property name="sizePolicy">
   7.429 +           <sizepolicy hsizetype="Minimum" vsizetype="Expanding">
   7.430 +            <horstretch>0</horstretch>
   7.431 +            <verstretch>0</verstretch>
   7.432 +           </sizepolicy>
   7.433 +          </property>
   7.434 +          <property name="widgetResizable">
   7.435 +           <bool>true</bool>
   7.436 +          </property>
   7.437 +          <widget class="QWidget" name="addprop_null_2">
   7.438 +           <property name="enabled">
   7.439 +            <bool>true</bool>
   7.440 +           </property>
   7.441 +           <property name="geometry">
   7.442 +            <rect>
   7.443 +             <x>0</x>
   7.444 +             <y>0</y>
   7.445 +             <width>344</width>
   7.446 +             <height>248</height>
   7.447 +            </rect>
   7.448 +           </property>
   7.449 +          </widget>
   7.450 +         </widget>
   7.451 +        </item>
   7.452 +       </layout>
   7.453        </widget>
   7.454       </widget>
   7.455      </item>
   7.456 @@ -281,6 +237,72 @@
   7.457      </item>
   7.458     </layout>
   7.459    </widget>
   7.460 +  <widget class="QMenuBar" name="menuBar">
   7.461 +   <property name="geometry">
   7.462 +    <rect>
   7.463 +     <x>0</x>
   7.464 +     <y>0</y>
   7.465 +     <width>910</width>
   7.466 +     <height>20</height>
   7.467 +    </rect>
   7.468 +   </property>
   7.469 +   <widget class="QMenu" name="menu_File">
   7.470 +    <property name="title">
   7.471 +     <string>&amp;File</string>
   7.472 +    </property>
   7.473 +    <addaction name="action_new"/>
   7.474 +    <addaction name="action_open"/>
   7.475 +    <addaction name="action_save"/>
   7.476 +    <addaction name="separator"/>
   7.477 +    <addaction name="action_export_mesh"/>
   7.478 +    <addaction name="action_export_shader"/>
   7.479 +    <addaction name="separator"/>
   7.480 +    <addaction name="action_quit"/>
   7.481 +   </widget>
   7.482 +   <widget class="QMenu" name="menu_Help">
   7.483 +    <property name="title">
   7.484 +     <string>&amp;Help</string>
   7.485 +    </property>
   7.486 +    <addaction name="action_about"/>
   7.487 +   </widget>
   7.488 +   <addaction name="menu_File"/>
   7.489 +   <addaction name="menu_Help"/>
   7.490 +  </widget>
   7.491 +  <action name="action_new">
   7.492 +   <property name="text">
   7.493 +    <string>&amp;New</string>
   7.494 +   </property>
   7.495 +  </action>
   7.496 +  <action name="action_open">
   7.497 +   <property name="text">
   7.498 +    <string>&amp;Open</string>
   7.499 +   </property>
   7.500 +  </action>
   7.501 +  <action name="action_save">
   7.502 +   <property name="text">
   7.503 +    <string>&amp;Save</string>
   7.504 +   </property>
   7.505 +  </action>
   7.506 +  <action name="action_export_mesh">
   7.507 +   <property name="text">
   7.508 +    <string>Export &amp;Mesh</string>
   7.509 +   </property>
   7.510 +  </action>
   7.511 +  <action name="action_export_shader">
   7.512 +   <property name="text">
   7.513 +    <string>Export &amp;GLSL</string>
   7.514 +   </property>
   7.515 +  </action>
   7.516 +  <action name="action_quit">
   7.517 +   <property name="text">
   7.518 +    <string>&amp;Quit</string>
   7.519 +   </property>
   7.520 +  </action>
   7.521 +  <action name="action_about">
   7.522 +   <property name="text">
   7.523 +    <string>&amp;About</string>
   7.524 +   </property>
   7.525 +  </action>
   7.526   </widget>
   7.527   <layoutdefault spacing="6" margin="11"/>
   7.528   <customwidgets>
     8.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     8.2 +++ b/ui/prop_capsule.ui	Mon Aug 31 01:55:24 2015 +0300
     8.3 @@ -0,0 +1,119 @@
     8.4 +<?xml version="1.0" encoding="UTF-8"?>
     8.5 +<ui version="4.0">
     8.6 + <class>frm_prop_capsule</class>
     8.7 + <widget class="QWidget" name="frm_prop_capsule">
     8.8 +  <property name="geometry">
     8.9 +   <rect>
    8.10 +    <x>0</x>
    8.11 +    <y>0</y>
    8.12 +    <width>242</width>
    8.13 +    <height>300</height>
    8.14 +   </rect>
    8.15 +  </property>
    8.16 +  <property name="windowTitle">
    8.17 +   <string>Form</string>
    8.18 +  </property>
    8.19 +  <layout class="QHBoxLayout" name="horizontalLayout">
    8.20 +   <item>
    8.21 +    <layout class="QFormLayout" name="formLayout">
    8.22 +     <item row="0" column="0">
    8.23 +      <widget class="QLabel" name="label">
    8.24 +       <property name="text">
    8.25 +        <string>Start radius</string>
    8.26 +       </property>
    8.27 +      </widget>
    8.28 +     </item>
    8.29 +     <item row="0" column="1">
    8.30 +      <widget class="QDoubleSpinBox" name="spin_radius1">
    8.31 +       <property name="singleStep">
    8.32 +        <double>0.100000000000000</double>
    8.33 +       </property>
    8.34 +       <property name="value">
    8.35 +        <double>1.000000000000000</double>
    8.36 +       </property>
    8.37 +      </widget>
    8.38 +     </item>
    8.39 +     <item row="1" column="0">
    8.40 +      <widget class="QLabel" name="label_3">
    8.41 +       <property name="text">
    8.42 +        <string>End radius</string>
    8.43 +       </property>
    8.44 +      </widget>
    8.45 +     </item>
    8.46 +     <item row="1" column="1">
    8.47 +      <widget class="QDoubleSpinBox" name="spin_radius2">
    8.48 +       <property name="enabled">
    8.49 +        <bool>false</bool>
    8.50 +       </property>
    8.51 +       <property name="singleStep">
    8.52 +        <double>0.100000000000000</double>
    8.53 +       </property>
    8.54 +       <property name="value">
    8.55 +        <double>1.000000000000000</double>
    8.56 +       </property>
    8.57 +      </widget>
    8.58 +     </item>
    8.59 +     <item row="2" column="1">
    8.60 +      <widget class="QCheckBox" name="chk_eqrad">
    8.61 +       <property name="text">
    8.62 +        <string>Equal radii</string>
    8.63 +       </property>
    8.64 +       <property name="checked">
    8.65 +        <bool>true</bool>
    8.66 +       </property>
    8.67 +      </widget>
    8.68 +     </item>
    8.69 +     <item row="3" column="0">
    8.70 +      <widget class="QLabel" name="label_2">
    8.71 +       <property name="text">
    8.72 +        <string>Height</string>
    8.73 +       </property>
    8.74 +      </widget>
    8.75 +     </item>
    8.76 +     <item row="3" column="1">
    8.77 +      <widget class="QDoubleSpinBox" name="spin_height">
    8.78 +       <property name="singleStep">
    8.79 +        <double>0.100000000000000</double>
    8.80 +       </property>
    8.81 +       <property name="value">
    8.82 +        <double>1.000000000000000</double>
    8.83 +       </property>
    8.84 +      </widget>
    8.85 +     </item>
    8.86 +    </layout>
    8.87 +   </item>
    8.88 +   <item>
    8.89 +    <spacer name="horizontalSpacer">
    8.90 +     <property name="orientation">
    8.91 +      <enum>Qt::Horizontal</enum>
    8.92 +     </property>
    8.93 +     <property name="sizeHint" stdset="0">
    8.94 +      <size>
    8.95 +       <width>41</width>
    8.96 +       <height>20</height>
    8.97 +      </size>
    8.98 +     </property>
    8.99 +    </spacer>
   8.100 +   </item>
   8.101 +  </layout>
   8.102 + </widget>
   8.103 + <resources/>
   8.104 + <connections>
   8.105 +  <connection>
   8.106 +   <sender>chk_eqrad</sender>
   8.107 +   <signal>toggled(bool)</signal>
   8.108 +   <receiver>spin_radius2</receiver>
   8.109 +   <slot>setDisabled(bool)</slot>
   8.110 +   <hints>
   8.111 +    <hint type="sourcelabel">
   8.112 +     <x>127</x>
   8.113 +     <y>82</y>
   8.114 +    </hint>
   8.115 +    <hint type="destinationlabel">
   8.116 +     <x>129</x>
   8.117 +     <y>51</y>
   8.118 +    </hint>
   8.119 +   </hints>
   8.120 +  </connection>
   8.121 + </connections>
   8.122 +</ui>
     9.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     9.2 +++ b/ui/prop_sphere.ui	Mon Aug 31 01:55:24 2015 +0300
     9.3 @@ -0,0 +1,55 @@
     9.4 +<?xml version="1.0" encoding="UTF-8"?>
     9.5 +<ui version="4.0">
     9.6 + <class>frm_prop_sphere</class>
     9.7 + <widget class="QWidget" name="frm_prop_sphere">
     9.8 +  <property name="geometry">
     9.9 +   <rect>
    9.10 +    <x>0</x>
    9.11 +    <y>0</y>
    9.12 +    <width>345</width>
    9.13 +    <height>303</height>
    9.14 +   </rect>
    9.15 +  </property>
    9.16 +  <property name="windowTitle">
    9.17 +   <string>Form</string>
    9.18 +  </property>
    9.19 +  <layout class="QHBoxLayout" name="horizontalLayout">
    9.20 +   <item>
    9.21 +    <layout class="QFormLayout" name="formLayout">
    9.22 +     <item row="0" column="0">
    9.23 +      <widget class="QLabel" name="label">
    9.24 +       <property name="text">
    9.25 +        <string>Radius</string>
    9.26 +       </property>
    9.27 +      </widget>
    9.28 +     </item>
    9.29 +     <item row="0" column="1">
    9.30 +      <widget class="QDoubleSpinBox" name="spin_radius">
    9.31 +       <property name="singleStep">
    9.32 +        <double>0.100000000000000</double>
    9.33 +       </property>
    9.34 +       <property name="value">
    9.35 +        <double>1.000000000000000</double>
    9.36 +       </property>
    9.37 +      </widget>
    9.38 +     </item>
    9.39 +    </layout>
    9.40 +   </item>
    9.41 +   <item>
    9.42 +    <spacer name="horizontalSpacer">
    9.43 +     <property name="orientation">
    9.44 +      <enum>Qt::Horizontal</enum>
    9.45 +     </property>
    9.46 +     <property name="sizeHint" stdset="0">
    9.47 +      <size>
    9.48 +       <width>198</width>
    9.49 +       <height>20</height>
    9.50 +      </size>
    9.51 +     </property>
    9.52 +    </spacer>
    9.53 +   </item>
    9.54 +  </layout>
    9.55 + </widget>
    9.56 + <resources/>
    9.57 + <connections/>
    9.58 +</ui>