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

feat(rcf): added guidlines

Browse Source
This commit is contained in:
Swann
2019-02-25 18:05:46 +01:00
parent afa44878a0
commit 33a19bc142
1 changed files with 68 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
net_operators.py
View File

@ -23,35 +23,42 @@ VECTOR_TYPES = (
'Vector' 'Vector'
) )
def on_scene_evalutation(scene):
# TODO: viewer representation
# TODO: Live update only selected object
# TODO: Scene representation
pass
def randomStringDigits(stringLength=6): def randomStringDigits(stringLength=6):
"""Generate a random string of letters and digits """ """Generate a random string of letters and digits """
lettersAndDigits = string.ascii_letters + string.digits lettersAndDigits = string.ascii_letters + string.digits
return ''.join(random.choice(lettersAndDigits) for i in range(stringLength)) return ''.join(random.choice(lettersAndDigits) for i in range(stringLength))
class VectorTypeTranslation(net_components.RCFTranslation): class VectorTypeTranslation(net_components.RCFTranslation):
def set(self,data): def set(self, data):
""" """
local program > rcf local program > rcf
""" """
return [data.x,data.y,data.z] return [data.x, data.y, data.z]
def get(self,data): def get(self, data):
""" """
rcf > local program rcf > local program
""" """
return mathutils.Vector((data[0],data[1],data[2])) return mathutils.Vector((data[0], data[1], data[2]))
def match_supported_types(value): def match_supported_types(value):
type_factory = None type_factory = None
if isinstance(value,bool): if isinstance(value, bool):
print("float") print("float")
elif isinstance(value,mathutils.Vector): elif isinstance(value, mathutils.Vector):
print("vector") print("vector")
type_factory = VectorTypeTranslation() type_factory = VectorTypeTranslation()
elif isinstance(value,mathutils.Euler): elif isinstance(value, mathutils.Euler):
print("Euler") print("Euler")
elif type(value) in NATIVE_TYPES: elif type(value) in NATIVE_TYPES:
print("native") print("native")
@ -60,31 +67,6 @@ def match_supported_types(value):
return type_factory return type_factory
# class RNAFractory(net_components.RCFMsgFactory):
# def __init__(self,data):
# self.load = match_type():
# def load(self,data):
# logger.debug(' casting from bpy')
# value_type = type(data)
# rna_value = None
# if value_type is mathutils.Vector or mathutils.Euler:
# rna_value = [data.x,data.y,data.z]
# elif value_type is bpy.props.collection:
# pass # TODO: Collection replication
# elif value_type in NATIVE_TYPES:
# rna_value = data
# return rna_value
# def unload(self,data):
# rcf_value = None
# if value_type == 'Vector':
# value_casted = mathutils.Vector((data[0],data[1],data[2]))
# return rcf_value
# TODO: Less ugly method # TODO: Less ugly method
def from_bpy(value): def from_bpy(value):
@ -93,15 +75,16 @@ def from_bpy(value):
value_casted = None value_casted = None
if value_type is mathutils.Vector: if value_type is mathutils.Vector:
value_casted = [value.x,value.y,value.z] value_casted = [value.x, value.y, value.z]
elif value_type is bpy.props.collection: elif value_type is bpy.props.collection:
pass # TODO: Collection replication pass # TODO: Collection replication
elif value_type is mathutils.Euler: elif value_type is mathutils.Euler:
value_casted = [value.x,value.y,value.z] value_casted = [value.x, value.y, value.z]
elif value_type is NATIVE_TYPES: elif value_type is NATIVE_TYPES:
value_casted = value value_casted = value
return str(value.__class__.__name__),value_casted return str(value.__class__.__name__), value_casted
def to_bpy(store_item): def to_bpy(store_item):
""" """
@ -112,10 +95,12 @@ def to_bpy(store_item):
store_value = store_item.body store_value = store_item.body
if value_type == 'Vector': if value_type == 'Vector':
value_casted = mathutils.Vector((store_value[0],store_value[1],store_value[2])) value_casted = mathutils.Vector(
(store_value[0], store_value[1], store_value[2]))
return value_casted return value_casted
def resolve_bpy_path(path): def resolve_bpy_path(path):
""" """
Get bpy property value from path Get bpy property value from path
@ -129,25 +114,26 @@ def resolve_bpy_path(path):
logger.debug("resolving {}".format(path)) logger.debug("resolving {}".format(path))
try: try:
obj = getattr(bpy.data,path[0])[path[1]] obj = getattr(bpy.data, path[0])[path[1]]
attribute = getattr(obj,path[2]) attribute = getattr(obj, path[2])
logger.debug("done {} : {}".format(obj,attribute)) logger.debug("done {} : {}".format(obj, attribute))
except AttributeError: except AttributeError:
logger.debug(" Attribute not found") logger.debug(" Attribute not found")
return obj, attribute return obj, attribute
def observer(): def observer():
global client global client
try: try:
for key,values in client.property_map.items(): for key, values in client.property_map.items():
# if values.id == client.id: # if values.id == client.id:
obj, attr = resolve_bpy_path(key) obj, attr = resolve_bpy_path(key)
if attr != to_bpy(client.property_map[key]): if attr != to_bpy(client.property_map[key]):
value_type, value = from_bpy(attr) value_type, value = from_bpy(attr)
client.push_update(key,value_type,value) client.push_update(key, value_type, value)
except: except:
pass pass
return bpy.context.scene.session_settings.update_frequency return bpy.context.scene.session_settings.update_frequency
@ -159,6 +145,7 @@ def refresh_window():
bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1) bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
def patch_scene(msg): def patch_scene(msg):
global client global client
@ -168,26 +155,30 @@ def patch_scene(msg):
obj, attr = resolve_bpy_path(msg.key) obj, attr = resolve_bpy_path(msg.key)
attr_name = msg.key.split('/')[2] attr_name = msg.key.split('/')[2]
value = to_bpy(msg) value = to_bpy(msg)
# print(msg.get) # print(msg.get)
logger.debug("Updating scene:\n object: {} attribute: {} , value: {}".format(obj, attr_name, value)) logger.debug("Updating scene:\n object: {} attribute: {} , value: {}".format(
obj, attr_name, value))
try: try:
setattr(obj,attr_name,value) setattr(obj, attr_name, value)
except: except:
pass pass
else: else:
logger.debug('no need to update scene on our own') logger.debug('no need to update scene on our own')
def vector2array(v): def vector2array(v):
return [v.x,v.y,v.z] return [v.x, v.y, v.z]
def array2vector(a): def array2vector(a):
logger.debug(mathutils.Vector((a[0],a[1],a[2]))) logger.debug(mathutils.Vector((a[0], a[1], a[2])))
return mathutils.Vector((a[0],a[1],a[2])) return mathutils.Vector((a[0], a[1], a[2]))
recv_callbacks=[patch_scene] recv_callbacks = [patch_scene]
post_init_callbacks=[refresh_window] post_init_callbacks = [refresh_window]
class session_join(bpy.types.Operator): class session_join(bpy.types.Operator):
bl_idname = "session.join" bl_idname = "session.join"
@ -205,12 +196,13 @@ class session_join(bpy.types.Operator):
net_settings = context.scene.session_settings net_settings = context.scene.session_settings
if net_settings.username == "DefaultUser": if net_settings.username == "DefaultUser":
net_settings.username = "{}_{}".format(net_settings.username,randomStringDigits()) net_settings.username = "{}_{}".format(
net_settings.username, randomStringDigits())
username = str(context.scene.session_settings.username) username = str(context.scene.session_settings.username)
client = net_components.Client(
client = net_components.Client(id=username,on_recv=recv_callbacks,on_post_init=post_init_callbacks) id=username, on_recv=recv_callbacks, on_post_init=post_init_callbacks)
time.sleep(1) time.sleep(1)
bpy.ops.asyncio.loop() bpy.ops.asyncio.loop()
@ -219,6 +211,7 @@ class session_join(bpy.types.Operator):
net_settings.is_running = True net_settings.is_running = True
return {"FINISHED"} return {"FINISHED"}
class session_add_property(bpy.types.Operator): class session_add_property(bpy.types.Operator):
bl_idname = "session.add_prop" bl_idname = "session.add_prop"
bl_label = "add" bl_label = "add"
@ -240,10 +233,11 @@ class session_add_property(bpy.types.Operator):
key = self.property_path key = self.property_path
value_type, value = from_bpy(attr) value_type, value = from_bpy(attr)
client.push_update(key,value_type,value) client.push_update(key, value_type, value)
return {"FINISHED"} return {"FINISHED"}
class session_remove_property(bpy.types.Operator): class session_remove_property(bpy.types.Operator):
bl_idname = "session.remove_prop" bl_idname = "session.remove_prop"
bl_label = "remove" bl_label = "remove"
@ -266,6 +260,7 @@ class session_remove_property(bpy.types.Operator):
except: except:
return {"CANCELED"} return {"CANCELED"}
class session_create(bpy.types.Operator): class session_create(bpy.types.Operator):
bl_idname = "session.create" bl_idname = "session.create"
bl_label = "create" bl_label = "create"
@ -305,7 +300,7 @@ class session_stop(bpy.types.Operator):
net_settings = context.scene.session_settings net_settings = context.scene.session_settings
if server : if server:
server.stop() server.stop()
del server del server
server = None server = None
@ -324,12 +319,13 @@ class session_stop(bpy.types.Operator):
class session_settings(bpy.types.PropertyGroup): class session_settings(bpy.types.PropertyGroup):
username = bpy.props.StringProperty(name="Username",default="user") username = bpy.props.StringProperty(name="Username", default="user")
ip = bpy.props.StringProperty(name="localhost") ip = bpy.props.StringProperty(name="localhost")
port = bpy.props.IntProperty(name="5555") port = bpy.props.IntProperty(name="5555")
buffer = bpy.props.StringProperty(name="None") buffer = bpy.props.StringProperty(name="None")
is_running = bpy.props.BoolProperty(name="is_running",default=False) is_running = bpy.props.BoolProperty(name="is_running", default=False)
update_frequency = bpy.props.FloatProperty(name="update_frequency", default=0.008) update_frequency = bpy.props.FloatProperty(
name="update_frequency", default=0.008)
# TODO: Rename to match official blender convention # TODO: Rename to match official blender convention
@ -348,7 +344,11 @@ def register():
for cls in classes: for cls in classes:
register_class(cls) register_class(cls)
bpy.types.Scene.session_settings = bpy.props.PointerProperty(type=session_settings) bpy.types.Scene.session_settings = bpy.props.PointerProperty(
type=session_settings)
bpy.app.handlers.depsgraph_update_post.append(on_scene_evalutation)
def unregister(): def unregister():
from bpy.utils import unregister_class from bpy.utils import unregister_class
@ -356,6 +356,7 @@ def unregister():
unregister_class(cls) unregister_class(cls)
del bpy.types.Scene.session_settings del bpy.types.Scene.session_settings
bpy.app.handlers.depsgraph_update_post.remove(on_scene_evalutation)
if __name__ == "__main__": if __name__ == "__main__":