Skip to content

Commit

Permalink
Added skybox rendering settings widget
Browse files Browse the repository at this point in the history
  • Loading branch information
@NEDJIMAbelgacem
NEDJIMAbelgacem committed Jul 26, 2020
1 parent 8b5dedf commit 0346107
Show file tree
Hide file tree
Showing 5 changed files with 172 additions and 113 deletions.
7 changes: 7 additions & 0 deletions src/app/3d/qgsskyboxrenderingsettingswidget.cpp
View file
@@ -0,0 +1,7 @@
#include "qgsskyboxrenderingsettingswidget.h"

QgsSkyboxRenderingSettingsWidget::QgsSkyboxRenderingSettingsWidget(QWidget *parent) :
QWidget(parent)
{
setupUi(this);
}
14 changes: 14 additions & 0 deletions src/app/3d/qgsskyboxrenderingsettingswidget.h
View file
@@ -0,0 +1,14 @@
#ifndef SKYBOXRENDERINGSETTINGSWIDGET_H
#define SKYBOXRENDERINGSETTINGSWIDGET_H

#include "ui_skyboxrenderingsettingswidget.h"

class QgsSkyboxRenderingSettingsWidget : public QWidget, private Ui::SkyboxRenderingSettingsWidget
{
Q_OBJECT

public:
explicit QgsSkyboxRenderingSettingsWidget(QWidget *parent = nullptr);
};

#endif // SKYBOXRENDERINGSETTINGSWIDGET_H
1 change: 1 addition & 0 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -282,6 +282,7 @@ IF (WITH_3D)
3d/qgsvectorlayer3drendererwidget.cpp
3d/qgsmeshlayer3drendererwidget.cpp
layout/qgslayout3dmapwidget.cpp
3d/qgsskyboxrenderingsettingswidget.cpp
)
ENDIF (WITH_3D)

Expand Down
244 changes: 131 additions & 113 deletions src/ui/3d/map3dconfigwidget.ui
View file
Expand Up @@ -38,9 +38,9 @@
<property name="geometry">
<rect>
<x>0</x>
<y>-49</y>
<y>0</y>
<width>541</width>
<height>724</height>
<height>763</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_4">
Expand All @@ -56,82 +56,24 @@
<property name="bottomMargin">
<number>0</number>
</property>
<item row="8" column="0">
<item row="9" column="0">
<widget class="QCheckBox" name="chkShowTileInfo">
<property name="text">
<string>Show map tile info</string>
</property>
</widget>
</item>
<item row="10" column="0">
<widget class="QCheckBox" name="chkShowCameraViewCenter">
<property name="text">
<string>Show camera's view center</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupTerrainShading">
<property name="title">
<string>Terrain Shading</string>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QgsPhongMaterialWidget" name="widgetTerrainMaterial" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="7" column="0">
<item row="8" column="0">
<widget class="QCheckBox" name="chkShowLabels">
<property name="text">
<string>Show labels</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupLights">
<property name="title">
<string>Lights</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QgsLightsWidget" name="widgetLights" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="9" column="0">
<widget class="QCheckBox" name="chkShowBoundingBoxes">
<item row="12" column="0">
<widget class="QCheckBox" name="chkShowLightSourceOrigins">
<property name="text">
<string>Show bounding boxes</string>
<string>Show light sources</string>
</property>
</widget>
</item>
Expand Down Expand Up @@ -161,19 +103,29 @@
</layout>
</widget>
</item>
<item row="6" column="0">
<item row="7" column="0">
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0">
<widget class="QLabel" name="label_6">
<item row="3" column="1">
<widget class="QLabel" name="labelZoomLevels">
<property name="text">
<string>Max. ground error</string>
<string>0</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<item row="1" column="1">
<widget class="QgsDoubleSpinBox" name="spinScreenError">
<property name="suffix">
<string> px</string>
</property>
<property name="decimals">
<number>1</number>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Map tile resolution</string>
<string>Max. screen error</string>
</property>
</widget>
</item>
Expand All @@ -187,13 +139,6 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_5">
<property name="text">
<string>Max. screen error</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QgsDoubleSpinBox" name="spinGroundError">
<property name="suffix">
Expand All @@ -213,44 +158,73 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<item row="2" column="0">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Zoom levels</string>
<string>Max. ground error</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="labelZoomLevels">
<item row="0" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string>0</string>
<string>Map tile resolution</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QgsDoubleSpinBox" name="spinScreenError">
<property name="suffix">
<string> px</string>
</property>
<property name="decimals">
<number>1</number>
<item row="3" column="0">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Zoom levels</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="12" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
<item row="2" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupMeshTerrainShading">
<property name="title">
<string>Mesh Terrain Settings</string>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
</layout>
</widget>
</item>
<item row="5" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupLights">
<property name="title">
<string>Lights</string>
</property>
</spacer>
<layout class="QVBoxLayout" name="verticalLayout_3">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QgsLightsWidget" name="widgetLights" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="1" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupTerrain">
Expand Down Expand Up @@ -335,34 +309,72 @@
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupMeshTerrainShading">
<item row="11" column="0">
<widget class="QCheckBox" name="chkShowCameraViewCenter">
<property name="text">
<string>Show camera's view center</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QgsCollapsibleGroupBox" name="groupTerrainShading">
<property name="title">
<string>Mesh Terrain Settings</string>
<string>Terrain Shading</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="checkable">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<property name="leftMargin">
<number>9</number>
<number>0</number>
</property>
<property name="topMargin">
<number>9</number>
<number>0</number>
</property>
<property name="rightMargin">
<number>9</number>
<number>0</number>
</property>
<property name="bottomMargin">
<number>9</number>
<number>0</number>
</property>
<item>
<widget class="QgsPhongMaterialWidget" name="widgetTerrainMaterial" native="true"/>
</item>
</layout>
</widget>
</item>
<item row="11" column="0">
<widget class="QCheckBox" name="chkShowLightSourceOrigins">
<item row="10" column="0">
<widget class="QCheckBox" name="chkShowBoundingBoxes">
<property name="text">
<string>Show light sources</string>
<string>Show bounding boxes</string>
</property>
</widget>
</item>
<item row="13" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="6" column="0">
<widget class="QgsCollapsibleGroupBox" name="SkyboxGroupBox">
<property name="title">
<string>Skybox rendering</string>
</property>
<layout class="QGridLayout" name="gridLayout_3">
<item row="0" column="0">
<widget class="QgsSkyboxRenderingSettingsWidget" name="skyboxRenderingSettingsWidget" native="true"/>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
</widget>
Expand Down Expand Up @@ -409,6 +421,12 @@
<header>qgslightswidget.h</header>
<container>1</container>
</customwidget>
<customwidget>
<class>QgsSkyboxRenderingSettingsWidget</class>
<extends>QWidget</extends>
<header>qgsskyboxrenderingsettingswidget.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>scrollArea</tabstop>
Expand Down
19 changes: 19 additions & 0 deletions src/ui/3d/skyboxrenderingsettingswidget.ui
View file
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>SkyboxRenderingSettingsWidget</class>
<widget class="QWidget" name="SkyboxRenderingSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>400</width>
<height>300</height>
</rect>
</property>
<property name="windowTitle">
<string>Form</string>
</property>
</widget>
<resources/>
<connections/>
</ui>

0 comments on commit 0346107

Please sign in to comment.