Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Receptacle test assets #1994

Merged
merged 8 commits into from
Mar 14, 2023
Merged

Receptacle test assets #1994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
95bedba
add new test assets for receptacle testing
aclegg3 Dec 8, 2022
d34f9fa
modify the simple_room config
aclegg3 Dec 15, 2022
3ae9558
updated receptacle metadata and meshes
aclegg3 Jan 31, 2023
2aee614
Merge remote-tracking branch 'origin/main' into receptacle-test-assets
aclegg3 Jan 31, 2023
f5b2364
update a manager test for asset changes
aclegg3 Jan 31, 2023
291c777
Merge remote-tracking branch 'origin/main' into receptacle-test-assets
aclegg3 Feb 10, 2023
efaf4f6
Merge remote-tracking branch 'origin/main' into receptacle-test-assets
aclegg3 Feb 10, 2023
39a99b0
adding Magnum::AnySceneImporter MagnumPlugins::AssimpImporter to pyth…
aclegg3 Feb 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 33 additions & 1 deletion data/test_assets/objects/chair.object_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,36 @@
{
"render_asset": "chair.glb",
"mass": 9
"mass": 9,
"user_defined": {
"receptacle_aabb_chair_test": {
"name": "receptacle_aabb_chair_test",
"parent_object": "chair",
"position": [
-0.079131,
0.119772,
0
],
"scale": [
0.158802,
0.11,
0.19

]
},
"receptacle_mesh_chair_test": {
"name": "receptacle_mesh_chair_test",
"parent_object": "chair",
"position": [
0.0,
0.0,
0.0
],
"scale": [
1.0,
1.0,
1.0
],
"mesh_filepath": "receptacle_mesh_chair.ply"
}
}
}
16 changes: 16 additions & 0 deletions data/test_assets/objects/receptacle_mesh_chair.ply
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ply
format ascii 1.0
comment Created by Blender 3.3.0 - www.blender.org
element vertex 4
property float x
property float y
property float z
element face 2
property list uchar uint vertex_indices
end_header
0.045097 0.009212 0.175879
-0.243901 0.009212 -0.175879
-0.243901 0.009212 0.175879
0.045097 0.009212 -0.175879
3 0 1 2
3 0 3 1
16 changes: 16 additions & 0 deletions data/test_assets/scenes/receptacle_mesh_simple_room_table.ply
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
ply
format ascii 1.0
comment Created by Blender 3.3.0 - www.blender.org
element vertex 4
property float x
property float y
property float z
element face 2
property list uchar uint vertex_indices
end_header
0.950000 1.167508 -0.950000
-0.450000 1.167508 0.450000
0.950000 1.167508 0.450000
-0.450000 1.167508 -0.950000
3 0 1 2
3 0 3 1
35 changes: 35 additions & 0 deletions data/test_assets/scenes/simple_room.stage_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"render_asset": "simple_room.glb",
"up": [0,0,1],
"front": [0,1,0],
"shader_type": "pbr",
"user_defined": {
"receptacle_aabb_simpleroom_test": {
"name": "receptacle_aabb_simpleroom_test",
"position": [
2.36945,
-1.3934,
2.61652
],
"scale": [
1.0,
1.0,
0.39171
]
},
"receptacle_mesh_simpleroom_test": {
"name": "receptacle_mesh_simpleroom_test",
"position": [
0.0,
0.0,
0.0
],
"scale": [
1.0,
1.0,
1.0
],
"mesh_filepath": "receptacle_mesh_simple_room_table.ply"
}
}
}
10 changes: 7 additions & 3 deletions src/cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,11 +348,15 @@ if(NOT USE_SYSTEM_MAGNUM)
# for Python as well; and reset that back to strange build procedures that
# turn some features off again later can still work.
if(BUILD_GUI_VIEWERS)
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS MagnumPlugins::StbTrueTypeFont
CACHE STRING "" FORCE
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS
MagnumPlugins::StbTrueTypeFont Magnum::AnySceneImporter
MagnumPlugins::AssimpImporter CACHE STRING "" FORCE
)
else()
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS "" CACHE STRING "" FORCE)
set(MAGNUM_PYTHON_BINDINGS_STATIC_PLUGINS Magnum::AnySceneImporter
MagnumPlugins::AssimpImporter
CACHE STRING "" FORCE
)
endif()
add_subdirectory("${DEPS_DIR}/magnum-bindings")
endif()
Expand Down
2 changes: 1 addition & 1 deletion src/tests/AttributesManagersTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -568,7 +568,7 @@ void AttributesManagersTest::testPhysicsAttributesManagersCreate() {

void AttributesManagersTest::testStageAttributesManagersCreate() {
std::string stageConfigFile =
Cr::Utility::Path::join(DATA_DIR, "test_assets/scenes/simple_room.glb");
Cr::Utility::Path::join(DATA_DIR, "test_assets/scenes/plane.glb");

CORRADE_INFO(
"Start Test : Create, Edit, Remove Attributes for "
Expand Down