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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 13 commits into from
Oct 25, 2024
Merged

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

merged 13 commits into from
Oct 25, 2024

Conversation

wonder-sk
Copy link
Member

@wonder-sk wonder-sk commented Oct 22, 2024 •
edited
Loading

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
@github-actions GitHub Actions
Copy link

github-actions bot commented Oct 22, 2024 •
edited
Loading

🪟 Windows builds

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

🪟 Windows Qt6 builds

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

@wonder-sk
Make coordinates of vector data chunks independent from scene origin
2c65c3a 
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
@github-actions github-actions bot added this to the 3.40.0 milestone Oct 23, 2024
@wonder-sk
Make instanced point rendering work if there is a QTransform
40fd1f5
@wonder-sk
Allow a bit more difference in the extruded polygon gooch test
9a1103e
@wonder-sk
Make extruded polygon with textures more robust
dd4cb6b 
The texture was barely visible at all, so let's magnify it
@wonder-sk
Make extractPointPositions() return x,y,z rather than x,z,-y
7e30d0a 
We just flip axes at the transform where needed back to world coordinates.
Make instanced renderer shader respect any QTransform and clean up its code
@wonder-sk
Make QgsLineVertexData return x,y,z coordinates instead of x,z,-y
b7cbbe0 
Flipping back to world coordinates is done in QTransform
@wonder-sk
Update some scene export files (just tiny changes in values)
c5a01f5
@wonder-sk
Fix the instanced shader
e71b3c3
@wonder-sk
Fix sip bindings
ea6be97
@wonder-sk
add qt6 test image for extruded textured phong
4f75f77
@wonder-sk wonder-sk force-pushed the vectors-3d-relative-to-chunk-origin branch from 7e2ac2f to 4f75f77 Compare October 23, 2024 20:45
@qgis qgis deleted a comment from github-actions bot Oct 24, 2024
@qgis qgis deleted a comment from github-actions bot Oct 24, 2024
@wonder-sk
Copy link
Member Author

This should be ready for review...

@nyalldawson nyalldawson reopened this Oct 24, 2024
nyalldawson
nyalldawson approved these changes Oct 25, 2024
View reviewed changes
Copy link
Collaborator

@nyalldawson nyalldawson left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks great!

python/3d/auto_generated/symbols/qgspoint3dsymbol.sip.in Outdated Show resolved Hide resolved
@nyalldawson nyalldawson removed the Frozen Feature freeze - Do not merge! label Oct 25, 2024
@nyalldawson nyalldawson merged commit ec02d36 into qgis:master Oct 25, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nyalldawson nyalldawson nyalldawson approved these changes

Assignees
No one assigned
Labels
3D Relates to QGIS' 3D engine or rendering
Projects
None yet
Milestone
3.40.0
Development

Successfully merging this pull request may close these issues.
2 participants
@wonder-sk @nyalldawson