Added Vignette to the Assets

Aspirata · Nov 10, 2024 · 62c1a7f · 62c1a7f
1 parent 4f15d4c
commit 62c1a7f
Show file tree

Hide file tree

Showing 6 changed files with 83 additions and 4 deletions.
diff --git a/MiBlend_Source/Assets.py b/MiBlend_Source/Assets.py
@@ -14,6 +14,12 @@ def append_asset(asset_data):
         elif asset_type == "Script":
             run_python_script(asset_name, asset_path)
 
+        elif asset_type == "Compositor Node":
+            append_cnode(asset_data)
+
+        elif asset_type == "Geo Node":
+            append_gnode(asset_data)
+
         elif asset_type == "Shader Node":
             append_snode(asset_data)
 
@@ -96,6 +102,36 @@ def append_snode(asset_data):
                     Node = current_material.node_tree.nodes.new(type='ShaderNodeGroup')
                     Node.node_tree = bpy.data.node_groups[Node_name]
 
+def append_cnode(asset_data):
+    Node_name = asset_data.get("Node_name", "")
+    Blend_file = asset_data.get("File_path", "")
+    Script_path = asset_data.get("File_path", "").replace(".blend", ".py")
+
+    if Node_name not in bpy.data.node_groups:
+        try:
+            with bpy.data.libraries.load(Blend_file, link=False) as (data_from, data_to):
+                data_to.node_groups = [Node_name]
+        except:
+            Absolute_Solver("009", Node_name, traceback.format_exc())
+
+    if os.path.isfile(Script_path):
+        run_python_script(asset_data.get("Asset_name"), Script_path)
+        dprint(f"{Node_name} Script Found")
+
+    else:
+        dprint(f"{Node_name} Script Not Found, using default algorithm")
+        bpy.context.scene.use_nodes = True
+        tree = bpy.context.scene.node_tree
+        Node = None
+        for node in tree:
+            if node.type == 'GROUP':
+                if Node_name in node.node_tree.name:
+                    Node = node
+
+        if Node == None:
+            Node = tree.nodes.new('CompositorNodeGroup')
+            Node.node_tree = bpy.data.node_groups[Node_name]
+
 def append_gnode(asset_data):
     Node_name = asset_data.get("Node_name", "")
     Append_mode = asset_data.get("Append_mode", "Active Only")

diff --git a/...Compositing Nodes/Vignette/Vignette.blend → .../Compositor Nodes/Vignette/Vignette.blend b/...Compositing Nodes/Vignette/Vignette.blend → .../Compositor Nodes/Vignette/Vignette.blend
diff --git a/.../Compositing Nodes/Vignette/Vignette.json → ...s/Compositor Nodes/Vignette/Vignette.json b/.../Compositing Nodes/Vignette/Vignette.json → ...s/Compositor Nodes/Vignette/Vignette.json
@@ -3,7 +3,7 @@
     "Asset_name": "Vignette",
     "Asset_version": "4.1",
     "Author": "Aspirata",
-    "File_path": "Nodes\\Compositing Nodes\\Vignette\\Vignette",
+    "File_path": "Nodes\\Compositor Nodes\\Vignette\\Vignette",
     "Node_name": "Vignette V4.1",
-    "Tags": ["Compositing Node", "Node"]
+    "Tags": ["Compositor Node", "Node"]
 }
diff --git a/MiBlend_Source/UI.py b/MiBlend_Source/UI.py
@@ -862,7 +862,7 @@ def draw(self, context):
         if assets_props.filters:
             sbox = box.box()
             primary_tags = {"Rig", "Script", "Shader Node", "Geo Node", "Compositor Node", "Model", "Material"}
-            secondary_tags = {"Simple", "Realistic", "Node", "Particles"}
+            secondary_tags = {"Simple", "Realistic", "Story Mode", "Node", "Particles"}
 
             row = sbox.row()
             row.label(text="Tags:")
@@ -907,7 +907,7 @@ def get_custom_icon(self, item):
             "Rig": "ARMATURE_DATA",
             "Material": "MATERIAL_DATA",
             "Script": "FILE_SCRIPT",
-            "Compositor Node": "MATERIAL_DATA",
+            "Compositor Node": "NODE_SEL",
             "Shader Node": "NODE",
             "Geo Nodes": "GEOMETRY_NODES",
             "Model": "OBJECT_DATA",

diff --git a/build.sh → build_linux.sh b/build.sh → build_linux.sh
diff --git a/build_windows.cmd b/build_windows.cmd
@@ -0,0 +1,43 @@
+@echo off
+setlocal
+
+rem Вставьте вашу команду или утилиту (если она нужна)
+rem bab
+
+set targetFile=MiBlend.blend
+
+rem Получаем PID процесса Blender
+for /f "tokens=2" %%a in ('tasklist /FI "IMAGENAME eq blender.exe" /FO LIST ^| find "PID"') do (
+    set blenderPID=%%a
+)
+
+rem Если процесс Blender запущен
+if defined blenderPID (
+    echo Найден процесс Blender с PID: %blenderPID%
+
+    rem Проверяем, открыт ли файл MiBlend.blend
+    for /f "tokens=*" %%b in ('wmic process where "ProcessId=%blenderPID%" get CommandLine ^| find /I "%targetFile%"') do (
+        echo Файл %targetFile% открыт в Blender. Перезапускаем Blender...
+
+        rem Завершаем процесс Blender
+        taskkill /PID %blenderPID% /F
+        echo Ожидание завершения процесса Blender...
+
+        rem Ждем завершения процесса
+        :waitLoop
+        tasklist /FI "PID eq %blenderPID%" 2>NUL | find "%blenderPID%" > NUL
+        if %ERRORLEVEL% equ 0 (
+            timeout /T 1 > NUL
+            goto waitLoop
+        )
+
+        rem Перезапуск Blender
+        echo Перезапуск Blender...
+        start "" "C:\Program Files\Blender Foundation\Blender\blender.exe" "C:\path\to\your\MiBlend.blend"
+        exit /B 0
+    )
+) else (
+    echo Blender не запущен.
+)
+
+endlocal