feat: move back to static methods & add fonts to drawing api

Author: hoffstadt

.vscode/settings.json

@@ -4,5 +4,9 @@
     "pl_*.m": "objective-c",
     "*.inc": "c"
    },
-  "python.analysis.extraPaths": ["./build"]
+  "python.analysis.extraPaths": [
+    "./build"
+  ],
+  "python.analysis.autoImportCompletions": true,
+  "python.analysis.typeCheckingMode": "basic"
 }

data/Cousine-Regular.ttf

@@ -18,6 +18,7 @@ class App:
 
     def __init__(self):
         self.ptWindow = None
+        self.ptFont = None
 
     # -------------------------------------------------------------------------
     # Application lifetime
@@ -33,22 +34,22 @@ def pl_app_load(self):
         # Mount directories used by the shader system.
         # /shaders points at the Python package shader folder.
         # /shader-temp is where compiled/intermediate shader output can go.
-        pl_vfs_mount_directory("/cache", "cache")
-        pl_vfs_mount_directory(
+        plVfsI.mount_directory("/cache", "cache")
+        plVfsI.mount_directory(
             "/shaders",
             os.path.dirname(os.path.abspath(pl.__file__)) + "/shaders"
         )
-        pl_vfs_mount_directory("/shader-temp", "shader-temp")
+        plVfsI.mount_directory("/shader-temp", "shader-temp")
 
         # Create and show the OS window.
         window_desc = plWindowDesc()
-        window_desc.pcTitle = "Pilot Light Python - Drawing API Example"
+        window_desc.pcTitle = "Pilot Light Python - Basic Example 0"
         window_desc.iXPos = 100
         window_desc.iYPos = 100
         window_desc.uWidth = 1280
         window_desc.uHeight = 720
-        _, self.ptWindow = pl_window_create(window_desc)
-        pl_window_show(self.ptWindow)
+        _, self.ptWindow = plWindowI.create(window_desc)
+        plWindowI.show(self.ptWindow)
 
         # Initialize the starter extension.
         # We explicitly disable the shader ext from the starter flags because
@@ -57,7 +58,7 @@ def pl_app_load(self):
         starter_flags &= ~plStarterFlag.PL_STARTER_FLAGS_SHADER_EXT
         starter_flags |= plStarterFlag.PL_STARTER_FLAGS_MSAA
 
-        pl_starter_initialize(self.ptWindow, starter_flags)
+        plStarterI.initialize(self.ptWindow, starter_flags)
 
         # Initialize shader system.
         # This is required even for simple drawing examples because the
@@ -72,27 +73,30 @@ def pl_app_load(self):
             | plShaderFlags.PL_SHADER_FLAGS_ALWAYS_COMPILE
         )
 
-        pl_shader_initialize(shader_options)
+        plShaderI.initialize(shader_options)
 
         # Complete starter initialization after custom systems are ready.
-        pl_starter_finalize()
+        plStarterI.finalize()
+
+        ptFontAtlas = plDrawI.get_current_font_atlas()
+        self.ptFont = plDrawI.get_first_font(ptFontAtlas)
 
     def pl_app_shutdown(self):
         """
         Called once when the app exits.
         Flush GPU work, clean up engine systems, then destroy the window.
         """
 
-        pl_graphics_flush_device(pl_starter_get_device())
-        pl_starter_cleanup()
-        pl_window_destroy(self.ptWindow)
+        plGraphicsI.flush_device(plStarterI.get_device())
+        plStarterI.cleanup()
+        plWindowI.destroy(self.ptWindow)
 
     def pl_app_resize(self):
         """
         Called when the window changes size.
         Let the starter extension rebuild any size-dependent resources.
         """
-        pl_starter_resize()
+        plStarterI.resize()
 
     # -------------------------------------------------------------------------
     # Per-frame update
