Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
OpenMesh
OpenMesh
Commits
ac5503d1
Commit
ac5503d1
authored
Oct 12, 2018
by
Max Lyon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more implementation of status reading
parent
6a2d1873
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
2 deletions
+35
-2
src/OpenMesh/Core/IO/reader/OMReader.cc
src/OpenMesh/Core/IO/reader/OMReader.cc
+35
-2
No files found.
src/OpenMesh/Core/IO/reader/OMReader.cc
View file @
ac5503d1
...
...
@@ -511,7 +511,7 @@ bool _OMReader_::read_binary_face_chunk(std::istream &_is, BaseImporter &_bi, Op
//-----------------------------------------------------------------------------
bool
_OMReader_
::
read_binary_edge_chunk
(
std
::
istream
&
_is
,
BaseImporter
&
_bi
,
Options
&
/*
_opt
*/
,
bool
_swap
)
const
bool
_OMReader_
::
read_binary_edge_chunk
(
std
::
istream
&
_is
,
BaseImporter
&
_bi
,
Options
&
_opt
,
bool
_swap
)
const
{
using
OMFormat
::
Chunk
;
...
...
@@ -519,6 +519,9 @@ bool _OMReader_::read_binary_edge_chunk(std::istream &_is, BaseImporter &_bi, Op
size_t
b
=
bytes_
;
size_t
eidx
=
0
;
OpenMesh
::
Attributes
::
StatusInfo
status
;
switch
(
chunk_header_
.
type_
)
{
case
Chunk
::
Type_Custom
:
...
...
@@ -526,6 +529,20 @@ bool _OMReader_::read_binary_edge_chunk(std::istream &_is, BaseImporter &_bi, Op
break
;
case
Chunk
::
Type_Status
:
{
assert
(
OMFormat
::
dimensions
(
chunk_header_
)
==
1
);
fileOptions_
+=
Options
::
Status
;
for
(;
eidx
<
header_
.
n_edges_
&&
!
_is
.
eof
();
++
eidx
)
{
bytes_
+=
restore
(
_is
,
status
,
_swap
);
if
(
fileOptions_
.
edge_has_status
()
&&
_opt
.
edge_has_status
())
_bi
.
set_status
(
EdgeHandle
(
int
(
eidx
)),
status
);
}
break
;
}
default:
// skip unknown type
size_t
size_of
=
OMFormat
::
chunk_data_size
(
header_
,
chunk_header_
);
...
...
@@ -539,13 +556,15 @@ bool _OMReader_::read_binary_edge_chunk(std::istream &_is, BaseImporter &_bi, Op
//-----------------------------------------------------------------------------
bool
_OMReader_
::
read_binary_halfedge_chunk
(
std
::
istream
&
_is
,
BaseImporter
&
_bi
,
Options
&
/*
_opt
*/
,
bool
_swap
)
const
bool
_OMReader_
::
read_binary_halfedge_chunk
(
std
::
istream
&
_is
,
BaseImporter
&
_bi
,
Options
&
_opt
,
bool
_swap
)
const
{
using
OMFormat
::
Chunk
;
assert
(
chunk_header_
.
entity_
==
Chunk
::
Entity_Halfedge
);
size_t
b
=
bytes_
;
size_t
hidx
=
0
;
OpenMesh
::
Attributes
::
StatusInfo
status
;
switch
(
chunk_header_
.
type_
)
{
case
Chunk
::
Type_Custom
:
...
...
@@ -588,6 +607,20 @@ bool _OMReader_::read_binary_halfedge_chunk(std::istream &_is, BaseImporter &_bi
break
;
case
Chunk
::
Type_Status
:
{
assert
(
OMFormat
::
dimensions
(
chunk_header_
)
==
1
);
fileOptions_
+=
Options
::
Status
;
for
(;
hidx
<
header_
.
n_edges_
*
2
&&
!
_is
.
eof
();
++
hidx
)
{
bytes_
+=
restore
(
_is
,
status
,
_swap
);
if
(
fileOptions_
.
halfedge_has_status
()
&&
_opt
.
halfedge_has_status
())
_bi
.
set_status
(
HalfedgeHandle
(
int
(
hidx
)),
status
);
}
break
;
}
default:
// skip unknown chunk
omerr
()
<<
"Unknown chunk type ignored!
\n
"
;
...
...
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