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
9e3037c6
Commit
9e3037c6
authored
May 25, 2016
by
Martin Schultz
Browse files
fixes
#50
Please enter the commit message for your changes. Lines starting
parent
09a03096
Pipeline
#2030
passed with stage
in 78 minutes and 2 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Plugin-PolyLine/PolyLinePlugin_BezierSpline.cc
View file @
9e3037c6
...
...
@@ -70,7 +70,8 @@ getPointOnMesh(PolyLineBezierSplineData* _SplineData, ACG::Vec3d _point, ACG::Ve
ACG
::
Vec3d
nor
=
mesh
->
mesh
()
->
normal
(
neigh
.
handle
);
if
(
_nor
)
*
_nor
=
nor
;
OpenMeshTriangleBSPT
<
TriMesh
>::
RayCollision
rayInt
=
bsp
->
raycollision
(
_point
,
nor
);
OpenMeshTriangleBSPT
<
TriMesh
>::
RayCollision
rayInt
;
rayInt
=
bsp
->
raycollision
(
_point
,
nor
);
if
(
rayInt
.
size
())
return
_point
+
nor
*
rayInt
[
0
].
second
;
return
_point
+
nor
.
normalize
()
*
neigh
.
dist
;
...
...
Plugin-PolyLine/PolyLinePlugin_Circle.cc
View file @
9e3037c6
...
...
@@ -82,7 +82,8 @@ struct Onb {
bool
PolyLinePlugin
::
createCircle_getPointOnMesh
(
TriMeshObject
*
_triMeshObject
,
ACG
::
Vec3d
_center
,
ACG
::
Vec3d
_pOnPlane
,
ACG
::
Vec3d
_n
,
ACG
::
Vec3d
*
_pOut
)
{
OpenMeshTriangleBSPT
<
TriMesh
>*
bsp
=
_triMeshObject
->
requestTriangleBsp
();
OpenMeshTriangleBSPT
<
TriMesh
>::
RayCollision
rayInt
=
bsp
->
raycollision
(
_pOnPlane
,
_n
);
OpenMeshTriangleBSPT
<
TriMesh
>::
RayCollision
rayInt
;
rayInt
=
bsp
->
raycollision
(
_pOnPlane
,
_n
);
if
(
rayInt
.
empty
())
return
false
;
...
...
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