Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Hurstel
CGoGN
Commits
b758b028
Commit
b758b028
authored
Mar 29, 2012
by
Pierre Kraemer
Browse files
little clean up of Examples directory
parent
5797d750
Changes
31
Hide whitespace changes
Inline
Side-by-side
Apps/Examples/Debug/CMakeLists.txt
View file @
b758b028
...
...
@@ -26,62 +26,50 @@ ENDIF(WIN32)
#define exec to compile
QT4_WRAP_CPP
(
polyhedronsView_moc ../polyhedronsView.h
)
add_executable
(
polyhedronsViewD ../polyhedronsView.cpp
${
polyhedronsView_moc
}
)
target_link_libraries
(
polyhedronsViewD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
frame_manip_moc ../frame_manip.h
)
add_executable
(
frame_manipD ../frame_manip.cpp
${
frame_manip_moc
}
)
target_link_libraries
(
frame_manipD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
frame_manipD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
texturesExample_moc ../texturesExample.h
)
add_executable
(
texturesExampleD ../texturesExample.cpp
${
texturesExample_moc
}
)
target_link_libraries
(
texturesExampleD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
texturesExampleD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleMap3_moc ../simpleMap3.h
)
add_executable
(
simpleMap3D ../simpleMap3.cpp
${
simpleMap3_moc
}
)
target_link_libraries
(
simpleMap3D
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
simpleMap3D
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleGMap2_moc ../simpleGMap2.h
)
add_executable
(
simpleGMap2D ../simpleGMap2.cpp
${
simpleGMap2_moc
}
)
target_link_libraries
(
simpleGMap2D
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
simpleGMap2D
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleGMap3_moc ../simpleGMap3.h
)
add_executable
(
simpleGMap3D ../simpleGMap3.cpp
${
simpleGMap3_moc
}
)
target_link_libraries
(
simpleGMap3D
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
simpleGMap3D
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
extrusionView_moc ../extrusionView.h
)
add_executable
(
extrusionViewD ../extrusionView.cpp
${
extrusionView_moc
}
)
target_link_libraries
(
extrusionViewD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
extrusionViewD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
viewer_ui ../viewer.ui
)
QT4_WRAP_CPP
(
viewer_moc ../viewer.h
)
add_executable
(
viewerD ../viewer.cpp
${
viewer_moc
}
${
viewer_ui
}
)
target_link_libraries
(
viewerD
${
CGoGN_LIBS_D
}
${
NUMERICAL_LIBS
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
viewerD
${
CGoGN_LIBS_D
}
${
NUMERICAL_LIBS
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
clipping_ui ../clipping.ui
)
QT4_WRAP_CPP
(
clipping_moc ../clipping.h
)
add_executable
(
clippingD ../clipping.cpp
${
clipping_ui
}
${
clipping_moc
}
)
target_link_libraries
(
clippingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
clippingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
volumeExplorer_ui ../volumeExplorer.ui
)
QT4_WRAP_CPP
(
volumeExplorer_moc ../volumeExplorer.h
)
add_executable
(
volumeExplorerD ../volumeExplorer.cpp
${
volumeExplorer_ui
}
${
volumeExplorer_moc
}
)
target_link_libraries
(
volumeExplorerD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
volumeExplorerD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
mcmesh_ui ../mcmesh.ui
)
QT4_WRAP_CPP
(
mcmesh_moc ../mcmesh.h
)
add_executable
(
mcmeshD ../mcmesh.cpp
${
mcmesh_moc
}
${
mcmesh_ui
}
)
add_executable
(
mcmeshD ../mcmesh.cpp
${
mcmesh_moc
}
${
mcmesh_ui
}
)
target_link_libraries
(
mcmeshD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
concave_rendering_moc ../concave_rendering.h
)
add_executable
(
concave_renderingD ../concave_rendering.cpp
${
concave_rendering_moc
}
${
concave_rendering_ui
}
)
target_link_libraries
(
concave_renderingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
Apps/Examples/Release/CMakeLists.txt
View file @
b758b028
...
...
@@ -23,59 +23,46 @@ ENDIF(WIN32)
#define exec to compile
QT4_WRAP_CPP
(
polyhedronsView_moc ../polyhedronsView.h
)
add_executable
(
polyhedronsView ../polyhedronsView.cpp
${
polyhedronsView_moc
}
)
target_link_libraries
(
polyhedronsView
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
frame_manip_moc ../frame_manip.h
)
add_executable
(
frame_manip ../frame_manip.cpp
${
frame_manip_moc
}
)
target_link_libraries
(
frame_manip
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
frame_manip
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
texturesExample_moc ../texturesExample.h
)
add_executable
(
texturesExample ../texturesExample.cpp
${
texturesExample_moc
}
)
target_link_libraries
(
texturesExample
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
texturesExample
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleGMap2_moc ../simpleGMap2.h
)
add_executable
(
simpleGMap2 ../simpleGMap2.cpp
${
simpleGMap2_moc
}
)
target_link_libraries
(
simpleGMap2
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
simpleGMap2
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
simpleGMap3_moc ../simpleGMap3.h
)
add_executable
(
simpleGMap3 ../simpleGMap3.cpp
${
simpleGMap3_moc
}
)
target_link_libraries
(
simpleGMap3
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
simpleGMap3
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
extrusionView_moc ../extrusionView.h
)
add_executable
(
extrusionView ../extrusionView.cpp
${
extrusionView_moc
}
)
target_link_libraries
(
extrusionView
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
extrusionView
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
viewer_ui ../viewer.ui
)
QT4_WRAP_CPP
(
viewer_moc ../viewer.h
)
add_executable
(
viewer ../viewer.cpp
${
viewer_moc
}
${
viewer_ui
}
)
target_link_libraries
(
viewer
${
CGoGN_LIBS_R
}
${
NUMERICAL_LIBS
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
viewer
${
CGoGN_LIBS_R
}
${
NUMERICAL_LIBS
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
clipping_ui ../clipping.ui
)
QT4_WRAP_CPP
(
clipping_moc ../clipping.h
)
add_executable
(
clipping ../clipping.cpp
${
clipping_ui
}
${
clipping_moc
}
)
target_link_libraries
(
clipping
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
clipping
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
volumeExplorer_ui ../volumeExplorer.ui
)
QT4_WRAP_CPP
(
volumeExplorer_moc ../volumeExplorer.h
)
add_executable
(
volumeExplorer ../volumeExplorer.cpp
${
volumeExplorer_ui
}
${
volumeExplorer_moc
}
)
target_link_libraries
(
volumeExplorer
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
target_link_libraries
(
volumeExplorer
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_UI
(
mcmesh_ui ../mcmesh.ui
)
QT4_WRAP_CPP
(
mcmesh_moc ../mcmesh.h
)
add_executable
(
mcmesh
../mcmesh.cpp
${
mcmesh_moc
}
${
mcmesh_ui
}
)
add_executable
(
mcmesh ../mcmesh.cpp
${
mcmesh_moc
}
${
mcmesh_ui
}
)
target_link_libraries
(
mcmesh
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
concave_rendering_moc ../concave_rendering.h
)
add_executable
(
concave_rendering ../concave_rendering.cpp
${
concave_rendering_moc
}
${
concave_rendering_ui
}
)
target_link_libraries
(
concave_rendering
${
CGoGN_LIBS_R
}
${
CGoGN_EXT_LIBS
}
)
Apps/Examples/Tests/CMakeLists.txt
View file @
b758b028
...
...
@@ -34,15 +34,4 @@ target_link_libraries( Geom_inclusionD
add_executable
(
Geom_intersectionD ./Geom_intersection.cpp
)
target_link_libraries
(
Geom_intersectionD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
add_executable
(
test_compactD ./test_compact.cpp
)
target_link_libraries
(
test_compactD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
IF
(
WITH_QT
)
QT4_WRAP_CPP
(
concave_rendering_moc concave_rendering.h
)
add_executable
(
concave_renderingD concave_rendering.cpp
${
concave_rendering_moc
}
)
target_link_libraries
(
concave_renderingD
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
ENDIF
(
WITH_QT
)
Apps/Examples/
Tests/
concave_rendering.cpp
→
Apps/Examples/concave_rendering.cpp
View file @
b758b028
File moved
Apps/Examples/
Tests/
concave_rendering.h
→
Apps/Examples/concave_rendering.h
View file @
b758b028
File moved
Apps/Examples/extrusionView.cpp
View file @
b758b028
...
...
@@ -45,18 +45,14 @@
using
namespace
CGoGN
;
struct
PFP
:
public
PFP_STANDARD
{
// definition de la carte
typedef
EmbeddedMap2
MAP
;
};
PFP
::
MAP
myMap
;
void
MyQT
::
cb_initGL
()
{
// choose to use GL version 2
...
...
@@ -68,7 +64,6 @@ void MyQT::cb_initGL()
// create VBO for position
m_positionVBO
=
new
Utils
::
VBO
();
m_shader
=
new
Utils
::
ShaderFlat
();
m_shader
->
setAttributePosition
(
m_positionVBO
);
m_shader
->
setDiffuse
(
Geom
::
Vec4f
(
0.
,
1.
,
0.
,
0.
));
...
...
@@ -83,7 +78,6 @@ void MyQT::cb_initGL()
registerShader
(
m_shader2
);
}
void
MyQT
::
cb_redraw
()
{
glPolygonMode
(
GL_FRONT_AND_BACK
,
GL_FILL
);
...
...
@@ -99,9 +93,6 @@ void MyQT::cb_redraw()
glDisable
(
GL_POLYGON_OFFSET_FILL
);
}
int
main
(
int
argc
,
char
**
argv
)
{
// interface:
...
...
@@ -145,23 +136,19 @@ int main(int argc, char **argv)
float
lWidthObj
=
std
::
max
<
PFP
::
REAL
>
(
std
::
max
<
PFP
::
REAL
>
(
bb
.
size
(
0
),
bb
.
size
(
1
)),
bb
.
size
(
2
));
Geom
::
Vec3f
lPosObj
=
(
bb
.
min
()
+
bb
.
max
())
/
PFP
::
REAL
(
2
);
// en
voit info BB a l'
interface
//
s
en
d the BB to the
interface
sqt
.
setParamObject
(
lWidthObj
,
lPosObj
.
data
());
//
show 1 pour
GL context
//
first show creates
GL context
sqt
.
show
();
// update
du VBO
position
(context GL necessaire)
// update position
VBO
sqt
.
m_positionVBO
->
updateData
(
position
);
// update de
s
primitives
du renderer
// update
ren
de
r
primitives
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
sqt
.
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
allDarts
,
Algo
::
Render
::
GL2
::
LINES
);
// show final pour premier redraw
sqt
.
show
();
// et on attend la fin.
return
app
.
exec
();
}
Apps/Examples/extrusionView.h
View file @
b758b028
...
...
@@ -22,12 +22,11 @@
* *
*******************************************************************************/
#ifndef EXTRUSIONVIEW_H_
#define EXTRUSIONVIEW_H_
#ifndef
_
EXTRUSIONVIEW_H_
#define
_
EXTRUSIONVIEW_H_
#include
<iostream>
#include
"Utils/Qt/qtSimple.h"
// forward definitions (minimize includes)
...
...
@@ -56,7 +55,8 @@ public:
Utils
::
ShaderFlat
*
m_shader
;
Utils
::
ShaderSimpleColor
*
m_shader2
;
MyQT
()
:
m_render
(
NULL
),
m_positionVBO
(
NULL
),
m_shader
(
NULL
),
m_shader2
(
NULL
){}
MyQT
()
:
m_render
(
NULL
),
m_positionVBO
(
NULL
),
m_shader
(
NULL
),
m_shader2
(
NULL
)
{}
// callbacks of simpleQT to overdefine:
void
cb_redraw
();
...
...
@@ -65,4 +65,3 @@ public:
};
#endif
Apps/Examples/texture.cpp
deleted
100644 → 0
View file @
5797d750
/*
* texture.cpp
*
* Created on: Jul 25, 2011
* Author: thery
*/
Apps/Tuto/CMakeLists.txt
View file @
b758b028
...
...
@@ -78,9 +78,9 @@ add_executable( show_traversors show_traversors.cpp ${show_traversors_ui} ${show
target_link_libraries
(
show_traversors
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
#
add_executable( tuto_subdivision tuto_subdivision.cpp)
#
target_link_libraries( tuto_subdivision
#
${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
add_executable
(
tuto_subdivision tuto_subdivision.cpp
)
target_link_libraries
(
tuto_subdivision
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
QT4_WRAP_CPP
(
tp_master_moc tp_master.h
)
add_executable
(
tp_master tp_master.cpp
${
tp_master_moc
}
)
...
...
@@ -93,20 +93,8 @@ target_link_libraries( tp_master
# exemple: BOOST_LIBS(boost_lib_lists "boost_thread-mt;boost_iostreams-mt")
#BOOST_LIBS(boost_lib_lists "boost_thread-mt")
QT4_WRAP_CPP
(
tuto_mt_moc tuto_mt.h
)
add_executable
(
tuto_mt tuto_mt.cpp
${
tuto_mt_moc
}
)
target_link_libraries
(
tuto_mt
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
${
Boost_THREAD_LIBRARY
}
)
QT4_WRAP_CPP
(
tuto_ogl3_moc tuto_ogl3.h
)
add_executable
(
tuto_ogl3 tuto_ogl3.cpp
${
tuto_ogl3_moc
}
)
target_link_libraries
(
tuto_ogl3
${
CGoGN_LIBS_D
}
${
CGoGN_EXT_LIBS
}
)
#add_executable( tuto_ogl2 tuto_ogl2.cpp)
#target_link_libraries( tuto_ogl2
# ${CGoGN_LIBS_D} ${CGoGN_EXT_LIBS} )
Apps/Tuto/README.TXT
deleted
100644 → 0
View file @
5797d750
Tutoriaux sur l'utilisation de CGoGN
tuto1:
creation d'une carte simple avec attribut de sommet
tuto2:
declaration et utilisation des MapBrowers
Apps/
Examples
/README
→
Apps/
deprecated
/README
View file @
b758b028
File moved
Apps/
Examples
/decimationVolumique.cpp
→
Apps/
deprecated
/decimationVolumique.cpp
View file @
b758b028
File moved
Apps/
Examples
/decimationVolumique.h
→
Apps/
deprecated
/decimationVolumique.h
View file @
b758b028
File moved
Apps/
Examples
/hm_convexhull.cpp
→
Apps/
deprecated
/hm_convexhull.cpp
View file @
b758b028
File moved
Apps/
Examples
/miniTest.cpp
→
Apps/
deprecated
/miniTest.cpp
View file @
b758b028
File moved
Apps/
Examples
/polyhedronsView.cpp
→
Apps/
deprecated
/polyhedronsView.cpp
View file @
b758b028
File moved
Apps/
Examples
/polyhedronsView.h
→
Apps/
deprecated
/polyhedronsView.h
View file @
b758b028
File moved
Apps/
Examples
/scene.cpp
→
Apps/
deprecated
/scene.cpp
View file @
b758b028
File moved
Apps/
Examples
/simpleEMap3.cpp
→
Apps/
deprecated
/simpleEMap3.cpp
View file @
b758b028
File moved
Apps/
Examples
/squelette3carte.cpp
→
Apps/
deprecated
/squelette3carte.cpp
View file @
b758b028
File moved
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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