Added __slots__ to all Python interface classes

Signed-off-by: Bhavye Mathur <bhavyemathur@gmail.com>

goopylib/color/color.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import Union
+from typing import Union, NoReturn
 
 # pylint: disable-next=no-name-in-module, import-error
 import goopylib.ext.color as _color
@@ -36,6 +36,8 @@ class Color:
         Color(60, 180, 90)
     """
 
+    __slots__ = ["_color"]
+
     def __init__(self, *args) -> None:
         """
         Create colors by passing RGB arguments or a hexstring.

goopylib/core/window.py

@@ -31,6 +31,8 @@ class Window:
         title: displayed in the title bar
     """
 
+    __slots__ = ["_window", "_background", "_camera"]
+
     def __init__(self, width: int, height: int, title: str = "goopylib Window") -> None:
         """
         Creates a window that can be used to draw graphics and widgets.

goopylib/layout/_internal.py

@@ -15,6 +15,9 @@
 
 
 class _LRTB:
+
+    __slots__ = ["_left", "_right", "_top", "_bottom", "_x", "_y"]
+
     def __init__(self, left: int, right: int, top: int, bottom: int):
         self._left = left
         self._right = right
@@ -232,6 +235,9 @@ def translate(self, dx: int, dy: int) -> None:
 
 
 class _Dimension(int):
+
+    __slots__ = ["_dimension", "_unit"]
+
     def __new__(cls, value: Union[int, str]) -> int:
         x = int.__new__(cls, _Dimension._parse_dimension(value)[0])
         return x

goopylib/layout/div.py

@@ -17,6 +17,9 @@ class Div:
     _context_tree: List[Div] = []
     _instances: List[Div] = []  # could consider making a dictionary
 
