brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 16:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add local to client transfer and Blender texture packing

Browse Source
This commit is contained in:
Brett Williams
2022-10-12 00:09:27 -07:00
parent 2c5be5632d
commit 8ae50e2431
2 changed files with 101 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
utilities/blender_worker.py
View File

@@ -1,7 +1,9 @@
#! /usr/bin/python
from utilities.render_worker import *
import re
import time
from utilities.render_worker import *
SUPPORTED_FORMATS = ['TGA', 'RAWTGA', 'JPEG', 'IRIS', 'IRIZ', 'AVIRAW', 'AVIJPEG', 'PNG', 'BMP', 'HDR', 'TIFF',
'OPEN_EXR', 'OPEN_EXR_MULTILAYER', 'MPEG', 'CINEON', 'DPX', 'DDS', 'JP2']
@@ -48,10 +50,10 @@ class BlenderRenderWorker(BaseRenderWorker):
if self.render_all_frames:
cmd = [self.renderer_path(), '-b', self.input, '-E', self.engine, '-o', self.output,
'-F', self.format, '-a']
'-F', self.format, '-a']
else:
cmd = [self.renderer_path(), '-b', self.input, '-E', self.engine, '-o', self.output,
'-F', self.format, '-f', str(self.frame)]
'-F', self.format, '-f', str(self.frame)]
return cmd
def _parse_stdout(self, line):
@@ -67,7 +69,7 @@ class BlenderRenderWorker(BaseRenderWorker):
sample_string = line.split('|')[-1].strip()
if "sample" in sample_string.lower():
samples = re.sub(r'[^/d/]', '', sample_string)
samples = re.sub(r'[^\d/]', '', sample_string)
self.frame_percent_complete = int(samples.split('/')[0]) / int(samples.split('/')[-1])
@@ -106,14 +108,38 @@ class BlenderRenderWorker(BaseRenderWorker):
if self.total_frames <= 1:
return self.frame_percent_complete
else:
return (self.current_frame / self.total_frames) +\
return (self.current_frame / self.total_frames) + \
(self.frame_percent_complete * (self.current_frame / self.total_frames))
def pack_blender_files(path):
# Credit to L0Lock for pack script - https://blender.stackexchange.com/a/243935
pack_script = "import bpy\nbpy.ops.file.pack_all()\nmyPath = bpy.data.filepath\nmyPath = str(myPath)\n" \
"bpy.ops.wm.save_as_mainfile(filepath=myPath[:-6]+'_packed'+myPath[-6:])"
if os.path.exists(path):
try:
results = subprocess.check_output(['blender', '-b', path, '--python-expr', pack_script])
result_text = results.decode()
dir_name = os.path.dirname(path)
p = re.compile('Info: Saved "(.*)"')
match = p.search(result_text)
new_path = os.path.join(dir_name, match.group(1))
return new_path
except Exception as e:
logger.error(f'Error packing .blend file: {e}')
return None
if __name__ == '__main__':
# x = pack_blender_files('/Users/brett/Blender Files/temple_animatic.blend')
# print(x)
logging.basicConfig(format='%(asctime)s - %(message)s', datefmt='%d-%b-%y %H:%M:%S', level=logging.DEBUG)
r = BlenderRenderWorker('/Users/brett/Blender Files/Ian Hubert/CyberExtras.blend', '/Users/brett/testing1234', render_all_frames=False, engine="CYCLES")
r = BlenderRenderWorker('/Users/brett/Blender Files/temple_animatic.blend', '/Users/brett/testing1234')
# r.engine = 'CYCLES'
r.start()
while r.is_running():
time.sleep(1)
time.sleep(1)