Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
Type-Skeleton
Commits
46b6922f
Commit
46b6922f
authored
Apr 27, 2021
by
Jan Möbius
Browse files
Fixed cppcheck warnings
parent
e2491c8b
Changes
3
Hide whitespace changes
Inline
Side-by-side
ObjectTypes/Skeleton/SkeletonObject.cc
View file @
46b6922f
...
...
@@ -352,8 +352,9 @@ void SkeletonObject::updateIndices(const AnimationHandle &_hAni)
removeAdditionalNode
(
pTransNode
,
"SkeletonPlugin"
,
nameTransformNode
.
c_str
());
++
i
;
continue
;
}
else
{
bAdditionalNodes
=
false
;
}
bAdditionalNodes
=
false
;
}
while
(
bAdditionalNodes
);
}
...
...
@@ -382,24 +383,25 @@ void SkeletonObject::showIndices(bool _bVisible)
pMatNode
->
set_status
(
ACG
::
SceneGraph
::
BaseNode
::
HideSubtree
);
// find and prune redundant nodes
unsigned
int
i
=
skeleton_
->
jointCount
();
unsigned
int
jointCount
=
skeleton_
->
jointCount
();
bool
bAdditionalNodes
=
true
;
do
{
std
::
stringstream
buf
;
std
::
string
nameTransformNode
;
buf
<<
"TextNode "
<<
i
<<
" Transform"
;
buf
<<
"TextNode "
<<
jointCount
<<
" Transform"
;
nameTransformNode
=
buf
.
str
();
ACG
::
SceneGraph
::
TransformNode
*
pTransNode
;
if
(
getAdditionalNode
(
pTransNode
,
"SkeletonPlugin"
,
nameTransformNode
.
c_str
()))
{
removeAdditionalNode
(
pTransNode
,
"SkeletonPlugin"
,
nameTransformNode
.
c_str
());
++
i
;
++
jointCount
;
continue
;
}
else
{
bAdditionalNodes
=
false
;
}
bAdditionalNodes
=
false
;
}
while
(
bAdditionalNodes
);
}
while
(
bAdditionalNodes
);
// add or update nodes
PoseT
<
OpenMesh
::
Vec3d
>*
ref
=
skeleton_
->
referencePose
();
...
...
@@ -543,8 +545,9 @@ void SkeletonObject::updateMotionPath(const AnimationHandle &_hAni)
removeAdditionalNode
(
pTransNode
,
"SkeletonPlugin"
,
nameTransformNode
.
c_str
());
++
i
;
continue
;
}
else
{
bAdditionalNodes
=
false
;
}
bAdditionalNodes
=
false
;
}
while
(
bAdditionalNodes
);
}
...
...
@@ -573,23 +576,24 @@ void SkeletonObject::showMotionPath(bool _visible)
pMatNode
->
set_status
(
ACG
::
SceneGraph
::
BaseNode
::
HideSubtree
);
// find and prune redundant nodes
unsigned
int
i
=
skeleton_
->
jointCount
();
unsigned
int
jointCount
=
skeleton_
->
jointCount
();
bool
bAdditionalNodes
=
true
;
do
{
std
::
stringstream
buf
;
std
::
string
nameTransformNode
;
buf
<<
"LineNode "
<<
i
<<
" Transform"
;
buf
<<
"LineNode "
<<
jointCount
<<
" Transform"
;
nameTransformNode
=
buf
.
str
();
ACG
::
SceneGraph
::
TransformNode
*
pTransNode
;
if
(
getAdditionalNode
(
pTransNode
,
"SkeletonPlugin"
,
nameTransformNode
.
c_str
()))
{
removeAdditionalNode
(
pTransNode
,
"SkeletonPlugin"
,
nameTransformNode
.
c_str
());
++
i
;
++
jointCount
;
continue
;
}
else
{
bAdditionalNodes
=
false
;
}
bAdditionalNodes
=
false
;
}
while
(
bAdditionalNodes
);
...
...
Plugin-TypeSkeleton/SkeletonBackup.cc
View file @
46b6922f
...
...
@@ -44,7 +44,7 @@
//-----------------------------------------------------------------------------
SkeletonBackup
::
SkeletonBackup
(
SkeletonObject
*
_skelObj
,
QString
_name
,
UpdateType
_type
)
SkeletonBackup
::
SkeletonBackup
(
SkeletonObject
*
_skelObj
,
const
QString
&
_name
,
UpdateType
_type
)
:
BaseBackup
(
_skelObj
,
_name
,
_type
),
skelObj_
(
_skelObj
)
{
...
...
Plugin-TypeSkeleton/SkeletonBackup.hh
View file @
46b6922f
...
...
@@ -53,7 +53,7 @@ class SkeletonBackup : public BaseBackup
{
public:
SkeletonBackup
(
SkeletonObject
*
_skelObj
,
QString
_name
,
UpdateType
_type
);
SkeletonBackup
(
SkeletonObject
*
_skelObj
,
const
QString
&
_name
,
UpdateType
_type
);
~
SkeletonBackup
();
public:
...
...
Write
Preview
Supports
Markdown
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