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
OpenVolumeMesh
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
7
Issues
7
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
OpenVolumeMesh
OpenVolumeMesh
Commits
0b9a9777
Commit
0b9a9777
authored
Feb 07, 2018
by
Jan Möbius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
https://www.graphics.rwth-aachen.de:9000/OpenVolumeMesh/OpenVolumeMesh
parents
25d0c892
3ae26e6a
Pipeline
#6177
canceled with stage
in 3 minutes and 14 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
4 deletions
+18
-4
src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh
src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh
+1
-1
src/OpenVolumeMesh/Core/PropertyDefines.cc
src/OpenVolumeMesh/Core/PropertyDefines.cc
+1
-0
src/OpenVolumeMesh/Core/PropertyDefines.hh
src/OpenVolumeMesh/Core/PropertyDefines.hh
+1
-0
src/OpenVolumeMesh/Core/ResourceManager.hh
src/OpenVolumeMesh/Core/ResourceManager.hh
+12
-3
src/OpenVolumeMesh/FileManager/FileManagerT.cc
src/OpenVolumeMesh/FileManager/FileManagerT.cc
+3
-0
No files found.
src/OpenVolumeMesh/Attribs/TexCoordAttrib.hh
View file @
0b9a9777
...
...
@@ -76,7 +76,7 @@ public:
return
vtexcoord_prop_
[
_h
.
idx
()];
}
bool
vertex_texcoords_available
()
{
return
vertex_texcoords_available_
;
}
bool
vertex_texcoords_available
()
const
{
return
vertex_texcoords_available_
;
}
void
clear_vertex_texcoords
();
...
...
src/OpenVolumeMesh/Core/PropertyDefines.cc
View file @
0b9a9777
...
...
@@ -55,5 +55,6 @@ template <> const std::string typeName<bool>() { return "bool"; }
template
<
>
const
std
::
string
typeName
<
float
>
()
{
return
"float"
;
}
template
<
>
const
std
::
string
typeName
<
double
>
()
{
return
"double"
;
}
template
<
>
const
std
::
string
typeName
<
std
::
string
>
()
{
return
"string"
;
}
template
<
>
const
std
::
string
typeName
<
std
::
map
<
HalfEdgeHandle
,
int
>
>
(){
return
"map_he_int"
;
}
}
// Namespace OpenVolumeMesh
src/OpenVolumeMesh/Core/PropertyDefines.hh
View file @
0b9a9777
...
...
@@ -72,6 +72,7 @@ template <> const std::string typeName<bool>();
template
<
>
const
std
::
string
typeName
<
float
>
();
template
<
>
const
std
::
string
typeName
<
double
>
();
template
<
>
const
std
::
string
typeName
<
std
::
string
>
();
template
<
>
const
std
::
string
typeName
<
std
::
map
<
HalfEdgeHandle
,
int
>
>
();
/// Property classes for the different entity types
template
<
class
T
>
...
...
src/OpenVolumeMesh/Core/ResourceManager.hh
View file @
0b9a9777
...
...
@@ -256,9 +256,18 @@ private:
}
PropIterT
it
=
_begin
;
for
(;
it
!=
_end
;
++
it
)
{
if
((
*
it
)
->
name
()
==
_name
&&
dynamic_cast
<
FullPropT
*>
(
*
it
)
!=
NULL
)
{
return
true
;
for
(;
it
!=
_end
;
++
it
)
{
if
((
*
it
)
->
name
()
==
_name
)
{
#if OVM_FORCE_STATIC_CAST
return
true
;
#else
if
(
dynamic_cast
<
FullPropT
*>
(
*
it
)
!=
NULL
)
{
return
true
;
}
#endif
}
}
return
false
;
...
...
src/OpenVolumeMesh/FileManager/FileManagerT.cc
View file @
0b9a9777
...
...
@@ -326,6 +326,8 @@ void FileManager::readProperty(std::istream& _iff, MeshT& _mesh) const {
name
=
line
;
extractQuotedText
(
name
);
std
::
cerr
<<
"OVM read property "
<<
name
<<
" of type "
<<
prop_t
<<
std
::
endl
;
if
(
prop_t
==
typeName
<
int
>
())
generateGenericProperty
<
int
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
unsigned
int
>
())
generateGenericProperty
<
unsigned
int
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
short
>
())
generateGenericProperty
<
short
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
...
...
@@ -337,6 +339,7 @@ void FileManager::readProperty(std::istream& _iff, MeshT& _mesh) const {
else
if
(
prop_t
==
typeName
<
float
>
())
generateGenericProperty
<
float
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
double
>
())
generateGenericProperty
<
double
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
std
::
string
>
())
generateGenericProperty
<
std
::
string
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
std
::
map
<
HalfEdgeHandle
,
int
>
>
())
generateGenericProperty
<
std
::
map
<
HalfEdgeHandle
,
int
>
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
Vec2f
>
())
generateGenericProperty
<
Vec2f
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
else
if
(
prop_t
==
typeName
<
Vec2d
>
())
generateGenericProperty
<
Vec2d
,
MeshT
>
(
entity_t
,
name
,
_iff
,
_mesh
);
...
...
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