kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Re-enable modifer and bmesh_boolean tests.

Browse Source 
These were disabled in the newboolean merge commit.
This commit renables them, using the original 'FAST' solver
so that the result objects need not change.
A TODO to add more tests using the 'EXACT' solver,
though most functionality there is now covered by unit gtests.
This commit is contained in:
Howard Trickey 2020-08-30 08:31:40 -04:00
parent dee665b462
commit 3699d6fe34
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
tests/python/CMakeLists.txt
View File

@ -154,13 +154,13 @@ add_blender_test(
--run-all-tests --run-all-tests
) )
# add_blender_test( add_blender_test(
# bmesh_boolean bmesh_boolean
# ${TEST_SRC_DIR}/modeling/bool_regression.blend ${TEST_SRC_DIR}/modeling/bool_regression.blend
# --python ${TEST_PYTHON_DIR}/boolean_operator.py --python ${TEST_PYTHON_DIR}/boolean_operator.py
# -- --
# --run-all-tests --run-all-tests
#) )
add_blender_test( add_blender_test(
bmesh_split_faces bmesh_split_faces
@ -176,13 +176,13 @@ add_blender_test(
--python-text run_tests.py --python-text run_tests.py
) )
#add_blender_test( add_blender_test(
# modifiers modifiers
# ${TEST_SRC_DIR}/modeling/modifiers.blend ${TEST_SRC_DIR}/modeling/modifiers.blend
# --python ${TEST_PYTHON_DIR}/modifiers.py --python ${TEST_PYTHON_DIR}/modifiers.py
# -- --
# --run-all-tests --run-all-tests
#) )
add_blender_test( add_blender_test(
physics_cloth physics_cloth

18
tests/python/boolean_operator.py
View File

@ -34,16 +34,16 @@ from modules.mesh_test import OperatorTest
def main(): def main():
tests = [ tests = [
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_1', 'intersect_boolean', {'operation': 'UNION'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_1', 'intersect_boolean', {'operation': 'UNION', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_2', 'intersect_boolean', {'operation': 'INTERSECT'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_2', 'intersect_boolean', {'operation': 'INTERSECT', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_3', 'intersect_boolean', {'operation': 'DIFFERENCE'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_3', 'intersect_boolean', {'operation': 'DIFFERENCE', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_4', 'intersect', {'separate_mode': 'CUT'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_4', 'intersect', {'separate_mode': 'CUT', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_5', 'intersect', {'separate_mode': 'ALL'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_5', 'intersect', {'separate_mode': 'ALL', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_6', 'intersect', {'separate_mode': 'NONE'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecube', 'Cubecube_result_6', 'intersect', {'separate_mode': 'NONE', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 'Cubecube', 'Cubecube_result_7', 'intersect', ['FACE', {0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11}, 'Cubecube', 'Cubecube_result_7', 'intersect',
{'mode': 'SELECT', 'separate_mode': 'NONE'}], {'mode': 'SELECT', 'separate_mode': 'NONE', 'solver' : 'FAST'}],
['FACE', {6, 7, 8, 9, 10}, 'Cubecone', 'Cubecone_result_1', 'intersect_boolean', {'operation': 'UNION'}], ['FACE', {6, 7, 8, 9, 10}, 'Cubecone', 'Cubecone_result_1', 'intersect_boolean', {'operation': 'UNION', 'solver' : 'FAST'}],
['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecones', 'Cubecones_result_1', 'intersect_boolean', {'operation': 'UNION'}], ['FACE', {0, 1, 2, 3, 4, 5}, 'Cubecones', 'Cubecones_result_1', 'intersect_boolean', {'operation': 'UNION', 'solver' : 'FAST'}],
] ]
operator_test = OperatorTest(tests) operator_test = OperatorTest(tests)

2
tests/python/modifiers.py
View File

@ -46,7 +46,7 @@ def get_generate_modifiers_list(test_object_name, randomize=False):
generate_modifiers = [ generate_modifiers = [
ModifierSpec('array', 'ARRAY', {}), ModifierSpec('array', 'ARRAY', {}),
ModifierSpec('bevel', 'BEVEL', {'width': 0.1}), ModifierSpec('bevel', 'BEVEL', {'width': 0.1}),
ModifierSpec('boolean', 'BOOLEAN', {'object': boolean_test_object}), ModifierSpec('boolean', 'BOOLEAN', {'object': boolean_test_object, 'solver': 'FAST'}),
ModifierSpec('build', 'BUILD', {'frame_start': 0, 'frame_duration': 1}), ModifierSpec('build', 'BUILD', {'frame_start': 0, 'frame_duration': 1}),
ModifierSpec('decimate', 'DECIMATE', {}), ModifierSpec('decimate', 'DECIMATE', {}),
ModifierSpec('edge split', 'EDGE_SPLIT', {}), ModifierSpec('edge split', 'EDGE_SPLIT', {}),