Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenMesh
OpenMesh
Commits
37523c16
Commit
37523c16
authored
Aug 28, 2019
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed vectorize warning
parent
0d04d4f4
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
10 deletions
+10
-10
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh
+1
-1
src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh
src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh
+7
-7
src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh
src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh
+1
-1
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh
...esh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh
+1
-1
No files found.
src/OpenMesh/Apps/QtViewer/MeshViewerWidgetT_impl.hh
View file @
37523c16
...
...
@@ -145,7 +145,7 @@ MeshViewerWidgetT<M>::open_mesh(const char* _filename, IO::Options _opt)
// set center and radius
set_scene_pos
(
(
bbMin
+
bbMax
)
*
0.5
,
(
bbMin
-
bbMax
).
norm
()
*
0.5
);
set_scene_pos
(
(
bbMin
+
bbMax
)
*
0.5
f
,
(
bbMin
-
bbMax
).
norm
()
*
0.5
f
);
// for normal display
normal_scale_
=
(
bbMax
-
bbMin
).
min
()
*
0.05
f
;
...
...
src/OpenMesh/Core/Mesh/PolyMeshT_impl.hh
View file @
37523c16
...
...
@@ -155,13 +155,13 @@ PolyMeshT<Kernel>::calc_face_normal_impl(FaceHandle, PointIsNot3DTag) const
{
// Dummy fallback implementation
// Returns just an initialized all 0 normal
// This function is only used if we don't ha
t
e a matching implementation
// This function is only used if we don't ha
v
e a matching implementation
// for normal computation with the current vector type defined in the mesh traits
assert
(
false
);
Normal
normal
;
vectorize
(
normal
,
Scalar
(
0
.0
));
vectorize
(
normal
,
Scalar
(
0
));
return
normal
;
}
...
...
@@ -223,13 +223,13 @@ PolyMeshT<Kernel>::calc_face_normal_impl(const Point&, const Point&, const Point
// Dummy fallback implementation
// Returns just an initialized all 0 normal
// This function is only used if we don't ha
t
e a matching implementation
// This function is only used if we don't ha
v
e a matching implementation
// for normal computation with the current vector type defined in the mesh traits
assert
(
false
);
Normal
normal
;
vectorize
(
normal
,
Scalar
(
0
.0
));
vectorize
(
normal
,
Scalar
(
0
));
return
normal
;
}
...
...
@@ -241,7 +241,7 @@ PolyMeshT<Kernel>::
calc_face_centroid
(
FaceHandle
_fh
)
const
{
Point
_pt
;
vectorize
(
_pt
,
Scalar
(
0
.0
));
vectorize
(
_pt
,
Scalar
(
0
));
Scalar
valence
=
0.0
;
for
(
ConstFaceVertexIter
cfv_it
=
this
->
cfv_iter
(
_fh
);
cfv_it
.
is_valid
();
++
cfv_it
,
valence
+=
1.0
)
{
...
...
@@ -404,7 +404,7 @@ template <class Kernel>
void
PolyMeshT
<
Kernel
>::
calc_vertex_normal_fast
(
VertexHandle
_vh
,
Normal
&
_n
)
const
{
vectorize
(
_n
,
Scalar
(
0
.0
));
vectorize
(
_n
,
Scalar
(
0
));
for
(
ConstVertexFaceIter
vf_it
=
this
->
cvf_iter
(
_vh
);
vf_it
.
is_valid
();
++
vf_it
)
_n
+=
this
->
normal
(
*
vf_it
);
}
...
...
@@ -414,7 +414,7 @@ template <class Kernel>
void
PolyMeshT
<
Kernel
>::
calc_vertex_normal_correct
(
VertexHandle
_vh
,
Normal
&
_n
)
const
{
vectorize
(
_n
,
Scalar
(
0
.0
));
vectorize
(
_n
,
Scalar
(
0
));
ConstVertexIHalfedgeIter
cvih_it
=
this
->
cvih_iter
(
_vh
);
if
(
!
cvih_it
.
is_valid
()
)
{
//don't crash on isolated vertices
...
...
src/OpenMesh/Tools/Decimater/ModHausdorffT_impl.hh
View file @
37523c16
...
...
@@ -256,7 +256,7 @@ collapse_priority(const CollapseInfo& _ci)
// undo simulation changes
mesh_
.
set_point
(
_ci
.
v0
,
_ci
.
p0
);
return
(
ok
?
Base
::
LEGAL_COLLAPSE
:
Base
::
ILLEGAL_COLLAPSE
);
return
(
ok
?
static_cast
<
float
>
(
Base
::
LEGAL_COLLAPSE
)
:
static_cast
<
float
>
(
Base
::
ILLEGAL_COLLAPSE
)
);
}
//-----------------------------------------------------------------------------
...
...
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT_impl.hh
View file @
37523c16
...
...
@@ -576,7 +576,7 @@ void CompositeT<MeshType,RealType>::FVc(Coeff& _coeff)
++
valence
;
}
c
=
static_cast
<
real
_t
>
(
_coeff
(
valence
));
c
=
static_cast
<
scalar
_t
>
(
_coeff
(
valence
));
for
(
voh_it
=
mesh_
.
voh_iter
(
*
v_it
);
voh_it
.
is_valid
();
++
voh_it
)
{
...
...
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