diff --git a/media/characters/tharquench-sizestealer/front.svg b/media/characters/tharquench-sizestealer/front.svg index 1686408c..a96badb9 100644 --- a/media/characters/tharquench-sizestealer/front.svg +++ b/media/characters/tharquench-sizestealer/front.svg @@ -1,2731 +1,5232 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/scripts/blender/addons/macrovision/ops.py b/scripts/blender/addons/macrovision/ops.py index a6d9972b..d0ea4b03 100644 --- a/scripts/blender/addons/macrovision/ops.py +++ b/scripts/blender/addons/macrovision/ops.py @@ -221,6 +221,28 @@ class MVAssignMaterials(bpy.types.Operator): bm.free() print("OK") bpy.ops.object.mode_set(mode = 'OBJECT') + elif context.scene.mv_material_mode == 'OBJECT_NAMES': + while len(object.material_slots) > 0: + bpy.ops.object.material_slot_remove({'object': object}) + + light_choices = context.scene.mv_material_names_light.split(",") + medium_choices = context.scene.mv_material_names_medium.split(",") + + bpy.ops.object.material_slot_add({'object': object}) + missing_idx = len(object.material_slots) - 1 + + chosen = 'dark' + + if any([choice in object.name for choice in medium_choices]): + chosen = 'medium' + if any([choice in object.name for choice in light_choices]): + chosen = 'light' + + object.material_slots[0].material = bpy.data.materials[chosen] + + + + return {'FINISHED'} diff --git a/scripts/blender/addons/macrovision/props.py b/scripts/blender/addons/macrovision/props.py index 212d59cd..dcac8c5a 100644 --- a/scripts/blender/addons/macrovision/props.py +++ b/scripts/blender/addons/macrovision/props.py @@ -82,7 +82,8 @@ scene_props["mv_material_mode"] = bpy.props.EnumProperty( items = ( ('RANDOM', "Random", 'Randomly assign materials'), ('NAMES', "Names", 'Turn the specified names medium or light; the rest become dark'), - ('FACE_MAPS', "Face Maps", "Assign a material for each face map") + ('FACE_MAPS', "Face Maps", "Assign a material for each face map"), + ('OBJECT_NAMES', "Object Names", "Same as Names, but with object names, not material names") ), ) diff --git a/scripts/blender/addons/macrovision/ui.py b/scripts/blender/addons/macrovision/ui.py index c6adc786..87ddb431 100644 --- a/scripts/blender/addons/macrovision/ui.py +++ b/scripts/blender/addons/macrovision/ui.py @@ -64,7 +64,7 @@ class MVScenePanel(bpy.types.Panel): box.prop(context.scene, "mv_material_mode") - if context.scene.mv_material_mode in ('NAMES', 'FACE_MAPS'): + if context.scene.mv_material_mode in ('NAMES', 'FACE_MAPS', 'OBJECT_NAMES'): box.prop(context.scene, "mv_material_names_light") box.prop(context.scene, "mv_material_names_medium") diff --git a/scripts/illustrator.jsx b/scripts/illustrator.jsx index 467376e7..2524c89a 100644 --- a/scripts/illustrator.jsx +++ b/scripts/illustrator.jsx @@ -5,20 +5,25 @@ var layers = doc.layers; var traces = [] settings = [ + { + name: "Bright", + color: 0x66, + threshold: 128 + }, { name: "Light", color: 0x4d, - threshold: 128 + threshold: 96 }, { name: "Medium", color: 0x33, - threshold: 96 + threshold: 64 }, { name: "Dark", color: 0x1a, - threshold: 64 + threshold: 32 }, { name: "Black",