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
OpenMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
13
Issues
13
List
Boards
Labels
Service Desk
Milestones
Merge Requests
5
Merge Requests
5
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenMesh
OpenMesh
Commits
b7aabbd9
Commit
b7aabbd9
authored
Oct 24, 2016
by
Jan Möbius
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed some warnings
parent
0132a367
Pipeline
#3328
passed with stage
in 67 minutes and 37 seconds
Changes
6
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
19 additions
and
19 deletions
+19
-19
src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
+12
-12
src/OpenMesh/Core/IO/reader/PLYReader.cc
src/OpenMesh/Core/IO/reader/PLYReader.cc
+1
-1
src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
+1
-1
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
+1
-1
src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc
src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc
+2
-2
src/Unittests/unittests_smoother.cc
src/Unittests/unittests_smoother.cc
+2
-2
No files found.
src/OpenMesh/Apps/QtViewer/QGLViewerWidget.cc
View file @
b7aabbd9
...
...
@@ -154,10 +154,10 @@ QGLViewerWidget::~QGLViewerWidget()
void
QGLViewerWidget
::
setDefaultMaterial
(
void
)
{
GLfloat
mat_a
[]
=
{
0.1
,
0.1
,
0.1
,
1.0
};
GLfloat
mat_d
[]
=
{
0.7
,
0.7
,
0.5
,
1.0
};
GLfloat
mat_s
[]
=
{
1.0
,
1.0
,
1.0
,
1.0
};
GLfloat
shine
[]
=
{
120.0
};
GLfloat
mat_a
[]
=
{
0.1
f
,
0.1
f
,
0.1
f
,
1.0
f
};
GLfloat
mat_d
[]
=
{
0.7
f
,
0.7
f
,
0.5
f
,
1.0
f
};
GLfloat
mat_s
[]
=
{
1.0
f
,
1.0
f
,
1.0
f
,
1.0
f
};
GLfloat
shine
[]
=
{
120.0
f
};
glMaterialfv
(
GL_FRONT_AND_BACK
,
GL_AMBIENT
,
mat_a
);
glMaterialfv
(
GL_FRONT_AND_BACK
,
GL_DIFFUSE
,
mat_d
);
...
...
@@ -171,12 +171,12 @@ QGLViewerWidget::setDefaultMaterial(void)
void
QGLViewerWidget
::
setDefaultLight
(
void
)
{
GLfloat
pos1
[]
=
{
0.1
,
0.1
,
-
0.02
,
0.0
};
GLfloat
pos2
[]
=
{
-
0.1
,
0.1
,
-
0.02
,
0.0
};
GLfloat
pos3
[]
=
{
0.0
,
0.0
,
0.1
,
0.0
};
GLfloat
col1
[]
=
{
0.7
,
0.7
,
0.8
,
1.0
};
GLfloat
col2
[]
=
{
0.8
,
0.7
,
0.7
,
1.0
};
GLfloat
col3
[]
=
{
1.0
,
1.0
,
1.0
,
1.0
};
GLfloat
pos1
[]
=
{
0.1
f
,
0.1
f
,
-
0.02
f
,
0.0
f
};
GLfloat
pos2
[]
=
{
-
0.1
f
,
0.1
f
,
-
0.02
f
,
0.0
f
};
GLfloat
pos3
[]
=
{
0.0
f
,
0.0
f
,
0.1
f
,
0.0
f
};
GLfloat
col1
[]
=
{
0.7
f
,
0.7
f
,
0.8
f
,
1.0
f
};
GLfloat
col2
[]
=
{
0.8
f
,
0.7
f
,
0.7
f
,
1.0
f
};
GLfloat
col3
[]
=
{
1.0
f
,
1.0
f
,
1.0
f
,
1.0
f
};
glEnable
(
GL_LIGHT0
);
glLightfv
(
GL_LIGHT0
,
GL_POSITION
,
pos1
);
...
...
@@ -214,10 +214,10 @@ QGLViewerWidget::initializeGL()
setDefaultLight
();
// Fog
GLfloat
fogColor
[
4
]
=
{
0.3
,
0.3
,
0.4
,
1.0
};
GLfloat
fogColor
[
4
]
=
{
0.3
f
,
0.3
f
,
0.4
f
,
1.0
f
};
glFogi
(
GL_FOG_MODE
,
GL_LINEAR
);
glFogfv
(
GL_FOG_COLOR
,
fogColor
);
glFogf
(
GL_FOG_DENSITY
,
0.35
);
glFogf
(
GL_FOG_DENSITY
,
0.35
f
);
glHint
(
GL_FOG_HINT
,
GL_DONT_CARE
);
glFogf
(
GL_FOG_START
,
5.0
f
);
glFogf
(
GL_FOG_END
,
25.0
f
);
...
...
src/OpenMesh/Core/IO/reader/PLYReader.cc
View file @
b7aabbd9
...
...
@@ -1077,7 +1077,7 @@ bool _PLYReader_::can_u_read(std::istream& _is) const {
trim
(
line
);
// Handle '\r\n' newlines
const
int
s
=
line
.
size
();
const
size_t
s
=
line
.
size
();
if
(
s
>
0
&&
line
[
s
-
1
]
==
'\r'
)
line
.
resize
(
s
-
1
);
//Check if this file is really a ply format
...
...
src/OpenMesh/Tools/Smoother/JacobiLaplaceSmootherT.cc
View file @
b7aabbd9
...
...
@@ -123,7 +123,7 @@ compute_new_positions_C0()
u
-=
vector_cast
<
typename
Mesh
::
Normal
>
(
Base
::
mesh_
.
point
(
*
v_it
));
// damping
u
*=
0.5
;
u
*=
static_cast
<
typename
Mesh
::
Scalar
>
(
0.5
)
;
// store new position
p
=
vector_cast
<
typename
Mesh
::
Normal
>
(
Base
::
mesh_
.
point
(
*
v_it
));
...
...
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View file @
b7aabbd9
...
...
@@ -863,7 +863,7 @@ void VF<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
if
(
Base
::
number
()
==
Base
::
subdiv_rule
()
->
number
()
+
1
&&
Base
::
mesh_
.
is_boundary
(
_fh
)
&&
!
MOBJ
(
_fh
).
final
())
position
*=
0.5
;
position
*=
static_cast
<
typename
M
::
Scalar
>
(
0.5
)
;
MOBJ
(
_fh
).
set_position
(
_target_state
,
position
);
MOBJ
(
_fh
).
inc_state
();
...
...
src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc
View file @
b7aabbd9
...
...
@@ -309,7 +309,7 @@ CatmullClarkT<MeshType,RealType>::compute_midpoint( MeshType& _m, const EdgeHand
// this yields the [1/2 1/2] mask
if
(
_m
.
is_boundary
(
_eh
)
||
!
_update_points
)
{
pos
*=
0.5
;
pos
*=
static_cast
<
RealType
>
(
0.5
)
;
}
// else if (_m.status(_eh).selected() )
// {
...
...
@@ -321,7 +321,7 @@ CatmullClarkT<MeshType,RealType>::compute_midpoint( MeshType& _m, const EdgeHand
{
pos
+=
_m
.
property
(
fp_pos_
,
_m
.
face_handle
(
heh
));
pos
+=
_m
.
property
(
fp_pos_
,
_m
.
face_handle
(
opp_heh
));
pos
*=
0.25
;
pos
*=
static_cast
<
RealType
>
(
0.25
)
;
}
_m
.
property
(
ep_pos_
,
_eh
)
=
pos
;
}
...
...
src/Unittests/unittests_smoother.cc
View file @
b7aabbd9
...
...
@@ -111,10 +111,10 @@ TEST_F(OpenMeshSmoother_Poly, Smoother_Triangle_Laplace) {
OpenMesh
::
Smoother
::
JacobiLaplaceSmootherT
<
PolyMesh
>
smoother
(
mesh_
);;
// Just call function to instantiate template
smoother
.
set_absolute_local_error
(
0.5
);
smoother
.
set_absolute_local_error
(
0.5
f
);
// Set an error
smoother
.
set_relative_local_error
(
0.1
);
smoother
.
set_relative_local_error
(
0.1
f
);
// Run algorithm with 5 steps
smoother
.
smooth
(
5
);
...
...
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