Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make coordinates of vector data chunks independent from scene origin #59174

Open
wants to merge 10 commits into
base: master
Choose a base branch
from

Conversation

wonder-sk
Copy link
Member

@wonder-sk wonder-sk commented Oct 22, 2024

This is a continuation of work started in #58948, handling all the cases of data from vector layers. No change of functionality, just changing what coordinates are stored in geometries sent to GPU.

Also:

  • point and line symbol implementations internally use (x,y,z) coordinates instead of (x,z,-y) - QTransforms are used to flip the axes back to scene's coordinates
  • instanced renderer's vertex shader has been cleaned up and made to work with QTransform
  • extruded polygons textured rendering test was modified to use more appropriately scaled texture
  • unused QgsTessellatedPolygonGeometry::setPolygons() was removed

@wonder-sk wonder-sk added Frozen Feature freeze - Do not merge! 3D Relates to QGIS' 3D engine or rendering labels Oct 22, 2024
@github-actions github-actions bot added this to the 3.40.0 milestone Oct 22, 2024
Copy link

github-actions bot commented Oct 22, 2024

🪟 Windows builds

Download Windows builds of this PR for testing.
Debug symbols for this build are available here.
(Built from commit 4f75f77)

🪟 Windows Qt6 builds

Download Windows Qt6 builds of this PR for testing.
(Built from commit 4f75f77)

This is a continuation of work started in qgis#58948, handling all the cases
of data from vector layers.
@wonder-sk wonder-sk force-pushed the vectors-3d-relative-to-chunk-origin branch from 2b7c460 to 2c65c3a Compare October 23, 2024 08:29
@wonder-sk wonder-sk removed this from the 3.40.0 milestone Oct 23, 2024
Copy link

github-actions bot commented Oct 23, 2024

Tests failed for Qt 6

One or more tests failed using the build from commit ea6be97

polygon3d_extrusion_textured_phong (testExtrudedPolygonsTexturedPhong)

polygon3d_extrusion_textured_phong

Test failed at testExtrudedPolygonsTexturedPhong at tests/src/3d/testqgs3drendering.cpp:593

Rendered image did not match tests/testdata/control_images/3d/expected_polygon3d_extrusion_textured_phong/default/expected_polygon3d_extrusion_textured_phong.png (found 439 pixels different)

The full test report (included comparison of rendered vs expected images) can be found here.

Further documentation on the QGIS test infrastructure can be found in the Developer's Guide.

Copy link

Tests failed for Qt 5

One or more tests failed using the build from commit 2c65c3a

polygon3d_extrusion_gooch_shading (testExtrudedPolygonsGoochShading)

polygon3d_extrusion_gooch_shading

Test failed at testExtrudedPolygonsGoochShading at tests/src/3d/testqgs3drendering.cpp:872

sphere_rendering (testInstancedRendering)

sphere_rendering

Test failed at testInstancedRendering at tests/src/3d/testqgs3drendering.cpp:1599

sphere_rendering_clipping (testInstancedRenderingClipping)

sphere_rendering_clipping

Test failed at testInstancedRenderingClipping at tests/src/3d/testqgs3drendering.cpp:1680

Rendered image did not match tests/testdata/control_images/3d/expected_sphere_rendering_clipping/expected_sphere_rendering_clipping.png (found 3225 pixels different)

The full test report (included comparison of rendered vs expected images) can be found here.

Further documentation on the QGIS test infrastructure can be found in the Developer's Guide.

@github-actions github-actions bot added this to the 3.40.0 milestone Oct 23, 2024
@wonder-sk wonder-sk force-pushed the vectors-3d-relative-to-chunk-origin branch from 7e2ac2f to 4f75f77 Compare October 23, 2024 20:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3D Relates to QGIS' 3D engine or rendering Frozen Feature freeze - Do not merge!
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant