Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Humanoid Path Planner
hpp-fcl
Commits
66957bad
Unverified
Commit
66957bad
authored
Apr 23, 2021
by
Justin Carpentier
Committed by
GitHub
Apr 23, 2021
Browse files
Merge pull request #221 from wxmerkt/topic/remove-register-keyword
Remove register keyword to fix #220
parents
40c9869a
5437fbe0
Pipeline
#14143
passed with stage
in 42 minutes and 15 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/BV/OBB.cpp
View file @
66957bad
...
...
@@ -163,7 +163,7 @@ inline OBB merge_smalldist(const OBB& b1, const OBB& b2)
bool
obbDisjoint
(
const
Matrix3f
&
B
,
const
Vec3f
&
T
,
const
Vec3f
&
a
,
const
Vec3f
&
b
)
{
register
FCL_REAL
t
,
s
;
FCL_REAL
t
,
s
;
const
FCL_REAL
reps
=
1e-6
;
Matrix3f
Bf
(
B
.
array
().
abs
()
+
reps
);
...
...
@@ -313,7 +313,7 @@ namespace internal
{
// Bf = |B|
// | B^T T| - Bf^T * a - b
register
FCL_REAL
s
,
t
=
0
;
FCL_REAL
s
,
t
=
0
;
s
=
std
::
abs
(
B
.
col
(
0
).
dot
(
T
))
-
Bf
.
col
(
0
).
dot
(
a
)
-
b
[
0
];
if
(
s
>
0
)
t
+=
s
*
s
;
s
=
std
::
abs
(
B
.
col
(
1
).
dot
(
T
))
-
Bf
.
col
(
1
).
dot
(
a
)
-
b
[
1
];
...
...
test/obb.cpp
View file @
66957bad
...
...
@@ -213,7 +213,7 @@ namespace obbDisjoint_impls
return AABB_corner.array().max(0).matrix().squaredNorm ();
/*/
#if MANUAL_PRODUCT
register
FCL_REAL
s
,
t
=
0
;
FCL_REAL
s
,
t
=
0
;
s
=
std
::
abs
(
B
.
col
(
0
).
dot
(
T
))
-
Bf
.
col
(
0
).
dot
(
a
)
-
b
[
0
];
if
(
s
>
0
)
t
+=
s
*
s
;
s
=
std
::
abs
(
B
.
col
(
1
).
dot
(
T
))
-
Bf
.
col
(
1
).
dot
(
a
)
-
b
[
1
];
...
...
@@ -816,7 +816,7 @@ namespace obbDisjoint_impls
// ------------------------ 5 --------------------------------------
bool
originalWithLowerBound
(
const
Matrix3f
&
B
,
const
Vec3f
&
T
,
const
Vec3f
&
a
,
const
Vec3f
&
b
,
const
FCL_REAL
&
breakDistance2
,
FCL_REAL
&
squaredLowerBoundDistance
)
{
register
FCL_REAL
t
,
s
;
FCL_REAL
t
,
s
;
FCL_REAL
diff
;
Matrix3f
Bf
(
B
.
cwiseAbs
());
...
...
@@ -1039,7 +1039,7 @@ namespace obbDisjoint_impls
// ------------------------ 6 --------------------------------------
bool
originalWithNoLowerBound
(
const
Matrix3f
&
B
,
const
Vec3f
&
T
,
const
Vec3f
&
a
,
const
Vec3f
&
b
,
const
FCL_REAL
&
,
FCL_REAL
&
squaredLowerBoundDistance
)
{
register
FCL_REAL
t
,
s
;
FCL_REAL
t
,
s
;
const
FCL_REAL
reps
=
1e-6
;
squaredLowerBoundDistance
=
0
;
...
...
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