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
KennethVanhoey
CGoGN
Commits
bb7622ee
Commit
bb7622ee
authored
Feb 18, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove useless Selectors
parent
8704c3dc
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
5 additions
and
14 deletions
+5
-14
Apps/Examples/mcmesh.cpp
Apps/Examples/mcmesh.cpp
+1
-1
Apps/Tuto/show_traversors.cpp
Apps/Tuto/show_traversors.cpp
+0
-5
Apps/Tuto/tuto1.cpp
Apps/Tuto/tuto1.cpp
+1
-1
Apps/Tuto/tuto_oper2.h
Apps/Tuto/tuto_oper2.h
+1
-3
Apps/Tuto/tuto_orbits.cpp
Apps/Tuto/tuto_orbits.cpp
+2
-4
No files found.
Apps/Examples/mcmesh.cpp
View file @
bb7622ee
...
...
@@ -154,7 +154,7 @@ void MCMesh::MC()
void
MCMesh
::
updateRender
()
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
//
SelectorDartNoBoundary<PFP::MAP> nb(myMap);
//TODO add Browser for no border
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
LINES
);
m_render
->
initPrimitives
<
PFP
>
(
myMap
,
Algo
::
Render
::
GL2
::
TRIANGLES
);
...
...
Apps/Tuto/show_traversors.cpp
View file @
bb7622ee
...
...
@@ -118,7 +118,6 @@ void MyQT::cb_initGL()
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.95
f
,
0.9
f
,
0.8
f
);
m_dm_topo
=
new
DartMarker
(
myMap
);
}
...
...
@@ -145,7 +144,6 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if
(
Shift
())
{
// SelectorDartNoBoundary<PFP::MAP> nb(myMap);
Dart
d
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
);
if
(
d
!=
Dart
::
nil
())
{
...
...
@@ -199,7 +197,6 @@ void MyQT::traverse2()
return
;
m_last
=
2
;
// int code = (m_ajd_or_inci2)*100+m_first2*10+m_second2;
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_drawer
.
newList
(
GL_COMPILE
);
m_drawer
.
lineWidth
(
7.0
f
);
...
...
@@ -266,8 +263,6 @@ void MyQT::traverse3()
m_last
=
3
;
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_affDarts
.
clear
();
m_drawer
.
newList
(
GL_COMPILE
);
...
...
Apps/Tuto/tuto1.cpp
View file @
bb7622ee
...
...
@@ -77,7 +77,7 @@ void MyQT::createMap()
show
();
// render the topo of the map without boundary darts
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
,
true
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.9
f
);
}
// initialization GL callback
...
...
Apps/Tuto/tuto_oper2.h
View file @
bb7622ee
...
...
@@ -69,7 +69,7 @@ class MyQT: public Utils::QT::SimpleQT
{
Q_OBJECT
public:
MyQT
()
:
nb
(
myMap
),
m_render_topo
(
NULL
),
m_selected
(
NIL
),
m_selected2
(
NIL
),
dm
(
myMap
),
m_shift
(
0.01
f
)
{}
MyQT
()
:
m_render_topo
(
NULL
),
m_selected
(
NIL
),
m_selected2
(
NIL
),
dm
(
myMap
),
m_shift
(
0.01
f
)
{}
void
cb_redraw
();
void
cb_initGL
();
...
...
@@ -87,8 +87,6 @@ protected:
VertexAttribute
<
VEC3
>
position
;
DartAttribute
<
VEC3
>
colorDarts
;
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
;
// render (for the topo)
Algo
::
Render
::
GL2
::
TopoRender
*
m_render_topo
;
Dart
m_selected
;
...
...
Apps/Tuto/tuto_orbits.cpp
View file @
bb7622ee
...
...
@@ -142,8 +142,7 @@ void MyQT::cb_initGL()
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
);
m_render_topo
=
new
Algo
::
Render
::
GL2
::
Topo3Render
();
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.8
f
,
0.8
f
/*, nb*/
);
m_render_topo
->
updateData
<
PFP
>
(
myMap
,
position
,
0.9
f
,
0.8
f
,
0.8
f
);
m_strings
=
new
Utils
::
Strings3D
(
true
,
Geom
::
Vec3f
(
0.1
f
,
0.0
f
,
0.3
f
));
registerShader
(
m_strings
);
...
...
@@ -167,8 +166,7 @@ void MyQT::cb_mousePress(int button, int x, int y)
{
if
(
Shift
())
{
SelectorDartNoBoundary
<
PFP
::
MAP
>
nb
(
myMap
);
m_clicked
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
/*, nb*/
);
m_clicked
=
m_render_topo
->
picking
<
PFP
>
(
myMap
,
x
,
y
);
if
(
m_clicked
!=
Dart
::
nil
())
{
unsigned
int
orbs
[
9
]
=
{
VERTEX
,
EDGE
,
FACE
,
VOLUME
,
PFP
::
MAP
::
VERTEX_OF_PARENT
,
PFP
::
MAP
::
EDGE_OF_PARENT
,
PFP
::
MAP
::
FACE_OF_PARENT
,
PFP
::
MAP
::
VERTEX_OF_PARENT2
,
PFP
::
MAP
::
EDGE_OF_PARENT2
};
...
...
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