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
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
34034512
Commit
34034512
authored
Jun 20, 2012
by
untereiner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
few changes in Multiresolution managing
parent
dde45350
Changes
5
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
800 additions
and
1020 deletions
+800
-1020
include/Algo/Multiresolution/map3MR/filters_Primal.h
include/Algo/Multiresolution/map3MR/filters_Primal.h
+53
-34
include/Algo/Multiresolution/map3MR/map3MR_PrimalRegular.h
include/Algo/Multiresolution/map3MR/map3MR_PrimalRegular.h
+34
-58
include/Algo/Multiresolution/map3MR/map3MR_PrimalRegular.hpp
include/Algo/Multiresolution/map3MR/map3MR_PrimalRegular.hpp
+675
-0
include/Topology/map/map3MR/schemes_Primal.h
include/Topology/map/map3MR/schemes_Primal.h
+38
-38
src/Topology/map/map3MR/map3MR_PrimalRegular.cpp
src/Topology/map/map3MR/map3MR_PrimalRegular.cpp
+0
-890
No files found.
include/
Topology/map
/map3MR/filters_Primal.h
→
include/
Algo/Multiresolution
/map3MR/filters_Primal.h
View file @
34034512
...
...
@@ -27,10 +27,14 @@
#include <cmath>
#include "Algo/Geometry/centroid.h"
#include "Algo/Modelisation/tetrahedralization.h"
namespace
CGoGN
{
namespace
Algo
{
namespace
Multiresolution
{
...
...
@@ -47,7 +51,7 @@ public:
* LOOP BASIC FUNCTIONS
*********************************************************************************/
template
<
typename
PFP
>
typename
PFP
::
VEC3
loopOddVertex
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
Dart
d1
)
typename
PFP
::
VEC3
loopOddVertex
(
typename
PFP
::
MAP
&
map
,
const
VertexAttribute
<
typename
PFP
::
VEC3
>
&
position
,
Dart
d1
)
{
Dart
d2
=
map
.
phi2
(
d1
)
;
Dart
d3
=
map
.
phi_1
(
d1
)
;
...
...
@@ -67,7 +71,7 @@ typename PFP::VEC3 loopOddVertex(typename PFP::MAP& map, const typename PFP::TVE
}
template
<
typename
PFP
>
typename
PFP
::
VEC3
loopEvenVertex
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
Dart
d
)
typename
PFP
::
VEC3
loopEvenVertex
(
typename
PFP
::
MAP
&
map
,
const
VertexAttribute
<
typename
PFP
::
VEC3
>
&
position
,
Dart
d
)
{
map
.
incCurrentLevel
()
;
...
...
@@ -93,11 +97,11 @@ typename PFP::VEC3 loopEvenVertex(typename PFP::MAP& map, const typename PFP::TV
* SHW04 BASIC FUNCTIONS : tetrahedral/octahedral meshes
*********************************************************************************/
template
<
typename
PFP
>
typename
PFP
::
VEC3
SHW04Vertex
(
typename
PFP
::
MAP
&
map
,
const
typename
PFP
::
TVEC3
&
position
,
Dart
d
)
typename
PFP
::
VEC3
SHW04Vertex
(
typename
PFP
::
MAP
&
map
,
const
VertexAttribute
<
typename
PFP
::
VEC3
>
&
position
,
Dart
d
)
{
typename
PFP
::
VEC3
res
(
0
);
if
(
map
.
isTetrahedron
(
d
))
if
(
Algo
::
Modelisation
::
Tetrahedralization
::
isTetrahedron
<
PFP
>
(
map
,
d
))
{
Dart
d1
=
map
.
phi1
(
d
)
;
Dart
d2
=
map
.
phi_1
(
d
);
...
...
@@ -162,10 +166,10 @@ class LoopEvenAnalysisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopEvenAnalysisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopEvenAnalysisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -188,10 +192,10 @@ class LoopNormalisationAnalysisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopNormalisationAnalysisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopNormalisationAnalysisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -218,10 +222,10 @@ class LoopOddAnalysisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopOddAnalysisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopOddAnalysisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -267,17 +271,28 @@ class LerpEdgeSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LerpEdgeSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpEdgeSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
{
std
::
cout
<<
"lerp edges"
<<
std
::
endl
;
TraversorE
<
typename
PFP
::
MAP
>
trav
(
m_map
)
;
std
::
cout
<<
"begin = "
<<
m_map
.
begin
()
<<
std
::
endl
;
std
::
cout
<<
"end = "
<<
m_map
.
end
()
<<
std
::
endl
;
std
::
cout
<<
"begin = "
<<
trav
.
begin
()
<<
std
::
endl
;
std
::
cout
<<
"end = "
<<
trav
.
end
()
<<
std
::
endl
;
std
::
cout
<<
"next = "
<<
trav
.
next
()
<<
std
::
endl
;
for
(
Dart
d
=
trav
.
begin
();
d
!=
trav
.
end
();
d
=
trav
.
next
())
{
std
::
cout
<<
"edges"
<<
std
::
endl
;
typename
PFP
::
VEC3
p
=
(
m_position
[
d
]
+
m_position
[
m_map
.
phi2
(
d
)])
*
typename
PFP
::
REAL
(
0.5
);
m_map
.
incCurrentLevel
()
;
...
...
@@ -295,14 +310,15 @@ class LerpFaceSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LerpFaceSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpFaceSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
{
std
::
cout
<<
"lerp faces"
<<
std
::
endl
;
TraversorF
<
typename
PFP
::
MAP
>
trav
(
m_map
)
;
for
(
Dart
d
=
trav
.
begin
();
d
!=
trav
.
end
();
d
=
trav
.
next
())
{
...
...
@@ -325,14 +341,15 @@ class LerpVolumeSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LerpVolumeSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpVolumeSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
{
std
::
cout
<<
"lerp volumes"
<<
std
::
endl
;
TraversorW
<
typename
PFP
::
MAP
>
trav
(
m_map
)
;
for
(
Dart
d
=
trav
.
begin
();
d
!=
trav
.
end
();
d
=
trav
.
next
())
{
...
...
@@ -340,7 +357,7 @@ public:
m_map
.
incCurrentLevel
()
;
if
(
!
m_map
.
isTetrahedron
(
d
))
if
(
!
Algo
::
Modelisation
::
Tetrahedralization
::
isTetrahedron
<
PFP
>
(
m_map
,
d
))
{
Dart
midV
=
m_map
.
phi_1
(
m_map
.
phi2
(
m_map
.
phi1
(
d
)));
...
...
@@ -361,10 +378,10 @@ class Ber02OddSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
Ber02OddSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
Ber02OddSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -450,10 +467,10 @@ class Ber02EvenSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
Ber02EvenSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
Ber02EvenSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -639,10 +656,10 @@ class Ber02ScaleSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
Ber02ScaleSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
Ber02ScaleSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -705,10 +722,10 @@ class LoopOddSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopOddSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopOddSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -748,10 +765,10 @@ class LoopNormalisationSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopNormalisationSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopNormalisationSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -778,10 +795,10 @@ class LoopEvenSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopEvenSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopEvenSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -804,10 +821,10 @@ class LoopVolumeSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
LoopVolumeSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopVolumeSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -815,7 +832,7 @@ public:
TraversorW
<
typename
PFP
::
MAP
>
trav
(
m_map
)
;
for
(
Dart
d
=
trav
.
begin
();
d
!=
trav
.
end
();
d
=
trav
.
next
())
{
if
(
!
m_map
.
isTetrahedron
(
d
))
if
(
!
Algo
::
Modelisation
::
Tetrahedralization
::
isTetrahedron
<
PFP
>
(
m_map
,
d
))
{
typename
PFP
::
VEC3
p
=
Algo
::
Geometry
::
volumeCentroid
<
PFP
>
(
m_map
,
d
,
m_position
);
...
...
@@ -835,10 +852,10 @@ class SHW04VolumeNormalisationSynthesisFilter : public MRFilter
{
protected:
typename
PFP
::
MAP
&
m_map
;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute
<
typename
PFP
::
VEC3
>
&
m_position
;
public:
SHW04VolumeNormalisationSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
SHW04VolumeNormalisationSynthesisFilter
(
typename
PFP
::
MAP
&
m
,
VertexAttribute
<
typename
PFP
::
VEC3
>
&
p
)
:
m_map
(
m
),
m_position
(
p
)
{}
void
operator
()
()
...
...
@@ -871,6 +888,8 @@ public:
}
// namespace Multiresolution
}
// namespace Algo
}
// namespace CGoGN
...
...
include/
Topology/map
/map3MR/map3MR_PrimalRegular.h
→
include/
Algo/Multiresolution
/map3MR/map3MR_PrimalRegular.h
View file @
34034512
...
...
@@ -29,29 +29,40 @@
#include "Topology/generic/traversorCell.h"
#include "Topology/generic/traversor3.h"
#include "
Topology/map
/map3MR/filters_Primal.h"
#include "
Topology/map/map3MR/schemes_Primal
.h"
#include "
Algo/Multiresolution
/map3MR/filters_Primal.h"
#include "
Algo/Modelisation/tetrahedralization
.h"
namespace
CGoGN
{
namespace
Algo
{
namespace
Multiresolution
{
/*! \brief The class of regular 3-map MR
*/
class
Map3MR_PrimalRegular
:
public
EmbeddedMap3
template
<
typename
PFP
>
class
Map3MR_PrimalRegular
{
public:
typedef
typename
PFP
::
MAP
MAP
;
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
typename
PFP
::
REAL
REAL
;
protected:
MAP
&
m_map
;
bool
shareVertexEmbeddings
;
std
::
vector
<
Multiresolution
::
MRFilter
*>
synthesisFilters
;
std
::
vector
<
Multiresolution
::
MRFilter
*>
analysisFilters
;
std
::
vector
<
Multiresolution
::
MRScheme
*>
subdivisionSchemes
;
std
::
vector
<
Algo
::
Multiresolution
::
MRFilter
*>
synthesisFilters
;
std
::
vector
<
Algo
::
Multiresolution
::
MRFilter
*>
analysisFilters
;
public:
Map3MR_PrimalRegular
();
Map3MR_PrimalRegular
(
MAP
&
map
);
virtual
std
::
string
mapTypeName
()
const
{
return
"Map3MR_PrimalRegular"
;
}
std
::
string
mapTypeName
()
const
{
return
"Map3MR_PrimalRegular"
;
}
/*! @name Topological helping functions
*
...
...
@@ -59,113 +70,78 @@ public:
//@{
void
swapEdges
(
Dart
d
,
Dart
e
);
bool
isTetrahedron
(
Dart
d
);
void
splitSurfaceInVolume
(
std
::
vector
<
Dart
>&
vd
,
bool
firstSideClosed
=
true
,
bool
secondSideClosed
=
false
);
//@}
void
setSharingVertexEmbeddings
(
bool
b
)
{
shareVertexEmbeddings
=
b
;
}
/*! @name Level creation
*
*************************************************************************/
//@{
//!
/*
*
*/
void
addNewLevelTetraOcta
(
bool
embedNewVertices
);
//!
/*
*
*/
void
addNewLevelHexa
(
bool
embedNewVertices
);
//
void addNewLevelHexa(bool embedNewVertices);
//!
/*
*
*/
void
addNewLevel
(
bool
embedNewVertices
);
//
void addNewLevel(bool embedNewVertices);
//@}
/*! @name Geometry modification
* Analysis / Synthesis
*************************************************************************/
//@{
//!
/*
*
*/
void
addSynthesisFilter
(
Multiresolution
::
MRFilter
*
f
)
{
assert
(
shareVertexEmbeddings
);
synthesisFilters
.
push_back
(
f
)
;
}
//!
/*
*
*/
void
addAnalysisFilter
(
Multiresolution
::
MRFilter
*
f
)
{
assert
(
shareVertexEmbeddings
);
analysisFilters
.
push_back
(
f
)
;
}
void
setSharingVertexEmbeddings
(
bool
b
)
{
shareVertexEmbeddings
=
b
;
}
//!
/*
*
*/
void
clearSynthesisFilters
()
{
synthesisFilters
.
clear
(
)
;
}
void
addSynthesisFilter
(
Algo
::
Multiresolution
::
MRFilter
*
f
)
{
synthesisFilters
.
push_back
(
f
)
;
}
//!
/*
*
*/
void
clearAnalysisFilters
()
{
analysisFilters
.
clear
(
)
;
}
void
addAnalysisFilter
(
Algo
::
Multiresolution
::
MRFilter
*
f
)
{
analysisFilters
.
push_back
(
f
)
;
}
//!
/*
*
*/
void
analysis
()
;
void
clearSynthesisFilters
()
{
synthesisFilters
.
clear
()
;
}
//!
/*
*
*/
void
synthesis
()
;
//@}
/*! @name Geometry modification
* Subdivision Schemes
*************************************************************************/
//@{
//!
/*!
*
*/
void
addSubdivisionScheme
(
Multiresolution
::
MRScheme
*
f
)
{
assert
(
!
shareVertexEmbeddings
);
subdivisionSchemes
.
push_back
(
f
);
}
void
clearAnalysisFilters
()
{
analysisFilters
.
clear
()
;
}
//!
/*
*
*/
void
clearSubdivisionSchemes
()
{
subdivisionSchemes
.
clear
()
;
}
void
analysis
()
;
//!
/*
*
*/
void
s
ubdivision
()
;
void
s
ynthesis
()
;
//@}
};
}
//
end namespace CGoGN
}
//
namespace Multiresolution
#endif
/* __MAP3MR_PRIMAL__ */
}
// namespace Algo
//void splitFaceInSurface(Dart d, Dart e);
}
// namespace CGoGN
//Dart cutEdgeInSurface(Dart d);
//void saveRelationsAroundVertex(Dart d, std::vector<std::pair<Dart, Dart> >& vd);
#include "Algo/Multiresolution/map3MR/map3MR_PrimalRegular.hpp"
//void unsewAroundVertex(std::vector<std::pair<Dart, Dart> >& vd);
//Dart quadranguleFace(Dart d);
#endif
/* __MAP3MR_PRIMAL__ */
include/Algo/Multiresolution/map3MR/map3MR_PrimalRegular.hpp
0 → 100644
View file @
34034512
This diff is collapsed.
Click to expand it.
include/Topology/map/map3MR/schemes_Primal.h
View file @
34034512
...
...
@@ -62,10 +62,10 @@ class LerpVertexSubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
LerpVertexSubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpVertexSubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -87,10 +87,10 @@ class LerpEdgeSubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
LerpEdgeSubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpEdgeSubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -115,10 +115,10 @@ class LerpFaceSubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
LerpFaceSubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpFaceSubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -145,10 +145,10 @@ class LerpVolumeSubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
LerpVolumeSubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LerpVolumeSubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -180,10 +180,10 @@ class LoopEvenSubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
LoopEvenSubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopEvenSubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -225,10 +225,10 @@ class LoopOddSubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
LoopOddSubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
LoopOddSubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -268,10 +268,10 @@ class SHW04SubdivisionScheme : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
SHW04SubdivisionScheme
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
SHW04SubdivisionScheme(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -325,10 +325,10 @@ class MJ96VertexSubdivision : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
MJ96VertexSubdivision
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
MJ96VertexSubdivision(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -430,10 +430,10 @@ class MJ96EdgeSubdivision : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
MJ96EdgeSubdivision
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
MJ96EdgeSubdivision(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -520,10 +520,10 @@ class MJ96FaceSubdivision : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
MJ96FaceSubdivision
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
MJ96FaceSubdivision(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -580,10 +580,10 @@ class MJ96VolumeSubdivision : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;
public:
MJ96VolumeSubdivision
(
typename
PFP
::
MAP
&
m
,
typename
PFP
::
TVEC3
&
p
)
:
m_map
(
m
),
m_position
(
p
)
MJ96VolumeSubdivision(typename PFP::MAP& m,
VertexAttribute<typename PFP::VEC3>
& p) : m_map(m), m_position(p)
{}
void operator() ()
...
...
@@ -617,10 +617,10 @@ class BSXW02AveragingSubdivision : public MRScheme
{
protected:
typename PFP::MAP& m_map ;
typename
PFP
::
TVEC3
&
m_position
;
VertexAttribute<typename PFP::VEC3>
& m_position ;