Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
VTK
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Kenneth Moreland
VTK
Commits
acd559f7
Commit
acd559f7
authored
1 month ago
by
Jean Fechter
Browse files
Options
Downloads
Patches
Plain Diff
Add documentation and move members to private
parent
fed38618
Loading
Loading
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
Documentation/release/dev/htg-representation-decimation.md
+36
-4
36 additions, 4 deletions
Documentation/release/dev/htg-representation-decimation.md
Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h
+19
-90
19 additions, 90 deletions
Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h
with
55 additions
and
94 deletions
Documentation/release/dev/htg-representation-decimation.md
+
36
−
4
View file @
acd559f7
## HTG Surface Representation improvements
Some protected members of
`vtkAdaptiveDataSetSurfaceFilter`
have been removed:
-
Rewrite french comments to english
-
Generify cell visibility test to work in 3D as well as 1D and 2D, and not necessarily with parallel projection.
-
Support masks in 2D and 3D
-
Update and add vtkAdaptiveDataSetSurfaceFilter tests
Some protected members of
`vtkAdaptiveDataSetSurfaceFilter`
have been moved to private or completely removed:
-
Removed:
-
`BBSelection`
-
`CircleSelection`
-
`DynamicDecimateLevelMax`
-
`LevelMax`
-
`LastCameraFocalPoint`
-
`LastCameraParallelScale`
-
`WindowBounds`
-
`Radius`
-
`DynamicDecimateLevelMax`
-
`ParallelProjection`
-
`Radius`
-
`Scale`
-
`WindowBounds`
-
Moved to private:
-
`Axis1`
-
`Axis2`
-
`Cells`
-
`Dimension`
-
`FixedLevelMax`
-
`InData`
-
`LastRendererSize`
-
`Mask`
-
`Orientation`
-
`OutData`
-
`Points`
-
`Renderer`
-
`ViewPointDepend`
The following methods have been moved to private:
-
`AddFace`
-
`ProcessLeaf1D`
-
`ProcessLeaf2D`
-
`ProcessLeaf3D`
-
`ProcessTrees`
-
`RecursivelyProcessTree1DAnd2D`
-
`RecursivelyProcessTree3D`
This diff is collapsed.
Click to expand it.
Filters/Hybrid/vtkAdaptiveDataSetSurfaceFilter.h
+
19
−
90
View file @
acd559f7
...
...
@@ -56,33 +56,6 @@ public:
*/
vtkMTimeType
GetMTime
()
override
;
///@{
/**
* Set/Get for active the circle selection viewport (default true)
*/
VTK_DEPRECATED_IN_9_5_0
(
"CircleSelection is deprecated. A single new selection method has been implemented."
)
vtkSetMacro
(
CircleSelection
,
bool
);
VTK_DEPRECATED_IN_9_5_0
(
"CircleSelection is deprecated. A single new selection method has been implemented."
)
vtkGetMacro
(
CircleSelection
,
bool
);
///@}
///@{
/**
* Set/Get activate the bounding box selection viewport
* This is a possible acceleration factor only if the view cannot rotate.
*
* Default is false.
*/
VTK_DEPRECATED_IN_9_5_0
(
"BBSelection is deprecated. A single new selection method has been implemented."
)
vtkSetMacro
(
BBSelection
,
bool
);
VTK_DEPRECATED_IN_9_5_0
(
"BBSelection is deprecated. A single new selection method has been implemented."
)
vtkGetMacro
(
BBSelection
,
bool
);
///@}
///@{
/**
* Set/Get the dependence to the point of view.
...
...
@@ -101,35 +74,6 @@ public:
vtkGetMacro
(
FixedLevelMax
,
int
);
///@}
///@{
/**
* Set/Get the scale factor that influences the adaptive view computation.
* For a refinement of 2, giving Scale=2*X amounts to calling DynamicDecimateLevelMax with the
* value X.
*
* Default is 1.0.
*/
VTK_DEPRECATED_IN_9_5_0
(
"Scale is deprecated. Please use ForcedLevelMax if needed."
)
vtkSetMacro
(
Scale
,
double
);
VTK_DEPRECATED_IN_9_5_0
(
"Scale is deprecated. Please use ForcedLevelMax if needed."
)
vtkGetMacro
(
Scale
,
double
);
///@}
///@{
/**
* Set/Get the dynamic decimate level max.
* This value is subtracted to the max depth level (LevelMax).
*
* Default is 0.
*/
VTK_DEPRECATED_IN_9_5_0
(
"DynamicDecimateLevelMax is deprecated. Please use ForcedLevelMax if needed."
)
vtkSetMacro
(
DynamicDecimateLevelMax
,
int
);
VTK_DEPRECATED_IN_9_5_0
(
"DynamicDecimateLevelMax is deprecated. Please use ForcedLevelMax if needed."
)
vtkGetMacro
(
DynamicDecimateLevelMax
,
int
);
///@}
protected:
vtkAdaptiveDataSetSurfaceFilter
();
~
vtkAdaptiveDataSetSurfaceFilter
()
override
;
...
...
@@ -139,6 +83,22 @@ protected:
int
DataObjectExecute
(
vtkDataObject
*
input
,
vtkPolyData
*
output
);
int
FillInputPortInformation
(
int
port
,
vtkInformation
*
info
)
override
;
private:
vtkAdaptiveDataSetSurfaceFilter
(
const
vtkAdaptiveDataSetSurfaceFilter
&
)
=
delete
;
void
operator
=
(
const
vtkAdaptiveDataSetSurfaceFilter
&
)
=
delete
;
enum
class
ShapeState
:
uint8_t
;
/**
* Check whether a shape is visible on the screen.
* @param points Points of the shape
* @param nbPoints Number of points to be read in `points` (not all 8 are necessarily defined).
* @param level The current depth level of the cell
* @return Whether the shape is visible on the screen (fully or partially).
*/
ShapeState
IsShapeVisible
(
const
std
::
array
<
std
::
array
<
double
,
3
>
,
8
>&
points
,
int
nbPoints
,
int
level
);
/**
* Main routine to generate external boundary
*/
...
...
@@ -223,51 +183,20 @@ protected:
*/
bool
ViewPointDepend
;
/**
* DEPRECATED
* Product cell when in circle selection
*/
bool
CircleSelection
;
/**
* DEPRECATED
* Product cell when in bounding box selection
*/
bool
BBSelection
;
/**
* Forced, fixed the level depth, ignored automatic determination
*/
int
FixedLevelMax
;
/**
* Scale factor for adaptive view
*/
double
Scale
;
/**
* Decimate level max after automatic determination
* Whether ParallelProjection is enabled on the renderer's camera
*/
int
DynamicDecimateLevelMax
;
private:
int
MaxLevel
=
VTK_INT_MAX
;
bool
IsParallel
=
false
;
enum
class
ShapeState
:
uint8_t
;
vtkAdaptiveDataSetSurfaceFilter
(
const
vtkAdaptiveDataSetSurfaceFilter
&
)
=
delete
;
void
operator
=
(
const
vtkAdaptiveDataSetSurfaceFilter
&
)
=
delete
;
/**
* Check whether a shape is visible on the screen.
* @param points Points of the shape
* @param nbPoints Number of points to be read in `points` (not all 8 are necessarily defined).
* @param level The current depth level of the cell
* @return Whether the shape is visible on the screen (fully or partially).
* Max depth to be rendered, any deeper is smaller than one pixel.
*/
ShapeState
IsShapeVisible
(
const
std
::
array
<
std
::
array
<
double
,
3
>
,
8
>&
points
,
int
nbPoints
,
int
level
);
int
MaxLevel
=
VTK_INT_MAX
;
vtkSmartPointer
<
vtkMatrix4x4
>
ModelViewMatrix
;
vtkSmartPointer
<
vtkMatrix4x4
>
ProjectionMatrix
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment