SHS/libs
Archived
3
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-23 14:24:46 +00:00
parent 056eea2407
commit 7c1dd9bf0a
7 changed files with 68 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
qglengine/widgets/object_editor.cpp
View File

@@ -49,7 +49,7 @@ ObjectEditor::ObjectEditor(QWidget * parent): QWidget(parent) {
connect(o, SIGNAL(valueChanged(double)), this, SLOT(spinLightChanged(double)));
ol.clear();
ol << ui->spinCameraFOV << ui->spinCameraDepthStart << ui->spinAimDist;
ol << ui->spinCameraFOV << ui->spinCameraDepthStart << ui->spinCameraRoll << ui->spinAimDist;
foreach (QObject * o, ol)
connect(o, SIGNAL(valueChanged(double)), this, SLOT(spinCameraChanged(double)));
@@ -152,6 +152,7 @@ void ObjectEditor::setObject(ObjectBase * o) {
ui->checkCameraMirrorX->setChecked(c->isMirrorX());
ui->checkCameraMirrorY->setChecked(c->isMirrorY());
ui->spinCameraFOV->setValue(c->FOV());
ui->spinCameraRoll->setValue(c->angleRoll());
ui->spinCameraDepthStart->setValue(c->depthStart());
ui->spinAimDist->setValue(c->distance());
}
@@ -240,8 +241,9 @@ void ObjectEditor::spinCameraChanged(double v) {
QObject * s = sender();
foreach (Camera * o, scl) {
if (s == ui->spinCameraFOV ) o->setFOV (v);
if (s == ui->spinCameraRoll ) o->setAngleRoll (v);
if (s == ui->spinCameraDepthStart) o->setDepthStart(v);
if (s == ui->spinAimDist ) o->setDistance(v);
if (s == ui->spinAimDist ) o->setDistance (v);
}
ignore_next = true;
}

38
qglengine/widgets/object_editor.ui
View File

@@ -650,14 +650,14 @@
<item row="0" column="0">
<widget class="QLabel" name="label_46">
<property name="text">
<string>Depth start</string>
<string>Depth start:</string>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_45">
<property name="text">
<string>FOV</string>
<string>FOV:</string>
</property>
</widget>
</item>
@@ -686,7 +686,7 @@
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="checkCameraMirrorY">
@@ -717,6 +717,38 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="SpinSlider" name="spinCameraRoll">
<property name="minimum">
<double>-180.000000000000000</double>
</property>
<property name="maximum">
<double>180.000000000000000</double>
</property>
<property name="value">
<double>0.000000000000000</double>
</property>
<property name="decimals">
<number>1</number>
</property>
<property name="singleStep">
<double>5.000000000000000</double>
</property>
<property name="pageStep">
<double>30.000000000000000</double>
</property>
<property name="suffix">
<string>°</string>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_47">
<property name="text">
<string>Roll:</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>