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
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
David Cazier
CGoGN
Commits
e79991db
Commit
e79991db
authored
Jan 17, 2013
by
Pierre Kraemer
Browse files
Options
Browse Files
Download
Plain Diff
Merge cgogn:~thery/CGoGN
parents
6b34f7fb
81ac136d
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
7 deletions
+7
-7
SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp
...ins/differentialProperties/src/differentialProperties.cpp
+1
-1
SCHNApps/Plugins/importSurface/importSurface.cpp
SCHNApps/Plugins/importSurface/importSurface.cpp
+1
-1
SCHNApps/Plugins/subdivideSurface/subdivideSurface.cpp
SCHNApps/Plugins/subdivideSurface/subdivideSurface.cpp
+3
-3
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+2
-2
No files found.
SCHNApps/Plugins/differentialProperties/src/differentialProperties.cpp
View file @
e79991db
...
...
@@ -61,7 +61,7 @@ void DifferentialPropertiesPlugin::cb_computeNormal()
if
(
!
normal
.
isValid
())
normal
=
map
->
addAttribute
<
VEC3
,
VERTEX
>
(
normalName
);
Algo
::
Geometry
::
computeNormalVertices
<
PFP
>
(
*
map
,
position
,
normal
);
Algo
::
Surface
::
Geometry
::
computeNormalVertices
<
PFP
>
(
*
map
,
position
,
normal
);
if
(
m_computeNormalDialog
->
check_createVBO
->
checkState
()
==
Qt
::
Checked
)
mh
->
createVBO
(
normal
);
...
...
SCHNApps/Plugins/importSurface/importSurface.cpp
View file @
e79991db
...
...
@@ -26,7 +26,7 @@ void ImportSurfacePlugin::cb_import()
MapHandler
<
PFP
>*
h
=
new
MapHandler
<
PFP
>
(
fi
.
baseName
(),
m_window
,
m
);
std
::
vector
<
std
::
string
>
attrNames
;
Algo
::
Import
::
importMesh
<
PFP
>
(
*
m
,
fileName
.
toUtf8
().
constData
(),
attrNames
);
Algo
::
Surface
::
Import
::
importMesh
<
PFP
>
(
*
m
,
fileName
.
toUtf8
().
constData
(),
attrNames
);
// get vertex position attribute
VertexAttribute
<
VEC3
>
position
=
m
->
getAttribute
<
VEC3
,
CGoGN
::
VERTEX
>
(
attrNames
[
0
]);
...
...
SCHNApps/Plugins/subdivideSurface/subdivideSurface.cpp
View file @
e79991db
...
...
@@ -82,7 +82,7 @@ void SubdivideSurfacePlugin::cb_loopSubdivision()
std
::
string
positionName
=
m_dockTab
->
combo_positionAttribute
->
currentText
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
position
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
positionName
);
Algo
::
Modelisation
::
LoopSubdivision
<
PFP
>
(
*
map
,
position
);
Algo
::
Surface
::
Modelisation
::
LoopSubdivision
<
PFP
>
(
*
map
,
position
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
POINTS
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
...
...
@@ -109,7 +109,7 @@ void SubdivideSurfacePlugin::cb_CCSubdivision()
std
::
string
positionName
=
m_dockTab
->
combo_positionAttribute
->
currentText
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
position
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
positionName
);
Algo
::
Modelisation
::
CatmullClarkSubdivision
<
PFP
>
(
*
map
,
position
);
Algo
::
Surface
::
Modelisation
::
CatmullClarkSubdivision
<
PFP
>
(
*
map
,
position
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
POINTS
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
...
...
@@ -136,7 +136,7 @@ void SubdivideSurfacePlugin::cb_trianguleFaces()
std
::
string
positionName
=
m_dockTab
->
combo_positionAttribute
->
currentText
().
toUtf8
().
constData
();
VertexAttribute
<
VEC3
>
position
=
map
->
getAttribute
<
VEC3
,
VERTEX
>
(
positionName
);
Algo
::
Modelisation
::
trianguleFaces
<
PFP
>
(
*
map
,
position
);
Algo
::
Surface
::
Modelisation
::
trianguleFaces
<
PFP
>
(
*
map
,
position
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
POINTS
);
mh
->
updatePrimitives
(
Algo
::
Render
::
GL2
::
LINES
);
...
...
src/Topology/generic/genericmap.cpp
View file @
e79991db
...
...
@@ -293,10 +293,10 @@ void GenericMap::removeLevelFront()
if
(
maxL
>
0
)
//must have at min 2 levels (0 and 1) to remove the front one
{
AttributeMultiVector
<
unsigned
int
>*
minMR
=
m_mrDarts
[
0
]
;
AttributeMultiVector
<
unsigned
int
>*
firstMR
=
m_mrDarts
[
1
]
;
//
AttributeMultiVector<unsigned int>* firstMR = m_mrDarts[1] ;
for
(
unsigned
int
i
=
m_mrattribs
.
begin
();
i
!=
m_mrattribs
.
end
();
m_mrattribs
.
next
(
i
))
{
unsigned
int
idx
=
(
*
minMR
)[
i
]
;
//
unsigned int idx = (*minMR)[i] ;
if
((
*
m_mrLevels
)[
i
]
!=
0
)
// if the MRdart was introduced after the level we're removing
{
--
(
*
m_mrLevels
)[
i
];
//decrement his level of insertion
...
...
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