Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CGoGN
CGoGN
Commits
e9902ae7
Commit
e9902ae7
authored
Dec 17, 2012
by
Sylvain Thery
Browse files
resolve MultiThread loading problems
parent
c477fa1c
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/Algo/Render/GL2/explodeVolumeRender.hpp
View file @
e9902ae7
...
...
@@ -27,6 +27,7 @@
#include
"Topology/generic/dartmarker.h"
#include
"Topology/generic/cellmarker.h"
#include
"Algo/Geometry/centroid.h"
#include
"Topology/generic/autoAttributeHandler.h"
namespace
CGoGN
{
...
...
src/Topology/generic/genericmap.cpp
View file @
e9902ae7
...
...
@@ -592,13 +592,25 @@ bool GenericMap::loadMapBin(const std::string& filename)
fs
.
read
(
reinterpret_cast
<
char
*>
(
&
(
m_mrNbDarts
[
0
])),
nb
*
sizeof
(
unsigned
int
));
}
// retrieve m_embeddings (from m_attribs)
update_m_emb_afterLoad
();
// recursive call from real type of map (for topo relation attributes pointers) down to GenericMap (for Marker_cleaning & pointers)
update_topo_shortcuts
();
// restore nbThreads
std
::
vector
<
std
::
string
>
typeMark
;
unsigned
int
nbatt0
=
m_attribs
[
0
].
getAttributesTypes
(
typeMark
);
m_nbThreads
=
0
;
for
(
unsigned
int
i
=
0
;
i
<
nbatt0
;
++
i
)
{
if
(
typeMark
[
i
]
==
"Mark"
)
++
m_nbThreads
;
}
return
true
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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