updated tests for vec array types

Author: jmacey

src/ncca/ngl/vec2.py

@@ -267,7 +267,7 @@ def __repr__(self):
 
     def __truediv__(self, rhs):
         if isinstance(rhs, (float, int)):
-            if math.isclose(rhs, 0.0):
+            if rhs == 0.0:
                 raise ZeroDivisionError("division by zero")
             r = Vec2()
             r._data = self._data / rhs

src/ncca/ngl/vec2_array.py

@@ -86,6 +86,20 @@ def __iter__(self):
             row = self._data[i]
             yield Vec2(row[0], row[1])
 
+    def __eq__(self, other):
+        """
+        Compare two Vec2Array instances for equality.
+
+        Args:
+            other: Another Vec2Array instance to compare with.
+
+        Returns:
+            bool: True if the arrays contain the same data, False otherwise.
+        """
+        if not isinstance(other, Vec2Array):
+            return NotImplemented
+        return np.array_equal(self._data, other._data)
+
     def append(self, value):
         """
         Append a Vec2 object to the array.

src/ncca/ngl/vec3.py

@@ -333,7 +333,7 @@ def __truediv__(self, rhs):
             ValueError: If the right-hand side is not a float.
         """
         if isinstance(rhs, (float, int)):
-            if math.isclose(rhs, 0.0):
+            if rhs == 0.0:
                 raise ZeroDivisionError("division by zero")
             r = Vec3()
             r._data = self._data / rhs

src/ncca/ngl/vec3_array.py

@@ -86,6 +86,20 @@ def __iter__(self):
             row = self._data[i]
             yield Vec3(row[0], row[1], row[2])
 
+    def __eq__(self, other):
+        """
+        Compare two Vec3Array instances for equality.
+
+        Args:
+            other: Another Vec3Array instance to compare with.
+
+        Returns:
+            bool: True if the arrays contain the same data, False otherwise.
+        """
+        if not isinstance(other, Vec3Array):
+            return NotImplemented
+        return np.array_equal(self._data, other._data)
+
     def append(self, value):
         """
         Append a Vec3 object to the array.

src/ncca/ngl/vec4.py

@@ -148,7 +148,7 @@ def __rmul__(self, rhs):
 
     def __truediv__(self, rhs):
         if isinstance(rhs, (float, int)):
-            if math.isclose(rhs, 0.0):
+            if rhs == 0.0:
                 raise ZeroDivisionError("division by zero")
             r = Vec4()
             r._data = self._data / rhs

src/ncca/ngl/vec4_array.py

@@ -86,6 +86,20 @@ def __iter__(self):
             row = self._data[i]
             yield Vec4(row[0], row[1], row[2], row[3])
 
+    def __eq__(self, other):
+        """
+        Compare two Vec4Array instances for equality.
+
+        Args:
+            other: Another Vec4Array instance to compare with.
+
+        Returns:
+            bool: True if the arrays contain the same data, False otherwise.
+        """
+        if not isinstance(other, Vec4Array):
+            return NotImplemented
+        return np.array_equal(self._data, other._data)
+
     def append(self, value):
         """
         Append a Vec4 object to the array.

tests/test_util.py

@@ -1,16 +1,6 @@
 import pytest
 
-from ncca.ngl import (
-    Mat4,
-    Vec3,
-    calc_normal,
-    clamp,
-    frustum,
-    lerp,
-    look_at,
-    ortho,
-    perspective,
-)
+from ncca.ngl import Mat4, PerspMode, Vec3, calc_normal, clamp, frustum, lerp, look_at, ortho, perspective
 
 
 def test_clamp():
@@ -58,18 +48,28 @@ def test_perspective():
 
     assert project.to_list() == pytest.approx(result.to_list(), abs=1e-3)
 
