AEmotionStudio
e79e49506d
## New Directory Structure - utils/: Shared utilities (color_utils, shape_masks, noise_utils) - core/: Central logic (params, constants, blending, transforms, model_compat, sampler, debug, logging) - shaders/: Shader generators with BaseNoiseGenerator ABC and plugin registry - nodes/: ComfyUI node class definitions ## Key Changes - Centralized color interpolation logic eliminating duplication across shader files - Unified shape mask generation with 20+ shape types - Consolidated simplex/FBM/perlin noise implementations - Created ShaderParams class for parameter normalization and validation - Implemented ShaderRegistry for plugin-based shader registration - Extracted blending operations and noise transforms to dedicated modules - Added model compatibility layer for channel detection - Moved stub visualizer/debugger to core/debug.py - Added centralized logging configuration ## Refactored Shaders - domain_warp.py: Now uses shared utilities and BaseNoiseGenerator - tensor_field.py: Now uses shared utilities and BaseNoiseGenerator - curl_noise.py: Now uses shared utilities and BaseNoiseGenerator - temporal_coherent_noise.py: Now uses shared utilities and BaseNoiseGenerator ## Cleanup - Removed duplicate SHADER_GENERATORS registry - Added comprehensive type hints to all new modules - Maintained backward compatibility with legacy API
121 lines
2.5 KiB
Python
121 lines
2.5 KiB
Python
"""
|
|
Core functionality for ComfyUI-ShaderNoiseKSampler.
|
|
|
|
This package provides the central logic for shader noise sampling:
|
|
- params: Parameter normalization and validation
|
|
- constants: Magic numbers and default values
|
|
- blending: Blend mode implementations
|
|
- transforms: Noise transforms
|
|
- model_compat: Model detection and channel handling
|
|
- sampler: Core sampling logic
|
|
"""
|
|
|
|
from .params import (
|
|
PARAM_ALIASES,
|
|
ShaderParams,
|
|
normalize_param_name,
|
|
get_param_value,
|
|
)
|
|
|
|
from .constants import (
|
|
HASH_CONSTANT,
|
|
DEFAULT_CHANNELS,
|
|
MAX_OCTAVES,
|
|
SUPPORTED_BLEND_MODES,
|
|
SUPPORTED_TRANSFORMS,
|
|
SUPPORTED_SHADER_TYPES,
|
|
SUPPORTED_DISTRIBUTIONS,
|
|
MODEL_CHANNEL_COUNTS,
|
|
VIDEO_MODEL_CHANNELS,
|
|
)
|
|
|
|
from .blending import (
|
|
blend_noises,
|
|
)
|
|
|
|
from .transforms import (
|
|
apply_noise_transform,
|
|
normalize_noise,
|
|
resize_noise_spatial,
|
|
resize_noise_channels,
|
|
match_noise_shape,
|
|
)
|
|
|
|
from .model_compat import (
|
|
get_model_channel_count,
|
|
detect_latent_format,
|
|
build_noise_shape,
|
|
)
|
|
|
|
from .sampler import (
|
|
calculate_stage_strengths,
|
|
calculate_step_ranges,
|
|
calculate_step_points,
|
|
generate_shader_noise,
|
|
)
|
|
|
|
from .debug import (
|
|
StubVisualizer,
|
|
StubDebugger,
|
|
get_visualizer,
|
|
get_debugger,
|
|
set_debug_level,
|
|
)
|
|
|
|
from .logging_config import (
|
|
setup_logging,
|
|
get_logger,
|
|
set_debug_logging,
|
|
set_info_logging,
|
|
set_warning_logging,
|
|
set_quiet_logging,
|
|
)
|
|
|
|
__all__ = [
|
|
# Parameters
|
|
"PARAM_ALIASES",
|
|
"ShaderParams",
|
|
"normalize_param_name",
|
|
"get_param_value",
|
|
# Constants
|
|
"HASH_CONSTANT",
|
|
"DEFAULT_CHANNELS",
|
|
"MAX_OCTAVES",
|
|
"SUPPORTED_BLEND_MODES",
|
|
"SUPPORTED_TRANSFORMS",
|
|
"SUPPORTED_SHADER_TYPES",
|
|
"SUPPORTED_DISTRIBUTIONS",
|
|
"MODEL_CHANNEL_COUNTS",
|
|
"VIDEO_MODEL_CHANNELS",
|
|
# Blending
|
|
"blend_noises",
|
|
# Transforms
|
|
"apply_noise_transform",
|
|
"normalize_noise",
|
|
"resize_noise_spatial",
|
|
"resize_noise_channels",
|
|
"match_noise_shape",
|
|
# Model compatibility
|
|
"get_model_channel_count",
|
|
"detect_latent_format",
|
|
"build_noise_shape",
|
|
# Sampler
|
|
"calculate_stage_strengths",
|
|
"calculate_step_ranges",
|
|
"calculate_step_points",
|
|
"generate_shader_noise",
|
|
# Debug
|
|
"StubVisualizer",
|
|
"StubDebugger",
|
|
"get_visualizer",
|
|
"get_debugger",
|
|
"set_debug_level",
|
|
# Logging
|
|
"setup_logging",
|
|
"get_logger",
|
|
"set_debug_logging",
|
|
"set_info_logging",
|
|
"set_warning_logging",
|
|
"set_quiet_logging",
|
|
]
|