Move to relative imports where possible, update to new dir structure …

…where not

docs/todos.txt

@@ -21,6 +21,7 @@ Eg should the setting of the file change a value in the pps file?
 
 Look at streaming ALL the possible information from the WAVE API, not just the location values.
 
+#TODO
 Set TCP_NODELAY on both the client and server side of the RTSERVER, as this may bring speed improvements
 
 FEATURES:

ematoblender/dataserver.py

@@ -14,7 +14,7 @@ def main(level=2):
 
     if level == 0:
         # perform most basic server testing, using one static file only.
-        from scripts.ema_io.ema_staticserver import rtserver as rts
+        from ematoblender.scripts.ema_io.ema_staticserver import rtserver as rts
         st, so = rts.initialise_server(datafile=datafile, loop=loop)
 
         print('Starting first server thread.')
@@ -28,12 +28,12 @@ def main(level=2):
 
     elif level == 1:
         # use the command-line server-switcher
-        from scripts.ema_io.ema_staticserver import rtserver_switcher as rtss
+        from ematoblender.scripts.ema_io.ema_staticserver import rtserver_switcher as rtss
         rtss.main()
 
     else:
         # use the gui switcher
-        from scripts.ema_io.ema_staticserver import rtserver_gui as rtg
+        from ematoblender.scripts.ema_io.ema_staticserver import rtserver_gui as rtg
         rtg.main()
 
 

ematoblender/scripts/ema_blender/blender_networking.py

@@ -16,11 +16,11 @@
 
 import xml.etree.ElementTree as ET
 from collections import deque
-
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_shared.properties as pps
 from subprocess import Popen
 
+from . import blender_shared_objects as bsh
+from ..ema_shared import properties as pps
+
 
 def setup_socket_to_gameserver(port=0, blocking=False):
     """Setup a persistent socket to the gameserver.
@@ -312,7 +312,7 @@ def get_one_df():
 
 #unused
 def bge_only_start_stream():
-    from scripts.ema_blender.ema_bge.bge_menus_overlays import bge_display_status_text
+    from ematoblender.scripts.ema_blender.ema_bge.bge_menus_overlays import bge_display_status_text
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='START_STREAM')
     reply1 = recv_from_gameserver(bsh.gs_soc_nonblocking)
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='STATUS')
@@ -321,7 +321,7 @@ def bge_only_start_stream():
 
 #unused
 def bge_only_stop_stream():
-    from scripts.ema_blender.ema_bge.bge_menus_overlays import bge_display_status_text
+    from .ema_bge.bge_menus_overlays import bge_display_status_text
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='STREAM_STOP')
     reply1 = recv_from_gameserver(bsh.gs_soc_nonblocking)
     send_to_gameserver(bsh.gs_soc_nonblocking, mode='STATUS')

ematoblender/scripts/ema_blender/blender_shared_objects.py

@@ -29,7 +29,7 @@
 ema_inferred_meshes = []
 
 # iterator over the lists of tuples above that re-evaluates whenever run
-from scripts.ema_shared.miscellanous import ReeevalIter
+from ..ema_shared.miscellanous import ReeevalIter
 ema_driven_meshes = ReeevalIter('bsh.ema_biteplate_meshes', 'bsh.ema_reference_meshes', 'bsh.ema_active_meshes')
 
 

ematoblender/scripts/ema_blender/bpy_operators/ops_bpy_palate_trace.py

@@ -18,12 +18,12 @@
 from collections import defaultdict
 
 from bpy_extras.view3d_utils import location_3d_to_region_2d as loc3d2d
-from scripts.ema_blender.coil_info import find_sensor_index
-from scripts.ema_io.rtc3d_parser import DataFrame
+from ematoblender.scripts.ema_blender.coil_info import find_sensor_index
+from ematoblender.scripts.ema_io.rtc3d_parser import DataFrame
 import scripts.ema_blender.blender_networking as bn
 import scripts.ema_blender.blender_shared_objects as bsh
 import scripts.ema_shared.properties as pps
-from scripts.ema_blender.ema_bpy.bpy_move_objects import apply_properties_transform
+from ematoblender.scripts.ema_blender.ema_bpy.bpy_move_objects import apply_properties_transform
 
 
 def draw_text_on_viewport(mystring):

ematoblender/scripts/ema_blender/coil_info.py

@@ -2,8 +2,8 @@
 
 import os
 import json
-from scripts.ema_blender import blender_shared_objects as bsh
-from scripts.ema_shared import properties as pps
+from . import blender_shared_objects as bsh
+from ..ema_shared import properties as pps
 
 
 def import_sensor_info_json(jsonfilename='./sensor_info.json'):

ematoblender/scripts/ema_blender/coord_transforms.py

@@ -1,12 +1,12 @@
 __author__ = 'Kristy'
 
 import mathutils
-import scripts.ema_io.ema_gameserver.data_manipulation as dm
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender.ema_bpy.bpy_setup_cameras import delete_standard_camera
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_blender.coil_info as ci
-import scripts.ema_shared.general_maths as bm
+from . import coil_info as ci
+from . import blender_shared_objects as bsh
+
+import ematoblender.scripts.ema_io.ema_gameserver.data_manipulation as dm
+import ematoblender.scripts.ema_shared.properties as pps
+import ematoblender.scripts.ema_shared.general_maths as bm
 
 class ObjectResizingCS(dm.BitePlane):
     """Class that takes either three points or two points (plus the assumption that Z is up)