+    # fmt: off
+    result=Mat4.from_list([1.69749,0,0,0,0,2.41421,0,0,0,0,-1.002004008016032,-1,0,0,-0.02004008016032064,0])
+    # fmt: on
+
+    project = perspective(fov, aspect, near, far, PerspMode.WebGPU)
+    assert project.to_list() == pytest.approx(result.to_list(), abs=1e-3)
+
 
 def test_ortho():
     project = ortho(-1.0, 1.0, -1.0, 1.0, 1.0, -1.0)
     # fmt:  off
     m = [ +1.000000,+0.000000, +0.000000, -0.000000, +0.000000, +1.000000,  +0.000000,-0.000000,+0.000000,+0.000000,+1.000000,+0.000000,+0.000000,+0.000000,+0.000000,+1.000000,]
     # fmt: on
-
     result = Mat4.from_list(m)
+    # fmt:  off
 
+    assert project.to_list() == pytest.approx(result.to_list(), abs=1e-3)
+    m = [ +1.000000,+0.000000, +0.000000, -0.000000, +0.000000, +1.000000,  +0.000000,-0.000000,+0.000000,+0.000000,+0.500000,+0.000000,+0.000000,+0.000000,+0.500000,+1.000000,]
     # fmt: on
+    result = Mat4.from_list(m)
 
-    assert project.to_list() == pytest.approx(result.to_list(), abs=1e-3)
+    project = ortho(-1.0, 1.0, -1.0, 1.0, 1.0, -1.0, PerspMode.WebGPU)
 
 
 def test_calc_normal():

tests/test_vec2.py

@@ -189,6 +189,25 @@ def test_truediv():
     v2 = v / 2.0
     assert v2.x == pytest.approx(1.0)
     assert v2.y == pytest.approx(2.0)
+    with pytest.raises(ValueError):
+        _ = v / "a"
+
+
+def test_div():
+    v = Vec2(2.0, 4.0)
+    v2 = v / 2.0
+    assert v2.x == pytest.approx(1.0)
+    assert v2.y == pytest.approx(2.0)
+    with pytest.raises(ZeroDivisionError):
+        _ = v / 0.0
+    with pytest.raises(ZeroDivisionError):
+        _ = v / Vec2(0.0, 0.0)
+
+    # v3 = v / Vec2(2.0, 2.0)
+    # result = v2 / v3
+    # print(result)
+    # assert result.x == pytest.approx(1.0)
+    # assert result.y == pytest.approx(2.0)
 
 
 def test_str():

tests/test_vec2_array.py

@@ -33,6 +33,27 @@ def test_append():
         a.append("not a vec2")
 
 
+def test_get_array():
+    """Test the get_array method"""
+    a = Vec2Array([Vec2(1, 2), Vec2(4, 5)])
+    arr = a.get_array()
+    assert len(arr) == 2
+    assert np.equal(arr[0], np.array([1.0, 2.0])).all()
+    assert np.equal(arr[1], np.array([4.0, 5.0])).all()
+
+
+def test_setitem():
+    """Test the __setitem__ method"""
+    a = Vec2Array([Vec2(1, 2), Vec2(4, 5)])
+    v = Vec2(7, 8)
+    a[1] = v
+    assert len(a) == 2
+    assert a[0] == Vec2(1, 2)
+    assert a[1] == v
+    with pytest.raises(TypeError):
+        a[1] = "not a vec2"
+
+
 def test_extend():
     """Test the extend method"""
     a = Vec2Array()
@@ -45,6 +66,18 @@ def test_extend():
         a.extend(["not a vec2"])
 
 
+def test_extend_existing():
+    """Test the extend method with existing array"""
+    a = Vec2Array([Vec2(1, 2), Vec2(4, 5)])
+    v = [Vec2(7, 8), Vec2(10, 11)]
+    a.extend(v)
+    assert len(a) == 4
+    assert a[2] == Vec2(7, 8)
+    assert a[3] == Vec2(10, 11)
+    with pytest.raises(TypeError):
+        a.extend(["not a vec2"])
+
+
 def test_getitem():
     """Test the __getitem__ method"""
     v = [Vec2(1, 2), Vec2(4, 5)]
@@ -104,6 +137,16 @@ def test_str():
     assert str(a) == "[Vec2 [1.0,2.0]]"
 
 
