refactor atlas implementation

demo/cube3d.fnl

@@ -8,6 +8,17 @@
 (var wireframe true)
 (var time 0)
 (var zoom 5.0)
+(var texture-id nil)
+(var use-texture false)
+(var affine false)
+(var texture-initialized false)
+
+(fn init-texture []
+  (when (not texture-initialized)
+    (pxl8.load_palette "sprites/pxl8_logo.ase")
+    (set texture-id (pxl8.load_sprite "sprites/pxl8_logo.ase"))
+    (pxl8.upload_atlas)
+    (set texture-initialized true)))
 
 (fn make-cube-vertices []
   [[-1 -1 -1] [1 -1 -1] [1 1 -1] [-1 1 -1]
@@ -21,6 +32,20 @@
    [3 2 6] [3 6 7]
    [4 5 1] [4 1 0]])
 
+(fn make-cube-faces-with-uvs []
+  [{:tri [0 1 2] :uvs [[0 0] [1 0] [1 1]]}
+   {:tri [0 2 3] :uvs [[0 0] [1 1] [0 1]]}
+   {:tri [1 5 6] :uvs [[0 0] [1 0] [1 1]]}
+   {:tri [1 6 2] :uvs [[0 0] [1 1] [0 1]]}
+   {:tri [5 4 7] :uvs [[0 0] [1 0] [1 1]]}
+   {:tri [5 7 6] :uvs [[0 0] [1 1] [0 1]]}
+   {:tri [4 0 3] :uvs [[0 0] [1 0] [1 1]]}
+   {:tri [4 3 7] :uvs [[0 0] [1 1] [0 1]]}
+   {:tri [3 2 6] :uvs [[0 0] [1 0] [1 1]]}
+   {:tri [3 6 7] :uvs [[0 0] [1 1] [0 1]]}
+   {:tri [4 5 1] :uvs [[0 0] [1 0] [1 1]]}
+   {:tri [4 1 0] :uvs [[0 0] [1 1] [0 1]]}])
+
 (fn get-face-color [face-idx]
   (let [colors [12 22 30 16 28 20]]
     (. colors (+ 1 (% face-idx 6)))))
@@ -43,10 +68,16 @@
 
   (when (pxl8.key_pressed " ")
     (set wireframe (not wireframe)))
-  (when (pxl8.key_pressed "r")
-    (set auto-rotate (not auto-rotate)))
+  (when (pxl8.key_pressed "f")
+    (set affine (not affine)))
   (when (pxl8.key_pressed "p")
     (set orthographic (not orthographic)))
+  (when (pxl8.key_pressed "r")
+    (set auto-rotate (not auto-rotate)))
+  (when (pxl8.key_pressed "t")
+    (set use-texture (not use-texture))
+    (when use-texture
+      (init-texture)))
 
   (when (pxl8.key_down "=")
     (set zoom (- zoom (* dt 2.0))))
@@ -63,8 +94,9 @@
   (pxl8.clr 0)
 
   (pxl8.clear_zbuffer)
-  (pxl8.set_wireframe wireframe)
+  (pxl8.set_affine_textures affine)
   (pxl8.set_backface_culling true)
+  (pxl8.set_wireframe wireframe)
 
   (if orthographic
       (let [size (* 2.5 (/ zoom 5.0))
@@ -84,15 +116,36 @@
                   (pxl8.mat4_multiply (pxl8.mat4_rotate_z angle-z)))]
     (pxl8.set_model model))
 
