Refactor and enhance SnapForm functionality
- Introduced MODEL_NUMBERS for better model indexing. - Improved enum_items function to cache results and handle download status. - Updated ActiveJob class to manage temporary input paths and added displacement_via property. - Changed IMAGE_DEPTH_PROCESS_RES_METHOD from "lower_bound_resize" to "upper_bound_resize". - Enhanced RunJob operator to include new properties and improved error messages. - Modified panel layout for better user experience and added runtime installation checks. - Updated SnapFormSettings to reflect new model properties and defaults. - Added temporary input path management in runtime. - Refined worker functions to improve error handling and messaging. - Expanded tests to cover new functionality and ensure backward compatibility. - Fixed packaging script to align with versioning conventions.
This commit is contained in:
@@ -234,7 +234,7 @@ class ImageDepthTest(unittest.TestCase):
|
||||
self.assertAlmostEqual(value, expected)
|
||||
|
||||
def test_source_empty_is_only_removed_when_requested(self):
|
||||
source = inspect.getsource(self.image_depth.build_depth_plane)
|
||||
source = inspect.getsource(self.image_depth.finish_depth_plane)
|
||||
|
||||
self.assertIn("source_name = source_object.name", source)
|
||||
self.assertIn("if delete_source:", source)
|
||||
@@ -243,27 +243,88 @@ class ImageDepthTest(unittest.TestCase):
|
||||
source,
|
||||
)
|
||||
self.assertNotIn("source_object.name =", source)
|
||||
self.assertIn(
|
||||
"bpy.data.objects.new(\n source_name,",
|
||||
source,
|
||||
)
|
||||
self.assertIn(
|
||||
"bpy.data.objects.remove(source_object, do_unlink=True)\n"
|
||||
" plane_object.name = source_name",
|
||||
source,
|
||||
)
|
||||
|
||||
def test_original_depth_mode_uses_uv_and_zero_midlevel(self):
|
||||
source = inspect.getsource(self.image_depth.build_image_depth_plane)
|
||||
|
||||
self.assertIn("texture.image = source_object.data", source)
|
||||
self.assertIn('modifiers.new("Displace", "DISPLACE")', source)
|
||||
self.assertIn("displace.texture = texture", source)
|
||||
self.assertIn('displace.texture_coords = "UV"', source)
|
||||
self.assertNotIn("displace.direction", source)
|
||||
self.assertNotIn("displace.strength", source)
|
||||
self.assertIn(
|
||||
"displace.mid_level = ORIGINAL_DISPLACEMENT_MIDLEVEL",
|
||||
source,
|
||||
)
|
||||
self.assertIn("plane_object.matrix_world =", source)
|
||||
|
||||
def test_process_resolution_scales_the_image_long_edge(self):
|
||||
image = SimpleNamespace(size=(1080, 1920))
|
||||
|
||||
self.assertEqual(
|
||||
self.image_depth.scaled_process_resolution(image, 0.5),
|
||||
960,
|
||||
)
|
||||
|
||||
def test_mesh_uses_source_object_name(self):
|
||||
source = inspect.getsource(self.image_depth.create_plane_mesh)
|
||||
|
||||
self.assertIn("bpy.data.meshes.new(source_object.name)", source)
|
||||
|
||||
def test_depth_data_uses_source_image_name(self):
|
||||
source_object = SimpleNamespace(
|
||||
name="obj_img",
|
||||
data=SimpleNamespace(name="img.png"),
|
||||
)
|
||||
|
||||
self.assertEqual(
|
||||
self.image_depth.depth_data_name(source_object),
|
||||
"img.depth",
|
||||
)
|
||||
source_object.data.name = "img.png.001"
|
||||
self.assertEqual(
|
||||
self.image_depth.depth_data_name(source_object),
|
||||
"img.001.depth",
|
||||
)
|
||||
estimate_source = inspect.getsource(
|
||||
self.image_depth.build_depth_plane
|
||||
)
|
||||
original_source = inspect.getsource(
|
||||
self.image_depth.build_image_depth_plane
|
||||
)
|
||||
self.assertIn("depth_name = depth_data_name(source_object)", estimate_source)
|
||||
self.assertIn("depth_data_name(source_object)", original_source)
|
||||
|
||||
def test_material_uses_source_object_name(self):
|
||||
da3_source = inspect.getsource(self.image_depth.build_depth_plane)
|
||||
image_source = inspect.getsource(
|
||||
self.image_depth.build_image_depth_plane
|
||||
)
|
||||
|
||||
self.assertIn(
|
||||
"create_material(\n source_name,",
|
||||
da3_source,
|
||||
)
|
||||
self.assertIn("create_material(\n source_name,", image_source)
|
||||
self.assertNotIn("DA3DepthMaterial", da3_source)
|
||||
|
||||
def test_displace_texture_uses_extend(self):
|
||||
source = inspect.getsource(
|
||||
self.image_depth.build_depth_plane
|
||||
)
|
||||
|
||||
self.assertIn('depth_name = f"{source_name}.depth"', source)
|
||||
self.assertIn("depth_name = depth_data_name(source_object)", source)
|
||||
self.assertIn("create_depth_image(\n depth_name,", source)
|
||||
self.assertIn("bpy.data.textures.new(\n depth_name,", source)
|
||||
self.assertIn("bpy.data.textures.new(\n depth_name,", source)
|
||||
self.assertIn('texture.extension = "EXTEND"', source)
|
||||
|
||||
def test_original_image_drives_bump_instead_of_displacement(self):
|
||||
def test_material_supports_bump_and_optional_displacement(self):
|
||||
source = inspect.getsource(self.image_depth.create_material)
|
||||
|
||||
self.assertIn('nodes.new("ShaderNodeBump")', source)
|
||||
@@ -297,16 +358,94 @@ class ImageDepthTest(unittest.TestCase):
|
||||
'curve_points[-1].location = (1.0, 0.1)',
|
||||
source,
|
||||
)
|
||||
self.assertIn(
|
||||
'shader.inputs["IOR"].default_value = 1.2',
|
||||
source,
|
||||
)
|
||||
self.assertNotIn('shader.inputs["IOR"]', source)
|
||||
self.assertIn(
|
||||
'roughness_curve.location = (-300.0, 320.0)',
|
||||
source,
|
||||
)
|
||||
self.assertIn('bump.location = (-300.0, -80.0)', source)
|
||||
self.assertNotIn("ShaderNodeDisplacement", source)
|
||||
self.assertIn('nodes.new("ShaderNodeDisplacement")', source)
|
||||
self.assertIn(
|
||||
'depth_texture.outputs["Color"],\n'
|
||||
' displacement.inputs["Height"]',
|
||||
source,
|
||||
)
|
||||
self.assertIn(
|
||||
'displacement.outputs["Displacement"],\n'
|
||||
' output.inputs["Displacement"]',
|
||||
source,
|
||||
)
|
||||
self.assertIn(
|
||||
'displacement.inputs["Midlevel"].default_value',
|
||||
source,
|
||||
)
|
||||
self.assertIn(
|
||||
'displacement.inputs["Scale"].default_value',
|
||||
source,
|
||||
)
|
||||
self.assertIn("set_displacement_only(material)", source)
|
||||
|
||||
def test_displacement_values_follow_depth_source(self):
|
||||
estimate_source = inspect.getsource(
|
||||
self.image_depth.build_depth_plane
|
||||
)
|
||||
original_source = inspect.getsource(
|
||||
self.image_depth.build_image_depth_plane
|
||||
)
|
||||
|
||||
self.assertIn(
|
||||
"displacement_midlevel=DISPLACEMENT_MIDLEVEL",
|
||||
estimate_source,
|
||||
)
|
||||
self.assertIn(
|
||||
"displacement_scale=DISPLACEMENT_STRENGTH",
|
||||
estimate_source,
|
||||
)
|
||||
self.assertIn(
|
||||
"displacement_midlevel=ORIGINAL_DISPLACEMENT_MIDLEVEL",
|
||||
original_source,
|
||||
)
|
||||
self.assertIn(
|
||||
"displacement_scale=ORIGINAL_DISPLACEMENT_STRENGTH",
|
||||
original_source,
|
||||
)
|
||||
self.assertEqual(self.image_depth.DISPLACEMENT_MIDLEVEL, 1.0)
|
||||
self.assertEqual(self.image_depth.DISPLACEMENT_STRENGTH, -1.0)
|
||||
self.assertEqual(
|
||||
self.image_depth.ORIGINAL_DISPLACEMENT_MIDLEVEL,
|
||||
0.0,
|
||||
)
|
||||
self.assertEqual(
|
||||
self.image_depth.ORIGINAL_DISPLACEMENT_STRENGTH,
|
||||
1.0,
|
||||
)
|
||||
|
||||
def test_material_displacement_mode_skips_displace_modifier(self):
|
||||
estimate_source = inspect.getsource(
|
||||
self.image_depth.build_depth_plane
|
||||
)
|
||||
original_source = inspect.getsource(
|
||||
self.image_depth.build_image_depth_plane
|
||||
)
|
||||
|
||||
for source in (estimate_source, original_source):
|
||||
self.assertIn('if displacement_via == "MODIFIER":', source)
|
||||
self.assertIn(
|
||||
'if displacement_via == "MATERIAL" else None',
|
||||
source,
|
||||
)
|
||||
|
||||
def test_surface_displacement_is_set_to_displacement_only(self):
|
||||
class Material:
|
||||
surface_displacement_method = "BUMP"
|
||||
|
||||
material = Material()
|
||||
self.image_depth.set_displacement_only(material)
|
||||
|
||||
self.assertEqual(
|
||||
material.surface_displacement_method,
|
||||
"DISPLACEMENT",
|
||||
)
|
||||
|
||||
def test_plane_transform_scales_depth_axis(self):
|
||||
source = inspect.getsource(self.image_depth.apply_plane_transform)
|
||||
|
||||
Reference in New Issue
Block a user