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
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
ac66f55e
Commit
ac66f55e
authored
Oct 09, 2012
by
pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
particles 2dAndHalf update
parent
47db3dde
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
368 additions
and
0 deletions
+368
-0
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
+61
-0
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
+307
-0
No files found.
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.h
0 → 100644
View file @
ac66f55e
#ifndef PARTCELL2DANDHALFMEMO_H
#define PARTCELL2DANDHALFMEMO_H
#include "particle_cell_2DandHalf.h"
#include "Algo/Geometry/inclusion.h"
#include "Geometry/intersection.h"
#include "Geometry/orientation.h"
#include <iostream>
/* A particle cell is a particle base within a map, within a precise cell, the displacement function should indicate
after each displacement wherein lies the new position of the particle */
namespace
CGoGN
{
namespace
Algo
{
namespace
MovingObjects
{
template
<
typename
PFP
>
class
ParticleCell2DAndHalfMemo
:
public
ParticleCell2DAndHalf
<
PFP
>
{
public
:
typedef
typename
PFP
::
MAP
Map
;
typedef
typename
PFP
::
VEC3
VEC3
;
typedef
VertexAttribute
<
typename
PFP
::
VEC3
>
TAB_POS
;
std
::
list
<
Dart
>
memo_cross
;
bool
detect_vertex
;
bool
detect_edge
;
bool
detect_face
;
ParticleCell2DAndHalfMemo
()
{};
ParticleCell2DAndHalfMemo
(
Map
&
map
,
Dart
belonging_cell
,
VEC3
pos
,
const
TAB_POS
&
tabPos
)
:
ParticleCell2DAndHalf
<
PFP
>
(
map
,
belonging_cell
,
pos
,
tabPos
),
detect_vertex
(
false
),
detect_edge
(
false
),
detect_face
(
true
)
{
// memo_cross.push_back(this->d);
};
void
vertexState
(
VEC3
current
);
void
edgeState
(
VEC3
current
,
Geom
::
Orientation3D
sideOfEdge
=
Geom
::
ALIGNED
);
void
faceState
(
VEC3
current
);
void
move
(
const
VEC3
&
newCurrent
);
};
#include "particle_cell_2DandHalf_memo.hpp"
//namespace
}
}
}
#endif
include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
0 → 100644
View file @
ac66f55e
//#define DEBUG
#include "Geometry/frame.h"
template
<
typename
PFP
>
void
ParticleCell2DAndHalfMemo
<
PFP
>::
move
(
const
VEC3
&
newCurrent
)
{
this
->
distance
=
0
;
this
->
crossCell
=
NO_CROSS
;
if
(
!
Geom
::
arePointsEquals
(
newCurrent
,
this
->
m_position
))
{
switch
(
this
->
state
)
{
case
VERTEX
:
vertexState
(
newCurrent
);
break
;
case
EDGE
:
edgeState
(
newCurrent
);
break
;
case
FACE
:
faceState
(
newCurrent
);
break
;
}
// display();
}
else
this
->
m_position
=
newCurrent
;
// this->display();
}
template
<
typename
PFP
>
void
ParticleCell2DAndHalfMemo
<
PFP
>::
vertexState
(
VEC3
current
)
{
#ifdef DEBUG
CGoGNout
<<
"vertexState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
std
::
isfinite
(
current
[
0
])
&&
std
::
isfinite
(
current
[
1
])
&&
std
::
isfinite
(
current
[
2
]));
this
->
crossCell
=
CROSS_OTHER
;
if
(
Algo
::
Geometry
::
isPointOnVertex
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
,
current
))
{
this
->
state
=
VERTEX
;
this
->
m_position
=
current
;
return
;
}
else
{
//orientation step
if
(
this
->
m_positions
[
this
->
d
][
0
]
==
this
->
m_positions
[
this
->
m
.
phi1
(
this
->
d
)][
0
]
&&
this
->
m_positions
[
this
->
d
][
1
]
==
this
->
m_positions
[
this
->
m
.
phi1
(
this
->
d
)][
1
])
this
->
d
=
this
->
m
.
phi2_1
(
this
->
d
);
if
(
getOrientationEdge
(
current
,
this
->
m
.
phi2_1
(
this
->
d
))
!=
Geom
::
UNDER
)
{
Dart
dd_vert
=
this
->
d
;
do
{
this
->
d
=
this
->
m
.
phi2_1
(
this
->
d
);
if
(
this
->
m_positions
[
this
->
d
][
0
]
==
this
->
m_positions
[
this
->
m
.
phi1
(
this
->
d
)][
0
]
&&
this
->
m_positions
[
this
->
d
][
1
]
==
this
->
m_positions
[
this
->
m
.
phi1
(
this
->
d
)][
1
])
this
->
d
=
this
->
m
.
phi2_1
(
this
->
d
);
}
while
(
getOrientationEdge
(
current
,
this
->
m
.
phi2_1
(
this
->
d
))
!=
Geom
::
UNDER
&&
dd_vert
!=
this
->
d
);
if
(
dd_vert
==
this
->
d
)
{
//orbit with 2 edges : point on one edge
if
(
this
->
m
.
phi2_1
(
this
->
m
.
phi2_1
(
this
->
d
))
==
this
->
d
)
{
if
(
!
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
,
current
))
this
->
d
=
this
->
m
.
phi2_1
(
this
->
d
);
}
else
{
this
->
m_position
=
current
;
this
->
state
=
VERTEX
;
return
;
}
}
}
else
{
Dart
dd_vert
=
this
->
m
.
phi2_1
(
this
->
d
);
while
(
getOrientationEdge
(
current
,
this
->
d
)
==
Geom
::
OVER
&&
dd_vert
!=
this
->
d
)
{
this
->
d
=
this
->
m
.
phi12
(
this
->
d
);
if
(
this
->
m_positions
[
this
->
d
][
0
]
==
this
->
m_positions
[
this
->
m
.
phi1
(
this
->
d
)][
0
]
&&
this
->
m_positions
[
this
->
d
][
1
]
==
this
->
m_positions
[
this
->
m
.
phi1
(
this
->
d
)][
1
])
this
->
d
=
this
->
m
.
phi12
(
this
->
d
);
}
}
//displacement step
if
(
detect_vertex
)
memo_cross
.
push_back
(
this
->
d
);
if
(
getOrientationEdge
(
current
,
this
->
d
)
==
Geom
::
ON
&&
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
,
current
))
edgeState
(
current
);
else
{
this
->
d
=
this
->
m
.
phi1
(
this
->
d
);
faceState
(
current
);
}
}
}
template
<
typename
PFP
>
void
ParticleCell2DAndHalfMemo
<
PFP
>::
edgeState
(
VEC3
current
,
Geom
::
Orientation3D
sideOfEdge
)
{
#ifdef DEBUG
CGoGNout
<<
"edgeState"
<<
d
<<
CGoGNendl
;
#endif
if
(
detect_edge
)
memo_cross
.
push_back
(
this
->
d
);
assert
(
std
::
isfinite
(
current
[
0
])
&&
std
::
isfinite
(
current
[
1
])
&&
std
::
isfinite
(
current
[
2
]));
// assert(Algo::Geometry::isPointOnEdge<PFP>(m,d,m_positions,m_position));
if
(
this
->
crossCell
==
NO_CROSS
)
{
this
->
crossCell
=
CROSS_EDGE
;
this
->
lastCrossed
=
this
->
d
;
}
else
this
->
crossCell
=
CROSS_OTHER
;
if
(
sideOfEdge
==
Geom
::
ON
)
sideOfEdge
=
getOrientationEdge
(
current
,
this
->
d
);
switch
(
sideOfEdge
)
{
case
Geom
::
UNDER
:
{
this
->
d
=
this
->
m
.
phi1
(
this
->
d
);
faceState
(
current
);
return
;
}
case
Geom
::
OVER
:
{
//transform the displacement into the new entered face
VEC3
displ
=
current
-
this
->
m_position
;
VEC3
n1
=
Algo
::
Geometry
::
faceNormal
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
);
VEC3
n2
=
Algo
::
Geometry
::
faceNormal
<
PFP
>
(
this
->
m
,
this
->
m
.
phi2
(
this
->
d
),
this
->
m_positions
);
VEC3
axis
=
n1
^
n2
;
float
angle
=
Geom
::
angle
(
n1
,
n2
)
;
displ
=
Geom
::
rotate
(
axis
,
angle
,
displ
)
;
current
=
this
->
m_position
+
displ
;
this
->
d
=
this
->
m
.
phi1
(
this
->
m
.
phi2
(
this
->
d
));
faceState
(
current
);
return
;
}
default
:
this
->
state
=
EDGE
;
break
;
}
if
(
!
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
,
current
))
{
this
->
m_position
=
this
->
m_positions
[
this
->
d
];
vertexState
(
current
);
return
;
}
else
if
(
!
Algo
::
Geometry
::
isPointOnHalfEdge
<
PFP
>
(
this
->
m
,
this
->
m
.
phi2
(
this
->
d
),
this
->
m_positions
,
current
))
{
this
->
d
=
this
->
m
.
phi2
(
this
->
d
);
this
->
m_position
=
this
->
m_positions
[
this
->
d
];
vertexState
(
current
);
return
;
}
this
->
m_position
=
current
;
}
template
<
typename
PFP
>
void
ParticleCell2DAndHalfMemo
<
PFP
>::
faceState
(
VEC3
current
)
{
#ifdef DEBUG
CGoGNout
<<
"faceState"
<<
this
->
d
<<
CGoGNendl
;
#endif
if
(
detect_face
)
memo_cross
.
push_back
(
this
->
d
);
assert
(
std
::
isfinite
(
this
->
m_position
[
0
])
&&
std
::
isfinite
(
this
->
m_position
[
1
])
&&
std
::
isfinite
(
this
->
m_position
[
2
]));
assert
(
std
::
isfinite
(
current
[
0
])
&&
std
::
isfinite
(
current
[
1
])
&&
std
::
isfinite
(
current
[
2
]));
// assert(Algo::Geometry::isPointInConvexFace2D<PFP>(m,d,m_positions,m_position,true));
//project current within face plane
VEC3
n1
=
Algo
::
Geometry
::
faceNormal
<
PFP
>
(
this
->
m
,
this
->
d
,
this
->
m_positions
);
VEC3
n2
=
current
-
this
->
m_position
;
// n1.normalize();
VEC3
n3
=
n1
^
n2
;
n3
.
normalize
();
VEC3
n4
=
n3
^
n1
;
current
=
this
->
m_position
+
(
n2
*
n4
)
*
n4
;
//track new position within map
Dart
dd
=
this
->
d
;
float
wsoe
=
getOrientationFace
(
current
,
this
->
m_position
,
this
->
m
.
phi1
(
this
->
d
));
// orientation step
if
(
wsoe
!=
Geom
::
UNDER
)
{
this
->
d
=
this
->
m
.
phi1
(
this
->
d
);
wsoe
=
getOrientationFace
(
current
,
this
->
m_position
,
this
->
m
.
phi1
(
this
->
d
));
while
(
wsoe
!=
Geom
::
UNDER
&&
dd
!=
this
->
d
)
{
this
->
d
=
this
->
m
.
phi1
(
this
->
d
);
wsoe
=
getOrientationFace
(
current
,
this
->
m_position
,
this
->
m
.
phi1
(
this
->
d
));
}
// source and position to reach are the same : verify if no edge is crossed due to numerical approximation
if
(
dd
==
this
->
d
)
{
do
{
switch
(
getOrientationEdge
(
current
,
this
->
d
))
{
case
Geom
::
UNDER
:
this
->
d
=
this
->
m
.
phi1
(
this
->
d
);
break
;
case
Geom
::
ON
:
this
->
m_position
=
current
;
edgeState
(
current
);
return
;
case
Geom
::
OVER
:
// CGoGNout << "smthg went bad " << m_position << " " << current << CGoGNendl;
// CGoGNout << "d1 " << m_positions[d] << " d2 " << m_positions[m.phi1(d)] << CGoGNendl;
this
->
m_position
=
intersectLineEdge
(
current
,
this
->
m_position
,
this
->
d
);
// CGoGNout << " " << this->m_position << CGoGNendl;
edgeState
(
current
,
Geom
::
OVER
);
return
;
}
}
while
(
this
->
d
!=
dd
);
this
->
m_position
=
current
;
this
->
state
=
FACE
;
// m_position = Algo::Geometry::faceCentroid<PFP>(m,d,m_positions);
// d = m.phi1(d);
// m_position = pointInFace(d);
// faceState(current);
// m_position = m_positions[d];
// vertexState(current);
return
;
}
// take the orientation with d1 : in case we are going through a vertex
wsoe
=
getOrientationFace
(
current
,
this
->
m_position
,
this
->
d
);
}
else
{
wsoe
=
getOrientationFace
(
current
,
this
->
m_position
,
this
->
d
);
while
(
wsoe
==
Geom
::
UNDER
&&
this
->
m
.
phi_1
(
this
->
d
)
!=
dd
)
{
this
->
d
=
this
->
m
.
phi_1
(
this
->
d
);
wsoe
=
getOrientationFace
(
current
,
this
->
m_position
,
this
->
d
);
}
// in case of numerical incoherence
if
(
this
->
m
.
phi_1
(
this
->
d
)
==
dd
&&
wsoe
==
Geom
::
UNDER
)
{
this
->
d
=
this
->
m
.
phi_1
(
this
->
d
);
do
{
switch
(
getOrientationEdge
(
current
,
this
->
d
))
{
case
Geom
::
UNDER
:
this
->
d
=
this
->
m
.
phi1
(
this
->
d
);
break
;
case
Geom
::
ON
:
// CGoGNout << "pic" << CGoGNendl;
this
->
m_position
=
current
;
edgeState
(
current
);
return
;
case
Geom
::
OVER
:
// CGoGNout << "smthg went bad(2) " << m_position << CGoGNendl;
this
->
m_position
=
intersectLineEdge
(
current
,
this
->
m_position
,
this
->
d
);
// CGoGNout << " " << m_position << CGoGNendl;
edgeState
(
current
,
Geom
::
OVER
);
return
;
}
}
while
(
this
->
d
!=
dd
);
this
->
m_position
=
current
;
this
->
state
=
FACE
;
return
;
}
}
//displacement step
switch
(
getOrientationEdge
(
current
,
this
->
d
))
{
case
Geom
::
UNDER
:
this
->
distance
+=
(
current
-
this
->
m_position
).
norm
();
this
->
m_position
=
current
;
this
->
state
=
FACE
;
break
;
default
:
if
(
wsoe
==
Geom
::
ON
)
{
std
::
cout
<<
__FILE__
<<
" to uncomment and check"
<<
std
::
endl
;
// d = m.phi1(d); //to check
// m_position = m_positions[d];
//
// vertexState(current);
}
else
{
// CGoGNout << "wsoe : " << wsoe << CGoGNendl;
// CGoGNout << "current " << current << " " << m_position << CGoGNendl;
// CGoGNout << "d " << d << "d1 " << m_positions[d] << " d2 " << m_positions[m.phi2(d)] << CGoGNendl;
VEC3
isect
=
intersectLineEdge
(
current
,
this
->
m_position
,
this
->
d
);
this
->
distance
+=
(
isect
-
this
->
m_position
).
norm
();
this
->
m_position
=
isect
;
// CGoGNout << " inter : " << m_position << CGoGNendl;
edgeState
(
current
,
Geom
::
OVER
);
};
break
;
}
}
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