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
c40a4912
Commit
c40a4912
authored
Jul 30, 2014
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove some warnings
parent
66ee2706
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
11 deletions
+10
-11
Apps/Examples/volumeExplorer.cpp
Apps/Examples/volumeExplorer.cpp
+4
-5
include/Algo/Geometry/volume.hpp
include/Algo/Geometry/volume.hpp
+1
-1
include/Geometry/vector_gen.hpp
include/Geometry/vector_gen.hpp
+1
-1
include/Topology/generic/attributeHandler.h
include/Topology/generic/attributeHandler.h
+1
-1
src/Container/attributeContainer.cpp
src/Container/attributeContainer.cpp
+1
-1
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+2
-2
No files found.
Apps/Examples/volumeExplorer.cpp
View file @
c40a4912
...
@@ -169,7 +169,6 @@ void MyQT::cb_Open()
...
@@ -169,7 +169,6 @@ void MyQT::cb_Open()
color
=
myMap
.
addAttribute
<
VEC3
,
VOLUME
,
MAP
>
(
"color"
);
color
=
myMap
.
addAttribute
<
VEC3
,
VOLUME
,
MAP
>
(
"color"
);
TraversorCell
<
MAP
,
VOLUME
>
tra
(
myMap
);
TraversorCell
<
MAP
,
VOLUME
>
tra
(
myMap
);
float
maxV
=
0.0
f
;
for
(
Dart
d
=
tra
.
begin
();
d
!=
tra
.
end
();
d
=
tra
.
next
())
for
(
Dart
d
=
tra
.
begin
();
d
!=
tra
.
end
();
d
=
tra
.
next
())
{
{
// float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
// float v = Algo::Geometry::tetrahedronVolume<PFP>(myMap, d, position);
...
@@ -503,11 +502,11 @@ int main(int argc, char **argv)
...
@@ -503,11 +502,11 @@ int main(int argc, char **argv)
Utils
::
Chrono
ch
;
Utils
::
Chrono
ch
;
Vertex
v
(
myMap
.
begin
());
//
Vertex v(myMap.begin());
VEC3
p
=
Algo
::
Volume
::
Geometry
::
vertexNeighborhoodCentroid
<
PFP
>
(
myMap
,
v
,
position
);
//
VEC3 p = Algo::Volume::Geometry::vertexNeighborhoodCentroid<PFP>(myMap,v,position);
Vol
w
(
myMap
.
begin
());
//
Vol w(myMap.begin());
VEC3
q
=
Algo
::
Surface
::
Geometry
::
volumeCentroid
<
PFP
>
(
myMap
,
w
,
position
);
//
VEC3 q = Algo::Surface::Geometry::volumeCentroid<PFP>(myMap,w,position);
ch
.
start
();
ch
.
start
();
float
vol
=
Algo
::
Geometry
::
Parallel
::
totalVolume
<
PFP
>
(
myMap
,
position
);
float
vol
=
Algo
::
Geometry
::
Parallel
::
totalVolume
<
PFP
>
(
myMap
,
position
);
...
...
include/Algo/Geometry/volume.hpp
View file @
c40a4912
...
@@ -158,7 +158,7 @@ typename PFP::REAL totalVolume(typename PFP::MAP& map, const VertexAttribute<typ
...
@@ -158,7 +158,7 @@ typename PFP::REAL totalVolume(typename PFP::MAP& map, const VertexAttribute<typ
// compute the sum of volumes
// compute the sum of volumes
typename
PFP
::
REAL
total
(
0
);
typename
PFP
::
REAL
total
(
0
);
for
(
unsigned
int
i
=
0
;
i
<
CGoGN
::
Parallel
::
NumberOfThreads
-
1
;
++
i
)
for
(
int
i
=
0
;
i
<
CGoGN
::
Parallel
::
NumberOfThreads
-
1
;
++
i
)
total
+=
vols
[
i
];
total
+=
vols
[
i
];
return
total
;
return
total
;
...
...
include/Geometry/vector_gen.hpp
View file @
c40a4912
...
@@ -57,7 +57,7 @@ Vector<DIM, T>::Vector(typename std::initializer_list<T> args)
...
@@ -57,7 +57,7 @@ Vector<DIM, T>::Vector(typename std::initializer_list<T> args)
m_data
[
i
]
=
*
iter
;
m_data
[
i
]
=
*
iter
;
// finish with 0 if necessary
// finish with 0 if necessary
for
(
int
j
=
i
;
j
<
DIM
;
++
j
)
for
(
unsigned
int
j
=
i
;
j
<
DIM
;
++
j
)
m_data
[
j
]
=
0
;
m_data
[
j
]
=
0
;
}
}
...
...
include/Topology/generic/attributeHandler.h
View file @
c40a4912
...
@@ -335,7 +335,7 @@ void foreach_attribute(ATTR& attribute, FUNC func, unsigned int nbth = NumberOfT
...
@@ -335,7 +335,7 @@ void foreach_attribute(ATTR& attribute, FUNC func, unsigned int nbth = NumberOfT
template
<
unsigned
int
ORBIT
>
template
<
unsigned
int
ORBIT
>
inline
bool
checkAttributeHandlerOrbit
(
const
AttributeHandlerGen
&
att
)
inline
bool
checkAttributeHandlerOrbit
(
const
AttributeHandlerGen
&
att
)
{
{
return
(
dynamic_cast
<
const
AttributeHandlerOrbit
<
ORBIT
>*>
(
&
att
)
!=
NULL
)
!=
NULL
;
return
dynamic_cast
<
const
AttributeHandlerOrbit
<
ORBIT
>*>
(
&
att
)
!=
NULL
;
}
}
}
// namespace CGoGN
}
// namespace CGoGN
...
...
src/Container/attributeContainer.cpp
View file @
c40a4912
...
@@ -271,7 +271,7 @@ void AttributeContainer::compact(std::vector<unsigned int>& mapOldNew)
...
@@ -271,7 +271,7 @@ void AttributeContainer::compact(std::vector<unsigned int>& mapOldNew)
}
}
// free memory and resize
// free memory and resize
for
(
int
i
=
m_holesBlocks
.
size
()
-
1
;
i
>
nbb
;
--
i
)
for
(
int
i
=
m_holesBlocks
.
size
()
-
1
;
i
>
int
(
nbb
)
;
--
i
)
delete
m_holesBlocks
[
i
];
delete
m_holesBlocks
[
i
];
m_holesBlocks
.
resize
(
nbb
);
m_holesBlocks
.
resize
(
nbb
);
...
...
src/Topology/generic/genericmap.cpp
View file @
c40a4912
...
@@ -55,8 +55,8 @@ std::vector<GenericMap*>* GenericMap::s_instances=NULL;
...
@@ -55,8 +55,8 @@ std::vector<GenericMap*>* GenericMap::s_instances=NULL;
GenericMap
::
GenericMap
()
:
GenericMap
::
GenericMap
()
:
m_
manipulator
(
NULL
),
m_
nextMarkerId
(
0
),
m_
nextMarkerId
(
0
)
m_
manipulator
(
NULL
)
{
{
if
(
m_attributes_registry_map
==
NULL
)
if
(
m_attributes_registry_map
==
NULL
)
{
{
...
...
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