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
S
SocialAgents3D
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Thomas Pitiot
SocialAgents3D
Commits
a6be0f0f
Commit
a6be0f0f
authored
Feb 27, 2015
by
Thomas Pitiot
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rdy to test surfaces
parent
98430ec3
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
5 deletions
+18
-5
include/env_map.h
include/env_map.h
+1
-2
include/pfp.h
include/pfp.h
+13
-1
include/simulator.h
include/simulator.h
+1
-0
src/env_map.cpp
src/env_map.cpp
+3
-2
No files found.
include/env_map.h
View file @
a6be0f0f
...
...
@@ -25,8 +25,6 @@
#include "Algo/Geometry/volume.h"
#include "Algo/Geometry/area.h"
//#include "Algo/ImplicitHierarchicalMesh/subdivision3.hxx"
/////////////////particules
#include "Algo/MovingObjects/particle_cell_3D_memo.h"
...
...
@@ -56,6 +54,7 @@ public:
VEC3
mapMaxY
;
VEC3
mapMinZ
;
VEC3
mapMaxZ
;
float
maxCellSize
;
bool
subdivideVolume
(
Dart
d
);
Dart
getBelongingCell
(
const
PFP
::
VEC3
&
pos
);
...
...
include/pfp.h
View file @
a6be0f0f
...
...
@@ -12,6 +12,8 @@
#include "Algo/ImplicitHierarchicalMesh/ihm3.h"
#include "Algo/ImplicitHierarchicalMesh/subdivision3.h"
#endif
#include "Topology/ihmap/ihm2.h"
#include "Topology/generic/parameters.h"
struct
PFP
:
public
PFP_STANDARD
{
...
...
@@ -20,16 +22,26 @@ struct PFP : public PFP_STANDARD
#ifndef IHMap
typedef
EmbeddedMap3
MAP
;
#else
typedef
Algo
::
Volume
::
IHM
::
ImplicitHierarchicalMap3
MAP
;
typedef
CGoGN
::
Algo
::
Volume
::
IHM
::
ImplicitHierarchicalMap3
MAP
;
#endif
// definition des listes d'arêtes
typedef
std
::
vector
<
Segment
*>
ARETE
;
typedef
NoTypeNameAttribute
<
ARETE
>
ARETES
;
//
// typedef NoMathIONameAttribute<std::pair<bool, bool> > BOOLATTRIB ;
}
;
struct
PFPSurface
:
public
PFP_STANDARD
{
// definition de la carte
typedef
CGoGN
::
ImplicitHierarchicalMap2
MAP
;
}
;
typedef
PFPSurface
::
MAP
SURFACE
;
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
VEC3
VEC3
;
typedef
PFP
::
REAL
REAL
;
...
...
include/simulator.h
View file @
a6be0f0f
...
...
@@ -5,6 +5,7 @@
#include "needle.h"
#include "knife.h"
#include "tree.h"
#include "surface.h"
#include "segment.h"
using
namespace
CGoGN
;
...
...
src/env_map.cpp
View file @
a6be0f0f
...
...
@@ -22,6 +22,7 @@ EnvMap::EnvMap()
void
EnvMap
::
init
(
int
argc
,
char
**
argv
)
{
maxCellSize
=
10.0
f
;
std
::
cout
<<
"Init EnvMap"
<<
std
::
endl
;
if
(
argc
>
2
)
{
...
...
@@ -667,9 +668,9 @@ bool EnvMap::subdivideVolume(Dart dglobal)
#ifdef DEBUG_affichage
CGoGNout
<<
"fin refine principal"
<<
CGoGNendl
;
#endif
#endif
return
res
;
...
...
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