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

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

Browse Source
This commit is contained in:
Пелипенко Иван
2019-12-10 10:22:09 +00:00
parent 86f4e0ad78
commit 9d05dbe6da
24 changed files with 186 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
qglengine/widgets/materials_editor.cpp
View File

@@ -172,7 +172,7 @@ void MaterialsEditor::on_buttonDelete_clicked() {
void MaterialsEditor::on_buttonAssign_clicked() {
if (!view) return;
Material * m = currentMaterial();
QList<ObjectBase*> ol = view->selectedObjects();
ObjectBaseList ol = view->selectedObjects();
foreach (ObjectBase * o, ol)
o->setMaterial(m, true);
}
@@ -180,7 +180,7 @@ void MaterialsEditor::on_buttonAssign_clicked() {
void MaterialsEditor::on_buttonUnset_clicked() {
if (!view) return;
QList<ObjectBase*> ol = view->selectedObjects();
ObjectBaseList ol = view->selectedObjects();
foreach (ObjectBase * o, ol)
o->setMaterial(0, true);
}

8
qglengine/widgets/object_editor.cpp
View File

@@ -91,7 +91,7 @@ void ObjectEditor::selectionChanged() {
}
ui->widgetMain->setEnabled(false);
if (!view) return;
QList<ObjectBase*> sol = view->selectedObjects(true);
ObjectBaseList sol = view->selectedObjects(true);
if (sol.isEmpty()) {
ui->labelTitle->setText(tr("[No selected]"));
return;
@@ -188,7 +188,7 @@ void ObjectEditor::on_comboLightType_currentIndexChanged(int index) {
void ObjectEditor::on_buttonColor_colorChanged(const QColor & v) {
if (!view || !active) return;
QList<ObjectBase*> sol = view->selectedObjects();
ObjectBaseList sol = view->selectedObjects();
foreach (ObjectBase * o, sol)
o->setColor(v);
QList<Light*> sll = view->selectedLights();
@@ -199,7 +199,7 @@ void ObjectEditor::on_buttonColor_colorChanged(const QColor & v) {
void ObjectEditor::spinChanged(double v) {
if (!view || !active) return;
QList<ObjectBase*> sol = view->selectedObjects(true);
ObjectBaseList sol = view->selectedObjects(true);
QObject * s = sender();
foreach (ObjectBase * o, sol) {
if (s == ui->spinPosX ) o->setPosX (v);
@@ -249,7 +249,7 @@ void ObjectEditor::spinCameraChanged(double v) {
void ObjectEditor::checkChanged(bool v) {
if (!view || !active) return;
QList<ObjectBase*> sol = view->selectedObjects();
ObjectBaseList sol = view->selectedObjects();
QList<Camera*> scl = view->selectedCameras();
QObject * s = sender();
foreach (ObjectBase * o, sol) {

10
qglengine/widgets/scene_tree.cpp
View File

@@ -266,7 +266,7 @@ void SceneTree::treeObjects_selectionCnahged() {
if (block_tree || !view) return;
block_tree = true;
view->scene()->clearSelection();
QList<ObjectBase*> sol;
ObjectBaseList sol;
QList<QTreeWidgetItem*> til = ui->treeObjects->selectedItems();
foreach (QTreeWidgetItem * i, til)
sol << itemObject(i);
@@ -361,7 +361,7 @@ void SceneTree::on_actionAdd_camera_triggered() {
void SceneTree::on_actionClone_triggered() {
if (!view) return;
QList<QTreeWidgetItem*> sil = ui->treeObjects->selectedItems();
QList<ObjectBase*> col;
ObjectBaseList col;
foreach (QTreeWidgetItem * i, sil) {
ObjectBase * o = itemObject(i);
if (!o) continue;
@@ -375,7 +375,7 @@ void SceneTree::on_actionClone_triggered() {
void SceneTree::on_actionGroup_triggered() {
if (!view) return;
QList<ObjectBase*> sol = view->scene()->selectedObjects(true);
ObjectBaseList sol = view->scene()->selectedObjects(true);
ObjectBase * cp = sol[0]->parent();
ObjectBase * nr = new ObjectBase();
cp->addChild(nr);
@@ -387,7 +387,7 @@ void SceneTree::on_actionGroup_triggered() {
void SceneTree::on_actionSelect_parent_triggered() {
if (!view) return;
QList<ObjectBase*> sol = view->scene()->selectedObjects(true);
ObjectBaseList sol = view->scene()->selectedObjects(true);
QSet<ObjectBase*> nsl;
foreach (ObjectBase * o, sol) {
ObjectBase * po = o->parent();
@@ -424,7 +424,7 @@ void SceneTree::focusObjects() {
if (!view) return;
if (!view->camera()) return;
Box3D bb;
QList<ObjectBase*> ol = view->selectedObjects();
ObjectBaseList ol = view->selectedObjects();
foreach (ObjectBase * o, ol) {
o->calculateBoundingBox();
bb |= o->boundingBox();