Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions scripts/scene2.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
from compas_viewer.viewer import Viewer
from compas.scene import Scene
from compas.geometry import Box, Translation

scene = Scene()
box = Box()
scene.add(box, color=(255, 0, 0), name="Box1")
group = scene.add_group(name="My Group")
obj2 = scene.add(box, color=(0, 0, 255), name="Box2", parent=group)
obj2.transformation = Translation().from_vector([2, 0, 0])


jsonstring = scene.to_jsonstring(pretty=True)
print(jsonstring)

scene_loaded = Scene.from_jsonstring(jsonstring)

viewer = Viewer()
viewer.scene = scene_loaded

viewer.show()

5 changes: 0 additions & 5 deletions src/compas_viewer/scene/geometryobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,6 @@ class GeometryObject(ViewerSceneObject, BaseGeometryObject):

geometry: Geometry

def __init__(self, u: Optional[int] = 16, v: Optional[int] = 16, **kwargs):
super().__init__(**kwargs)
self.u = u
self.v = v

@property
def facecolor(self) -> Color:
return self.surfacecolor
Expand Down
15 changes: 5 additions & 10 deletions src/compas_viewer/scene/scene.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,8 +66,8 @@ class ViewerScene(Scene):
:class:`compas.scene.Scene`
"""

def __init__(self, name: str = "ViewerScene", context: str = "Viewer"):
super().__init__(name=name, context=context)
def __init__(self, name: str = "ViewerScene", context: str = "Viewer", **kwargs):
super().__init__(name=name, context=context, **kwargs)
self.instance_colors: dict[tuple[int, int, int], ViewerSceneObject] = {}
self._instance_colors_generator = instance_colors_generator()

Expand Down Expand Up @@ -140,10 +140,6 @@ def add(
Whether to hide the coplanar edges of the mesh.
use_vertexcolors : bool, optional
Whether to use vertex color.
v : int, optional
The number of vertices in the u-direction of non-OCC geometries. Default is 16.
u : int, optional
The number of vertices in the v-direction of non-OCC geometries. Default is 16.
**kwargs : dict, optional
The other possible parameters to be passed to the object.

Expand Down Expand Up @@ -172,8 +168,6 @@ def add(
opacity=opacity,
hide_coplanaredges=hide_coplanaredges,
use_vertexcolors=use_vertexcolors,
v=v,
u=u,
**kwargs,
)
return sceneobject
Expand All @@ -196,6 +190,7 @@ def add_group(self, name: str = None, parent: Optional[ViewerSceneObject] = None
:class:`compas_viewer.scene.Group`
The group.
"""
parent = parent or self.root
group = Group(name=name, **kwargs)
self.add(group, parent=parent)
return group
super(Scene, self).add(group, parent=parent)
return group
1 change: 0 additions & 1 deletion src/compas_viewer/scene/sceneobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ def __init__(
self.use_rgba = use_rgba

# Geometric
self.transformation: Optional[Transformation] = None
self._bounding_box: Optional[list[float]] = None
self._bounding_box_center: Optional[Point] = None

Expand Down
21 changes: 0 additions & 21 deletions src/compas_viewer/scene/shapeobject.py
Original file line number Diff line number Diff line change
Expand Up @@ -50,27 +50,6 @@ class ShapeObject(GeometryObject):

geometry: Shape

def __init__(self, u: Optional[int] = 16, v: Optional[int] = 16, **kwargs):
super().__init__(**kwargs)
self.u = u
self.v = v

@property
def u(self) -> int:
return self.geometry.resolution_u

@u.setter
def u(self, u: int) -> None:
self.geometry.resolution_u = u

@property
def v(self) -> int:
return self.geometry.resolution_v

@v.setter
def v(self, v: int) -> None:
self.geometry.resolution_v = v

@property
def facecolor(self) -> Color:
return self.surfacecolor
Expand Down
Loading