@@ -105,31 +109,31 @@ def pl_app_update(self):
         """
 
         # Begin the frame. If it returns False, skip rendering this frame.
-        if not pl_starter_begin_frame():
+        if not plStarterI.begin_frame():
             return
 
         # Foreground fgLayer is a convenient draw list for 2D overlay-style
         # rendering.
-        fgLayer = pl_starter_get_foreground_layer()
+        fgLayer = plStarterI.get_foreground_layer()
 
         # Outer frame
-        pl_draw_add_rect(
+        plDrawI.add_rect(
             fgLayer,
             [40.0, 40.0],
             [1240.0, 680.0],
             plDrawLineOptions(PL_COLOR_32_YELLOW, 2.0)
         )
 
         # Diagonal guide line
-        pl_draw_add_line(
+        plDrawI.add_line(
             fgLayer,
             [40.0, 40.0],
             [1240.0, 680.0],
             plDrawLineOptions(PL_COLOR_32_GREEN, 2.0)
         )
 
         # Rounded panel region
-        pl_draw_add_rect_rounded(
+        plDrawI.add_rect_rounded(
             fgLayer,
             [70.0, 70.0],
             [500.0, 300.0],
@@ -140,7 +144,7 @@ def pl_app_update(self):
         )
 
         # Triangle outline
-        pl_draw_add_triangle(
+        plDrawI.add_triangle(
             fgLayer,
             [120.0, 240.0],
             [240.0, 120.0],
@@ -149,7 +153,7 @@ def pl_app_update(self):
         )
 
         # Arbitrary quad outline
-        pl_draw_add_quad(
+        plDrawI.add_quad(
             fgLayer,
             [580.0, 100.0],
             [760.0, 120.0],
@@ -159,16 +163,30 @@ def pl_app_update(self):
         )
 
         # Circle outline
-        pl_draw_add_circle(
+        plDrawI.add_circle(
             fgLayer,
             [930.0, 180.0],
             70.0,
             0,  # segment count (0 = automatic/default)
             plDrawLineOptions(PL_COLOR_32_BLUE)
         )
 
+        # Lines
+        plDrawI.add_lines(
+            fgLayer,
+            [
+                [1040.0, 110.0],
+                [1180.0, 250.0],
+                [1140.0, 90.0]
+            ],
+            plDrawLineOptions(PL_COLOR_32_GREEN)
+        )
+
+        # text
+        plDrawI.add_text(fgLayer, [300, 300], "Hello Python", plDrawTextOptions(self.ptFont, 25.0, PL_COLOR_32_CYAN))
+
         # Polygon outline
-        pl_draw_add_polygon(
+        plDrawI.add_polygon(
             fgLayer,
             [
                 [1040.0, 110.0],
@@ -181,7 +199,7 @@ def pl_app_update(self):
             plDrawLineOptions(PL_COLOR_32_RED)
         )
 
-        pl_draw_add_bezier_quad(
+        plDrawI.add_bezier_quad(
             fgLayer,
             [120.0, 420.0],   # start
             [260.0, 320.0],   # control
@@ -191,7 +209,7 @@ def pl_app_update(self):
         )
 
         # Cubic bezier with thicker line
-        pl_draw_add_bezier_cubic(
+        plDrawI.add_bezier_cubic(
             fgLayer,
             [120.0, 560.0],   # start
             [220.0, 460.0],   # control 1
@@ -202,7 +220,7 @@ def pl_app_update(self):
         )
 
         # Filled triangle
-        pl_draw_add_triangle_filled(
+        plDrawI.add_triangle_filled(
             fgLayer,
             [640.0, 420.0],
             [820.0, 360.0],
@@ -211,21 +229,21 @@ def pl_app_update(self):
         )
 
         # Filled-looking composition using multiple primitives
-        pl_draw_add_line(
+        plDrawI.add_line(
             fgLayer,
             [900.0, 360.0],
             [1180.0, 360.0],
             plDrawLineOptions(PL_COLOR_32_WHITE, 4.0)
         )
 
-        pl_draw_add_rect(
+        plDrawI.add_rect(
             fgLayer,
             [920.0, 390.0],
             [1160.0, 560.0],
             plDrawLineOptions(PL_COLOR_32_WHITE, 3.0)
         )
 
-        pl_draw_add_circle(
+        plDrawI.add_circle(
             fgLayer,
             [1040.0, 475.0],
             50.0,
@@ -234,7 +252,7 @@ def pl_app_update(self):
         )
 
         # Submit/present the frame.
-        pl_starter_end_frame()
+        plStarterI.end_frame()
 
 
 # Run the application.