ncca-ngl 0.3.1__tar.gz → 0.3.2__tar.gz

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ncca-ngl
-Version: 0.3.1
+Version: 0.3.2
 Summary: A Python version of the NGL graphics library.
 Author: Jon Macey
 Author-email: Jon Macey <jmacey@bournemouth.ac.uk>

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ncca-ngl"
-version = "0.3.1"
+version = "0.3.2"
 description = "A Python version of the NGL graphics library."
 authors = [{ name = "Jon Macey", email = "jmacey@bournemouth.ac.uk" }]
 requires-python = ">=3.13"

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/__main__.py

@@ -21,7 +21,7 @@ class SimpleDialog(QDialog):
         self.setMinimumWidth(200)
         layout = QGridLayout()
 
-        self.vec2_widget = Vec2Widget("Vec2 Widget", Vec2(1, 2), self)
+        self.vec2_widget = Vec2Widget(self, "Vec2 Widget", Vec2(1, 2))
         self.vec2_widget.set_x_range(-1, 1)
         self.vec2_widget.set_y_range(-2, 2)
         layout.addWidget(self.vec2_widget, 0, 0)
@@ -29,7 +29,7 @@ class SimpleDialog(QDialog):
         layout.addWidget(self.vec2_label, 0, 1)
         self.vec2_widget.valueChanged.connect(self._update_vec2)
 
-        self.vec3_widget = Vec3Widget("Vec3 Widget", Vec3(1, 2, 3), self)
+        self.vec3_widget = Vec3Widget(self, "Vec3 Widget", Vec3(1, 2, 3))
         self.vec3_widget.set_y_range(-2, 2)
         self.vec3_widget.set_z_range(-3, 3)
         layout.addWidget(self.vec3_widget, 1, 0)
@@ -37,7 +37,7 @@ class SimpleDialog(QDialog):
         layout.addWidget(self.vec3_label, 1, 1)
         self.vec3_widget.valueChanged.connect(self._update_vec3)
 
-        self.vec4_widget = Vec4Widget("Vec4 Widget", Vec4(1, 2, 3, 1.0), self)
+        self.vec4_widget = Vec4Widget(self, "Vec4 Widget", Vec4(1, 2, 3, 1.0))
         self.vec4_widget.set_y_range(-2, 2)
         self.vec4_widget.set_z_range(-3, 3)
         layout.addWidget(self.vec4_widget, 2, 0)
@@ -45,15 +45,15 @@ class SimpleDialog(QDialog):
         layout.addWidget(self.vec4_label, 2, 1)
         self.vec4_widget.valueChanged.connect(self._update_vec4)
 
-        self.transform_widget = TransformWidget("Transform Widget", self)
+        self.transform_widget = TransformWidget(self, "Transform Widget")
         layout.addWidget(self.transform_widget, 3, 0)
 
-        self.lookat = LookAtWidget("Look At", parent=self)
+        self.lookat = LookAtWidget(self, "Look At")
         layout.addWidget(self.lookat, 4, 0)
 
-        self.rgb_colour_widget = RGBColourWidget("RGB Colour Widget", 1.0, 0.0, 0.0, self)
+        self.rgb_colour_widget = RGBColourWidget(self, "RGB Colour Widget", 1.0, 0.0, 0.0)
         layout.addWidget(self.rgb_colour_widget, 5, 0)
-        self.rgba_colour_widget = RGBAColourWidget("RGB Colour Widget", 1.0, 0.0, 0.0, 1.0, self)
+        self.rgba_colour_widget = RGBAColourWidget(self, "RGB Colour Widget", 1.0, 0.0, 0.0, 1.0)
         layout.addWidget(self.rgba_colour_widget, 6, 0)
 
         self.setLayout(layout)

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/lookatwidget.py

@@ -11,7 +11,7 @@ class LookAtWidget(QFrame):
 
     valueChanged = Signal(Mat4)
 
