The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
Add a ConditioningSetAreaPercentage node.
comfyanonymousf88f7f413afb
diff --git a/comfy/samplers.py b/comfy/samplers.pyindex 103ac33ff..3250b2edc 100644--- a/comfy/samplers.py+++ b/comfy/samplers.py@@ -390,11 +390,20 @@ def get_mask_aabb(masks):return bounding_boxes, is_empty-def resolve_cond_masks(conditions, h, w, device):+def resolve_areas_and_cond_masks(conditions, h, w, device):# We need to decide on an area outside the sampling loop in order to properly generate opposite areas of equal sizes.# While we're doing this, we can also resolve the mask device and scaling for performance reasonsfor i in range(len(conditions)):c = conditions[i]+ if 'area' in c[1]:+ area = c[1]['area']+ if area[0] == "percentage":+ modified = c[1].copy()+ area = (max(1, round(area[1] * h)), max(1, round(area[2] * w)), round(area[3] * h), round(area[4] * w))+ modified['area'] = area+ c = [c[0], modified]+ conditions[i] = c+if 'mask' in c[1]:mask = c[1]['mask']mask = mask.to(device=device)@@ -622,8 +631,8 @@ class KSampler:positive = positive[:]negative = negative[:]- resolve_cond_masks(positive, noise.shape[2], noise.shape[3], self.device)- resolve_cond_masks(negative, noise.shape[2], noise.shape[3], self.device)+ resolve_areas_and_cond_masks(positive, noise.shape[2], noise.shape[3], self.device)+ resolve_areas_and_cond_masks(negative, noise.shape[2], noise.shape[3], self.device)calculate_start_end_timesteps(self.model_wrap, negative)calculate_start_end_timesteps(self.model_wrap, positive)diff --git a/nodes.py b/nodes.pyindex fa26e5939..77d180526 100644--- a/nodes.py+++ b/nodes.py@@ -159,6 +159,31 @@ class ConditioningSetArea:c.append(n)return (c, )+class ConditioningSetAreaPercentage:+ @classmethod+ def INPUT_TYPES(s):+ return {"required": {"conditioning": ("CONDITIONING", ),+ "width": ("FLOAT", {"default": 1.0, "min": 0, "max": 1.0, "step": 0.01}),+ "height": ("FLOAT", {"default": 1.0, "min": 0, "max": 1.0, "step": 0.01}),+ "x": ("FLOAT", {"default": 0, "min": 0, "max": 1.0, "step": 0.01}),+ "y": ("FLOAT", {"default": 0, "min": 0, "max": 1.0, "step": 0.01}),+ "strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),+ }}+ RETURN_TYPES = ("CONDITIONING",)+ FUNCTION = "append"++ CATEGORY = "conditioning"++ def append(self, conditioning, width, height, x, y, strength):+ c = []+ for t in conditioning:+ n = [t[0], t[1].copy()]+ n[1]['area'] = ("percentage", height, width, y, x)+ n[1]['strength'] = strength+ n[1]['set_area_to_bounds'] = False+ c.append(n)+ return (c, )+class ConditioningSetMask:@classmethoddef INPUT_TYPES(s):@@ -1583,6 +1608,7 @@ NODE_CLASS_MAPPINGS = {"ConditioningCombine": ConditioningCombine,"ConditioningConcat": ConditioningConcat,"ConditioningSetArea": ConditioningSetArea,+ "ConditioningSetAreaPercentage": ConditioningSetAreaPercentage,"ConditioningSetMask": ConditioningSetMask,"KSamplerAdvanced": KSamplerAdvanced,"SetLatentNoiseMask": SetLatentNoiseMask,@@ -1644,6 +1670,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {"ConditioningAverage ": "Conditioning (Average)","ConditioningConcat": "Conditioning (Concat)","ConditioningSetArea": "Conditioning (Set Area)",+ "ConditioningSetAreaPercentage": "Conditioning (Set Area with Percentage)","ConditioningSetMask": "Conditioning (Set Mask)","ControlNetApply": "Apply ControlNet","ControlNetApplyAdvanced": "Apply ControlNet (Advanced)",