ematoblender/scripts/ema_blender/ema_bge/bge_camera_control.py

@@ -5,9 +5,10 @@
 import mathutils
 import math
 import bge
-import scripts.ema_blender.ema_bge.bge_splines_lines as sl
-import scripts.ema_blender.ema_bge.bge_menus_overlays as mo
-import scripts.ema_blender.blender_shared_objects as bsh
+from . import bge_splines_lines as sl
+from . import bge_menus_overlays as mo
+from .. import blender_shared_objects as bsh
+from ematoblender.scripts.ema_shared import properties as pps
 
 neutral_position = None # todo: get the basic position
 speed_factor=50
@@ -81,7 +82,6 @@ def bge_circular_camera_control(keys, target_name='CameraFocus', camera_name='Ci
 
 def bge_apply_head_movement(cameraempty='CameraFocus'):
     """Move the camera position relative to the parent empty based on the head-correction matrix"""
-    import scripts.ema_blender.blender_networking as bn
     matlist, *cam_pos = bsh.head_inversion
     print('got matlist', matlist)
     if matlist is not None:
@@ -128,7 +128,7 @@ def bge_point_cam_at_origin(camname="CircularCamera"):
 
 def bge_rotate_with_mouse(camname='CircularCamera'):
     """Rotate with the mouse position, if holding t (track)"""
-    from scripts.ema_blender.ema_bge.bge_standard_gamefns import get_scene_info
+    from .bge_standard_gamefns import get_scene_info
     scn, objs, cont, own, acts = get_scene_info()
     print([x for x in own.sensors])
     mouse = own.sensors["MouseSensor"]
@@ -187,7 +187,6 @@ def use_viewports(vertical=True):
     Choose vertical or horizontal split.
     """
 
-    import scripts.ema_shared.properties as pps
     scn = bge.logic.getCurrentScene()
     cams = [scn.objects.get(cam) for cam in pps.display_cameras]
 

ematoblender/scripts/ema_blender/ema_bge/bge_emareadin.py

@@ -25,12 +25,12 @@
 
 # My scripts for networking with the EMA (file)
 # client script that connects to EMA server
-from scripts.ema_blender import blender_networking as bn
-from scripts.ema_blender.blender_networking import send_to_gameserver
+from .. import blender_networking as bn
+from ..blender_networking import send_to_gameserver
 
 # external modules relevant to bge, stored separately for convenience
 # below illustrates absolute and relative imports of same directory
-import scripts.ema_blender.ema_bge.bge_standard_gamefns as gf
+from . import bge_standard_gamefns as gf
 from . import bge_camera_control as cc
 from . import bge_menus_overlays as mo
 from . import bge_update_armature as ua
@@ -39,13 +39,13 @@
 from . import bge_splines_lines as sl
 from . import bge_static_video as vid
 
-from scripts.ema_blender import coil_info as ci
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender import blender_shared_objects as bsh
-import scripts.ema_blender.coord_transforms as ct
+from .. import coil_info as ci
+from .. import blender_shared_objects as bsh
+from .. import coord_transforms as ct
+from ...ema_shared import properties as pps
 
-from scripts.ema_io.rtc3d_parser import DataFrame
-from scripts.ema_shared.miscellanous import reload_modules_for_testing
+from ...ema_io.rtc3d_parser import DataFrame
+from ...ema_shared.miscellanous import reload_modules_for_testing
 
 ##### global variables #####
 
@@ -64,7 +64,7 @@
 from queue import deque
 bsh.gs_answers = deque()  # store responses from gameserver (deque to can restrict length if req'd)
 # persistent socket that connects to the gameserver
-from scripts.ema_blender.blender_shared_objects import gs_soc_blocking, gs_soc_nonblocking
+from ..blender_shared_objects import gs_soc_blocking, gs_soc_nonblocking
 #bsh.gs_soc_blocking = None
 #bsh.gs_soc_nonblocking = None
 

ematoblender/scripts/ema_blender/ema_bge/bge_manual_constraints.py

@@ -1,7 +1,7 @@
 __author__ = 'Kristy'
 
 import mathutils
-from scripts.ema_blender import blender_shared_objects as bsh
+from ematoblender.scripts.ema_blender import blender_shared_objects as bsh
 
 """This file controls manual constraints on objects that are executed every frame.
 For example, if one object must always mirror another, it is controlled here.

ematoblender/scripts/ema_blender/ema_bge/bge_menus_overlays.py

@@ -4,10 +4,11 @@
 import bge
 import mathutils
 import math
-import scripts.ema_blender.ema_bge.bge_standard_gamefns as sg
-from scripts.ema_blender.blender_networking import send_to_gameserver, recv_from_gameserver
-import scripts.ema_shared.properties as pps
-import scripts.ema_blender.blender_shared_objects as bsh
+
+from . import bge_standard_gamefns as sg
+from ..blender_networking import send_to_gameserver, recv_from_gameserver
+from .. import blender_shared_objects as bsh
+from ...ema_shared import properties as pps
 
 ##########################################################################
 ##                   STATUS OVERLAY SCENE

ematoblender/scripts/ema_blender/ema_bge/bge_move_objects.py

@@ -1,13 +1,14 @@
 __author__ = 'Kristy'
 import mathutils
-from scripts.ema_blender.blender_networking import send_to_gameserver, recv_from_gameserver
-from scripts.ema_blender.blender_shared_objects import ema_active_meshes
-from scripts.ema_blender.ema_bge.bge_menus_overlays import bge_update_overlay_status_decorator
-from scripts.ema_blender.coil_info import find_transform_by_index
-from scripts.ema_blender import  blender_shared_objects as bsh
-from scripts.ema_blender.coord_transforms import PointsTransformationMatrix
-import scripts.ema_shared.properties as pps
-import scripts.ema_blender.coord_transforms as ct
+
+from .bge_menus_overlays import bge_update_overlay_status_decorator
+from ..blender_networking import send_to_gameserver, recv_from_gameserver
+from ..blender_shared_objects import ema_active_meshes
+from ..coil_info import find_transform_by_index
+from .. import  blender_shared_objects as bsh
+from ..coord_transforms import PointsTransformationMatrix
+from .. import coord_transforms as ct
+from ...ema_shared import properties as pps
 
 
 def bge_update_from_df(scene_objs, df, showall=True):

ematoblender/scripts/ema_blender/ema_bge/bge_play_audio.py

@@ -5,8 +5,8 @@
 import time
 import random
 import math
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_shared.properties as pps
+from .. import blender_shared_objects as bsh
+from ...ema_shared import properties as pps
 
 sound_first_exec = True
 

ematoblender/scripts/ema_blender/ema_bge/bge_splines_lines.py

@@ -4,11 +4,11 @@
 # note: you can also draw on images in Blender with
 #bpy.data.images['Image Name'].pixels[0:4] = (Red, Green, Blue, Alpha) #Here "Red, Green, Blue, Alfa" are floating values.
 
-import mathutils
 import bge
-from mathutils import Vector
 import math
-from scripts.ema_shared.general_maths import *
+import mathutils
+from mathutils import Vector
+from ...ema_shared.general_maths import *
 
 
 def draw_line_through_points(*points, color=(1, 0, 0)):

ematoblender/scripts/ema_blender/ema_bge/bge_static_video.py

@@ -5,11 +5,12 @@
 so when it is restarted the coils will be out of sync. Also if streaming takes a moment to initialise,
 the video plays (almost) immediately, also leading to timing mismatches."""
 
-from scripts.ema_shared.properties import video_override
-
 import bge
 import os
 
+from ...ema_shared.properties import video_override
+
+
 
 def bge_update_videoplane(timestamp_secs, videolocation, planename='UltrasoundPlane'):
     """Update the video appropriately based on timestamp"""

ematoblender/scripts/ema_blender/ema_bge/bge_update_armature.py

@@ -1,8 +1,8 @@
 __author__ = 'Kristy'
 import bge
-import scripts.ema_blender.coil_info as ci
-import scripts.ema_blender.ema_bge.bge_splines_lines as sl
-import scripts.ema_shared.general_maths as bm
+from .. import coil_info as ci
+from . import bge_splines_lines as sl
+from ...ema_shared import general_maths as bm
 
 ###############################################
 ##   NEW APPROACH - UPDATE ARMATURES WITH IK EMPTIES
@@ -29,11 +29,10 @@ def update_tongue_surface():
     else:
         print("Tongue armature not found in scene. This is problematic.")
 
-
-import scripts.ema_blender.blender_shared_objects as bsh
-import scripts.ema_blender.ema_bge.bge_splines_lines as splines
-import scripts.ema_blender.ema_bge.bge_standard_gamefns as gf
-import scripts.ema_shared.properties as pps
+from . import bge_splines_lines as splines
+from . import bge_standard_gamefns as gf
+from .. import blender_shared_objects as bsh
+from ...ema_shared import properties as pps
 
 
 def update_these_bones(armature_name='Mid-Saggital'):

ematoblender/scripts/ema_blender/ema_bpy/bpy_add_game_objects.py

@@ -4,9 +4,9 @@
 from . import bpy_workspace as ws
 
 
-from scripts.ema_shared import properties as pps
-from scripts.ema_shared.miscellanous import get_random_color
-from scripts.ema_blender import blender_shared_objects as bsh
+from ematoblender.scripts.ema_shared import properties as pps
+from ematoblender.scripts.ema_shared.miscellanous import get_random_color
+from ematoblender.scripts.ema_blender import blender_shared_objects as bsh
 
 
 @ws.postfn_gamemaster_reset_decorator

ematoblender/scripts/ema_blender/ema_bpy/bpy_emareadin.py

@@ -25,15 +25,15 @@
 from . import bpy_move_objects as mo
 from . import bpy_static_video as vid
 
-from scripts.ema_blender import coil_info as ci
-from scripts.ema_blender import blender_shared_objects as bsh
-from scripts.ema_blender import coord_transforms as ct
-from scripts.ema_blender import blender_networking as bn
-
-from scripts.ema_shared import miscellanous as misc
-from scripts.ema_shared import properties as pps
-from scripts.ema_shared import general_maths as bm
-from scripts.ema_shared.miscellanous import reload_modules_for_testing
+from .. import coil_info as ci
+from .. import blender_shared_objects as bsh
+from .. import coord_transforms as ct
+from .. import blender_networking as bn
+
+from ...ema_shared import miscellanous as misc
+from ...ema_shared import properties as pps
+from ...ema_shared import general_maths as bm
+from ...ema_shared.miscellanous import reload_modules_for_testing
 
 
 def main():

ematoblender/scripts/ema_blender/ema_bpy/bpy_import_assets.py

@@ -5,9 +5,9 @@
 import mathutils
 import re, os, copy
 from .bpy_workspace import postfn_gamemaster_reset_decorator, prefn_gamemaster_select_decorator
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender.ema_bpy.bpy_setup_cameras import delete_standard_camera
-import scripts.ema_blender.coil_info as ci
+from .bpy_setup_cameras import delete_standard_camera
+from .. import coil_info as ci
+from ...ema_shared import properties as pps
 
 ##########################################################################
 ##                    GENERAL IMPORT FUNCTIONS
@@ -130,7 +130,7 @@ def add_statusbar_scene():
     bpy.ops.object.select_all(action='DESELECT')
 
     # get the circling camera object, it is on this that the scene is overlaid
-    from scripts.ema_blender.blender_shared_objects import circling_cam
+    from ematoblender.scripts.ema_blender.blender_shared_objects import circling_cam
     camname = circling_cam.name
 
     # add a low-frequency sensor logic brick to the camera

ematoblender/scripts/ema_blender/ema_bpy/bpy_link_assets_coils.py

@@ -3,8 +3,8 @@
 from . import bpy_workspace as ws
 import os
 import json
-from scripts.ema_shared import properties as pps
-from scripts.ema_blender import blender_shared_objects as bsh
+from ematoblender.scripts.ema_shared import properties as pps
+from .. import blender_shared_objects as bsh
 
 import scripts.ema_shared.general_maths as bm
 import scripts.ema_blender.coil_info as ci