From fdc13886786fef56057279a5534a7b7f60ca4d9f Mon Sep 17 00:00:00 2001 From: Mohamed Abouagour Date: Sat, 14 Dec 2024 23:54:59 -0500 Subject: [PATCH] RF: convert `actor` module into fury/actor.py --- fury/{actor => }/actor.py | 15 ++++++--------- fury/actor/__init__.py | 1 - fury/{actor => }/geometry.py | 0 fury/{actor/materials.py => material.py} | 11 ++--------- 4 files changed, 8 insertions(+), 19 deletions(-) rename fury/{actor => }/actor.py (73%) delete mode 100644 fury/actor/__init__.py rename fury/{actor => }/geometry.py (100%) rename fury/{actor/materials.py => material.py} (72%) diff --git a/fury/actor/actor.py b/fury/actor.py similarity index 73% rename from fury/actor/actor.py rename to fury/actor.py index e994dec70..d35f765e3 100644 --- a/fury/actor/actor.py +++ b/fury/actor.py @@ -1,7 +1,7 @@ import numpy as np import fury.primitive as fp -from fury.actor.materials import _create_mesh_material -from fury.actor.geometry import buffer_to_geometry, create_mesh +from fury.material import _create_mesh_material +from fury.geometry import buffer_to_geometry, create_mesh def sphere( @@ -11,8 +11,6 @@ def sphere( radii=1.0, phi=16, theta=16, - vertices=None, - faces=None, opacity=None, material='phong', enable_picking=True @@ -21,8 +19,7 @@ def sphere( scales = radii directions = (1, 0, 0) - if faces is None and vertices is None: - vertices, faces = fp.prim_sphere(phi=phi, theta=theta) + vertices, faces = fp.prim_sphere(phi=phi, theta=theta) res = fp.repeat_primitive( vertices, @@ -32,7 +29,7 @@ def sphere( colors=colors, scales=scales, ) - big_verts, big_faces, big_colors, _ = res + big_vertices, big_faces, big_colors, _ = res prim_count = len(centers) @@ -48,8 +45,8 @@ def sphere( geo = buffer_to_geometry( indices=big_faces.astype('int32'), - positions=big_verts.astype('float32'), - texcoords=big_verts.astype('float32'), + positions=big_vertices.astype('float32'), + texcoords=big_vertices.astype('float32'), colors=big_colors.astype('float32'), ) diff --git a/fury/actor/__init__.py b/fury/actor/__init__.py deleted file mode 100644 index a9ac08277..000000000 --- a/fury/actor/__init__.py +++ /dev/null @@ -1 +0,0 @@ -from fury.actor.actor import sphere diff --git a/fury/actor/geometry.py b/fury/geometry.py similarity index 100% rename from fury/actor/geometry.py rename to fury/geometry.py diff --git a/fury/actor/materials.py b/fury/material.py similarity index 72% rename from fury/actor/materials.py rename to fury/material.py index 3ea740b9f..07bef9913 100644 --- a/fury/actor/materials.py +++ b/fury/material.py @@ -6,11 +6,8 @@ def _create_mesh_material( enable_picking=True, color=None, opacity=1.0): - if material == 'phong': - - if opacity is None: - opacity = 1.0 + if material == 'phong': return gfx.MeshPhongMaterial( pick_write=enable_picking, color_mode='vertex' if color is None else 'auto', @@ -20,9 +17,5 @@ def _create_mesh_material( return gfx.MeshBasicMaterial( pick_write=enable_picking, color_mode='vertex' if color is None else 'auto', - color=color if color is not None else ( - 1, - 1, - 1, - opacity if color is None else 1), + color=color if color is not None else (1, 1, 1, opacity), )