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

[3dtiles] Skip completely transparent primitives #56303

Merged
merged 1 commit into from Feb 12, 2024

Conversation

nyalldawson
Copy link
Collaborator

Don't render these in 2d or 3d views

Fixes #55579

Don't render these in 2d or 3d views

Fixes qgis#55579
@github-actions github-actions bot added this to the 3.36.0 milestone Feb 12, 2024
@nyalldawson
Copy link
Collaborator Author

@wonder-sk look ok to you?

@nyalldawson nyalldawson merged commit 26f467c into qgis:master Feb 12, 2024
34 of 35 checks passed
@nyalldawson nyalldawson deleted the transparent_3d_tils branch February 12, 2024 09:42
@qgis-bot
Copy link
Collaborator

The backport to release-3_34 failed:

The process '/usr/bin/git' failed with exit code 1
stderr
error: could not apply 1f2b11cdca9... [3dtiles] Skip completely transparent primitives
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".

stdout
Auto-merging src/3d/qgsgltf3dutils.cpp
CONFLICT (content): Merge conflict in src/3d/qgsgltf3dutils.cpp

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-release-3_34 release-3_34
# Navigate to the new working tree
cd .worktrees/backport-release-3_34
# Create a new branch
git switch --create backport-56303-to-release-3_34
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick 1f2b11cdca95f2d940eb8d0bd1adba1a5c18a7e6
# Push it to GitHub
git push --set-upstream origin backport-56303-to-release-3_34
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-release-3_34

Then, create a pull request where the base branch is release-3_34 and the compare/head branch is backport-56303-to-release-3_34.

@qgis-bot qgis-bot added the failed backport The automated backport attempt failed, needs a manual backport label Feb 12, 2024
@P-SLISSE
Copy link

Hi,
If necessary, you can test this evolution with this sample dataset
Testing_3DTilesWithFullTransparency.zip
The file mesh_6180061.b3dm is a mesh with full transparency, that as to be skiped in 2D and 3D cartographic views
Thanks for this upgrade for 3DTiles display in QGis

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport release-3_34 failed backport The automated backport attempt failed, needs a manual backport
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3DTiles: QGIS fails to render the transparency that Skyline's 3DTiles set to the floor tiles
4 participants