Merge branch 'master' of https://github.com/compas-dev/compas

Author: tomvanmele

.gitignore

@@ -119,6 +119,8 @@ temp/**
 src/.build/**
 
 data/bunny
+data/models
+data/ctralie
 *.ply
 *.tar.gz
 

src/compas_blender/__init__.py

@@ -3,15 +3,19 @@
 compas_blender
 ********************************************************************************
 
-.. currentmodule:: compas_blender
+.. module:: compas_blender
 
 .. toctree::
     :maxdepth: 1
 
     compas_blender.artists
+    compas_blender.conduits
     compas_blender.forms
     compas_blender.geometry
     compas_blender.helpers
+    compas_blender.inspectors
+    compas_blender.modifiers
+    compas_blender.selectors
     compas_blender.ui
     compas_blender.utilities
 

src/compas_blender/artists/__init__.py

@@ -1,11 +1,11 @@
+
 """
 ********************************************************************************
 compas_blender.artists
 ********************************************************************************
 
 .. currentmodule:: compas_blender.artists
 
-
 Artists for visualising (painting) COMPAS data structures in Blender.
 
 
@@ -17,14 +17,15 @@
     VolMeshArtist
 
 """
-from __future__ import absolute_import
 
+from .artist import *
 from .meshartist import *
 from .networkartist import *
 from .volmeshartist import *
 
-from . import meshartist
-from . import networkartist
-from . import volmeshartist
+from .artist import __all__ as a
+from .meshartist import __all__ as b
+from .networkartist import __all__ as c
+from .volmeshartist import __all__ as d
 
-__all__ = meshartist.__all__ + networkartist.__all__ + volmeshartist.__all__
+__all__ = a + b + c + d

src/compas_blender/artists/artist.py

@@ -0,0 +1,71 @@
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+try:
+    import bpy
+except ImportError:
+    pass
+
+
+__all__ = [
+    'Artist',
+]
+
+
+class Artist(object):
+
+    __module__ = "compas_blender.artists"
+
+    def __init__(self, layer=None):
+
+        self.layer = layer
+        self.defaults = {
+            'color.point':   [255, 255, 255],
+            'color.line':    [0, 0, 0],
+            'color.polygon': [210, 210, 210],
+        }
+        self.vertex_objects = []
+        self.edge_objects   = []
+        self.face_objects   = []
+
+
+    def redraw(self, timeout=None):
+
+        bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
+
+
+    def clear_layer(self):
+
+        raise NotImplementedError
+
+
+    def save(self, path, width=1920, height=1080, scale=1,
+             draw_grid=False, draw_world_axes=False, draw_cplane_axes=False, background=False):
+
+        raise NotImplementedError
+
+
+    def draw_points(self, points, layer=None, clear_layer=False, redraw=False):
+
+        raise NotImplementedError
+
+
+    def draw_lines(self, lines, layer=None, clear_layer=False, redraw=False):
+
+        raise NotImplementedError
+
+
+    def draw_polygons(self, polygons, layer=None, clear_layer=False, redraw=False):
+
+        raise NotImplementedError
+
+
+# ==============================================================================
+# Main
+# ==============================================================================
+
+if __name__ == "__main__":
+
+    pass

src/compas_blender/artists/meshartist.py

@@ -1,78 +1,83 @@
-import time
-
-try:
-    import bpy
-except ImportError:
-    pass
-
-from compas_blender.utilities import clear_layer
-from compas_blender.artists.mixins import VertexArtist
-from compas_blender.artists.mixins import EdgeArtist
-from compas_blender.artists.mixins import FaceArtist
-
-
-__author__     = ['Andrew Liew <[email protected]>']
-__copyright__  = 'Copyright 2017, Block Research Group - ETH Zurich'
-__license__    = 'MIT License'
-__email__      = '[email protected]'
-
-
-__all__ = ['MeshArtist']
-
-
-class MeshArtist(FaceArtist, EdgeArtist, VertexArtist):
-    """"""
-
-    def __init__(self, mesh, layer=0):
-        self.datastructure = mesh
-        self.layer = layer
-        self.defaults = {
-            'color.vertex': [1, 0, 0],
-            'color.face': [1, 1, 1],
-            'color.edge': [0, 0, 1]}
-
-    def redraw(self, timeout=None):
-        """Redraw the Blender view."""
-        if timeout:
-            time.sleep(timeout)
-        bpy.ops.wm.redraw_timer(type='DRAW_WIN_SWAP', iterations=1)
-
-    def clear_layer(self):
-        clear_layer(layer=self.layer)
-
-    def clear(self):
-        self.clear_vertices()
-        self.clear_faces()
-        self.clear_edges()
-
-
-# ==============================================================================
-# Main
-# ==============================================================================
-
-if __name__ == "__main__":
-
-    from compas_blender.utilities import get_objects
-
-    from compas_blender.helpers import mesh_from_bmesh
-
-    mesh = mesh_from_bmesh(bmesh=get_objects(layer=0)[0])
-
-    meshartist = MeshArtist(mesh=mesh, layer=1)
-
-    meshartist.clear_layer()
-
-    meshartist.draw_vertices()
-    meshartist.draw_vertexlabels()
-    meshartist.clear_vertices(keys=[4])
-    meshartist.clear_vertexlabels(keys=[6])
-
-    meshartist.draw_edges()
-    meshartist.draw_edgelabels()
-    meshartist.clear_edges(keys=[(0, 4)])
-    meshartist.clear_edgelabels(keys=[(5, 4)])
-
-    meshartist.draw_faces()
-    meshartist.draw_facelabels()
-    meshartist.clear_faces(keys=[2, 3])
-    meshartist.clear_facelabels(keys=[5])
+
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
+from compas_blender.artists import Artist
+from compas_blender.artists.mixins import VertexArtist
+from compas_blender.artists.mixins import EdgeArtist
+from compas_blender.artists.mixins import FaceArtist
+
+
+__all__ = [
+    'MeshArtist',
+]
+
+
+class MeshArtist(FaceArtist, EdgeArtist, VertexArtist, Artist):
+
+    __module__ = "compas_blender.artists"
+
+    def __init__(self, mesh, layer=None):
+        super(MeshArtist, self).__init__(layer=layer)
+
+        self.mesh = mesh
+        self.defaults.update({
+            'color.vertex': [255, 255, 255],
+            'color.edge':   [0, 0, 0],
+            'color.face':   [110, 110, 110],
+        })
+
+
+    @property
+    def mesh(self):
+
+        return self.datastructure
+
+
+    @mesh.setter
+    def mesh(self, mesh):
+
+        self.datastructure = mesh
+
+
+    def draw(self):
+
+        raise NotImplementedError
+
+
+    def clear(self):
+
+        self.clear_vertices()
+        self.clear_faces()
+        self.clear_edges()
+
+
+# ==============================================================================
+# Main
+# ==============================================================================
+
+if __name__ == "__main__":
+
+    import compas
+
+    from compas.datastructures import Mesh
+
+
+    mesh = Mesh.from_obj(compas.get('quadmesh.obj'))
+
+    artist = MeshArtist(mesh)
+
+    # artist.clear()
+
+    artist.draw_vertices(radius=0.01)
+    artist.draw_vertexlabels()
+    # artist.clear_vertexlabels()
+
+    # artist.draw_edges(width=0.01)
+    # artist.draw_edgelabels()
+    # artist.clear_edgelabels()
+
+    # artist.draw_faces()
+    # artist.draw_facelabels()
+    # artist.clear_facelabels()

src/compas_blender/artists/mixins/__init__.py

@@ -1,11 +1,10 @@
-from .vertexartist import *
-from .edgeartist import *
-from .faceartist import *
-from .pathartist import *
-
-from .vertexartist import __all__ as a
-from .edgeartist import __all__ as b
-from .faceartist import __all__ as c
-from .pathartist import __all__ as d
-
-__all__ = a + b + d
+
+from .vertexartist import *
+from .edgeartist import *
+from .faceartist import *
+
+from .vertexartist import __all__ as a
+from .edgeartist import __all__ as b
+from .faceartist import __all__ as c
+
+__all__ = a + b + c