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
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
Etienne Schmitt
CGoGN
Commits
2e3d2fa2
Commit
2e3d2fa2
authored
Oct 15, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
topoRender + schnappsTopoRender
parent
99686812
Changes
52
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
52 changed files
with
1760 additions
and
904 deletions
+1760
-904
Apps/Examples/simpleMap3.cpp
Apps/Examples/simpleMap3.cpp
+2
-2
Apps/Examples/simpleMap3.h
Apps/Examples/simpleMap3.h
+1
-1
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+9
-6
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+3
-3
Apps/Examples/volumeExplorer.cpp
Apps/Examples/volumeExplorer.cpp
+2
-2
Apps/SandBox/testPlaneCutting.cpp
Apps/SandBox/testPlaneCutting.cpp
+4
-4
Apps/SandBox/testPlaneCutting.h
Apps/SandBox/testPlaneCutting.h
+1
-1
Apps/SandBox/test_traversor2.cpp
Apps/SandBox/test_traversor2.cpp
+36
-99
Apps/SandBox/test_traversor2.h
Apps/SandBox/test_traversor2.h
+1
-1
Apps/Tuto/Modelling/tuto_oper2.cpp
Apps/Tuto/Modelling/tuto_oper2.cpp
+12
-91
Apps/Tuto/Modelling/tuto_oper2.h
Apps/Tuto/Modelling/tuto_oper2.h
+1
-2
Apps/Tuto/Modelling/tuto_oper3.cpp
Apps/Tuto/Modelling/tuto_oper3.cpp
+2
-14
Apps/Tuto/Modelling/tuto_oper3.h
Apps/Tuto/Modelling/tuto_oper3.h
+2
-3
Apps/Tuto/Traversals/show_traversors2.cpp
Apps/Tuto/Traversals/show_traversors2.cpp
+7
-10
Apps/Tuto/Traversals/show_traversors2.h
Apps/Tuto/Traversals/show_traversors2.h
+1
-3
Apps/Tuto/Traversals/show_traversors3.cpp
Apps/Tuto/Traversals/show_traversors3.cpp
+2
-0
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+2
-2
Apps/Tuto/tuto1.h
Apps/Tuto/tuto1.h
+3
-5
Apps/Tuto/tuto3.cpp
Apps/Tuto/tuto3.cpp
+6
-6
Apps/Tuto/tuto3.h
Apps/Tuto/tuto3.h
+1
-1
Apps/Tuto/tuto4.cpp
Apps/Tuto/tuto4.cpp
+3
-3
Apps/Tuto/tuto4.h
Apps/Tuto/tuto4.h
+1
-1
SCHNApps/Plugins/surface_deformation/src/surface_deformation.cpp
...s/Plugins/surface_deformation/src/surface_deformation.cpp
+4
-0
SCHNApps/Plugins/surface_modelisation/src/surface_modelisation.cpp
...Plugins/surface_modelisation/src/surface_modelisation.cpp
+4
-0
SCHNApps/Plugins/surface_render/include/surface_render.h
SCHNApps/Plugins/surface_render/include/surface_render.h
+5
-0
SCHNApps/Plugins/surface_render/src/surface_render.cpp
SCHNApps/Plugins/surface_render/src/surface_render.cpp
+50
-0
SCHNApps/Plugins/surface_render/src/surface_render_dockTab.cpp
...pps/Plugins/surface_render/src/surface_render_dockTab.cpp
+1
-1
SCHNApps/Plugins/surface_renderScalar/src/surface_renderScalar.cpp
...Plugins/surface_renderScalar/src/surface_renderScalar.cpp
+4
-0
SCHNApps/Plugins/surface_renderTopo/forms/surface_renderTopo.ui
...ps/Plugins/surface_renderTopo/forms/surface_renderTopo.ui
+89
-39
SCHNApps/Plugins/surface_renderTopo/include/surface_renderTopo.h
...s/Plugins/surface_renderTopo/include/surface_renderTopo.h
+52
-27
SCHNApps/Plugins/surface_renderTopo/include/surface_renderTopo_dockTab.h
...s/surface_renderTopo/include/surface_renderTopo_dockTab.h
+1
-1
SCHNApps/Plugins/surface_renderTopo/src/surface_renderTopo.cpp
...pps/Plugins/surface_renderTopo/src/surface_renderTopo.cpp
+45
-13
SCHNApps/Plugins/surface_renderTopo/src/surface_renderTopo_dockTab.cpp
...ins/surface_renderTopo/src/surface_renderTopo_dockTab.cpp
+53
-12
SCHNApps/Plugins/surface_renderVector/src/surface_renderVector.cpp
...Plugins/surface_renderVector/src/surface_renderVector.cpp
+4
-0
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
SCHNApps/Plugins/surface_selection/src/surface_selection.cpp
+5
-0
SCHNApps/include/mapHandler.h
SCHNApps/include/mapHandler.h
+27
-0
SCHNApps/include/mapHandler.hpp
SCHNApps/include/mapHandler.hpp
+47
-1
SCHNApps/include/view.h
SCHNApps/include/view.h
+4
-0
SCHNApps/src/controlDock_mapTab.cpp
SCHNApps/src/controlDock_mapTab.cpp
+29
-0
SCHNApps/src/mapHandler.cpp
SCHNApps/src/mapHandler.cpp
+12
-1
SCHNApps/src/schnapps.cpp
SCHNApps/src/schnapps.cpp
+34
-0
SCHNApps/src/view.cpp
SCHNApps/src/view.cpp
+17
-0
include/Algo/Render/GL2/topoRender.h
include/Algo/Render/GL2/topoRender.h
+146
-91
include/Algo/Render/GL2/topoRender.hpp
include/Algo/Render/GL2/topoRender.hpp
+213
-457
include/Topology/gmap/gmap2.hpp
include/Topology/gmap/gmap2.hpp
+1
-1
include/Utils/GLSLShader.h
include/Utils/GLSLShader.h
+1
-0
include/Utils/Shaders/shaderSimpleFlat.frag
include/Utils/Shaders/shaderSimpleFlat.frag
+51
-0
include/Utils/Shaders/shaderSimpleFlat.h
include/Utils/Shaders/shaderSimpleFlat.h
+105
-0
include/Utils/Shaders/shaderSimpleFlat.vert
include/Utils/Shaders/shaderSimpleFlat.vert
+26
-0
src/Algo/Render/topoGenRender.cpp
src/Algo/Render/topoGenRender.cpp
+395
-0
src/Utils/GLSLShader.cpp
src/Utils/GLSLShader.cpp
+42
-0
src/Utils/Shaders/shaderSimpleFlat.cpp
src/Utils/Shaders/shaderSimpleFlat.cpp
+191
-0
No files found.
Apps/Examples/simpleMap3.cpp
View file @
2e3d2fa2
...
...
@@ -110,10 +110,10 @@ void SimpleMap3::cb_initGL()
m_render_topo
->
setInitialDartsColor
(
1.0
f
,
1.0
f
,
1.0
f
);
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
0.8
f
);
m_render_topo_boundary
=
new
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
();
m_render_topo_boundary
=
new
Algo
::
Render
::
GL2
::
TopoRender
();
m_render_topo_boundary
->
setDartWidth
(
2.0
f
);
m_render_topo_boundary
->
setInitialDartsColor
(
0.4
f
,
0.8
f
,
0.4
f
);
m_render_topo_boundary
->
updateDataBoundary
(
myMap
,
position
,
0.9
f
,
0.9
f
,
bb
.
maxSize
()
/
50.0
f
);
m_render_topo_boundary
->
updateDataBoundary
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
bb
.
maxSize
()
/
50.0
f
);
m_render_topo_primal
=
new
Algo
::
Render
::
GL2
::
Topo3PrimalRender
<
PFP
>
();
m_render_topo_primal
->
setDartWidth
(
2.0
f
);
...
...
Apps/Examples/simpleMap3.h
View file @
2e3d2fa2
...
...
@@ -58,7 +58,7 @@ public:
VertexAttribute
<
VEC3
,
MAP
>
position
;
Algo
::
Render
::
GL2
::
Topo3RenderMap
<
PFP
>*
m_render_topo
;
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
*
m_render_topo_boundary
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo_boundary
;
Algo
::
Render
::
GL2
::
Topo3PrimalRender
<
PFP
>*
m_render_topo_primal
;
SimpleMap3
()
;
...
...
Apps/Examples/viewer.cpp
View file @
2e3d2fa2
...
...
@@ -83,7 +83,7 @@ void Viewer::cb_initGL()
Utils
::
GLSLShader
::
areShadersSupported
();
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
()
;
m_topoRender
->
setInitialDartsColor
(
0.25
f
,
0.25
f
,
0.25
f
)
;
...
...
@@ -98,12 +98,12 @@ void Viewer::cb_initGL()
m_phongShader
->
setSpecular
(
colSpec
)
;
m_phongShader
->
setShininess
(
shininess
)
;
m_flatShader
=
new
Utils
::
ShaderFlat
()
;
m_flatShader
=
new
Utils
::
Shader
Simple
Flat
()
;
m_flatShader
->
setAttributePosition
(
m_positionVBO
)
;
m_flatShader
->
setAmbiant
(
colClear
)
;
m_flatShader
->
setDiffuse
(
colDif
)
;
m_flatShader
->
setDiffuseBack
(
Geom
::
Vec4f
(
0
,
0
,
0
,
0
))
;
m_flatShader
->
setExplode
(
faceShrinkage
)
;
//
m_flatShader->setDiffuseBack(Geom::Vec4f(0,0,0,0)) ;
//
m_flatShader->setExplode(faceShrinkage) ;
m_vectorShader
=
new
Utils
::
ShaderVectorPerVertex
()
;
m_vectorShader
->
setAttributePosition
(
m_positionVBO
)
;
...
...
@@ -130,12 +130,14 @@ void Viewer::cb_redraw()
{
if
(
m_drawVertices
)
{
glDepthFunc
(
GL_LEQUAL
);
m_pointSprite
->
setSize
(
vertexScaleFactor
)
;
m_render
->
draw
(
m_pointSprite
,
Algo
::
Render
::
GL2
::
POINTS
)
;
}
if
(
m_drawEdges
)
{
glDepthFunc
(
GL_LEQUAL
);
glLineWidth
(
1.0
f
)
;
m_render
->
draw
(
m_simpleColorShader
,
Algo
::
Render
::
GL2
::
LINES
)
;
}
...
...
@@ -146,10 +148,10 @@ void Viewer::cb_redraw()
glEnable
(
GL_LIGHTING
)
;
glEnable
(
GL_POLYGON_OFFSET_FILL
)
;
glPolygonOffset
(
1.0
f
,
1.0
f
)
;
glDepthFunc
(
GL_LESS
);
switch
(
m_renderStyle
)
{
case
FLAT
:
m_flatShader
->
setExplode
(
faceShrinkage
)
;
m_render
->
draw
(
m_flatShader
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
break
;
case
PHONG
:
...
...
@@ -161,6 +163,7 @@ void Viewer::cb_redraw()
if
(
m_drawTopo
)
{
glDepthFunc
(
GL_LEQUAL
);
m_topoRender
->
drawTopo
()
;
}
...
...
@@ -543,7 +546,7 @@ void Viewer::importMesh(std::string& filename)
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
m_topoRender
->
updateData
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
m_topoRender
->
updateData
<
PFP
>
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
normalBaseSize
=
bb
.
diagSize
()
/
100.0
f
;
...
...
Apps/Examples/viewer.h
View file @
2e3d2fa2
...
...
@@ -42,7 +42,7 @@
#include "Algo/Render/GL2/topoRender.h"
#include "Utils/Shaders/shaderPhong.h"
#include "Utils/Shaders/shaderFlat.h"
#include "Utils/Shaders/shader
Simple
Flat.h"
#include "Utils/Shaders/shaderSimpleColor.h"
#include "Utils/Shaders/shaderVectorPerVertex.h"
#include "Utils/pointSprite.h"
...
...
@@ -104,13 +104,13 @@ public:
VertexAttribute
<
VEC3
,
MAP
>
normal
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
*
m_topoRender
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_topoRender
;
Utils
::
VBO
*
m_positionVBO
;
Utils
::
VBO
*
m_normalVBO
;
Utils
::
ShaderPhong
*
m_phongShader
;
Utils
::
ShaderFlat
*
m_flatShader
;
Utils
::
Shader
Simple
Flat
*
m_flatShader
;
Utils
::
ShaderVectorPerVertex
*
m_vectorShader
;
Utils
::
ShaderSimpleColor
*
m_simpleColorShader
;
Utils
::
PointSprite
*
m_pointSprite
;
...
...
Apps/Examples/volumeExplorer.cpp
View file @
2e3d2fa2
...
...
@@ -447,13 +447,13 @@ int main(int argc, char **argv)
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
int
nb
=
8
;
int
nb
=
64
;
Algo
::
Volume
::
Tilings
::
Cubic
::
Grid
<
PFP
>
cubic
(
myMap
,
nb
,
nb
,
nb
);
cubic
.
embedIntoGrid
(
position
,
1.0
f
,
1.0
f
,
1.0
f
);
for
(
unsigned
int
i
=
position
.
begin
();
i
!=
position
.
end
();
position
.
next
(
i
))
{
VEC3
pert
(
float
(
double
(
rand
())
/
RAND_MAX
/
20
.0
),
float
(
double
(
rand
())
/
RAND_MAX
/
20.0
),
float
(
double
(
rand
())
/
RAND_MAX
/
2
0.0
));
VEC3
pert
(
float
(
double
(
rand
())
/
RAND_MAX
/
20
0.0
),
float
(
double
(
rand
())
/
RAND_MAX
/
200.0
),
float
(
double
(
rand
())
/
RAND_MAX
/
20
0.0
));
position
[
i
]
+=
pert
;
}
...
...
Apps/SandBox/testPlaneCutting.cpp
View file @
2e3d2fa2
...
...
@@ -85,7 +85,7 @@ void Viewer::cb_initGL()
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
)
;
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
()
;
m_topoRender
->
setInitialDartsColor
(
0.25
f
,
0.25
f
,
0.25
f
)
;
...
...
@@ -232,7 +232,7 @@ void Viewer::cb_keyPress(int keycode)
m_positionVBO
->
updateData
(
position
)
;
m_normalVBO
->
updateData
(
normal
)
;
m_topoRender
->
updateData
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
m_topoRender
->
updateData
<
PFP
>
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
updateGL
();
break
;
...
...
@@ -267,7 +267,7 @@ void Viewer::cb_keyPress(int keycode)
m_positionVBO
->
updateData
(
position
)
;
m_normalVBO
->
updateData
(
normal
)
;
m_topoRender
->
updateData
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
m_topoRender
->
updateData
<
PFP
>
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
updateGL
();
break
;
...
...
@@ -338,7 +338,7 @@ void Viewer::importMesh(std::string& filename)
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
)
;
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
)
;
m_topoRender
->
updateData
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
m_topoRender
->
updateData
<
PFP
>
(
myMap
,
position
,
0.85
f
,
0.85
f
,
m_drawBoundaryTopo
)
;
bb
=
Algo
::
Geometry
::
computeBoundingBox
<
PFP
>
(
myMap
,
position
)
;
normalBaseSize
=
bb
.
diagSize
()
/
100.0
f
;
...
...
Apps/SandBox/testPlaneCutting.h
View file @
2e3d2fa2
...
...
@@ -103,7 +103,7 @@ public:
VertexAttribute
<
VEC3
,
MAP
>
normal
;
Algo
::
Render
::
GL2
::
MapRender
*
m_render
;
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
*
m_topoRender
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_topoRender
;
Utils
::
VBO
*
m_positionVBO
;
Utils
::
VBO
*
m_normalVBO
;
...
...
Apps/SandBox/test_traversor2.cpp
View file @
2e3d2fa2
...
...
@@ -75,8 +75,7 @@ void MyQT::traversors(int x)
// update all color to grey
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
colorDarts
[
d
]
=
Geom
::
Vec3f
(
0.5
f
,
0.5
f
,
0.5
f
);
m_render_topo
->
setDartColor
(
d
,
0.5
f
,
0.5
f
,
0.5
f
);
m_render_topo
->
addColoredDart
(
d
,
0.5
f
,
0.5
f
,
0.5
f
);
}
switch
(
x
)
...
...
@@ -85,7 +84,7 @@ void MyQT::traversors(int x)
{
Traversor2VVaE
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
...
...
@@ -94,14 +93,14 @@ void MyQT::traversors(int x)
Traversor2VVaF
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
2
:
{
Traversor2EEaV
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
3
:
...
...
@@ -109,63 +108,63 @@ void MyQT::traversors(int x)
Traversor2EEaF
<
MAP
>
trav
(
myMap
,
m_selected
);
float
c
=
0.0
f
;
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
c
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
c
);
}
break
;
case
4
:
{
Traversor2FFaV
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
5
:
{
Traversor2FFaE
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
6
:
{
Traversor2FV
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
7
:
{
Traversor2FE
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
8
:
{
Traversor2EV
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
9
:
{
Traversor2EF
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
10
:
{
Traversor2VE
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
case
11
:
{
Traversor2VF
<
MAP
>
trav
(
myMap
,
m_selected
);
for
(
Dart
b
=
trav
.
begin
();
b
!=
trav
.
end
();
b
=
trav
.
next
())
m_render_topo
->
setDartColor
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
addColoredDart
(
b
,
0.0
f
,
1.0
f
,
0.0
f
);
}
break
;
default:
...
...
@@ -178,9 +177,8 @@ void MyQT::traversors(int x)
void
MyQT
::
createMap
(
int
n
)
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
colorDarts
=
myMap
.
addAttribute
<
VEC3
,
DART
,
MAP
>
(
"color"
);
Algo
::
Surface
::
Tilings
::
Square
::
Grid
<
PFP
>
grid
(
myMap
,
n
,
n
,
true
);
Algo
::
Surface
::
Tilings
::
Square
::
Grid
<
PFP
>
grid
(
myMap
,
n
,
n
,
true
);
grid
.
embedIntoGrid
(
position
,
1.
,
1.
,
0.
);
// bounding box of scene
...
...
@@ -197,31 +195,28 @@ void MyQT::createMap(int n)
m_render_topo
->
setInitialDartsColor
(
0.5
f
,
0.5
f
,
0.5
f
);
m_render_topo
->
setInitialBoundaryDartsColor
(
0.3
f
,
0.3
f
,
0.3
f
);
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
dock
.
withBoundary
->
isChecked
());
std
::
cout
<<
"markAll OK"
<<
std
::
endl
;
#ifdef USE_GMAP
m_render_topo
->
updateDataGMap
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
dock
.
withBoundary
->
isChecked
());
#else
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
dock
.
withBoundary
->
isChecked
());
#endif
std
::
cout
<<
"markAll OK"
<<
std
::
endl
;
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
)))
{
colorDarts
[
d
]
=
Geom
::
Vec3f
(
0.5
f
,
0.5
f
,
0.5
f
);
m_render_topo
->
setDartColor
(
d
,
0.5
f
,
0.5
f
,
0.5
f
);
}
}
}
void
MyQT
::
updateMap
()
{
m_render_topo
->
setInitialBoundaryDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
dock
.
withBoundary
->
isChecked
());
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
)))
{
const
Geom
::
Vec3f
&
C
=
colorDarts
[
d
];
if
(
C
*
C
!=
0.0
f
)
m_render_topo
->
setDartColor
(
d
,
C
[
0
],
C
[
1
],
C
[
2
]);
}
}
#ifdef USE_GMAP
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
dock
.
withBoundary
->
isChecked
());
#else
m_render_topo
->
updateDataGMap
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
dock
.
withBoundary
->
isChecked
());
#endif
updateGL
();
}
...
...
@@ -229,28 +224,24 @@ void MyQT::updateMap()
void
MyQT
::
cb_initGL
()
{
glClearColor
(
1.0
f
,
1.0
f
,
1.0
f
,
1.0
f
);
#ifdef USE_GMAP
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRenderGMap
<
PFP
>
(
0.01
f
)
;
#else
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRenderMap
<
PFP
>
(
0.01
f
)
;
#endif
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRender
(
0.01
f
)
;
}
// redraw GL callback (clear and swap already done)
void
MyQT
::
cb_redraw
()
{
glEnable
(
GL_POLYGON_OFFSET_FILL
);
glPolygonOffset
(
1.0
f
,
1.0
f
);
glDepthFunc
(
GL_LESS
);
m_render_topo
->
drawTopo
();
glDisable
(
GL_POLYGON_OFFSET_FILL
);
glDepthFunc
(
GL_LEQUAL
);
m_render_topo
->
drawColoredDarts
(
myMap
);
if
(
m_selected
!=
NIL
)
m_render_topo
->
overdrawDart
(
m_selected
,
11
,
1.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
overdrawDart
(
m
yMap
,
m
_selected
,
11
,
1.0
f
,
0.0
f
,
0.0
f
);
if
(
m_selected2
!=
NIL
)
m_render_topo
->
overdrawDart
(
m_selected2
,
11
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
overdrawDart
(
m
yMap
,
m
_selected2
,
11
,
0.0
f
,
1.0
f
,
0.0
f
);
}
void
MyQT
::
cb_mousePress
(
int
button
,
int
x
,
int
y
)
...
...
@@ -279,38 +270,6 @@ void MyQT::cb_keyPress(int keycode)
{
switch
(
keycode
)
{
case
'c'
:
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
))
{
int
n
=
rand
();
float
r
=
float
(
n
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
g
=
float
((
n
>>
8
)
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
b
=
float
((
n
>>
16
)
&
0x7f
)
/
255.0
+
0.25
f
;
colorDarts
[
d
]
=
Geom
::
Vec3f
(
r
,
g
,
b
);
m_render_topo
->
setDartColor
(
d
,
r
,
g
,
b
);
}
}
break
;
case
'g'
:
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
colorDarts
[
d
]
=
Geom
::
Vec3f
(
0.5
f
,
0.5
f
,
0.5
f
);
m_render_topo
->
setDartColor
(
d
,
0.5
f
,
0.5
f
,
0.5
f
);
}
break
;
case
'h'
:
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
))
{
colorDarts
[
d
]
=
Geom
::
Vec3f
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
setDartColor
(
d
,
0.0
f
,
0.0
f
,
0.0
f
);
}
}
break
;
case
Qt
::
Key_Up
:
if
(
m_selected
!=
NIL
)
position
[
m_selected
][
1
]
+=
m_shift
;
...
...
@@ -344,11 +303,6 @@ void MyQT::cb_keyPress(int keycode)
void
MyQT
::
svg
()
{
if
(
m_selected
!=
NIL
)
m_render_topo
->
setDartColor
(
m_selected
,
0.8
f
,
0.0
f
,
0.0
f
);
if
(
m_selected2
!=
NIL
)
m_render_topo
->
setDartColor
(
m_selected2
,
0.0
f
,
0.8
f
,
0.0
f
);
std
::
string
filename
=
selectFileSave
(
"snapshot file"
,
"."
,
"(*.svg)"
);
m_render_topo
->
svgout2D
(
filename
,
modelViewMatrix
(),
projectionMatrix
());
}
...
...
@@ -392,23 +346,6 @@ void MyQT::importMesh(std::string& filename)
position
=
myMap
.
getAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
attrNames
[
0
])
;
}
colorDarts
=
myMap
.
getAttribute
<
VEC3
,
DART
,
MAP
>
(
"color"
);
if
(
!
colorDarts
.
isValid
())
{
colorDarts
=
myMap
.
addAttribute
<
VEC3
,
DART
,
MAP
>
(
"color"
);
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
)))
{
int
n
=
rand
();
float
r
=
float
(
n
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
g
=
float
((
n
>>
8
)
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
b
=
float
((
n
>>
16
)
&
0x7f
)
/
255.0
+
0.25
f
;
colorDarts
[
d
]
=
Geom
::
Vec3f
(
r
,
g
,
b
);
m_render_topo
->
setDartColor
(
d
,
r
,
g
,
b
);
}
}
}
m_selected
=
NIL
;
m_selected2
=
NIL
;
...
...
Apps/SandBox/test_traversor2.h
View file @
2e3d2fa2
...
...
@@ -94,7 +94,7 @@ protected:
#ifdef USE_GMAP
Algo
::
Render
::
GL2
::
TopoRenderGMap
<
PFP
>*
m_render_topo
;
#else
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
*
m_render_topo
;
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo
;
#endif
Dart
m_selected
;
...
...
Apps/Tuto/Modelling/tuto_oper2.cpp
View file @
2e3d2fa2
...
...
@@ -169,7 +169,6 @@ void MyQT::operation(int x)
void
MyQT
::
createMap
(
int
n
)
{
position
=
myMap
.
addAttribute
<
VEC3
,
VERTEX
,
MAP
>
(
"position"
);
colorDarts
=
myMap
.
addAttribute
<
VEC3
,
DART
,
MAP
>
(
"color"
);
Algo
::
Surface
::
Tilings
::
Square
::
Grid
<
PFP
>
grid
(
myMap
,
n
,
n
,
true
);
grid
.
embedIntoGrid
(
position
,
1.
,
1.
,
0.
);
...
...
@@ -191,43 +190,22 @@ void MyQT::createMap(int n)
m_render_topo
->
setInitialBoundaryDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
#ifdef PRIMAL_TOPO
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
);
#else
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
#endif
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
)))
{
int
n
=
rand
();
float
r
=
float
(
n
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
g
=
float
((
n
>>
8
)
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
b
=
float
((
n
>>
16
)
&
0x7f
)
/
255.0
+
0.25
f
;
colorDarts
[
d
]
=
Geom
::
Vec3f
(
r
,
g
,
b
);
m_render_topo
->
setDartColor
(
d
,
r
,
g
,
b
);
}
}
}
void
MyQT
::
updateMap
()
{
m_render_topo
->
setInitialBoundaryDartsColor
(
0.0
f
,
0.0
f
,
0.0
f
);
#ifdef PRIMAL_TOPO
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
);
#else
m_render_topo
->
updateData
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
#endif
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
dm
.
isMarked
(
d
)
&&
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
)))
{
const
Geom
::
Vec3f
&
C
=
colorDarts
[
d
];
if
(
C
*
C
!=
0.0
f
)
m_render_topo
->
setDartColor
(
d
,
C
[
0
],
C
[
1
],
C
[
2
]);
}
}
}
// initialization GL callback
...
...
@@ -235,27 +213,27 @@ void MyQT::cb_initGL()
{
glClearColor
(
1.0
f
,
1.0
f
,
1.0
f
,
1.0
f
);
#ifdef PRIMAL_TOPO
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoPrimalRender
<
PFP
>
()
;
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoPrimalRender
()
;
#else
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRender
Map
<
PFP
>
(
0.01
f
)
;
m_render_topo
=
new
Algo
::
Render
::
GL2
::
TopoRender
(
0.01
f
)
;
#endif
}
// redraw GL callback (clear and swap already done)
void
MyQT
::
cb_redraw
()
{
glEnable
(
GL_POLYGON_OFFSET_FILL
);
glPolygonOffset
(
1.0
f
,
1.0
f
);
glDepthFunc
(
GL_LESS
);
m_render_topo
->
drawTopo
();
glDisable
(
GL_POLYGON_OFFSET_FILL
);
glDepthFunc
(
GL_LEQUAL
);
m_render_topo
->
drawColoredDarts
<
MAP
>
(
myMap
);
if
(
m_selected
!=
NIL
)
m_render_topo
->
overdrawDart
(
m_selected
,
11
,
1.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
overdrawDart
(
m
yMap
,
m
_selected
,
11
,
1.0
f
,
0.0
f
,
0.0
f
);
if
(
m_selected2
!=
NIL
)
m_render_topo
->
overdrawDart
(
m_selected2
,
11
,
0.0
f
,
1.0
f
,
0.0
f
);
m_render_topo
->
overdrawDart
(
m
yMap
,
m
_selected2
,
11
,
0.0
f
,
1.0
f
,
0.0
f
);
}
void
MyQT
::
cb_mousePress
(
int
button
,
int
x
,
int
y
)
...
...
@@ -281,41 +259,6 @@ void MyQT::cb_keyPress(int keycode)
{
switch
(
keycode
)
{
case
'c'
:
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
))
{
int
n
=
rand
();
float
r
=
float
(
n
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
g
=
float
((
n
>>
8
)
&
0x7f
)
/
255.0
f
+
0.25
f
;
float
b
=
float
((
n
>>
16
)
&
0x7f
)
/
255.0
+
0.25
f
;
colorDarts
[
d
]
=
Geom
::
Vec3f
(
r
,
g
,
b
);
m_render_topo
->
setDartColor
(
d
,
r
,
g
,
b
);
}
}
break
;
case
'g'
:
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
))
{
colorDarts
[
d
]
=
Geom
::
Vec3f
(
0.5
f
,
0.5
f
,
0.5
f
);
m_render_topo
->
setDartColor
(
d
,
0.5
f
,
0.5
f
,
0.5
f
);
}
}
break
;
case
'b'
:
for
(
Dart
d
=
myMap
.
begin
();
d
!=
myMap
.
end
();
myMap
.
next
(
d
))
{
if
(
!
myMap
.
isBoundaryMarked
<
2
>
(
d
))
{
colorDarts
[
d
]
=
Geom
::
Vec3f
(
0.0
f
,
0.0
f
,
0.0
f
);
m_render_topo
->
setDartColor
(
d
,
0.0
f
,
0.0
f
,
0.0
f
);
}
}
break
;
case
Qt
::
Key_Up
:
if
(
m_selected
!=
NIL
)