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
C
CGoGN
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CGoGN
CGoGN
Commits
edd64adf
Commit
edd64adf
authored
Nov 29, 2012
by
Jund Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
correction importSVG
parent
972f331f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
5 deletions
+11
-5
include/Algo/Import/importSvg.hpp
include/Algo/Import/importSvg.hpp
+11
-5
No files found.
include/Algo/Import/importSvg.hpp
View file @
edd64adf
...
@@ -491,7 +491,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
...
@@ -491,7 +491,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
//if the valence of one of the vertex is equal to one
//if the valence of one of the vertex is equal to one
//cut the edge to insert the quadrangular face
//cut the edge to insert the quadrangular face
if
(
map
.
phi2_1
(
d1
)
==
d1
)
if
(
map
.
vertexDegree
(
d1
)
==
2
)
{
{
map
.
cutEdge
(
d2
)
;
map
.
cutEdge
(
d2
)
;
brokenL
.
mark
(
map
.
phi1
(
d2
))
;
brokenL
.
mark
(
map
.
phi1
(
d2
))
;
...
@@ -502,7 +502,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
...
@@ -502,7 +502,7 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
edgePlanes
[
map
.
phi_1
(
d1
)]
=
Geom
::
Plane3D
<
typename
PFP
::
REAL
>
(
v
,
p1
)
;
edgePlanes
[
map
.
phi_1
(
d1
)]
=
Geom
::
Plane3D
<
typename
PFP
::
REAL
>
(
v
,
p1
)
;
}
}
if
(
map
.
phi2_1
(
d2
)
==
d
2
)
if
(
map
.
vertexDegree
(
d2
)
==
2
)
{
{
map
.
cutEdge
(
d1
)
;
map
.
cutEdge
(
d1
)
;
brokenL
.
mark
(
map
.
phi1
(
d1
))
;
brokenL
.
mark
(
map
.
phi1
(
d1
))
;
...
@@ -533,15 +533,21 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
...
@@ -533,15 +533,21 @@ bool importSVG(typename PFP::MAP& map, const std::string& filename, VertexAttrib
{
{
if
(
brokenL
.
isMarked
(
d
))
if
(
brokenL
.
isMarked
(
d
))
{
{
VEC3
pos
;
Geom
::
Plane3D
<
typename
PFP
::
REAL
>
pl
;
Geom
::
Plane3D
<
typename
PFP
::
REAL
>
pl
;
VEC3
pos
=
position
[
d
]
;
pos
=
position
[
d
]
;
pl
=
edgePlanes
[
d
]
;
pl
=
edgePlanes
[
d
]
;
pl
.
project
(
pos
)
;
pl
.
project
(
pos
)
;
pl
=
edgePlanes
[
map
.
phi_1
(
d
)]
;
//
pl = edgePlanes[map.phi_1(d)] ;
pl
.
project
(
pos
)
;
//
pl.project(pos) ;
position
[
d
]
=
pos
;
position
[
d
]
=
pos
;
pos
=
position
[
map
.
phi1
(
d
)]
;
pl
.
project
(
pos
)
;
position
[
map
.
phi1
(
d
)]
=
pos
;
}
}
}
}
/////////////////////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////////////////////
...
...
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