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
2023e6b7
Commit
2023e6b7
authored
Apr 05, 2013
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of cgogn:CGoGN
parents
48169a85
2d8f863c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
21 additions
and
6 deletions
+21
-6
Apps/Examples/viewer.cpp
Apps/Examples/viewer.cpp
+12
-3
Apps/Examples/viewer.h
Apps/Examples/viewer.h
+4
-2
include/Algo/Import/importMesh.hpp
include/Algo/Import/importMesh.hpp
+5
-1
No files found.
Apps/Examples/viewer.cpp
View file @
2023e6b7
...
...
@@ -78,8 +78,6 @@ void Viewer::cb_initGL()
{
Utils
::
GLSLShader
::
setCurrentOGLVersion
(
2
)
;
setFocal
(
5.0
f
)
;
m_render
=
new
Algo
::
Render
::
GL2
::
MapRender
()
;
m_topoRender
=
new
Algo
::
Render
::
GL2
::
TopoRender
()
;
...
...
@@ -109,7 +107,7 @@ void Viewer::cb_initGL()
m_simpleColorShader
=
new
Utils
::
ShaderSimpleColor
()
;
m_simpleColorShader
->
setAttributePosition
(
m_positionVBO
)
;
Geom
::
Vec4f
c
(
0.
1
f
,
0.1
f
,
0.1
f
,
1.0
f
)
;
Geom
::
Vec4f
c
(
0.
0
f
,
0.0
f
,
0.0
f
,
1.0
f
)
;
m_simpleColorShader
->
setColor
(
c
)
;
m_pointSprite
=
new
Utils
::
PointSprite
()
;
...
...
@@ -294,6 +292,17 @@ void Viewer::slot_drawEdges(bool b)
void
Viewer
::
slot_drawFaces
(
bool
b
)
{
m_drawFaces
=
b
;
if
(
b
)
{
Geom
::
Vec4f
c
(
0.0
f
,
0.0
f
,
0.0
f
,
1.0
f
)
;
m_simpleColorShader
->
setColor
(
c
)
;
}
else
{
Geom
::
Vec4f
c
(
0.9
f
,
0.9
f
,
0.1
f
,
1.0
f
)
;
m_simpleColorShader
->
setColor
(
c
)
;
}
updateGL
()
;
}
...
...
Apps/Examples/viewer.h
View file @
2023e6b7
...
...
@@ -24,7 +24,8 @@
#include <iostream>
#include "Utils/Qt/qtSimple.h"
//#include "Utils/Qt/qtSimple.h"
#include "Utils/Qt/qtQGLV.h"
#include "ui_viewer.h"
#include "Utils/Qt/qtui.h"
...
...
@@ -65,7 +66,8 @@ struct PFP: public PFP_STANDARD
typedef
PFP
::
MAP
MAP
;
typedef
PFP
::
VEC3
VEC3
;
class
Viewer
:
public
Utils
::
QT
::
SimpleQT
//class Viewer : public Utils::QT::SimpleQT
class
Viewer
:
public
Utils
::
QT
::
SimpleQGLV
{
Q_OBJECT
...
...
include/Algo/Import/importMesh.hpp
View file @
2023e6b7
...
...
@@ -111,11 +111,15 @@ bool importMesh(typename PFP::MAP& map, MeshTablesSurface<PFP>& mts)
if
(
good_dart
!=
NIL
)
{
if
(
(
d
!=
map
.
phi2
(
d
))
&&
(
good_dart
!=
map
.
phi2
(
good_dart
))
)
if
(
good_dart
==
map
.
phi2
(
good_dart
)
)
{
map
.
sewFaces
(
d
,
good_dart
,
false
);
m
.
unmarkOrbit
<
EDGE
>
(
d
);
}
else
{
++
nbBoundaryEdges
;
}
}
else
{
...
...
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