-    def __init__(self, name: str, eye=Vec3(2, 2, 2), look=Vec3(0, 0, 0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", eye=Vec3(2, 2, 2), look=Vec3(0, 0, 0)) -> None:
         """
         Args:
             name: The name of the widget.
@@ -38,8 +38,8 @@ class LookAtWidget(QFrame):
         content_layout = QVBoxLayout(self._content_widget)
         content_layout.setContentsMargins(0, 0, 0, 0)
 
-        self._eye = Vec3Widget("Eye", eye, self)
-        self._look = Vec3Widget("Look", look, self)
+        self._eye = Vec3Widget(self, "Eye", eye)
+        self._look = Vec3Widget(self, "Look", look)
         self._up = QComboBox(self)
         for v in ["y-up", "x-up", "z-up"]:
             self._up.addItem(v)

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/rgbacolourwidget.py

@@ -22,7 +22,15 @@ class RGBAColourWidget(QFrame):
     bValueChanged = Signal(float)
     aValueChanged = Signal(float)
 
-    def __init__(self, name: str, r: float, g: float, b: float, a: float, parent: QWidget | None = None) -> None:
+    def __init__(
+        self,
+        parent: QWidget | None = None,
+        name: str = "",
+        r: float = 1.0,
+        g: float = 1.0,
+        b: float = 1.0,
+        a: float = 1.0,
+    ) -> None:
         """
         Args:
             name: The name of the widget.

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/rgbcolourwidget.py

@@ -21,7 +21,9 @@ class RGBColourWidget(QFrame):
     gValueChanged = Signal(float)
     bValueChanged = Signal(float)
 
-    def __init__(self, name: str, r: float, g: float, b: float, parent: QWidget | None = None) -> None:
+    def __init__(
+        self, parent: QWidget | None = None, name: str = "", r: float = 1.0, g: float = 1.0, b: float = 1.0
+    ) -> None:
         """
         Args:
             name: The name of the widget.

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/transformwidget.py

@@ -12,7 +12,7 @@ class TransformWidget(QFrame):
     valueChanged = Signal(Mat4)
     _rotation_order = ["xyz", "yzx", "zxy", "xzy", "yxz", "zyx"]
 
-    def __init__(self, name: str, parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "") -> None:
         """
         Args:
             name: The name of the widget.
@@ -39,9 +39,9 @@ class TransformWidget(QFrame):
         content_layout = QVBoxLayout(self._content_widget)
         content_layout.setContentsMargins(0, 0, 0, 0)
 
-        self._position = Vec3Widget("Position", Vec3(0.0, 0.0, 0.0), self)
-        self._rotation = Vec3Widget("Rotation", Vec3(0.0, 0.0, 0.0), self)
-        self._scale = Vec3Widget("Scale", Vec3(1.0, 1.0, 1.0), self)
+        self._position = Vec3Widget(self, "Position", Vec3(0.0, 0.0, 0.0))
+        self._rotation = Vec3Widget(self, "Rotation", Vec3(0.0, 0.0, 0.0))
+        self._scale = Vec3Widget(self, "Scale", Vec3(1.0, 1.0, 1.0))
         self._rot_order = QComboBox(self)
         for v in self._rotation_order:
             self._rot_order.addItem(v)

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/vec2widget.py

@@ -11,7 +11,7 @@ class Vec2Widget(QFrame):
     xValueChanged = Signal(float)
     yValueChanged = Signal(float)
 
-    def __init__(self, name: str, value: Vec2 = Vec2(0.0, 0.0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", value: Vec2 = Vec2(0.0, 0.0)) -> None:
         """
         Args:
             name: The name of the widget.

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/vec3widget.py

@@ -12,7 +12,7 @@ class Vec3Widget(QFrame):
     yValueChanged = Signal(float)
     zValueChanged = Signal(float)
 
-    def __init__(self, name: str, value: Vec3 = Vec3(0.0, 0.0, 0.0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", value: Vec3 = Vec3(0.0, 0.0, 0.0)) -> None:
         """
         Args:
             name: The name of the widget.

{ncca_ngl-0.3.1 → ncca_ngl-0.3.2}/src/ncca/ngl/widgets/vec4widget.py

@@ -13,7 +13,7 @@ class Vec4Widget(QFrame):
     zValueChanged = Signal(float)
     wValueChanged = Signal(float)
 
-    def __init__(self, name: str, value: Vec4 = Vec4(0.0, 0.0, 0.0, 1.0), parent: QWidget | None = None) -> None:
+    def __init__(self, parent: QWidget | None = None, name: str = "", value: Vec4 = Vec4(0.0, 0.0, 0.0, 1.0)) -> None:
         """
         Args:
             name: The name of the widget.