Backups/multi-user
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add suport for MOVIE, IMAGE SOUND and EFFECT strips

Browse Source
This commit is contained in:
Swann 2020-11-02 18:13:31 +01:00
parent 0bad6895da
commit babecf5ae7
No known key found for this signature in database
GPG Key ID: E1D3641A7C43AACB
4 changed files with 126 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
multi_user/__init__.py
View File

@ -44,7 +44,7 @@ from . import environment
DEPENDENCIES = {
("replication", '0.1.6'),
("replication", '0.1.7'),
}

3
multi_user/bl_types/bl_action.py
View File

@ -153,7 +153,8 @@ class BlAction(BlDatablock):
dumped_data_path, index=dumped_array_index)
load_fcurve(dumped_fcurve, fcurve)
target.id_root = data['id_root']
if data['id_root']:
target.id_root = data['id_root']
def _dump_implementation(self, data, instance=None):
dumper = Dumper()

140
multi_user/bl_types/bl_scene.py
View File

@ -16,20 +16,20 @@
# ##### END GPL LICENSE BLOCK #####
import logging
from pathlib import Path
import bpy
import mathutils
from .dump_anything import Loader, Dumper
from .bl_datablock import BlDatablock
from .bl_collection import (dump_collection_children,
dump_collection_objects,
load_collection_childrens,
load_collection_objects,
resolve_collection_dependencies)
from replication.constants import (DIFF_JSON, MODIFIED)
from deepdiff import DeepDiff
import logging
from replication.constants import DIFF_JSON, MODIFIED
from .bl_collection import (dump_collection_children, dump_collection_objects,
load_collection_childrens, load_collection_objects,
resolve_collection_dependencies)
from .bl_datablock import BlDatablock
from .dump_anything import Dumper, Loader
from .bl_file import get_filepath
RENDER_SETTINGS = [
'dither_intensity',
'engine',
@ -265,6 +265,90 @@ VIEW_SETTINGS = [
'black_level'
]
def dump_sequence(sequence: bpy.types.Sequence) -> dict:
dumper = Dumper()
dumper.exclude_filter = [
'lock',
'select',
'select_left_handle',
'select_right_handle',
]
dumper.depth = 1
data = dumper.dump(sequence)
input_count = getattr(sequence, 'input_count', None)
if sequence.type == 'IMAGE':
data['filename'] = sequence.elements[0].filename
if input_count:
for n in range(input_count):
input_name = f"input_{n+1}"
data[input_name] = getattr(sequence, input_name).name
return data
def load_sequence(sequence_data: dict, sequence_editor: bpy.types.SequenceEditor):
strip_type = sequence_data.get('type')
strip_name = sequence_data.get('name')
strip_channel = sequence_data.get('channel')
strip_frame_start = sequence_data.get('frame_start')
if strip_type == 'SCENE':
strip_scene = bpy.data.scenes.get(sequence_data.get('scene'))
sequence = sequence_editor.sequences.new_scene(strip_name,
strip_scene,
strip_channel,
strip_frame_start)
elif strip_type == 'MOVIE':
filepath = get_filepath(Path(sequence_data['filepath']).name)
sequence = sequence_editor.sequences.new_movie(strip_name,
filepath,
strip_channel,
strip_frame_start)
elif strip_type == 'SOUND':
filepath = bpy.data.sounds[sequence_data['sound']].filepath
sequence = sequence_editor.sequences.new_sound(strip_name,
filepath,
strip_channel,
strip_frame_start)
elif strip_type == 'IMAGE':
filepath = get_filepath(sequence_data['filename'])
sequence = sequence_editor.sequences.new_image(strip_name,
filepath,
strip_channel,
strip_frame_start)
else:
seq1 = sequence_editor.sequences_all.get(sequence_data.get("input_1", None))
seq2 = seq3 = None
if sequence_data['input_count'] == 2:
seq2 = sequence_editor.sequences_all.get(sequence_data.get("input_2", None))
if sequence_data['input_count'] == 3:
seq3 = sequence_editor.sequences_all.get(sequence_data.get("input_3", None))
strip_frame_end = sequence_data.get("strip_frame_end")
sequence = sequence_editor.sequences.new_effect(strip_name,
strip_type,
strip_channel,
strip_frame_start,
seq1=seq1,
seq2=seq2,
seq3=seq3,
)
loader = Loader()
loader.load(sequence, sequence_data)
sequence.select = False
# elif strip_type == 'MOVIE':
def get_sequence_dependency(sequence: bpy.types.Sequence):
if sequence.type == 'MOVIE':
return Path(bpy.path.abspath(sequence.filepath))
elif sequence.type == 'SOUND':
return sequence.sound
elif sequence.type == 'IMAGE':
return Path(bpy.path.abspath(sequence.directory), sequence.elements[0].filename)
class BlScene(BlDatablock):
bl_id = "scenes"
bl_class = bpy.types.Scene
@ -314,7 +398,7 @@ class BlScene(BlDatablock):
if 'view_settings' in data.keys():
loader.load(target.view_settings, data['view_settings'])
if target.view_settings.use_curve_mapping and \
'curve_mapping' in data['view_settings']:
'curve_mapping' in data['view_settings']:
# TODO: change this ugly fix
target.view_settings.curve_mapping.white_level = data[
'view_settings']['curve_mapping']['white_level']
@ -322,10 +406,19 @@ class BlScene(BlDatablock):
'view_settings']['curve_mapping']['black_level']
target.view_settings.curve_mapping.update()
# Sequencer
sequences = data.get('sequences')
if sequences:
target.sequence_editor_clear()
if target.sequence_editor is None:
target.sequence_editor_create()
for seq_name, seq_data in sequences.items():
load_sequence(seq_data, target.sequence_editor)
def _dump_implementation(self, data, instance=None):
assert(instance)
data = {}
# Metadata
scene_dumper = Dumper()
scene_dumper.depth = 1
scene_dumper.include_filter = [
@ -340,11 +433,9 @@ class BlScene(BlDatablock):
if self.preferences.sync_flags.sync_active_camera:
scene_dumper.include_filter.append('camera')
data = scene_dumper.dump(instance)
data.update(scene_dumper.dump(instance))
scene_dumper.depth = 3
scene_dumper.include_filter = ['children', 'objects', 'name']
# Master collection
data['collection'] = {}
data['collection']['children'] = dump_collection_children(
instance.collection)
@ -354,6 +445,7 @@ class BlScene(BlDatablock):
scene_dumper.depth = 1
scene_dumper.include_filter = None
# Render settings
if self.preferences.sync_flags.sync_render_settings:
scene_dumper.include_filter = RENDER_SETTINGS
@ -381,6 +473,15 @@ class BlScene(BlDatablock):
data['view_settings']['curve_mapping']['curves'] = scene_dumper.dump(
instance.view_settings.curve_mapping.curves)
# Sequencer
if instance.sequence_editor is not None:
sequences = {}
for seq in instance.sequence_editor.sequences_all:
sequences[seq.name] = dump_sequence(seq)
data['sequences'] = sequences
return data
def _resolve_deps_implementation(self):
@ -398,7 +499,12 @@ class BlScene(BlDatablock):
deps.append(self.instance.grease_pencil)
# Sequences
if self.instance.sequence_editor:
for seq in self.instance.sequence_editor.sequences_all:
dep = get_sequence_dependency(seq)
if dep:
deps.append(dep)
# deps.extend(list(self.instance.sequence_editor.sequences_all))
return deps
def diff(self):

57
multi_user/bl_types/bl_strip.py
View File

@ -1,57 +0,0 @@
# ##### BEGIN GPL LICENSE BLOCK #####
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <https://www.gnu.org/licenses/>.
#
# ##### END GPL LICENSE BLOCK #####
import bpy
import mathutils
from .dump_anything import Loader, Dumper
from .bl_datablock import BlDatablock
class BlSequence(BlDatablock):
bl_id = "sequence"
bl_class = bpy.types.Sequence
bl_delay_refresh = 1
bl_delay_apply = 1
bl_automatic_push = True
bl_check_common = False
bl_icon = 'SEQUENCE'
def _construct(self, data):
return bpy.data.cameras.new(data["name"])
def _load_implementation(self, data, target):
loader = Loader()
loader.load(target, data)
def _dump_implementation(self, data, instance=None):
assert(instance)
dumper = Dumper()
dumper.depth = 1
data.update(dumper.dump(instance))
return data
def _resolve_deps_implementation(self):
deps = []
for background in self.instance.background_images:
if background.image:
deps.append(background.image)
return deps