Skip to content

Allow object to have distinct transformations in distinct viewports#460

Merged
Fedr merged 11 commits intomasterfrom
feature/per_viewport_xf
Sep 6, 2022
Merged

Allow object to have distinct transformations in distinct viewports#460
Fedr merged 11 commits intomasterfrom
feature/per_viewport_xf

Conversation

@Fedr
Copy link
Contributor

@Fedr Fedr commented Sep 5, 2022

No description provided.

@Fedr Fedr requested a review from Grantim September 5, 2022 12:44
MRMESH_API Box3f getBoundingBox() const;
void setXf( const AffineXf3f& xf ) override { Object::setXf( xf ); setDirtyFlags( DIRTY_BOUNDING_BOX_XF ); };
void setXf( ViewportId id, const AffineXf3f& xf ) override { Object::setXf( id, xf ); setDirtyFlags( DIRTY_BOUNDING_BOX_XF ); };
MRMESH_API Box3f getBoundingBoxXf() const;
Copy link
Contributor

Choose a reason for hiding this comment

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

ViewportId arg?

Comment on lines 382 to +383
if ( !root["XF"].isNull() )
deserializeFromJson( root["XF"], xf_ );
deserializeFromJson( root["XF"], xf_.get() );
Copy link
Contributor

Choose a reason for hiding this comment

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

do we need to store all viewports xfs too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Let us serialize only default one for now

Fedr added 4 commits September 6, 2022 11:21
# Conflicts:
#	source/MRMesh/MRObjectLabel.cpp
#	source/MRMesh/MRObjectLabel.h
#	source/MRMesh/MRObjectLinesHolder.cpp
#	source/MRMesh/MRObjectLinesHolder.h
#	source/MRMesh/MRObjectMeshHolder.cpp
#	source/MRMesh/MRObjectMeshHolder.h
#	source/MRMesh/MRObjectPointsHolder.cpp
#	source/MRMesh/MRObjectPointsHolder.h
#	source/MRMesh/MRVisualObject.cpp
#	source/MRMesh/MRVisualObject.h
@Fedr Fedr merged commit 035b06a into master Sep 6, 2022
@Fedr Fedr deleted the feature/per_viewport_xf branch September 6, 2022 16:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants