Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openstructure
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container registry
Model registry
Analyze
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
schwede
openstructure
Commits
2aee19d8
Commit
2aee19d8
authored
14 years ago
by
Marco Biasini
Browse files
Options
Downloads
Patches
Plain Diff
silence some warnings
parent
0d6c6b87
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
modules/gfx/src/impl/cartoon_renderer.cc
+6
-1
6 additions, 1 deletion
modules/gfx/src/impl/cartoon_renderer.cc
modules/gfx/src/impl/entity_detail.cc
+1
-1
1 addition, 1 deletion
modules/gfx/src/impl/entity_detail.cc
with
7 additions
and
2 deletions
modules/gfx/src/impl/cartoon_renderer.cc
+
6
−
1
View file @
2aee19d8
...
@@ -105,7 +105,9 @@ void CartoonRenderer::PrepareRendering(const BackboneTrace& subset,
...
@@ -105,7 +105,9 @@ void CartoonRenderer::PrepareRendering(const BackboneTrace& subset,
FudgeSplineObj
(
tmp_sll
);
FudgeSplineObj
(
tmp_sll
);
}
}
spline_list_list
.
clear
();
spline_list_list
.
clear
();
#if !defined(NDEBUG)
unsigned
int
tmp_count
=
0
;
unsigned
int
tmp_count
=
0
;
#endif
for
(
SplineEntryListList
::
const_iterator
sit
=
tmp_sll
.
begin
();
sit
!=
tmp_sll
.
end
();
++
sit
)
{
for
(
SplineEntryListList
::
const_iterator
sit
=
tmp_sll
.
begin
();
sit
!=
tmp_sll
.
end
();
++
sit
)
{
if
(
sit
->
size
()
==
2
and
sit
->
at
(
0
).
type
==
6
)
{
if
(
sit
->
size
()
==
2
and
sit
->
at
(
0
).
type
==
6
)
{
// don't intpol cylinders
// don't intpol cylinders
...
@@ -418,7 +420,10 @@ void CartoonRenderer::RebuildSplineObj(IndexedVertexArray& va,
...
@@ -418,7 +420,10 @@ void CartoonRenderer::RebuildSplineObj(IndexedVertexArray& va,
}
}
// iterate over all spline segments
// iterate over all spline segments
#if !defined(NDEBUG)
unsigned
int
tmp_count
=
0
;
unsigned
int
tmp_count
=
0
;
#endif
for
(
SplineEntryListList
::
const_iterator
it
=
spline_list_list
.
begin
();
for
(
SplineEntryListList
::
const_iterator
it
=
spline_list_list
.
begin
();
it
<
spline_list_list
.
end
();
++
it
)
{
it
<
spline_list_list
.
end
();
++
it
)
{
/*
/*
...
@@ -560,7 +565,7 @@ void CartoonRenderer::AssembleProfile(const TraceProfile& prof1,
...
@@ -560,7 +565,7 @@ void CartoonRenderer::AssembleProfile(const TraceProfile& prof1,
// first get the best correction offset
// first get the best correction offset
float
accum
[]
=
{
0.0
,
0.0
,
0.0
,
0.0
,
0.0
};
float
accum
[]
=
{
0.0
,
0.0
,
0.0
,
0.0
,
0.0
};
for
(
in
t
i
=
0
;
i
<
size
;
++
i
)
{
for
(
size_
t
i
=
0
;
i
<
size
;
++
i
)
{
int
i1
=
(
i
+
0
)
%
(
size
);
int
i1
=
(
i
+
0
)
%
(
size
);
int
i2
=
(
i
+
1
)
%
(
size
);
int
i2
=
(
i
+
1
)
%
(
size
);
geom
::
Vec3
v1
=
va
.
GetVert
(
prof1
[
i1
].
id
);
geom
::
Vec3
v1
=
va
.
GetVert
(
prof1
[
i1
].
id
);
...
...
This diff is collapsed.
Click to expand it.
modules/gfx/src/impl/entity_detail.cc
+
1
−
1
View file @
2aee19d8
...
@@ -390,7 +390,7 @@ SplineEntryList Spline::Generate(const SplineEntryList& entry_list, int nsub, ui
...
@@ -390,7 +390,7 @@ SplineEntryList Spline::Generate(const SplineEntryList& entry_list, int nsub, ui
sublist
.
back
().
frac
=
0.0
;
sublist
.
back
().
frac
=
0.0
;
float
insub
=
1.0
/
static_cast
<
float
>
(
nsub
);
float
insub
=
1.0
/
static_cast
<
float
>
(
nsub
);
for
(
in
t
c
=
0
;
c
<
sublist
.
size
();
++
c
)
{
for
(
size_
t
c
=
0
;
c
<
sublist
.
size
();
++
c
)
{
sublist
[
c
].
running_length
=
static_cast
<
float
>
(
c
)
*
insub
;
sublist
[
c
].
running_length
=
static_cast
<
float
>
(
c
)
*
insub
;
}
}
...
...
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