Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper-Free
Commits
a431485e
Commit
a431485e
authored
Oct 24, 2016
by
Jan Möbius
Browse files
Merge branch 'cpp_check_warnings' into 'master'
Fxed some cpp_check warnings See merge request
!179
parents
f0e98942
99bdf023
Pipeline
#3340
passed with stage
in 79 minutes and 14 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
ACG/GL/DrawMesh.hh
View file @
a431485e
...
...
@@ -385,22 +385,22 @@ private:
* @param _hh corresponding halfedge handle of this vertex
* @param _fh corresponding face handle of this vertex
*/
void
readVertex
(
size_t
_vertex
,
const
typename
Mesh
::
VertexHandle
_vh
,
const
typename
Mesh
::
HalfedgeHandle
_hh
,
const
typename
Mesh
::
FaceHandle
_fh
);
void
readVertex
(
size_t
_vertex
,
const
typename
Mesh
::
VertexHandle
&
_vh
,
const
typename
Mesh
::
HalfedgeHandle
&
_hh
,
const
typename
Mesh
::
FaceHandle
&
_fh
);
/** \brief return a vertex color from mesh
*
* @param _vh mesh vertex handle
*/
unsigned
int
getVertexColor
(
const
typename
Mesh
::
VertexHandle
_vh
);
unsigned
int
getVertexColor
(
const
typename
Mesh
::
VertexHandle
&
_vh
);
/** \brief return a face color from mesh
*
* @param _fh mesh face handle
*/
unsigned
int
getFaceColor
(
const
typename
Mesh
::
FaceHandle
_fh
);
unsigned
int
getFaceColor
(
const
typename
Mesh
::
FaceHandle
&
_fh
);
/** \brief eventually update vertex and index buffers
*
...
...
ACG/GL/DrawMeshT.cc
View file @
a431485e
...
...
@@ -753,9 +753,9 @@ DrawMeshT<Mesh>::rebuild()
template
<
class
Mesh
>
void
DrawMeshT
<
Mesh
>::
readVertex
(
size_t
_vertex
,
const
typename
Mesh
::
VertexHandle
_vh
,
const
typename
Mesh
::
HalfedgeHandle
_hh
,
const
typename
Mesh
::
FaceHandle
_fh
)
const
typename
Mesh
::
VertexHandle
&
_vh
,
const
typename
Mesh
::
HalfedgeHandle
&
_hh
,
const
typename
Mesh
::
FaceHandle
&
_fh
)
{
static
const
typename
Mesh
::
HalfedgeHandle
invalidHEH
(
-
1
);
static
const
typename
Mesh
::
FaceHandle
invalidFH
(
-
1
);
...
...
@@ -831,7 +831,7 @@ DrawMeshT<Mesh>::readVertex(size_t _vertex,
template
<
class
Mesh
>
unsigned
int
DrawMeshT
<
Mesh
>::
getVertexColor
(
const
typename
Mesh
::
VertexHandle
_vh
)
DrawMeshT
<
Mesh
>::
getVertexColor
(
const
typename
Mesh
::
VertexHandle
&
_vh
)
{
static
const
typename
Mesh
::
VertexHandle
invalidVH
(
-
1
);
...
...
@@ -853,7 +853,7 @@ DrawMeshT<Mesh>::getVertexColor(const typename Mesh::VertexHandle _vh)
template
<
class
Mesh
>
unsigned
int
DrawMeshT
<
Mesh
>::
getFaceColor
(
const
typename
Mesh
::
FaceHandle
_fh
)
DrawMeshT
<
Mesh
>::
getFaceColor
(
const
typename
Mesh
::
FaceHandle
&
_fh
)
{
static
const
typename
Mesh
::
FaceHandle
invalidFH
(
-
1
);
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment