Add propane and initial scene grammar

.gitignore

@@ -1,5 +1,6 @@
 /fart
 *.bmp
 *.png
+/.propane*
 /.rscons*
 /build/

Rsconscript

@@ -6,7 +6,16 @@ fart_env = env "fart" do |env|
   env["DFLAGS"] += %w[-Werror -O2]
   env["D_IMPORT_PATH"] += %w[src]
 
-  env["sources"] = glob("src/**/*.d")
+  env.Command("^/src/sceneparser.d", "src/sceneparser.propane",
+              "CMD" => %w[./propane ${_SOURCES} ${_TARGET}],
+              "CMD_DESC" => "Generating scene parser")
+  env.add_build_hook do |builder|
+    if builder.sources.first =~ /sceneparser\.d/
+      builder.vars["DFLAGS"] -= %w[-Werror]
+    end
+  end
+
+  env["sources"] = glob("src/**/*.d") + ["^/src/sceneparser.d"]
   env.Program("fart", "${sources}")
 end
 

propane

@@ -0,0 +1,45 @@
+#!/usr/bin/env ruby
+
+# The MIT License (MIT)
+#
+# Copyright (c) 2010-2023 Josh Holtrop
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the "Software"), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+# THE SOFTWARE.
+
+
+script = File.join(File.dirname(__FILE__), ".propane-1.0.0-5dab693259ff5ad86cc8d86fdd20c552.rb")
+unless File.exist?(script)
+  if File.read(__FILE__, mode: "rb") =~ /^#==>(.*)/
+    require "zlib"
+    require "base64"
+    encoded_compressed = $1
+    unescaped_compressed = Base64.decode64(encoded_compressed)
+    inflated = Zlib::Inflate.inflate(unescaped_compressed)
+    File.open(script, "wb") do |fh|
+      fh.write(inflated)
+    end
+  else
+    raise "Could not decompress."
+  end
+end
+load script
+if __FILE__ == $0
+  Propane::CLI.new.run(ARGV)
+end
+#==>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 truncated

src/fart/color.d

@@ -40,4 +40,6 @@ struct Color
     {
         return cast(ubyte)(0xFF * v);
     }
+
+    public static immutable Color TRANSPARENT = Color(0, 0, 0, 0);
 }

src/fart/main.d

@@ -1,7 +1,27 @@
-import fart.png;
+module fart.main;
 
+import fart.png;
+import fart.color;
+
+/**
+ * Main program entry point.
+ *
+ * @param args
+ *   Program arguments.
+ */
 int main(string[] args)
 {
-    png_test();
+    size_t width = 800;
+    size_t height = 600;
+    string output_filename = "out.png";
+    Color[] pixels = [];
+    for (size_t y = 0; y < height; y++)
+    {
+        for (size_t x = 0; x < width; x++)
+        {
+            pixels ~= Color.TRANSPARENT;
+        }
+    }
+    write_png(output_filename, width, height, pixels);
     return 0;
 }

src/fart/png.d

@@ -1,15 +1,21 @@
 module fart.png;
 
 import std.zlib;
-import std.math;
 import std.digest;
 
 import fart.bfile;
 import fart.crc32;
 import fart.hton;
+import fart.color;
 
+/**
+ * PNG file header.
+ */
 private immutable ubyte[] HEADER = [0x89, 0x50, 0x4E, 0x47, 0x0D, 0x0A, 0x1A, 0x0A];
 
+/**
+ * PNG IHDR chunk.
+ */
 struct IHDR
 {
     uint width;
@@ -21,10 +27,10 @@ struct IHDR
     ubyte interlace;
     ubyte[0] end;
 
-    this(uint width, uint height)
+    this(size_t width, size_t height)
     {
-        this.width = htonl(width);
-        this.height = htonl(height);
+        this.width = htonl(cast(uint)width);
+        this.height = htonl(cast(uint)height);
         this.bit_depth = 8;
         this.color_type = 6;
         this.compression = 0;
@@ -43,6 +49,9 @@ struct IHDR
     }
 }
 
+/**
+ * PNG IDAT chunk.
+ */
 struct IDAT
 {
     private const(ubyte)[] m_data;
@@ -63,6 +72,9 @@ struct IDAT
     }
 }
 
+/**
+ * PNG IEND chunk.
+ */
 struct IEND
 {
     public const(void) * data()
@@ -76,6 +88,16 @@ struct IEND
     }
 }
 
+/**
+ * Write a PNG chunk to the output file.
+ *
+ * @param file
+ *   Output file
+ * @param chunk_type
+ *   Chunk type.
+ * @param chunk
+ *   Chunk to write.
+ */
 private void write_chunk(Chunk)(BFile file, string chunk_type, Chunk chunk)
 {
     size_t chunk_data_length = chunk.data_length();
@@ -88,34 +110,49 @@ private void write_chunk(Chunk)(BFile file, string chunk_type, Chunk chunk)
     file.writeObject(crc_be32);
 }
 
-public void write_png(string filename, uint width, uint height, ubyte[] data)
+/**
+ * Write a PNG image from the given metadata and pixel data.
+ *
+ * @param filename
+ *   Name of file to write.
+ * @param width
+ *   Width of image.
+ * @param height
+ *   Height of image.
+ * @param data
+ *   Pixel color data.
+ */
+public void write_png(string filename, size_t width, size_t height, const(Color)[] data)
 {
-    BFile file = BFile(filename);
-    file.write(HEADER);
-    IHDR ihdr = IHDR(width, height);
-    write_chunk(file, "IHDR", ihdr);
-    IDAT idat = IDAT(data);
-    write_chunk(file, "IDAT", idat);
-    IEND iend;
-    write_chunk(file, "IEND", iend);
-    file.close();
-}
+    if (data.length != width * height)
+        return;
 
-void png_test()
-{
-    ubyte[] pixel_data = [];
-    for (size_t y = 0; y < 500; y++)
+    /* Convert Color values to 32-bit RGBA values. */
+    ubyte[] pixel_data;
+    size_t data_index;
+    for (size_t y = 0; y < height; y++)
     {
         /* Filter method 0 (None) */
-        pixel_data ~= [0];
-        for (size_t x = 0; x < 500; x++)
+        pixel_data ~= 0;
+        for (size_t x = 0; x < width; x++)
         {
-            ubyte r = cast(ubyte)(x / 2);
-            ubyte g = 0x80;
-            ubyte b = cast(ubyte)((500 - y) / 2);
-            ubyte a = cast(ubyte)((abs(cast(int)x - 250) + abs(cast(int)y - 250)) / 2);
-            pixel_data ~= [r, g, b, a];
+            pixel_data ~= data[data_index++].rgba32();
         }
     }
-    write_png("out.png", 500, 500, pixel_data);
+
+    /* Open output file. */
+    BFile file = BFile(filename);
+    /* Write PNG header. */
+    file.write(HEADER);
+    /* Write IHDR chunk. */
+    IHDR ihdr = IHDR(width, height);
+    write_chunk(file, "IHDR", ihdr);
+    /* Write IDAT chunk. */
+    IDAT idat = IDAT(pixel_data);
+    write_chunk(file, "IDAT", idat);
+    /* Write IEND chunk. */
+    IEND iend;
+    write_chunk(file, "IEND", iend);
+    /* Close output file. */
+    file.close();
 }

src/sceneparser.propane

@@ -0,0 +1,22 @@
+<<
+import std.conv;
+>>
+
+token background;
+token comma /,/;
+token number /\d+(\.\d+)?/;
+token lt /</;
+token gt />/;
+token semicolon /;/;
+
+Start -> Statements;
+
+Statements -> ;
+
+Statements -> Statement Statements;
+
+Statement -> BackgroundStatement;
+
+BackgroundStatement -> background Vec3 semicolon;
+
+Vec3 -> lt number comma number comma number gt;