Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpenFlipper
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
b9215ce6
Commit
b9215ce6
authored
Dec 13, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Merge branch 'master' into AngleBasedEdgeSelection
parent
e636de1f
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
cmake/FindCLP.cmake
cmake/FindCLP.cmake
+4
-0
libs_required/MeshTools/MeshSelectionT.cc
libs_required/MeshTools/MeshSelectionT.cc
+3
-2
libs_required/MeshTools/MeshSelectionT.hh
libs_required/MeshTools/MeshSelectionT.hh
+1
-1
No files found.
cmake/FindCLP.cmake
View file @
b9215ce6
...
...
@@ -78,4 +78,8 @@ find_package_handle_standard_args(CLP DEFAULT_MSG
mark_as_advanced
(
CLP_INCLUDE_DIR CLP_LIBRARY
)
<<<<<<< HEAD
endif
(
NOT CLP_FOUND
)
=======
endif
(
NOT CLP_FOUND
)
>>>>>>> de50b89d4c22e69eb9f024dd18a994331b44d056
libs_required/MeshTools/MeshSelectionT.cc
View file @
b9215ce6
...
...
@@ -521,13 +521,14 @@ std::vector< int > getArea(MeshT* _mesh, unsigned int _type , bool& _invert) {
template
<
typename
MeshT
>
inline
void
selectEdges
(
MeshT
*
_mesh
,
const
std
::
vector
<
int
>&
_edges
)
{
void
selectEdges
(
MeshT
*
_mesh
,
const
std
::
vector
<
int
>&
_edges
,
const
double
_dihedral_angle_threshold
)
{
const
int
n_edges
=
(
int
)
_mesh
->
n_edges
();
for
(
uint
i
=
0
;
i
<
_edges
.
size
()
;
++
i
)
if
(
(
_edges
[
i
]
>=
0
)
&&
(
_edges
[
i
]
<
n_edges
)
)
{
typename
MeshT
::
EdgeHandle
eh
(
_edges
[
i
]);
_mesh
->
status
(
eh
).
set_selected
(
true
);
if
(
!
_mesh
->
has_face_normals
()
||
std
::
abs
(
_mesh
->
calc_dihedral_angle_fast
(
eh
))
>=
_dihedral_angle_threshold
)
_mesh
->
status
(
eh
).
set_selected
(
true
);
}
}
...
...
libs_required/MeshTools/MeshSelectionT.hh
View file @
b9215ce6
...
...
@@ -261,7 +261,7 @@ std::vector< int > getArea(MeshT* _mesh, unsigned int _type , bool& _invert);
/// Select given edges of a mesh
template
<
typename
MeshT
>
inline
void
selectEdges
(
MeshT
*
_mesh
,
const
std
::
vector
<
int
>&
_edges
);
void
selectEdges
(
MeshT
*
_mesh
,
const
std
::
vector
<
int
>&
_edges
,
const
double
_dihedral_angle_threshold
=
0.0
);
/// Unselect given edges of a mesh
template
<
typename
MeshT
>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment