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

[3D] Add support for polygon geometry & dashed outline in QgsRubberBand3D #60378

Merged
merged 11 commits into from
Feb 26, 2025
Merged

[3D] Add support for polygon geometry & dashed outline in QgsRubberBand3D #60378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e7edc9a
Add support for polygon geometry & dashed outline in QgsRubberBand3D
Withalion Jan 31, 2025
cdc852b
Update unit tests
Withalion Jan 31, 2025
ecb347f
Fix documentation
Withalion Feb 17, 2025
a6f18bf
Fix review issues
Withalion Feb 18, 2025
1f4eee1
Rework highlighting in QgsRubberband3D
Withalion Feb 19, 2025
1aa0ee8
Rework QgsRubberBand3D to use generic QgsGeometry
Withalion Feb 20, 2025
61d6e9f
Fix edges highlighting in QgsRubberBand3D
Withalion Feb 21, 2025
fbde06e
Add unit tests for QgsRubberBand3D
Withalion Feb 21, 2025
b8ec74d
Fix review issues
Withalion Feb 24, 2025
61d047d
Fix marker outline bug & geometry type assignment
Withalion Feb 25, 2025
1f4ae1a
Fix unit tests again
Withalion Feb 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/3d/qgsframegraph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -478,10 +478,19 @@ Qt3DRender::QFrameGraphNode *QgsFrameGraph::constructRubberBandsPass()
mRubberBandsLayerFilter = new Qt3DRender::QLayerFilter( mRubberBandsCameraSelector );
mRubberBandsLayerFilter->addLayer( mRubberBandsLayer );

Qt3DRender::QBlendEquationArguments *blendState = new Qt3DRender::QBlendEquationArguments;
blendState->setSourceRgb( Qt3DRender::QBlendEquationArguments::SourceAlpha );
blendState->setDestinationRgb( Qt3DRender::QBlendEquationArguments::OneMinusSourceAlpha );

Qt3DRender::QBlendEquation *blendEquation = new Qt3DRender::QBlendEquation;
blendEquation->setBlendFunction( Qt3DRender::QBlendEquation::Add );

mRubberBandsStateSet = new Qt3DRender::QRenderStateSet( mRubberBandsLayerFilter );
Qt3DRender::QDepthTest *depthTest = new Qt3DRender::QDepthTest;
depthTest->setDepthFunction( Qt3DRender::QDepthTest::Always );
mRubberBandsStateSet->addRenderState( depthTest );
mRubberBandsStateSet->addRenderState( blendState );
mRubberBandsStateSet->addRenderState( blendEquation );

// Here we attach our drawings to the render target also used by forward pass.
// This is kind of okay, but as a result, post-processing effects get applied
Expand Down
Loading
Loading