diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/Analysis-00.toc b/Texturing/MergeTextures/build/merge_textures_dekogon/Analysis-00.toc index 7eaa2ca..d2d802c 100644 --- a/Texturing/MergeTextures/build/merge_textures_dekogon/Analysis-00.toc +++ b/Texturing/MergeTextures/build/merge_textures_dekogon/Analysis-00.toc @@ -1,6 +1,6 @@ -(['E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py'], - ['E:\\Arma Reforger Work\\1960 Life\\1960-utils\\Texturing\\MergeTextures'], +(['E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py'], + ['E:\\Arma Reforger Work\\1960-utils\\Texturing\\MergeTextures'], [], ['C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\numpy\\_pyinstaller', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\_pyinstaller_hooks_contrib\\hooks\\stdhooks', @@ -24,8 +24,8 @@ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py', 'PYSOURCE'), ('merge_textures_dekogon', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py', 'PYSOURCE')], [('multiprocessing.popen_forkserver', 'C:\\Program ' @@ -618,14 +618,14 @@ 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\_py_abc.py', 'PYMODULE'), - ('tracemalloc', - 'C:\\Program ' - 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\tracemalloc.py', - 'PYMODULE'), ('stringprep', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\stringprep.py', 'PYMODULE'), + ('tracemalloc', + 'C:\\Program ' + 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\tracemalloc.py', + 'PYMODULE'), ('numpy', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\numpy\\__init__.py', 'PYMODULE'), @@ -1560,13 +1560,13 @@ 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\libffi-7.dll', 'BINARY'), - ('pywin32_system32\\pywintypes310.dll', - 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\pywin32_system32\\pywintypes310.dll', - 'BINARY'), ('VCRUNTIME140_1.dll', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\VCRUNTIME140_1.dll', 'BINARY'), + ('pywin32_system32\\pywintypes310.dll', + 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\pywin32_system32\\pywintypes310.dll', + 'BINARY'), ('python3.dll', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\python3.dll', @@ -1577,8 +1577,11 @@ [], [], [('base_library.zip', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\base_library.zip', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\base_library.zip', + 'DATA'), + ('cv2\\config-3.py', + 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config-3.py', 'DATA'), ('cv2\\config.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config.py', @@ -1586,9 +1589,6 @@ ('cv2\\load_config_py3.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\load_config_py3.py', 'DATA'), - ('cv2\\config-3.py', - 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config-3.py', - 'DATA'), ('cv2\\__init__.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\__init__.py', 'DATA'), diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/EXE-00.toc b/Texturing/MergeTextures/build/merge_textures_dekogon/EXE-00.toc index 9df384e..e73f35e 100644 --- a/Texturing/MergeTextures/build/merge_textures_dekogon/EXE-00.toc +++ b/Texturing/MergeTextures/build/merge_textures_dekogon/EXE-00.toc @@ -1,10 +1,10 @@ -('E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\dist\\merge_textures_dekogon.exe', +('E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\dist\\merge_textures_dekogon.exe', True, False, False, - ['E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\merge_textures.ico'], + ['E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\merge_textures.ico'], None, False, False, @@ -31,32 +31,32 @@ None, None, None, - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\merge_textures_dekogon.pkg', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\merge_textures_dekogon.pkg', [('pyi-contents-directory _internal', '', 'OPTION'), ('PYZ-00.pyz', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\PYZ-00.pyz', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\PYZ-00.pyz', 'PYZ'), ('struct', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\struct.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\struct.pyc', 'PYMODULE'), ('pyimod01_archive', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod01_archive.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod01_archive.pyc', 'PYMODULE'), ('pyimod02_importers', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod02_importers.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod02_importers.pyc', 'PYMODULE'), ('pyimod03_ctypes', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod03_ctypes.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod03_ctypes.pyc', 'PYMODULE'), ('pyimod04_pywin32', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod04_pywin32.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod04_pywin32.pyc', 'PYMODULE'), ('pyiboot01_bootstrap', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py', @@ -71,8 +71,8 @@ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py', 'PYSOURCE'), ('merge_textures_dekogon', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py', 'PYSOURCE'), ('python310.dll', 'C:\\Program ' @@ -213,13 +213,13 @@ 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\libffi-7.dll', 'BINARY'), - ('pywin32_system32\\pywintypes310.dll', - 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\pywin32_system32\\pywintypes310.dll', - 'BINARY'), ('VCRUNTIME140_1.dll', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\VCRUNTIME140_1.dll', 'BINARY'), + ('pywin32_system32\\pywintypes310.dll', + 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\pywin32_system32\\pywintypes310.dll', + 'BINARY'), ('python3.dll', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\python3.dll', @@ -228,8 +228,11 @@ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\numpy\\.libs\\libopenblas64__v0.3.21-gcc_10_3_0.dll', 'BINARY'), ('base_library.zip', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\base_library.zip', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\base_library.zip', + 'DATA'), + ('cv2\\config-3.py', + 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config-3.py', 'DATA'), ('cv2\\config.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config.py', @@ -237,9 +240,6 @@ ('cv2\\load_config_py3.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\load_config_py3.py', 'DATA'), - ('cv2\\config-3.py', - 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config-3.py', - 'DATA'), ('cv2\\__init__.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\__init__.py', 'DATA'), @@ -267,7 +267,7 @@ [], False, False, - 1711307417, + 1728825288, [('run.exe', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\bootloader\\Windows-64bit-intel\\run.exe', 'EXECUTABLE')], diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/PKG-00.toc b/Texturing/MergeTextures/build/merge_textures_dekogon/PKG-00.toc index 1f1dd6c..58fb558 100644 --- a/Texturing/MergeTextures/build/merge_textures_dekogon/PKG-00.toc +++ b/Texturing/MergeTextures/build/merge_textures_dekogon/PKG-00.toc @@ -1,5 +1,5 @@ -('E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\merge_textures_dekogon.pkg', +('E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\merge_textures_dekogon.pkg', {'BINARY': True, 'DATA': True, 'EXECUTABLE': True, @@ -11,28 +11,28 @@ 'SYMLINK': False}, [('pyi-contents-directory _internal', '', 'OPTION'), ('PYZ-00.pyz', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\PYZ-00.pyz', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\PYZ-00.pyz', 'PYZ'), ('struct', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\struct.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\struct.pyc', 'PYMODULE'), ('pyimod01_archive', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod01_archive.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod01_archive.pyc', 'PYMODULE'), ('pyimod02_importers', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod02_importers.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod02_importers.pyc', 'PYMODULE'), ('pyimod03_ctypes', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod03_ctypes.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod03_ctypes.pyc', 'PYMODULE'), ('pyimod04_pywin32', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod04_pywin32.pyc', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\localpycs\\pyimod04_pywin32.pyc', 'PYMODULE'), ('pyiboot01_bootstrap', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py', @@ -47,8 +47,8 @@ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\PyInstaller\\hooks\\rthooks\\pyi_rth_multiprocessing.py', 'PYSOURCE'), ('merge_textures_dekogon', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\merge_textures_dekogon.py', 'PYSOURCE'), ('python310.dll', 'C:\\Program ' @@ -189,13 +189,13 @@ 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\DLLs\\libffi-7.dll', 'BINARY'), - ('pywin32_system32\\pywintypes310.dll', - 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\pywin32_system32\\pywintypes310.dll', - 'BINARY'), ('VCRUNTIME140_1.dll', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\VCRUNTIME140_1.dll', 'BINARY'), + ('pywin32_system32\\pywintypes310.dll', + 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\pywin32_system32\\pywintypes310.dll', + 'BINARY'), ('python3.dll', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\python3.dll', @@ -204,8 +204,11 @@ 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\numpy\\.libs\\libopenblas64__v0.3.21-gcc_10_3_0.dll', 'BINARY'), ('base_library.zip', - 'E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\base_library.zip', + 'E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\base_library.zip', + 'DATA'), + ('cv2\\config-3.py', + 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config-3.py', 'DATA'), ('cv2\\config.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config.py', @@ -213,9 +216,6 @@ ('cv2\\load_config_py3.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\load_config_py3.py', 'DATA'), - ('cv2\\config-3.py', - 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\config-3.py', - 'DATA'), ('cv2\\__init__.py', 'C:\\Users\\Niklas\\AppData\\Local\\Packages\\PythonSoftwareFoundation.Python.3.10_qbz5n2kfra8p0\\LocalCache\\local-packages\\Python310\\site-packages\\cv2\\__init__.py', 'DATA'), diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.pyz b/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.pyz index 68104d1..acb48fa 100644 Binary files a/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.pyz and b/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.pyz differ diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.toc b/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.toc index 5b6013f..8cc2a66 100644 --- a/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.toc +++ b/Texturing/MergeTextures/build/merge_textures_dekogon/PYZ-00.toc @@ -1,5 +1,5 @@ -('E:\\Arma Reforger Work\\1960 ' - 'Life\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\PYZ-00.pyz', +('E:\\Arma Reforger ' + 'Work\\1960-utils\\Texturing\\MergeTextures\\build\\merge_textures_dekogon\\PYZ-00.pyz', [('__future__', 'C:\\Program ' 'Files\\WindowsApps\\PythonSoftwareFoundation.Python.3.10_3.10.3056.0_x64__qbz5n2kfra8p0\\lib\\__future__.py', diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/base_library.zip b/Texturing/MergeTextures/build/merge_textures_dekogon/base_library.zip index a6b9d38..2c5d5de 100644 Binary files a/Texturing/MergeTextures/build/merge_textures_dekogon/base_library.zip and b/Texturing/MergeTextures/build/merge_textures_dekogon/base_library.zip differ diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/merge_textures_dekogon.pkg b/Texturing/MergeTextures/build/merge_textures_dekogon/merge_textures_dekogon.pkg index ca1e644..72d66c5 100644 Binary files a/Texturing/MergeTextures/build/merge_textures_dekogon/merge_textures_dekogon.pkg and b/Texturing/MergeTextures/build/merge_textures_dekogon/merge_textures_dekogon.pkg differ diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/warn-merge_textures_dekogon.txt b/Texturing/MergeTextures/build/merge_textures_dekogon/warn-merge_textures_dekogon.txt index 65fba53..80e0517 100644 --- a/Texturing/MergeTextures/build/merge_textures_dekogon/warn-merge_textures_dekogon.txt +++ b/Texturing/MergeTextures/build/merge_textures_dekogon/warn-merge_textures_dekogon.txt @@ -18,9 +18,9 @@ missing module named _frozen_importlib_external - imported by importlib._bootstr excluded module named _frozen_importlib - imported by importlib (optional), importlib.abc (optional), zipimport (top-level) missing module named pep517 - imported by importlib.metadata (delayed) missing module named org - imported by pickle (optional) -missing module named pwd - imported by posixpath (delayed, conditional), shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), subprocess (delayed, conditional, optional), http.server (delayed, optional), webbrowser (delayed), psutil (optional), netrc (delayed, conditional), getpass (delayed) -missing module named grp - imported by shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), subprocess (delayed, conditional, optional) -missing module named posix - imported by os (conditional, optional), importlib._bootstrap_external (conditional), shutil (conditional) +missing module named pwd - imported by posixpath (delayed, conditional), subprocess (delayed, conditional, optional), shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), http.server (delayed, optional), webbrowser (delayed), psutil (optional), netrc (delayed, conditional), getpass (delayed) +missing module named grp - imported by subprocess (delayed, conditional, optional), shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional) +missing module named posix - imported by os (conditional, optional), shutil (conditional), importlib._bootstrap_external (conditional) missing module named resource - imported by posix (top-level) missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional) missing module named _scproxy - imported by urllib.request (conditional) diff --git a/Texturing/MergeTextures/build/merge_textures_dekogon/xref-merge_textures_dekogon.html b/Texturing/MergeTextures/build/merge_textures_dekogon/xref-merge_textures_dekogon.html index e2b4200..33c63e7 100644 --- a/Texturing/MergeTextures/build/merge_textures_dekogon/xref-merge_textures_dekogon.html +++ b/Texturing/MergeTextures/build/merge_textures_dekogon/xref-merge_textures_dekogon.html @@ -15,7 +15,7 @@
- merge_textures_dekogon.py + merge_textures_dekogon.py Script
imports: _collections_abc @@ -171,6 +171,7 @@ imports: • sre_parse • stat • sys + • time • traceback • types • warnings @@ -7257,6 +7258,7 @@ imports: • importlib._bootstrap • importlib._bootstrap_external • importlib.abc + • importlib.machinery • sys • warnings @@ -7393,6 +7395,7 @@ imports:
imported by: ctypes.util + • importlib • importlib.abc • inspect • numpy.compat.py3k @@ -16679,6 +16682,7 @@ imported by: • http.server • logging • logging.handlers + • merge_textures_dekogon.py • multiprocessing.connection • multiprocessing.managers • multiprocessing.pool diff --git a/Texturing/MergeTextures/dist/merge_textures_dekogon.exe b/Texturing/MergeTextures/dist/merge_textures_dekogon.exe index abee587..6dd43da 100644 Binary files a/Texturing/MergeTextures/dist/merge_textures_dekogon.exe and b/Texturing/MergeTextures/dist/merge_textures_dekogon.exe differ diff --git a/Texturing/MergeTextures/merge_textures_dekogon.py b/Texturing/MergeTextures/merge_textures_dekogon.py index 89b413c..b3bd466 100644 --- a/Texturing/MergeTextures/merge_textures_dekogon.py +++ b/Texturing/MergeTextures/merge_textures_dekogon.py @@ -2,20 +2,25 @@ import cv2 import sys import numpy as np import os +import time if len(sys.argv) < 2: print("Please provide the input files.") + time.sleep(5) sys.exit(1) basecolor_file = None normal_file = None rma_file = None +basecolor_prefixes = ["_alb.","_albedo."] +normal_prefixes = ["_nrm.", "_normal."] + # Loop through the command-line arguments for arg in sys.argv[1:]: - if '_alb.' in arg.lower(): + if any(prefix in arg.lower() for prefix in basecolor_prefixes): basecolor_file = arg - elif '_nrm.' in arg.lower(): + elif any(prefix in arg.lower() for prefix in normal_prefixes): normal_file = arg elif '_rma.' in arg.lower(): rma_file = arg @@ -23,6 +28,7 @@ for arg in sys.argv[1:]: # Check if all files are provided if not all([basecolor_file, normal_file, rma_file]): print("Please provide all input files: base_color, normal, roughness, ambient_occlusion, and metallic.") + time.sleep(5) sys.exit(1) basecolor = cv2.imread(basecolor_file, cv2.IMREAD_COLOR) @@ -39,7 +45,9 @@ NMO = np.array([metallicb, normalg, normalr, aob]) #result = re.search(r'TX_(.*)_', basecolor_file) output_filename = os.path.basename(basecolor_file) output_filename = output_filename.removeprefix("TX_") +output_filename = output_filename.removeprefix("T_") output_filename = output_filename.removesuffix("_ALB.PNG") +output_filename = output_filename.removesuffix("_Albedo.PNG") if not os.path.exists(os.path.join(os.path.dirname(basecolor_file),"merged")): os.mkdir(os.path.join(os.path.dirname(basecolor_file),"merged")) @@ -49,4 +57,7 @@ output_dir = os.path.join(os.path.dirname(basecolor_file),"merged") #output_dir = re.search(r'^(.+)\\.+$', basecolor_file).group(1) cv2.imwrite(output_dir + f"\\{output_filename}_BCR.png", BCR.T) -cv2.imwrite(output_dir + f"\\{output_filename}_NMO.png", NMO.T) \ No newline at end of file +cv2.imwrite(output_dir + f"\\{output_filename}_NMO.png", NMO.T) + +print("Textures successfully merged!") +time.sleep(5) \ No newline at end of file