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
P
polymesh-samples
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
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Philip Trettner
polymesh-samples
Commits
02e39f40
Commit
02e39f40
authored
Mar 09, 2020
by
Philip Trettner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
incorporated pm changes
parent
31321838
Pipeline
#13733
passed with stage
in 4 minutes and 51 seconds
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
22 deletions
+22
-22
extern/polymesh
extern/polymesh
+1
-1
tests/attributes/attribute-test.cc
tests/attributes/attribute-test.cc
+20
-20
tests/basics.cc
tests/basics.cc
+1
-1
No files found.
polymesh
@
cd4589aa
Compare
784b49ba
...
cd4589aa
Subproject commit
784b49ba7b1ffe0f30990a898757d33a0b79edef
Subproject commit
cd4589aad58e4429311af9d63c2aadb9aeb4d1bd
tests/attributes/attribute-test.cc
View file @
02e39f40
...
...
@@ -59,10 +59,10 @@ TEST_CASE("Attributes.Creation")
{
auto
a0
=
m
.
vertices
().
make_attribute
<
int
>
();
auto
a1
=
m
.
vertices
().
make_attribute
_with_default
(
3
);
auto
a1
=
m
.
vertices
().
make_attribute
(
3
);
auto
a2
=
m
.
vertices
().
make_attribute_from_data
(
std
::
vector
<
int
>
(
3
,
5
));
auto
a3
=
m
.
vertices
().
ma
ke_attribute
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
vertices
().
ma
ke_attribute
([](
auto
)
{
return
11
;
});
auto
a3
=
m
.
vertices
().
ma
p
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
vertices
().
ma
p
([](
auto
)
{
return
11
;
});
auto
a5
=
pm
::
vertex_attribute
<
int
>
(
m
);
// TODO: auto a6 = pm::vertex_attribute(m, 13);
auto
a7
=
pm
::
attribute
<
int
>
(
m
.
vertices
());
...
...
@@ -84,10 +84,10 @@ TEST_CASE("Attributes.Creation")
{
auto
a0
=
m
.
faces
().
make_attribute
<
int
>
();
auto
a1
=
m
.
faces
().
make_attribute
_with_default
(
3
);
auto
a1
=
m
.
faces
().
make_attribute
(
3
);
auto
a2
=
m
.
faces
().
make_attribute_from_data
(
std
::
vector
<
int
>
(
3
,
5
));
auto
a3
=
m
.
faces
().
ma
ke_attribute
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
faces
().
ma
ke_attribute
([](
auto
)
{
return
11
;
});
auto
a3
=
m
.
faces
().
ma
p
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
faces
().
ma
p
([](
auto
)
{
return
11
;
});
auto
a5
=
pm
::
face_attribute
<
int
>
(
m
);
// TODO: auto a6 = pm::face_attribute(m, 13);
auto
a7
=
pm
::
attribute
<
int
>
(
m
.
faces
());
...
...
@@ -106,10 +106,10 @@ TEST_CASE("Attributes.Creation")
{
auto
a0
=
m
.
edges
().
make_attribute
<
int
>
();
auto
a1
=
m
.
edges
().
make_attribute
_with_default
(
3
);
auto
a1
=
m
.
edges
().
make_attribute
(
3
);
auto
a2
=
m
.
edges
().
make_attribute_from_data
(
std
::
vector
<
int
>
(
3
,
5
));
auto
a3
=
m
.
edges
().
ma
ke_attribute
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
edges
().
ma
ke_attribute
([](
auto
)
{
return
11
;
});
auto
a3
=
m
.
edges
().
ma
p
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
edges
().
ma
p
([](
auto
)
{
return
11
;
});
auto
a5
=
pm
::
edge_attribute
<
int
>
(
m
);
// TODO: auto a6 = pm::edge_attribute(m, 13);
auto
a7
=
pm
::
attribute
<
int
>
(
m
.
edges
());
...
...
@@ -118,10 +118,10 @@ TEST_CASE("Attributes.Creation")
{
auto
a0
=
m
.
halfedges
().
make_attribute
<
int
>
();
auto
a1
=
m
.
halfedges
().
make_attribute
_with_default
(
3
);
auto
a1
=
m
.
halfedges
().
make_attribute
(
3
);
auto
a2
=
m
.
halfedges
().
make_attribute_from_data
(
std
::
vector
<
int
>
(
3
,
5
));
auto
a3
=
m
.
halfedges
().
ma
ke_attribute
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
halfedges
().
ma
ke_attribute
([](
auto
)
{
return
11
;
});
auto
a3
=
m
.
halfedges
().
ma
p
([](
auto
)
{
return
7
;
});
auto
a4
=
m
.
halfedges
().
ma
p
([](
auto
)
{
return
11
;
});
auto
a5
=
pm
::
halfedge_attribute
<
int
>
(
m
);
// TODO: auto a6 = pm::halfedge_attribute(m, 13);
auto
a7
=
pm
::
attribute
<
int
>
(
m
.
halfedges
());
...
...
@@ -210,13 +210,13 @@ TEST_CASE("Attributes.DefaultSemantic")
m
.
vertices
().
add
();
m
.
vertices
().
add
();
auto
a
=
m
.
vertices
().
make_attribute
_with_default
(
7
);
auto
a
=
m
.
vertices
().
make_attribute
(
7
);
CHECK
(
ll
.
vertex_attribute_count
()
==
1
);
for
(
auto
v
:
m
.
vertices
())
CHECK
(
a
[
v
]
==
7
);
auto
b
=
m
.
vertices
().
make_attribute
_with_default
(
9
);
auto
b
=
m
.
vertices
().
make_attribute
(
9
);
CHECK
(
ll
.
vertex_attribute_count
()
==
2
);
for
(
auto
v
:
m
.
vertices
())
...
...
@@ -255,8 +255,8 @@ TEST_CASE("Attributes.DefaultSemantic")
CHECK
(
d
[
v
]
==
7
);
}
auto
e
=
m
.
vertices
().
make_attribute
_with_default
(
11
);
auto
f
=
m
.
vertices
().
make_attribute
_with_default
(
13
);
auto
e
=
m
.
vertices
().
make_attribute
(
11
);
auto
f
=
m
.
vertices
().
make_attribute
(
13
);
c
=
std
::
move
(
f
);
CHECK
(
!
f
.
is_valid
());
...
...
@@ -407,13 +407,13 @@ TEST_CASE("Attributes.DefaultSemanticEdge")
ll
.
alloc_edge
();
ll
.
alloc_edge
();
auto
a
=
m
.
edges
().
make_attribute
_with_default
(
7
);
auto
a
=
m
.
edges
().
make_attribute
(
7
);
CHECK
(
ll
.
edge_attribute_count
()
==
1
);
for
(
auto
e
:
m
.
edges
())
CHECK
(
a
[
e
]
==
7
);
auto
b
=
m
.
edges
().
make_attribute
_with_default
(
9
);
auto
b
=
m
.
edges
().
make_attribute
(
9
);
CHECK
(
ll
.
edge_attribute_count
()
==
2
);
for
(
auto
e
:
m
.
edges
())
...
...
@@ -452,8 +452,8 @@ TEST_CASE("Attributes.DefaultSemanticEdge")
CHECK
(
d
[
e
]
==
7
);
}
auto
e
=
m
.
edges
().
make_attribute
_with_default
(
11
);
auto
f
=
m
.
edges
().
make_attribute
_with_default
(
13
);
auto
e
=
m
.
edges
().
make_attribute
(
11
);
auto
f
=
m
.
edges
().
make_attribute
(
13
);
c
=
std
::
move
(
f
);
CHECK
(
!
f
.
is_valid
());
...
...
tests/basics.cc
View file @
02e39f40
...
...
@@ -73,7 +73,7 @@ TEST_CASE("PolyMesh, Properties")
auto
v2
=
m
.
vertices
().
add
();
auto
f
=
m
.
faces
().
add
(
v0
,
v1
,
v2
);
auto
pos
=
m
.
vertices
().
make_attribute
_with_default
(
glm
::
vec3
(
7
,
7
,
7
));
auto
pos
=
m
.
vertices
().
make_attribute
(
glm
::
vec3
(
7
,
7
,
7
));
auto
centroid
=
m
.
faces
().
make_attribute
<
glm
::
vec3
>
();
CHECK
(
pos
[
v0
]
==
glm
::
vec3
(
7
));
...
...
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