diff --git a/docs/documentation_guidelines/substitutions.rst b/docs/documentation_guidelines/substitutions.rst index 333341c6a45..95fc7e2c2ad 100644 --- a/docs/documentation_guidelines/substitutions.rst +++ b/docs/documentation_guidelines/substitutions.rst @@ -260,7 +260,7 @@ Map Navigation and attributes :class: longtable ============================== ================================== ============================== ================================== - Icon Substitution Icon Substitution + Icon Substitution Icon Substitution ============================== ================================== ============================== ================================== |pan| ``|pan|`` |panToSelected| ``|panToSelected|`` |zoomIn| ``|zoomIn|`` |zoomOut| ``|zoomOut|`` @@ -273,6 +273,7 @@ Map Navigation and attributes |measure| ``|measure|`` |measureArea| ``|measureArea|`` |measureBearing| ``|measureBearing|`` |measureAngle| ``|measureAngle|`` |newMap| ``|newMap|`` |new3DMap| ``|new3DMap|`` + |new3DMapGlobe| ``|new3DMapGlobe|`` |tiltUp| ``|tiltUp|`` |tiltDown| ``|tiltDown|`` |3dNavigation| ``|3dNavigation|`` |play| ``|play|`` |camera| ``|camera|`` |shadow| ``|shadow|`` @@ -1365,6 +1366,8 @@ Grass integration :width: 1.5em .. |new3DMap| image:: /static/common/mActionNew3DMap.png :width: 1.5em +.. |new3DMapGlobe| image:: /static/common/mActionNew3DMapGlobe.png + :width: 1.5em .. |newAttribute| image:: /static/common/mActionNewAttribute.png :width: 1.5em .. |newBookmark| image:: /static/common/mActionNewBookmark.png diff --git a/docs/user_manual/introduction/qgis_gui.rst b/docs/user_manual/introduction/qgis_gui.rst index b164ddf4a50..07fd35815bc 100644 --- a/docs/user_manual/introduction/qgis_gui.rst +++ b/docs/user_manual/introduction/qgis_gui.rst @@ -538,6 +538,10 @@ actions like: - :kbd:`Ctrl+Alt+M` - :guilabel:`Map Navigation` - :ref:`label_3dmapview` + * - :menuselection:`-->` |new3DMapGlobe| :guilabel:`New 3D Globe View` + - + - + - :ref:`label_3dmapview` * - :menuselection:`--> Manage 3D Map Views` - - @@ -2315,6 +2319,8 @@ processes (QGIS startup, plugins loading, processing tools...) :width: 1.5em .. |new3DMap| image:: /static/common/mActionNew3DMap.png :width: 1.5em +.. |new3DMapGlobe| image:: /static/common/mActionNew3DMapGlobe.png + :width: 1.5em .. |newBookmark| image:: /static/common/mActionNewBookmark.png :width: 1.5em .. |newElevationProfile| image:: /static/common/mActionNewElevationProfile.png diff --git a/docs/user_manual/map_views/3d_map_view.rst b/docs/user_manual/map_views/3d_map_view.rst index cc793b50c5b..101efb4b6ec 100644 --- a/docs/user_manual/map_views/3d_map_view.rst +++ b/docs/user_manual/map_views/3d_map_view.rst @@ -11,15 +11,27 @@ :local: -3D visualization support is offered through the 3D map view. +3D visualization support is offered through the 3D views. +Two different types of 3D views are supported: + +* ``3D map view``: overlays the 3D features on a small scale, local 3D Scene based on a projected CRS, +* ``3D globe view``: displays the world as a geospatially accurate ellipsoid + and show 3D content (such as 3D renderers of tiled scene layers and point cloud layers) + alongside projected 2D map content (such as raster, mesh, and vector datasets). + Any map layer type can be used as a 2D texture for the globe. + Globe view uses the ellipsoid of the project to generate globe mesh. + It is even possible to use other celestial bodies, such as Mars or Moon, + if the project’s CRS is set up accordingly. + You can create, manage and open 3D map views via :menuselection:`View --> 3D Map Views -->` menu: -#. By clicking on |new3DMap| :menuselection:`New 3D Map View` you can create a new 3D map view. - A floating and dockable QGIS panel will appear (see :ref:`figure_3dmapview`). +#. By clicking dedicated |new3DMap| :menuselection:`New 3D Map View` (:kbd:`Ctrl+Alt+M`) + or |new3DMapGlobe| :menuselection:`New 3D Globe View` buttons. + In both cases, a floating and dockable QGIS panel will appear (see :ref:`figure_3dmapview`). It has the same extent and view as the 2D main map canvas and provides a set of navigation tools to turn the view into 3D. #. By clicking on :menuselection:`Manage 3D Map Views` you get in the 3D Map Views Manager. - Here you get the ability to open, duplicate, remove and rename 3D map views. + There you get the ability to open, duplicate, remove and rename 3D map views. #. If you created one or more 3D map views, you see them listed in :menuselection:`3D Map Views`. You can turn them on and off by clicking on. They will be saved by saving the project, even if they are turned off. @@ -530,6 +542,8 @@ in 3D map views. See :ref:`3D view layer properties ` f :width: 1.5em .. |new3DMap| image:: /static/common/mActionNew3DMap.png :width: 1.5em +.. |new3DMapGlobe| image:: /static/common/mActionNew3DMapGlobe.png + :width: 1.5em .. |options| image:: /static/common/mActionOptions.png :width: 1em .. |pan| image:: /static/common/mActionPan.png diff --git a/static/common/mActionNew3DMapGlobe.png b/static/common/mActionNew3DMapGlobe.png new file mode 100644 index 00000000000..857f1b0b43d Binary files /dev/null and b/static/common/mActionNew3DMapGlobe.png differ diff --git a/substitutions.txt b/substitutions.txt index 169bbebf251..9200000aa65 100644 --- a/substitutions.txt +++ b/substitutions.txt @@ -837,6 +837,8 @@ :width: 1.5em .. |new3DMap| image:: /static/common/mActionNew3DMap.png :width: 1.5em +.. |new3DMapGlobe| image:: /static/common/mActionNew3DMapGlobe.png + :width: 1.5em .. |newAttribute| image:: /static/common/mActionNewAttribute.png :width: 1.5em .. |newBookmark| image:: /static/common/mActionNewBookmark.png