git-svn-id: svn://db.shs.com.ru/libs@653 a8b55f48-bf90-11e4-a774-851b48703e85
This commit is contained in:
@@ -83,7 +83,7 @@ QGLView::QGLView(): OpenGLWindow(), renderer_(this), mouse(this) {
|
|||||||
camera_ = new Camera();
|
camera_ = new Camera();
|
||||||
camera_->setPos(QVector3D(2, 2, 2));
|
camera_->setPos(QVector3D(2, 2, 2));
|
||||||
camera_->setAim(QVector3D());
|
camera_->setAim(QVector3D());
|
||||||
qDebug() << camera_->aim();
|
// qDebug() << camera_->aim();
|
||||||
camera_->setName("Camera");
|
camera_->setName("Camera");
|
||||||
emit cameraPosChanged(camera_->pos());
|
emit cameraPosChanged(camera_->pos());
|
||||||
//camera().aim_ = camera().pos_;
|
//camera().aim_ = camera().pos_;
|
||||||
|
|||||||
@@ -174,7 +174,7 @@ void RendererBase::reloadMaterials(Scene & scene) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
textures_maps.mipmaps(view);
|
textures_maps.mipmaps(view);
|
||||||
qDebug() << "load" << (cl+1) << "bitmaps";
|
// qDebug() << "load" << (cl+1) << "bitmaps";
|
||||||
}
|
}
|
||||||
|
|
||||||
QGLMaterial glm;
|
QGLMaterial glm;
|
||||||
|
|||||||
@@ -141,9 +141,24 @@
|
|||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<double>360.000000000000000</double>
|
<double>360.000000000000000</double>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="decimals">
|
||||||
|
<number>1</number>
|
||||||
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>4.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="pageStep">
|
||||||
|
<double>90.000000000000000</double>
|
||||||
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>°</string>
|
<string>°</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="tickPosition">
|
||||||
|
<enum>QSlider::TicksAbove</enum>
|
||||||
|
</property>
|
||||||
|
<property name="tickInterval">
|
||||||
|
<number>90</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="1" column="0">
|
<item row="1" column="0">
|
||||||
@@ -167,9 +182,21 @@
|
|||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<double>360.000000000000000</double>
|
<double>360.000000000000000</double>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>4.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="pageStep">
|
||||||
|
<double>90.000000000000000</double>
|
||||||
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>°</string>
|
<string>°</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="tickPosition">
|
||||||
|
<enum>QSlider::TicksAbove</enum>
|
||||||
|
</property>
|
||||||
|
<property name="tickInterval">
|
||||||
|
<number>90</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item row="2" column="0">
|
<item row="2" column="0">
|
||||||
@@ -193,9 +220,21 @@
|
|||||||
<property name="maximum">
|
<property name="maximum">
|
||||||
<double>360.000000000000000</double>
|
<double>360.000000000000000</double>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="singleStep">
|
||||||
|
<double>4.500000000000000</double>
|
||||||
|
</property>
|
||||||
|
<property name="pageStep">
|
||||||
|
<double>90.000000000000000</double>
|
||||||
|
</property>
|
||||||
<property name="suffix">
|
<property name="suffix">
|
||||||
<string>°</string>
|
<string>°</string>
|
||||||
</property>
|
</property>
|
||||||
|
<property name="tickPosition">
|
||||||
|
<enum>QSlider::TicksAbove</enum>
|
||||||
|
</property>
|
||||||
|
<property name="tickInterval">
|
||||||
|
<number>90</number>
|
||||||
|
</property>
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
|
|||||||
Reference in New Issue
Block a user