refactor: cleanup

related to #18
This commit is contained in:
Swann Martinez
2019-12-02 17:34:08 +01:00
parent a12d32341c
commit 315c2903c0

View File

@ -32,6 +32,8 @@ stop_modal_executor = False
modal_executor_queue = None
# OPERATORS
class SessionStartOperator(bpy.types.Operator):
bl_idname = "session.start"
bl_label = "start"
@ -104,8 +106,6 @@ class SessionStartOperator(bpy.types.Operator):
"A session is already hosted on this address")
return {"CANCELLED"}
# Init user settings
usr = presence.User(
username=settings.username,
@ -142,7 +142,7 @@ class SessionStartOperator(bpy.types.Operator):
global modal_executor_queue
modal_executor_queue = queue.Queue()
bpy.ops.wm.modal_executor_operator()
bpy.ops.session.apply_armature_operator()
self.report(
{'INFO'},
@ -274,7 +274,8 @@ class SessionSnapUserOperator(bpy.types.Operator):
target_client = client.get(uuid=self.target_client)
if target_client:
rv3d.view_matrix = mathutils.Matrix(target_client.data['view_matrix'])
rv3d.view_matrix = mathutils.Matrix(
target_client.data['view_matrix'])
else:
return {"CANCELLED"}
@ -320,9 +321,10 @@ class SessionCommit(bpy.types.Operator):
client.push(self.target)
return {"FINISHED"}
class ModalExecutorOperator(bpy.types.Operator):
class ApplyArmatureOperator(bpy.types.Operator):
"""Operator which runs its self from a timer"""
bl_idname = "wm.modal_executor_operator"
bl_idname = "session.apply_armature_operator"
bl_label = "Modal Executor Operator"
_timer = None
@ -344,7 +346,8 @@ class ModalExecutorOperator(bpy.types.Operator):
try:
client.apply(node)
except Exception as e:
logger.error("fail to apply {}: {}".format(node_ref.uuid,e))
logger.error(
"fail to apply {}: {}".format(node_ref.uuid, e))
return {'PASS_THROUGH'}
@ -371,7 +374,7 @@ classes = (
SessionPropertyRightOperator,
SessionApply,
SessionCommit,
ModalExecutorOperator,
ApplyArmatureOperator,
)
@ -380,6 +383,7 @@ def register():
for cls in classes:
register_class(cls)
def unregister():
global client
@ -391,5 +395,6 @@ def unregister():
for cls in reversed(classes):
unregister_class(cls)
if __name__ == "__main__":
register()