+def test_eq():
+    """Test the __eq__ method"""
+    a = Vec2Array([Vec2(1, 2), Vec2(4, 5)])
+    b = Vec2Array([Vec2(1, 2), Vec2(4, 5)])
+    assert a == b
+    c = Vec2Array([Vec2(1, 2), Vec2(4, 6)])
+    assert a != c
+    assert a.__eq__(1) == NotImplemented
+
+
 def test_sizeof():
     a = Vec2Array()
     assert a.sizeof() == 0
@@ -115,3 +158,14 @@ def test_sizeof():
     assert a.sizeof() == 3 * Vec2.sizeof()
     a.append(Vec2())
     assert a.sizeof() == 4 * Vec2.sizeof()
+
+
+def test_slice():
+    """Test the __getitem__ method with slice"""
+    v = [Vec2(1, 2), Vec2(4, 5), Vec2(7, 8)]
+    a = Vec2Array(v)
+    assert a[0:2] == Vec2Array([Vec2(1, 2), Vec2(4, 5)])
+    assert a[1:] == Vec2Array([Vec2(4, 5), Vec2(7, 8)])
+    assert a[:] == Vec2Array(v)
+    with pytest.raises(IndexError):
+        _ = a[3]

tests/test_vec3_array.py

@@ -33,6 +33,27 @@ def test_append():
         a.append("not a vec3")
 
 
+def test_get_array():
+    """Test the get_array method"""
+    a = Vec3Array([Vec3(1, 2, 3), Vec3(4, 5, 6)])
+    arr = a.get_array()
+    assert len(arr) == 2
+    assert np.equal(arr[0], np.array([1.0, 2.0, 3.0])).all()
+    assert np.equal(arr[1], np.array([4.0, 5.0, 6.0])).all()
+
+
+def test_setitem():
+    """Test the __setitem__ method"""
+    a = Vec3Array([Vec3(1, 2, 3), Vec3(4, 5, 6)])
+    v = Vec3(7, 8, 9)
+    a[1] = v
+    assert len(a) == 2
+    assert a[0] == Vec3(1, 2, 3)
+    assert a[1] == v
+    with pytest.raises(TypeError):
+        a[1] = "not a vec3"
+
+
 def test_getitem():
     """Test the __getitem__ method"""
     v = [Vec3(1, 2, 3), Vec3(4, 5, 6)]
@@ -94,6 +115,18 @@ def test_extend():
         a.extend(["not a vec3"])
 
 
+def test_extend_existing():
+    """Test the extend method with existing array"""
+    a = Vec3Array([Vec3(1, 2, 3), Vec3(4, 5, 6)])
+    v = [Vec3(7, 8, 9), Vec3(10, 11, 12)]
+    a.extend(v)
+    assert len(a) == 4
+    assert a[2] == Vec3(7, 8, 9)
+    assert a[3] == Vec3(10, 11, 12)
+    with pytest.raises(TypeError):
+        a.extend(["not a vec3"])
+
+
 def test_repr():
     a = Vec3Array([Vec3(1, 2, 3)])
     assert repr(a) == "Vec3Array([Vec3 [1.0,2.0,3.0]])"
@@ -130,3 +163,24 @@ def test_setitem():
     # Test index out of range
     with pytest.raises(IndexError):
         a[2] = Vec3()
+
+
+def test_eq():
+    """Test the __eq__ method"""
+    a = Vec3Array([Vec3(1, 2, 3), Vec3(4, 5, 6)])
+    b = Vec3Array([Vec3(1, 2, 3), Vec3(4, 5, 6)])
+    assert a == b
+    c = Vec3Array([Vec3(1, 2, 3), Vec3(4, 5, 7)])
+    assert a != c
+    assert a.__eq__(1) == NotImplemented
+
+
+def test_slice():
+    """Test the __getitem__ method with slice"""
+    v = [Vec3(1, 2, 3), Vec3(5, 6, 7), Vec3(9, 10, 11)]
+    a = Vec3Array(v)
+    assert a[0:2] == Vec3Array([Vec3(1, 2, 3), Vec3(5, 6, 7)])
+    assert a[1:] == Vec3Array([Vec3(5, 6, 7), Vec3(9, 10, 11)])
+    assert a[:] == Vec3Array(v)
+    with pytest.raises(IndexError):
+        _ = a[3]