-  (let [vertices (make-cube-vertices)
-        faces (make-cube-faces)]
-    (each [i face (ipairs faces)]
-      (let [[i0 i1 i2] face
-            v0 (. vertices (+ 1 i0))
-            v1 (. vertices (+ 1 i1))
-            v2 (. vertices (+ 1 i2))
-            color (get-face-color (math.floor (/ (- i 1) 2)))]
-        (pxl8.draw_triangle_3d v0 v1 v2 color)))))
+  (let [vertices (make-cube-vertices)]
+    (if (and use-texture texture-id)
+        (let [faces (make-cube-faces-with-uvs)]
+          (each [i face-data (ipairs faces)]
+            (let [tri-indices face-data.tri
+                  tri-uvs face-data.uvs
+                  v0 (. vertices (+ 1 (. tri-indices 1)))
+                  v1 (. vertices (+ 1 (. tri-indices 2)))
+                  v2 (. vertices (+ 1 (. tri-indices 3)))
+                  uv0 (. tri-uvs 1)
+                  uv1 (. tri-uvs 2)
+                  uv2 (. tri-uvs 3)]
+              (pxl8.draw_triangle_3d_textured
+                v0 v1 v2
+                uv0 uv1 uv2
+                texture-id))))
+        (let [faces (make-cube-faces)]
+          (each [i face (ipairs faces)]
+            (let [[i0 i1 i2] face
+                  v0 (. vertices (+ 1 i0))
+                  v1 (. vertices (+ 1 i1))
+                  v2 (. vertices (+ 1 i2))
+                  color (get-face-color (math.floor (/ (- i 1) 2)))]
+              (pxl8.draw_triangle_3d v0 v1 v2 color))))))
+
+  (pxl8.text "WASD/QE: Rotate | +/-: Zoom | Space: Wire | R: Auto | P: Proj" 5 5 15)
+  (pxl8.text (.. "T: Texture | F: Affine | Mode: "
+                 (if wireframe "Wire" "Fill")
+                 " | Texture: " (if use-texture "On" "Off")
+                 " | Mapping: " (if affine "Affine" "Persp")) 5 15 15))
 
 {:update cube-update
  :frame cube-frame}

demo/main.fnl

@@ -7,6 +7,7 @@
 (var fire-init false)
 (var rain-init false)
 (var snow-init false)
+(var use-nes-palette false)
 
 (var logo-x 256)
 (var logo-y 148)
@@ -15,7 +16,7 @@
 (var logo-sprite nil)
 
 (global init (fn []
-  (pxl8.load_palette "palettes/gruvbox.ase")
+  (pxl8.load_palette "sprites/pxl8_logo.ase")
   (set logo-sprite (pxl8.load_sprite "sprites/pxl8_logo.ase"))
   (set particles (pxl8.particles_new 1000))))
 
@@ -41,6 +42,12 @@
     (set snow-init false))
   (when (pxl8.key_pressed "8")
     (set current-effect 8))
+  (when (pxl8.key_pressed "9")
+    (set use-nes-palette (not use-nes-palette))
+    (local palette-path (if use-nes-palette "palettes/nes.ase" "sprites/pxl8_logo.ase"))
+    (print (.. "Switching to palette: " palette-path))
+    (pxl8.load_palette palette-path)
+    (print "Palette loaded"))
 
   (case current-effect
     1 (do
@@ -63,15 +70,15 @@
         (when logo-sprite
           (pxl8.sprite logo-sprite logo-x logo-y 128 64)))
 
-    2 (pxl8.vfx_plasma time 0.10 0.04 0)
+    2 (pxl8.vfx_plasma time 0.10 0.04 1)
 
     3 (pxl8.vfx_tunnel time 2.0 0.25)
 
     4 (do
         (pxl8.clr 0)
-        (local bars [{:base_y 60 :amplitude 30 :height 16 :speed 2.0 :phase 0 :color 20 :fade_color 10}
-                     {:base_y 180 :amplitude 35 :height 16 :speed 1.8 :phase 2.0 :color 26 :fade_color 10}
-                     {:base_y 300 :amplitude 25 :height 16 :speed 2.2 :phase 4.0 :color 14 :fade_color 10}])
+        (local bars [{:base_y 60 :amplitude 30 :height 16 :speed 2.0 :phase 0 :color 1 :fade_color 18}
+                     {:base_y 180 :amplitude 35 :height 16 :speed 1.8 :phase 2.0 :color 1 :fade_color 27}
+                     {:base_y 300 :amplitude 25 :height 16 :speed 2.2 :phase 4.0 :color 1 :fade_color 24}])
         (pxl8.vfx_raster_bars bars time))
 
     5 (do