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
4f7af6be
Commit
4f7af6be
authored
Jun 08, 2015
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
compil pb
parent
4481e868
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
17 additions
and
14 deletions
+17
-14
CGoGN/include/Algo/MovingObjects/particle_cell_2D.hpp
CGoGN/include/Algo/MovingObjects/particle_cell_2D.hpp
+6
-4
CGoGN/include/Algo/MovingObjects/particle_cell_2DandHalf.hpp
CGoGN/include/Algo/MovingObjects/particle_cell_2DandHalf.hpp
+5
-4
CGoGN/include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
...clude/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
+5
-5
CGoGN/include/Utils/textures.hpp
CGoGN/include/Utils/textures.hpp
+1
-1
No files found.
CGoGN/include/Algo/MovingObjects/particle_cell_2D.hpp
View file @
4f7af6be
...
...
@@ -24,6 +24,8 @@
//#define DEBUG
#include "Geometry/vector_gen.h"
namespace
CGoGN
{
...
...
@@ -99,7 +101,7 @@ void ParticleCell2D<PFP>::vertexState(const VEC3& goal)
#ifdef DEBUG
CGoGNout
<<
"vertexState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
goal
))
;
assert
(
Geom
::
isFinite
(
goal
))
;
crossCell
=
CROSS_OTHER
;
...
...
@@ -195,7 +197,7 @@ void ParticleCell2D<PFP>::edgeState(const VEC3& goal, Geom::Orientation2D sideOf
CGoGNout
<<
"goal :"
<<
goal
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
goal
));
assert
(
Geom
::
isFinite
(
goal
));
// assert(Geometry::isPointOnEdge<PFP>(m,d,m_positions,m_position));
if
(
crossCell
==
NO_CROSS
)
...
...
@@ -327,8 +329,8 @@ void ParticleCell2D<PFP>::faceState(const VEC3& goal)
CGoGNout
<<
"faceState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
this
->
getPosition
()));
assert
(
Geom
etry
::
isFinite
(
goal
));
assert
(
Geom
::
isFinite
(
this
->
getPosition
()));
assert
(
Geom
::
isFinite
(
goal
));
// assert(Geometry::isPointInConvexFace2D<PFP>(m,d,m_positions,m_position,true));
Dart
dd
=
d
;
...
...
CGoGN/include/Algo/MovingObjects/particle_cell_2DandHalf.hpp
View file @
4f7af6be
...
...
@@ -25,6 +25,7 @@
//#define DEBUG
#include "Geometry/frame.h"
#include "Geometry/vector_gen.h"
namespace
CGoGN
{
...
...
@@ -114,7 +115,7 @@ void ParticleCell2DAndHalf<PFP>::vertexState(VEC3 goal)
#ifdef DEBUG
CGoGNout
<<
"vertexState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
goal
));
assert
(
Geom
::
isFinite
(
goal
));
crossCell
=
CROSS_OTHER
;
...
...
@@ -189,7 +190,7 @@ void ParticleCell2DAndHalf<PFP>::edgeState(VEC3 goal, Geom::Orientation3D sideOf
CGoGNout
<<
"edgeState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
goal
));
assert
(
Geom
::
isFinite
(
goal
));
// assert(Geometry::isPointOnEdge<PFP>(m,d,m_positions,m_position));
if
(
crossCell
==
NO_CROSS
)
...
...
@@ -261,8 +262,8 @@ void ParticleCell2DAndHalf<PFP>::faceState(VEC3 goal)
CGoGNout
<<
"faceState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
goal
));
assert
(
Geom
etry
::
isFinite
(
this
->
getPosition
()));
assert
(
Geom
::
isFinite
(
goal
));
assert
(
Geom
::
isFinite
(
this
->
getPosition
()));
//project goal within face plane
VEC3
n1
=
Geometry
::
faceNormal
<
PFP
>
(
m
,
d
,
m_positions
);
...
...
CGoGN/include/Algo/MovingObjects/particle_cell_2DandHalf_memo.hpp
View file @
4f7af6be
...
...
@@ -24,7 +24,7 @@
//#define DEBUG
#include "Geometry/frame.h"
#include "Geometry/vector_gen.h"
namespace
CGoGN
...
...
@@ -106,7 +106,7 @@ void ParticleCell2DAndHalfMemo<PFP>::vertexState(VEC3 current, CellMarkerMemo<MA
#ifdef DEBUG
CGoGNout
<<
"vertexState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
current
));
assert
(
Geom
::
isFinite
(
current
));
this
->
crossCell
=
CROSS_OTHER
;
...
...
@@ -177,7 +177,7 @@ void ParticleCell2DAndHalfMemo<PFP>::edgeState(VEC3 current, CellMarkerMemo<MAP,
CGoGNout
<<
"edgeState"
<<
d
<<
CGoGNendl
;
#endif
assert
(
Geom
etry
::
isFinite
(
current
));
assert
(
Geom
::
isFinite
(
current
));
// assert(Geometry::isPointOnEdge<PFP>(m,d,m_positions,m_position));
if
(
this
->
crossCell
==
NO_CROSS
)
...
...
@@ -249,8 +249,8 @@ void ParticleCell2DAndHalfMemo<PFP>::faceState(VEC3 current, CellMarkerMemo<MAP,
if
(
memo_cross
.
isMarked
(
this
->
d
))
return
;
memo_cross
.
mark
(
this
->
d
);
assert
(
Geom
etry
::
isFinite
(
this
->
getPosition
()));
assert
(
Geom
etry
::
isFinite
(
current
));
assert
(
Geom
::
isFinite
(
this
->
getPosition
()));
assert
(
Geom
::
isFinite
(
current
));
// assert(Geometry::isPointInConvexFace2D<PFP>(m,d,m_positions,m_position,true));
//project current within face plane
...
...
CGoGN/include/Utils/textures.hpp
View file @
4f7af6be
...
...
@@ -501,7 +501,7 @@ template < unsigned int DIM, typename TYPE >
void Image<DIM,TYPE>::crop(const COORD& origin, const COORD& sz)
{
Image<DIM,TYPE>* newImg = subImage(origin,sz);
swap(*newImg);
this->
swap(*newImg);
delete newImg;
}
...
...
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