Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
GUI for configuration of 3D polygon symbols for vector layers
In the style dock there is a new "3D View" tab - so far working just for polygon layers. It is possible to select a polygon layer, enable 3D renderer and adjust its properties. If a 3D Map View is open, it will be immediately updated (if auto-apply is enabled) Very exciting! :-)
- Loading branch information
Showing
with
850 additions
and 60 deletions.
- +1 −0 CMakeLists.txt
- +3 −1 cmake_templates/qgsconfig.h.in
- +1 −0 images/images.qrc
- +38 −0 images/themes/default/3d.svg
- +1 −0 python/core/qgsapplication.sip
- +8 −0 python/core/qgsmaplayer.sip
- +3 −2 src/3d/CMakeLists.txt
- +5 −5 src/3d/map3d.cpp
- +2 −2 src/3d/map3d.h
- +3 −3 src/3d/phongmaterialsettings.h
- +38 −4 src/3d/scene.cpp
- +4 −0 src/3d/scene.h
- +2 −1 src/3d/testapp/main.cpp
- +2 −2 src/3d/{abstract3drenderer.cpp → vectorlayer3drenderer.cpp}
- +8 −29 src/3d/{abstract3drenderer.h → vectorlayer3drenderer.h}
- +35 −0 src/app/3d/qgsphongmaterialwidget.cpp
- +27 −0 src/app/3d/qgsphongmaterialwidget.h
- +38 −0 src/app/3d/qgspolygon3dsymbolwidget.cpp
- +26 −0 src/app/3d/qgspolygon3dsymbolwidget.h
- +88 −0 src/app/3d/qgsvectorlayer3drendererwidget.cpp
- +43 −0 src/app/3d/qgsvectorlayer3drendererwidget.h
- +7 −0 src/app/CMakeLists.txt
- +2 −3 src/app/qgisapp.cpp
- +31 −0 src/app/qgslayerstylingwidget.cpp
- +5 −0 src/app/qgslayerstylingwidget.h
- +45 −0 src/core/3d/qgs3drendererregistry.cpp
- +61 −0 src/core/3d/qgs3drendererregistry.h
- +11 −0 src/core/3d/qgsabstract3drenderer.cpp
- +35 −0 src/core/3d/qgsabstract3drenderer.h
- +7 −0 src/core/CMakeLists.txt
- +8 −0 src/core/qgsapplication.cpp
- +9 −0 src/core/qgsapplication.h
- +17 −0 src/core/qgsmaplayer.cpp
- +24 −0 src/core/qgsmaplayer.h
- +94 −0 src/ui/3d/phongmaterialwidget.ui
- +110 −0 src/ui/3d/polygon3dsymbolwidget.ui
- +8 −8 src/ui/symbollayer/widget_simplefill.ui
@@ -0,0 +1,38 @@ | ||
<?xml version="1.0" encoding="UTF-8" standalone="no"?> | ||
<svg | ||
xmlns:dc="http://purl.org/dc/elements/1.1/" | ||
xmlns:cc="http://creativecommons.org/ns#" | ||
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" | ||
xmlns:svg="http://www.w3.org/2000/svg" | ||
xmlns="http://www.w3.org/2000/svg" | ||
id="svg12" | ||
version="1.1" | ||
width="16" | ||
height="16"> | ||
<metadata | ||
id="metadata18"> | ||
<rdf:RDF> | ||
<cc:Work | ||
rdf:about=""> | ||
<dc:format>image/svg+xml</dc:format> | ||
<dc:type | ||
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> | ||
<dc:title></dc:title> | ||
</cc:Work> | ||
</rdf:RDF> | ||
</metadata> | ||
<defs | ||
id="defs16" /> | ||
<path | ||
d="M 2.3348556,4.5414044 8.0212426,8.3776059 13.466994,4.7037083 7.7806076,0.86750671 Z" | ||
style="fill:#f79191;fill-opacity:1;fill-rule:evenodd;stroke:#a40000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" | ||
id="path4535" /> | ||
<path | ||
d="M 8.6635732,9.3611399 V 14.964189 L 14.109324,11.290292 V 5.6872423 Z" | ||
style="fill:#fce94f;fill-opacity:1;fill-rule:evenodd;stroke:#c4a000;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" | ||
id="path4537" /> | ||
<path | ||
d="m 1.6730308,5.5249384 5.686387,3.8362015 v 5.6030491 l -5.686387,-3.836201 z" | ||
style="fill:#8ae234;fill-opacity:1;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" | ||
id="path4539" /> | ||
</svg> |
Oops, something went wrong.