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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hurstel
CGoGN
Commits
41e15d17
Commit
41e15d17
authored
Jan 30, 2011
by
Sylvain Thery
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug visual pb avec objet en static -> registred... en ptr
log2 et isnan n standard sous windows
parent
7a730c5b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
10 deletions
+14
-10
include/Algo/Geometry/laplacian.hpp
include/Algo/Geometry/laplacian.hpp
+1
-1
include/Algo/Geometry/normal.hpp
include/Algo/Geometry/normal.hpp
+2
-1
include/Container/attribmv.hpp
include/Container/attribmv.hpp
+3
-3
include/Topology/generic/genericmap.h
include/Topology/generic/genericmap.h
+1
-1
src/Topology/generic/genericmap.cpp
src/Topology/generic/genericmap.cpp
+7
-4
No files found.
include/Algo/Geometry/laplacian.hpp
View file @
41e15d17
...
...
@@ -39,7 +39,7 @@ void computeLaplacianVertices(
LaplacianType
type
,
const
typename
PFP
::
TVEC3
&
position
,
typename
PFP
::
TVEC3
&
laplacian
,
const
FunctorSelect
&
select
=
SelectorTrue
()
)
const
FunctorSelect
&
select
)
{
CellMarker
marker
(
map
,
VERTEX_CELL
);
for
(
Dart
d
=
map
.
begin
();
d
!=
map
.
end
();
map
.
next
(
d
))
...
...
include/Algo/Geometry/normal.hpp
View file @
41e15d17
...
...
@@ -64,7 +64,8 @@ typename PFP::VEC3 faceNormal(typename PFP::MAP& map, Dart d, const typename PFP
do
{
VEC3
n
=
triangleNormal
<
PFP
>
(
map
,
it
,
position
)
;
if
(
!
std
::
isnan
(
n
[
0
]))
//if(!std::isnan(n[0]))
if
(
n
[
0
]
==
n
[
0
])
N
+=
n
;
it
=
map
.
phi1
(
it
)
;
}
while
(
it
!=
d
)
;
...
...
include/Container/attribmv.hpp
View file @
41e15d17
...
...
@@ -211,7 +211,7 @@ void AttribMultiVect<T>::addBlocksBefore(unsigned int nbb)
std
::
vector
<
T
*
>
tempo
;
tempo
.
reserve
(
1024
);
for
(
uint
i
=
0
;
i
<
nbb
;
++
i
)
for
(
u
nsigned
int
i
=
0
;
i
<
nbb
;
++
i
)
{
T
*
ptr
=
new
T
[
_BLOCKSIZE_
];
tempo
.
push_back
(
ptr
);
...
...
@@ -277,7 +277,7 @@ void AttribMultiVect<T>::saveBin(CGoGNostream& fs, unsigned int id)
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
nbs
),
2
*
sizeof
(
unsigned
int
));
// store data blocks
for
(
uint
i
=
0
;
i
<
nbs
[
0
];
++
i
)
for
(
u
nsigned
int
i
=
0
;
i
<
nbs
[
0
];
++
i
)
{
fs
.
write
(
reinterpret_cast
<
const
char
*>
(
m_tableData
[
i
]),
_BLOCKSIZE_
*
sizeof
(
T
));
}
...
...
@@ -311,7 +311,7 @@ bool AttribMultiVect<T>::loadBin(CGoGNistream& fs)
// load data blocks
m_tableData
.
resize
(
nb
);
for
(
uint
i
=
0
;
i
<
nb
;
++
i
)
for
(
u
nsigned
int
i
=
0
;
i
<
nb
;
++
i
)
{
T
*
ptr
=
new
T
[
_BLOCKSIZE_
];
fs
.
read
(
reinterpret_cast
<
char
*>
(
ptr
),
_BLOCKSIZE_
*
sizeof
(
T
));
...
...
include/Topology/generic/genericmap.h
View file @
41e15d17
...
...
@@ -87,7 +87,7 @@ protected:
*/
AttribContainer
m_attribs
[
NB_ORBITS
]
;
static
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*
>
m_attributes_registry_map
;
static
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*
>
*
m_attributes_registry_map
;
/**
* Direct access to the Dart attributes that store the orbits embeddings
...
...
src/Topology/generic/genericmap.cpp
View file @
41e15d17
...
...
@@ -30,11 +30,12 @@
namespace
CGoGN
{
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*
>
GenericMap
::
m_attributes_registry_map
=
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*
>
();
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*
>*
GenericMap
::
m_attributes_registry_map
=
NULL
;
GenericMap
::
GenericMap
()
{
m_attributes_registry_map
=
new
std
::
map
<
std
::
string
,
RegisteredBaseAttribute
*
>
;
// register all known types
registerAttribute
<
Dart
>
(
"Dart"
);
registerAttribute
<
Mark
>
(
"Mark"
);
...
...
@@ -65,7 +66,7 @@ GenericMap::GenericMap()
for
(
unsigned
int
i
=
0
;
i
<
NB_ORBITS
;
++
i
)
{
m_attribs
[
i
].
setRegistry
(
&
m_attributes_registry_map
)
;
m_attribs
[
i
].
setRegistry
(
m_attributes_registry_map
)
;
m_embeddings
[
i
]
=
NULL
;
m_markerTables
[
i
]
=
NULL
;
}
...
...
@@ -80,6 +81,8 @@ GenericMap::~GenericMap()
m_attribs
[
i
].
clear
(
true
)
;
}
}
if
(
m_attributes_registry_map
)
delete
m_attributes_registry_map
;
}
/****************************************
...
...
@@ -136,7 +139,7 @@ bool GenericMap::registerAttribute(const std::string &nameType)
ra
->
setTypeName
(
nameType
);
m_attributes_registry_map
.
insert
(
std
::
pair
<
std
::
string
,
RegisteredBaseAttribute
*>
(
nameType
,
ra
));
m_attributes_registry_map
->
insert
(
std
::
pair
<
std
::
string
,
RegisteredBaseAttribute
*>
(
nameType
,
ra
));
return
true
;
}
...
...
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