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
Sauvage
CGoGN
Commits
cc598de6
Commit
cc598de6
authored
Feb 22, 2012
by
Pierre Kraemer
Browse files
importMRDAT encore..
parent
832f1c78
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/Algo/Import/importMRDAT.h
View file @
cc598de6
...
...
@@ -34,13 +34,14 @@ namespace Algo
namespace
Import
{
template
<
typename
PFP
>
bool
importMRDAT
(
typename
PFP
::
MAP
&
map
,
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
)
;
template
<
typename
PFP
>
class
QuadTreeNode
{
public:
public:
unsigned
int
indices
[
3
]
;
QuadTreeNode
*
children
[
4
]
;
QuadTreeNode
*
parent
;
unsigned
int
level
;
QuadTreeNode
()
{
for
(
unsigned
int
i
=
0
;
i
<
3
;
++
i
)
...
...
@@ -48,6 +49,7 @@ public:
for
(
unsigned
int
i
=
0
;
i
<
4
;
++
i
)
children
[
i
]
=
NULL
;
parent
=
NULL
;
level
=
0
;
}
~
QuadTreeNode
()
...
...
@@ -59,11 +61,12 @@ public:
void
subdivide
()
{
assert
(
children
[
0
]
==
NULL
)
;
assert
(
!
isSubdivided
()
)
;
for
(
unsigned
int
i
=
0
;
i
<
4
;
++
i
)
{
children
[
i
]
=
new
QuadTreeNode
()
;
children
[
i
]
->
parent
=
this
;
children
[
i
]
->
level
=
level
+
1
;
}
}
...
...
@@ -72,8 +75,11 @@ public:
return
children
[
0
]
!=
NULL
;
}
template
<
typename
PFP
>
void
embed
(
typename
PFP
::
MAP
&
map
,
Dart
d
,
std
::
vector
<
unsigned
int
>&
vID
,
std
::
vector
<
unsigned
int
>&
vLev
,
bool
CCW
)
{
assert
(
map
.
getCurrentLevel
()
==
level
)
;
if
(
isSubdivided
())
{
std
::
cout
<<
"embed subdivided edge vertices / current level -> "
<<
map
.
getCurrentLevel
()
<<
std
::
endl
;
...
...
@@ -103,9 +109,9 @@ public:
unsigned
int
e1L
=
vLev
[
children
[
0
]
->
indices
[
1
]]
;
unsigned
int
e2L
=
vLev
[
children
[
0
]
->
indices
[
2
]]
;
assert
(
map
.
getMaxLevel
()
+
1
-
e0L
==
map
.
getCurrentLevel
()
+
1
)
;
assert
(
map
.
getMaxLevel
()
+
1
-
e1L
==
map
.
getCurrentLevel
()
+
1
)
;
assert
(
map
.
getMaxLevel
()
+
1
-
e2L
==
map
.
getCurrentLevel
()
+
1
)
;
//
assert(map.getMaxLevel() + 1 - e0L == map.getCurrentLevel() + 1) ;
//
assert(map.getMaxLevel() + 1 - e1L == map.getCurrentLevel() + 1) ;
//
assert(map.getMaxLevel() + 1 - e2L == map.getCurrentLevel() + 1) ;
// assert(e0L == map.getCurrentLevel() + 1 + 1) ;
// assert(e1L == map.getCurrentLevel() + 1 + 1) ;
// assert(e2L == map.getCurrentLevel() + 1 + 1) ;
...
...
@@ -192,24 +198,24 @@ public:
Dart
t0
=
map
.
phi_1
(
d
)
;
map
.
incCurrentLevel
()
;
t0
=
map
.
phi2
(
map
.
phi1
(
t0
))
;
children
[
0
]
->
embed
(
map
,
t0
,
vID
,
vLev
,
CCW
)
;
children
[
0
]
->
embed
<
PFP
>
(
map
,
t0
,
vID
,
vLev
,
CCW
)
;
map
.
decCurrentLevel
()
;
Dart
t1
=
d
;
map
.
incCurrentLevel
()
;
children
[
1
]
->
embed
(
map
,
t1
,
vID
,
vLev
,
!
CCW
)
;
children
[
1
]
->
embed
<
PFP
>
(
map
,
t1
,
vID
,
vLev
,
!
CCW
)
;
map
.
decCurrentLevel
()
;
Dart
t2
=
map
.
phi1
(
d
)
;
map
.
incCurrentLevel
()
;
t2
=
map
.
phi1
(
t2
)
;
children
[
2
]
->
embed
(
map
,
t2
,
vID
,
vLev
,
!
CCW
)
;
children
[
2
]
->
embed
<
PFP
>
(
map
,
t2
,
vID
,
vLev
,
!
CCW
)
;
map
.
decCurrentLevel
()
;
Dart
t3
=
map
.
phi_1
(
d
)
;
map
.
incCurrentLevel
()
;
t3
=
map
.
phi_1
(
t3
)
;
children
[
3
]
->
embed
(
map
,
t3
,
vID
,
vLev
,
!
CCW
)
;
children
[
3
]
->
embed
<
PFP
>
(
map
,
t3
,
vID
,
vLev
,
!
CCW
)
;
map
.
decCurrentLevel
()
;
}
else
...
...
@@ -228,17 +234,12 @@ public:
children
[
i
]
->
print
()
;
}
}
unsigned
int
indices
[
3
]
;
QuadTreeNode
*
children
[
4
]
;
QuadTreeNode
*
parent
;
}
;
template
<
typename
PFP
>
class
QuadTree
{
public:
std
::
vector
<
QuadTreeNode
<
PFP
>
*>
roots
;
std
::
vector
<
QuadTreeNode
*>
roots
;
std
::
vector
<
Dart
>
darts
;
~
QuadTree
()
...
...
@@ -247,10 +248,11 @@ public:
delete
roots
[
i
]
;
}
template
<
typename
PFP
>
void
embed
(
typename
PFP
::
MAP
&
map
,
std
::
vector
<
unsigned
int
>&
vID
,
std
::
vector
<
unsigned
int
>&
vLev
)
{
for
(
unsigned
int
i
=
0
;
i
<
roots
.
size
();
++
i
)
roots
[
i
]
->
embed
(
map
,
darts
[
i
],
vID
,
vLev
,
true
)
;
roots
[
i
]
->
embed
<
PFP
>
(
map
,
darts
[
i
],
vID
,
vLev
,
true
)
;
}
void
print
()
...
...
@@ -264,6 +266,9 @@ public:
}
}
;
template
<
typename
PFP
>
bool
importMRDAT
(
typename
PFP
::
MAP
&
map
,
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
QuadTree
&
qt
)
;
}
// namespace Import
}
// namespace Algo
...
...
include/Algo/Import/importMRDAT.hpp
View file @
cc598de6
...
...
@@ -39,7 +39,7 @@ inline void nextNonEmptyLine(std::ifstream& fp, std::string& line)
}
template
<
typename
PFP
>
bool
importMRDAT
(
typename
PFP
::
MAP
&
map
,
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
)
bool
importMRDAT
(
typename
PFP
::
MAP
&
map
,
const
std
::
string
&
filename
,
std
::
vector
<
std
::
string
>&
attrNames
,
QuadTree
&
qt
)
{
AttributeHandler
<
typename
PFP
::
VEC3
>
position
=
map
.
template
getAttribute
<
typename
PFP
::
VEC3
>(
VERTEX
,
"position"
)
;
...
...
@@ -116,11 +116,11 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
nextNonEmptyLine
(
fp
,
line
)
;
}
std
::
cout
<<
"..done"
<<
std
::
endl
;
std
::
cout
<<
"..done
(nb vertices -> "
<<
verticesID
.
size
()
<<
")
"
<<
std
::
endl
;
std
::
cout
<<
" Read triangles (build quadtree).."
<<
std
::
flush
;
QuadTree
<
PFP
>
qt
;
QuadTreeNode
<
PFP
>
*
current
=
NULL
;
//
QuadTree qt ;
QuadTreeNode
*
current
=
NULL
;
unsigned
int
currentLevel
=
-
1
;
std
::
vector
<
unsigned
int
>
lastNum
;
...
...
@@ -144,10 +144,10 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
if
(
root
==
1
)
{
assert
(
num
==
0
)
;
QuadTreeNode
<
PFP
>
*
n
=
new
QuadTreeNode
<
PFP
>
()
;
assert
(
depth
+
1
-
verticesLevel
[
idx0
]
==
0
)
;
assert
(
depth
+
1
-
verticesLevel
[
idx1
]
==
0
)
;
assert
(
depth
+
1
-
verticesLevel
[
idx2
]
==
0
)
;
QuadTreeNode
*
n
=
new
QuadTreeNode
()
;
//
assert(depth + 1 - verticesLevel[idx0] == 0) ;
//
assert(depth + 1 - verticesLevel[idx1] == 0) ;
//
assert(depth + 1 - verticesLevel[idx2] == 0) ;
// assert(verticesLevel[idx0] == 1) ;
// assert(verticesLevel[idx1] == 1) ; // pour les exports de triReme
// assert(verticesLevel[idx2] == 1) ;
...
...
@@ -183,9 +183,9 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
}
while
(
lastNum
[
currentLevel
]
==
3
)
;
}
}
assert
(
depth
+
1
-
verticesLevel
[
idx0
]
<=
currentLevel
)
;
assert
(
depth
+
1
-
verticesLevel
[
idx1
]
<=
currentLevel
)
;
assert
(
depth
+
1
-
verticesLevel
[
idx2
]
<=
currentLevel
)
;
//
assert(depth + 1 - verticesLevel[idx0] <= currentLevel) ;
//
assert(depth + 1 - verticesLevel[idx1] <= currentLevel) ;
//
assert(depth + 1 - verticesLevel[idx2] <= currentLevel) ;
// assert(verticesLevel[idx0] <= currentLevel + 1) ;
// assert(verticesLevel[idx1] <= currentLevel + 1) ; // pour les exports de triReme
// assert(verticesLevel[idx2] <= currentLevel + 1) ;
...
...
@@ -275,27 +275,9 @@ bool importMRDAT(typename PFP::MAP& map, const std::string& filename, std::vecto
std
::
cout
<<
" Embed finer resolution levels.."
<<
std
::
flush
;
map
.
setCurrentLevel
(
0
)
;
qt
.
embed
(
map
,
verticesID
,
verticesLevel
)
;
qt
.
embed
<
PFP
>
(
map
,
verticesID
,
verticesLevel
)
;
map
.
setCurrentLevel
(
map
.
getMaxLevel
())
;
// TraversorV<typename PFP::MAP> tv(map, allDarts, true) ;
// for(Dart d = tv.begin(); d != tv.end(); d = tv.next())
// {
// unsigned int vertexLevel = map.getDartLevel(d) ;
// if(vertexLevel > 0 && vertexLevel < map.getMaxLevel())
// {
// map.pushLevel() ;
// map.setCurrentLevel(vertexLevel) ;
// unsigned int emb = map.getEmbedding(VERTEX, d) ;
// for(unsigned int i = vertexLevel + 1; i <= map.getMaxLevel(); ++i)
// {
// map.setCurrentLevel(i) ;
// map.embedOrbit(VERTEX, d, emb) ;
// }
// map.popLevel() ;
// }
// }
std
::
cout
<<
"..done"
<<
std
::
endl
;
return
true
;
...
...
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