From cc4033978d8f4e204e82d48a3ca8b7dbbb8acf1c Mon Sep 17 00:00:00 2001
From: Swann Martinez <s.martinez@cubedns.fr>
Date: Wed, 10 Apr 2019 11:21:10 +0200
Subject: [PATCH] refactor: clean

---
 __init__.py       |  4 ---
 libs/__init__.py  |  0
 libs/bsyncio      |  1 -
 libs/esper        |  1 -
 net_components.py |  9 ++++--
 net_ecs.py        | 73 -----------------------------------------------
 6 files changed, 7 insertions(+), 81 deletions(-)
 create mode 100644 libs/__init__.py
 delete mode 160000 libs/bsyncio
 delete mode 160000 libs/esper
 delete mode 100644 net_ecs.py

diff --git a/__init__.py b/__init__.py
index 63f074e..874306d 100644
--- a/__init__.py
+++ b/__init__.py
@@ -8,8 +8,6 @@ bl_info = {
     "category" : "Collaboration"
 }
 
-from .libs.bsyncio import bsyncio
-
 
 import bpy
 import os
@@ -21,7 +19,6 @@ from . import net_ui
 from . import net_ecs
 
 def register():
-    bsyncio.register()
     net_operators.register()
     net_ui.register()
     net_ecs.register()
@@ -30,5 +27,4 @@ def unregister():
     net_ui.unregister()
     net_operators.unregister()
     net_ecs.unregister()
-    bsyncio.unregister()
     
\ No newline at end of file
diff --git a/libs/__init__.py b/libs/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/libs/bsyncio b/libs/bsyncio
deleted file mode 160000
index 9527509..0000000
--- a/libs/bsyncio
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 95275093b79d9289f939079550bb47ab25c1eacd
diff --git a/libs/esper b/libs/esper
deleted file mode 160000
index 5b6cd0c..0000000
--- a/libs/esper
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 5b6cd0c51718d5dcfa0e5613f824b5251cf092ac
diff --git a/net_components.py b/net_components.py
index 226653a..9d730f7 100644
--- a/net_components.py
+++ b/net_components.py
@@ -4,14 +4,19 @@ import threading
 from uuid import uuid4
 import binascii
 import os
+import sys
 from random import randint
 import time
 from enum import Enum
 
 try:
-    from .libs import umsgpack, zmq
+    from .libs import umsgpack
+    from .libs import zmq
 except:
-    from libs import umsgpack, zmq
+    # Server import
+    from libs import umsgpack
+    from libs import zmq
+
 logger = logging.getLogger(__name__)
 logging.basicConfig(level=logging.DEBUG)
 
diff --git a/net_ecs.py b/net_ecs.py
deleted file mode 100644
index ab2d0eb..0000000
--- a/net_ecs.py
+++ /dev/null
@@ -1,73 +0,0 @@
-import bpy
-from .libs.esper import esper
-
-class Object:
-    def __init__(self, name=None):
-        self.name = name
-
-class Vector:
-    def __init__(self, x=0.0 ,y=0.0,z=0.0):
-        self.x = x
-        self.y = y
-        self.z = z
-
-class Pointer:
-    def __init__(self, path=None):
-        self.path = path
-
-class ObjectProcessor(esper.Processor):
-    def __init__(self):
-        super().__init__()
-
-    def process(self):
-            for ent  in self.world.get_component(Object):
-                print('asdasd')
-
-
-
-class ecs_launch(bpy.types.Operator):
-    bl_idname = "ecs.launch"
-    bl_label = "ecs_launch"
-    bl_description = "Description that shows in blender tooltips"
-    bl_options = {'REGISTER'}
-
-    @classmethod
-    def poll(cls, context):
-        return True
-
-    def invoke(self, context, event):
-        context.window_manager.modal_handler_add(self)
-        return {"RUNNING_MODAL"}
-
-    def modal(self, context, event):
-        
-        if event.type == "LEFTMOUSE":
-            return {"FINISHED"}
-        
-        if event.type in {"RIGHTMOUSE", "ESC"}:
-            return {"CANCELLED"}
-        
-        return {"RUNNING_MODAL"}
-
-class ecs_init(bpy.types.Operator):
-    bl_idname = "ecs.init"
-    bl_label = "ecs_init"
-    bl_description = "Description that shows in blender tooltips"
-    bl_options = {"REGISTER"}
-
-    @classmethod
-    def poll(cls, context):
-        return True
-
-    def execute(self, context):
-        
-        return {"FINISHED"}
-
-
-classes = (
-    ecs_init,
-    ecs_launch,
-)
-
-
-register, unregister = bpy.utils.register_classes_factory(classes)