+    __slots__ = ["_width", "_height", "_min_width", "_min_height", "_max_width", "_max_height", "_margin", "_padding",
+                 "_flex", "_children", "_parent", "_classes", "_layer", "_margin_box", "_padding_box", "_content_box"]
+
     def __init__(self,
                  width: Union[int, str],
                  height: Union[int, str],

goopylib/layout/flex.py

@@ -21,6 +21,9 @@ class Flex:
     A class storing a container's flex properties
     """
 
+    __slots__ = ["_wrap", "_align", "_cross_align", "_item_align", "_row_gap", "_column_gap", "_direction", "_order",
+                 "_grow", "_cross_align_self"]
+
     def __init__(self,
                  wrap: _FLEX_WRAP_TYPE = "nowrap",
                  align: _FLEX_ALIGN_TYPE = "start",

goopylib/maths/easing.py

@@ -13,6 +13,8 @@
 class EasingType:
     """Generic Easing Type"""
 
+    __slots__ = []
+
     def __call__(self, t: float) -> float:
         """
         Raises:

goopylib/maths/packing/packing.py

@@ -21,6 +21,8 @@ class Item:
     Class representing a rectangular object to be packed.
     """
 
+    __slots__ = ["_width", "_height", "_long_side", "_short_side", "_x", "_y", "_rotated", "_id"]
+
     items: int = 0
 
     def __init__(self, width: float, height: float) -> None:
@@ -168,6 +170,8 @@ class Bin:
     Class representing the maximum area in which to pack Items
     """
 
+    __slots__ = ["_width", "_height", "_items", "_id"]
+
     bins: int = 0
 
     def __init__(self, width: float, height: float) -> None:
@@ -233,6 +237,8 @@ class PackingAlgorithm:
         bin_height: the maximum height of the packed bin
     """
 
+    __slots__ = ["_bin_width", "_bin_height", "_bins"]
+
     def __init__(self, bin_width: float, bin_height: float):
         """
         A class representing a rectangle packing algorithm.

goopylib/maths/packing/shelf.py

@@ -26,6 +26,8 @@ class Shelf:
         bin: the bin associated with the shelf
     """
 
+    __slots__ = ["width", "height", "packed_width", "available_width", "vertical_offset", "is_open", "bin", "items"]
+
     def __init__(self, vertical_offset: float, bin: ShelvedBin) -> None:
         """
         Class representing a single shelf (row) for shelf-based packing algorithms
@@ -108,6 +110,8 @@ class ShelvedBin(Bin):
         height: of the bin
     """
 
+    __slots__ = ["open_shelf", "shelves"]
+
     def __init__(self, width: float, height: float) -> None:
         """
         Class representing the maximum area in which to pack Items broken down into shelves
@@ -238,6 +242,8 @@ class NextFit(ShelfPackingAlgorithm):
         bin_height: the maximum height of the packed bin
     """
 
+    __slots__ = ["_shelf"]
+
     def __init__(self, bin_width: float, bin_height: float):
         """
         A class representing a shelf-based, next-fit packing algorithm.
@@ -285,6 +291,8 @@ class FirstFit(ShelfPackingAlgorithm):
         bin_height: the maximum height of the packed bin
     """
 
+    __slots__ = ["_shelf"]
+
     def __init__(self, bin_width: float, bin_height: float):
         """
         A class representing a shelf-based, first-fit packing algorithm.
@@ -344,6 +352,8 @@ class ScoredFit(ShelfPackingAlgorithm):
         bin_height: the maximum height of the packed bin
     """
 
+    __slots__ = ["_shelf", "_scoring_func"]
+
     def __init__(self, bin_width: float, bin_height: float, scoring_function: Callable[[Shelf, Item], float]):
         """
         A class representing a shelf-based, scored-fit packing algorithm.

goopylib/objects/renderable/renderable.py

@@ -4,7 +4,7 @@
 
 from __future__ import annotations
 
-from typing import Tuple
+from typing import Tuple, Union
 
 from goopylib.core.window import Window
 
@@ -15,6 +15,8 @@ class Renderable:
     The methods provided can be called by any other goopylib objects.
     """
 
+    __slots__ = ["_renderable", "_window"]
+
     # pylint: disable-next=super-init-not-called
     def __init__(self) -> None:
         """
@@ -25,7 +27,7 @@ def __init__(self) -> None:
             NotImplementedError: cannot directly initialize a Renderable
         """
         self._renderable = None
-        self.window: Window = None
+        self._window: Union[Window, None] = None
 
     def __repr__(self) -> str:
         return self._renderable.__repr__()
@@ -43,7 +45,7 @@ def draw(self, window: Window) -> Renderable:
         """
         if isinstance(window, Window):
             self._renderable.draw(window._window)
-            self.window = window
+            self._window = window
         else:
             self._renderable.draw(window)
         return self
@@ -130,6 +132,13 @@ def set_size(self, width: float, height: float) -> None:
         """
         return self._renderable.set_size(width, height)
 
+    @property
+    def window(self) -> Union[Window, None]:
+        """
+        The window the object is drawn to (or None)
+        """
+        return self._window
+
     @property
     def x(self) -> float:
         """

goopylib/scene/camera.py

@@ -60,6 +60,8 @@ class Camera:
         TypeError: arguments must be numbers
     """
 
+    __slots__ = ["_camera"]
+
     def __init__(self, left: float, right: float, bottom: float, top: float) -> None:
         """
         An orthographic camera associated with a Window.

goopylib/scene/camera_controller.py

@@ -21,6 +21,8 @@ class CameraController:
         TypeError: window must be a goopylib Window
     """
 
+    __slots__ = ["_window", "_controller"]
+
     def __init__(self, window: Window) -> None:
         """
         Controller class that automatically manages camera movement, rotation, and zoom.

src/goopylib/core/Core.cpp

@@ -1,4 +1,4 @@
-#define GP_LOGGING_LEVEL 6
+#define GP_LOGGING_LEVEL 3
 
 #include "Core.h"
 #include "src/goopylib/core/Window.h"

src/goopylib/core/VertexArray.cpp

@@ -1,4 +1,4 @@
-#define GP_LOGGING_LEVEL 6
+#define GP_LOGGING_LEVEL 3
 
 #include "src/goopylib/core/VertexArray.h"
 

src/goopylib/scene/Renderer.cpp

@@ -1,4 +1,4 @@
-#define GP_LOGGING_LEVEL 6
+#define GP_LOGGING_LEVEL 3
 
 #include "Renderer.h"