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
ccd0d80c
Commit
ccd0d80c
authored
Aug 27, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge cgogn:~jund/CGoGN
Conflicts: README.TXT
parents
a2591cfe
e314968a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
46 additions
and
30 deletions
+46
-30
Apps/Tuto/tuto5.cpp
Apps/Tuto/tuto5.cpp
+8
-7
README.TXT
README.TXT
+20
-22
include/Algo/MovingObjects/particle_base.h
include/Algo/MovingObjects/particle_base.h
+5
-0
include/Algo/MovingObjects/particle_cell_2D.h
include/Algo/MovingObjects/particle_cell_2D.h
+4
-0
include/Algo/MovingObjects/particle_cell_2D_memo.h
include/Algo/MovingObjects/particle_cell_2D_memo.h
+3
-0
include/Algo/MovingObjects/particle_cell_2D_secured.h
include/Algo/MovingObjects/particle_cell_2D_secured.h
+6
-1
No files found.
Apps/Tuto/tuto5.cpp
View file @
ccd0d80c
...
...
@@ -129,7 +129,6 @@ void MyQT::cb_initGL()
m_sprite
=
new
Utils
::
PointSprite
();
m_sprite
->
setAttributePosition
(
m_positionVBO
);
m_sprite
->
setColor
(
Geom
::
Vec4f
(
1.0
f
,
0.0
f
,
0.0
f
,
1.0
f
));
m_strings
=
new
Utils
::
Strings3D
(
true
,
Geom
::
Vec3f
(
0.1
f
,
0.0
f
,
0.3
f
));
storeVerticesInfo
();
...
...
@@ -201,7 +200,9 @@ void MyQT::cb_redraw()
if
(
render_balls
)
{
m_sprite
->
predraw
(
Geom
::
Vec3f
(
1.0
f
,
0.0
f
,
0.0
f
));
m_render
->
draw
(
m_sprite
,
Algo
::
Render
::
GL2
::
POINTS
);
m_sprite
->
postdraw
();
}
if
(
render_vectors
)
...
...
@@ -236,13 +237,13 @@ void MyQT::cb_keyPress(int code)
{
std
::
string
filename
=
selectFileSave
(
"Export SVG file "
,
"."
,
"(*.svg)"
);
Utils
::
SVG
::
SVGOut
svg
(
filename
,
modelViewMatrix
(),
projectionMatrix
());
//
svg.setWidth(1.0f);
//
svg.setColor(Geom::Vec3f(0.0f,0.0f,0.5f));
svg
.
setWidth
(
1.0
f
);
svg
.
setColor
(
Geom
::
Vec3f
(
0.0
f
,
0.0
f
,
0.5
f
));
Algo
::
Render
::
SVG
::
renderEdges
<
PFP
>
(
svg
,
myMap
,
position
);
//
svg.setColor(Geom::Vec3f(0.0f,0.8f,0.0f));
//
svg.setWidth(5.0f);
svg
.
setColor
(
Geom
::
Vec3f
(
0.0
f
,
0.8
f
,
0.0
f
));
svg
.
setWidth
(
5.0
f
);
Algo
::
Render
::
SVG
::
renderVertices
<
PFP
>
(
svg
,
myMap
,
position
);
//
svg.setColor(Geom::Vec3f(1.0f,0.0f,0.0f));
svg
.
setColor
(
Geom
::
Vec3f
(
1.0
f
,
0.0
f
,
0.0
f
));
m_strings
->
toSVG
(
svg
);
//svg destruction close the file
}
...
...
@@ -300,7 +301,7 @@ int main(int argc, char **argv)
CGoGNout
<<
"CGoGNOut dans la console"
<<
Geom
::
Vec3f
(
2.5
f
,
2.2
f
,
4.3
f
)
<<
CGoGNendl
;
CGoGNout
.
noStatusBar
();
CGoGNout
.
noStatusBar
();
// bounding box
Geom
::
BoundingBox
<
PFP
::
VEC3
>
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
);
...
...
README.TXT
View file @
ccd0d80c
*** english version below ***
Dépendences Linux:
installer les paquets suivants:
cmake cmake-curses-gui libXi-dev libXmu-dev libglew-dev libxml2-dev libboost-all-dev zlib1g-dev qt4-designer qt4-dev-tools uuid-dev libgsl0-dev libsuitesparse-dev
...
...
@@ -14,31 +12,30 @@ Pour compiler CGoGN:
make install
On peut fixer certaines option pour ne pas tout compiler (cf le README.TXT dans ThirdParty)
- ensuite on compile CGoGN (compile les libs dans CGoGN/lib et des exemples dans CGoGN/bin) :
cd CGoGN/build
cmake ..
make (-j x si vous avez x cores)
Certaines options (booléennes) sont ici aussi disponible:
On peut aussi compiler en debug en créant un répertoir qui fini par Debug à la place de build
- aller dans build et taper "cmake ..", puis make
Des options (booléennes) sont ici aussi disponible:
BUILD_SHARED_LIBS (F) experimental !
WITH_ASSIMP (T)
WITH_NUMERICAL (T)
WITH_ZINRI (T)
WITH_QT (T)
afin de limiter les dépendances et le temps de compilation
afin de limiter les dépendances et le temps de compilation/
FORCE_MR (2)
permet de compiler dans 3 modes: mono-resolution (0), multi-resolution (1)
permet de compiler dans 3 modes: mixte (0), multi-resolution(1), mono-resolution(2).
ONELIB (F)
permet de forcer la compilation en une seule lib (libcgogn.a) au lieu de quatre.
- on peut ensuite compiler SCHNApps ainsi que les plugins fournis :
cd CGoGN/SCHNApps/
build
cmake ..
make (-j x si vous avez x cores)
- la compilation des sous-parties se fait en allant dans les sous-repertoires de
build
Les applications (Examples et Tutos) sont dans le répertoire Apps
Les binaires sont générés dans le repertoire bin
Des exemples de données:
- fichiers trianbgz, off, etc
...
...
@@ -77,16 +74,17 @@ To compile CGoGN:
WITH_QT (T)
to minimize dependencies and compilation time
FORCE_MR (2)
allows the compilation in 3 modes: mono-resolution (0), multi-resolution (1)
allow the compilation in 3 mode: mixed(0), multi-resolution(1), mono-resolution(2).
ONELIB (F)
allow
ss to force the
compilation in one lib (libcgogn.a) instead of four.
allow compilation in one lib (libcgogn.a) instead of four.
- we can then compile SCHNApps and the provided plugins :
cd CGoGN/SCHNApps/
build
cmake ..
make (-j x if you have x cores)
- the compilation of each sub-parts is done by going in the subdirectories of
build
Applications (examples and tutorials) are in the Apps directory
The binaries are generated in the bin directory
Examples of data:
- Trianbgz files, off, etc.
...
...
include/Algo/MovingObjects/particle_base.h
View file @
ccd0d80c
...
...
@@ -51,6 +51,11 @@ public:
{
}
virtual
~
ParticleBase
()
{
}
void
setState
(
unsigned
int
state
)
{
m_state
=
state
;
...
...
include/Algo/MovingObjects/particle_cell_2D.h
View file @
ccd0d80c
...
...
@@ -57,6 +57,10 @@ public:
{
}
~
ParticleCell2D
()
{
}
Dart
getCell
()
{
return
d
;
...
...
include/Algo/MovingObjects/particle_cell_2D_memo.h
View file @
ccd0d80c
...
...
@@ -42,7 +42,10 @@ public:
ParticleCell2DMemo
(
MAP
&
map
,
Dart
belonging_cell
,
VEC3
pos
,
const
TAB_POS
&
tabPos
)
:
ParticleCell2D
<
PFP
>
(
map
,
belonging_cell
,
pos
,
tabPos
)
{
}
virtual
~
ParticleCell2DMemo
()
{
}
virtual
void
vertexState
(
const
VEC3
&
current
,
CellMarkerMemo
<
FACE
>&
memo_cross
)
;
...
...
include/Algo/MovingObjects/particle_cell_2D_secured.h
View file @
ccd0d80c
...
...
@@ -40,7 +40,12 @@ public:
ParticleCell2DSecured
(
MAP
&
map
,
Dart
belonging_cell
,
VEC3
pos
,
const
TAB_POS
&
tabPos
)
:
ParticleCell2DMemo
<
PFP
>
(
map
,
belonging_cell
,
pos
,
tabPos
)
{
std
::
cout
<<
"Particle Memo : for debugging (unoptimized)"
<<
std
::
endl
;
// std::cout << "Particle Memo : for debugging (unoptimized)" << std::endl;
}
~
ParticleCell2DSecured
()
{
}
...
...
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