diff --git a/build.zig b/build.zig deleted file mode 100644 index 1bfb163..0000000 --- a/build.zig +++ /dev/null @@ -1,156 +0,0 @@ -const std = @import("std"); - -// Although this function looks imperative, it does not perform the build -// directly and instead it mutates the build graph (`b`) that will be then -// executed by an external runner. The functions in `std.Build` implement a DSL -// for defining build steps and express dependencies between them, allowing the -// build runner to parallelize the build automatically (and the cache system to -// know when a step doesn't need to be re-run). -pub fn build(b: *std.Build) void { - // Standard target options allow the person running `zig build` to choose - // what target to build for. Here we do not override the defaults, which - // means any target is allowed, and the default is native. Other options - // for restricting supported target set are available. - const target = b.standardTargetOptions(.{}); - // Standard optimization options allow the person running `zig build` to select - // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. Here we do not - // set a preferred release mode, allowing the user to decide how to optimize. - const optimize = b.standardOptimizeOption(.{}); - // It's also possible to define more custom flags to toggle optional features - // of this build script using `b.option()`. All defined flags (including - // target and optimize options) will be listed when running `zig build --help` - // in this directory. - - // This creates a module, which represents a collection of source files alongside - // some compilation options, such as optimization mode and linked system libraries. - // Zig modules are the preferred way of making Zig code available to consumers. - // addModule defines a module that we intend to make available for importing - // to our consumers. We must give it a name because a Zig package can expose - // multiple modules and consumers will need to be able to specify which - // module they want to access. - const mod = b.addModule("castle", .{ - // The root source file is the "entry point" of this module. Users of - // this module will only be able to access public declarations contained - // in this file, which means that if you have declarations that you - // intend to expose to consumers that were defined in other files part - // of this module, you will have to make sure to re-export them from - // the root file. - .root_source_file = b.path("src/root.zig"), - // Later on we'll use this module as the root module of a test executable - // which requires us to specify a target. - .target = target, - }); - - // Here we define an executable. An executable needs to have a root module - // which needs to expose a `main` function. While we could add a main function - // to the module defined above, it's sometimes preferable to split business - // business logic and the CLI into two separate modules. - // - // If your goal is to create a Zig library for others to use, consider if - // it might benefit from also exposing a CLI tool. A parser library for a - // data serialization format could also bundle a CLI syntax checker, for example. - // - // If instead your goal is to create an executable, consider if users might - // be interested in also being able to embed the core functionality of your - // program in their own executable in order to avoid the overhead involved in - // subprocessing your CLI tool. - // - // If neither case applies to you, feel free to delete the declaration you - // don't need and to put everything under a single module. - const exe = b.addExecutable(.{ - .name = "castle", - .root_module = b.createModule(.{ - // b.createModule defines a new module just like b.addModule but, - // unlike b.addModule, it does not expose the module to consumers of - // this package, which is why in this case we don't have to give it a name. - .root_source_file = b.path("src/main.zig"), - // Target and optimization levels must be explicitly wired in when - // defining an executable or library (in the root module), and you - // can also hardcode a specific target for an executable or library - // definition if desireable (e.g. firmware for embedded devices). - .target = target, - .optimize = optimize, - // List of modules available for import in source files part of the - // root module. - .imports = &.{ - // Here "castle" is the name you will use in your source code to - // import this module (e.g. `@import("castle")`). The name is - // repeated because you are allowed to rename your imports, which - // can be extremely useful in case of collisions (which can happen - // importing modules from different packages). - .{ .name = "castle", .module = mod }, - }, - }), - }); - - // This declares intent for the executable to be installed into the - // install prefix when running `zig build` (i.e. when executing the default - // step). By default the install prefix is `zig-out/` but can be overridden - // by passing `--prefix` or `-p`. - b.installArtifact(exe); - - // This creates a top level step. Top level steps have a name and can be - // invoked by name when running `zig build` (e.g. `zig build run`). - // This will evaluate the `run` step rather than the default step. - // For a top level step to actually do something, it must depend on other - // steps (e.g. a Run step, as we will see in a moment). - const run_step = b.step("run", "Run the app"); - - // This creates a RunArtifact step in the build graph. A RunArtifact step - // invokes an executable compiled by Zig. Steps will only be executed by the - // runner if invoked directly by the user (in the case of top level steps) - // or if another step depends on it, so it's up to you to define when and - // how this Run step will be executed. In our case we want to run it when - // the user runs `zig build run`, so we create a dependency link. - const run_cmd = b.addRunArtifact(exe); - run_step.dependOn(&run_cmd.step); - - // By making the run step depend on the default step, it will be run from the - // installation directory rather than directly from within the cache directory. - run_cmd.step.dependOn(b.getInstallStep()); - - // This allows the user to pass arguments to the application in the build - // command itself, like this: `zig build run -- arg1 arg2 etc` - if (b.args) |args| { - run_cmd.addArgs(args); - } - - // Creates an executable that will run `test` blocks from the provided module. - // Here `mod` needs to define a target, which is why earlier we made sure to - // set the releative field. - const mod_tests = b.addTest(.{ - .root_module = mod, - }); - - // A run step that will run the test executable. - const run_mod_tests = b.addRunArtifact(mod_tests); - - // Creates an executable that will run `test` blocks from the executable's - // root module. Note that test executables only test one module at a time, - // hence why we have to create two separate ones. - const exe_tests = b.addTest(.{ - .root_module = exe.root_module, - }); - - // A run step that will run the second test executable. - const run_exe_tests = b.addRunArtifact(exe_tests); - - // A top level step for running all tests. dependOn can be called multiple - // times and since the two run steps do not depend on one another, this will - // make the two of them run in parallel. - const test_step = b.step("test", "Run tests"); - test_step.dependOn(&run_mod_tests.step); - test_step.dependOn(&run_exe_tests.step); - - // Just like flags, top level steps are also listed in the `--help` menu. - // - // The Zig build system is entirely implemented in userland, which means - // that it cannot hook into private compiler APIs. All compilation work - // orchestrated by the build system will result in other Zig compiler - // subcommands being invoked with the right flags defined. You can observe - // these invocations when one fails (or you pass a flag to increase - // verbosity) to validate assumptions and diagnose problems. - // - // Lastly, the Zig build system is relatively simple and self-contained, - // and reading its source code will allow you to master it. -} diff --git a/build.zig.zon b/build.zig.zon deleted file mode 100644 index f76570d..0000000 --- a/build.zig.zon +++ /dev/null @@ -1,81 +0,0 @@ -.{ - // This is the default name used by packages depending on this one. For - // example, when a user runs `zig fetch --save `, this field is used - // as the key in the `dependencies` table. Although the user can choose a - // different name, most users will stick with this provided value. - // - // It is redundant to include "zig" in this name because it is already - // within the Zig package namespace. - .name = .castle, - // This is a [Semantic Version](https://semver.org/). - // In a future version of Zig it will be used for package deduplication. - .version = "0.0.0", - // Together with name, this represents a globally unique package - // identifier. This field is generated by the Zig toolchain when the - // package is first created, and then *never changes*. This allows - // unambiguous detection of one package being an updated version of - // another. - // - // When forking a Zig project, this id should be regenerated (delete the - // field and run `zig build`) if the upstream project is still maintained. - // Otherwise, the fork is *hostile*, attempting to take control over the - // original project's identity. Thus it is recommended to leave the comment - // on the following line intact, so that it shows up in code reviews that - // modify the field. - .fingerprint = 0x4512fc283391a69a, // Changing this has security and trust implications. - // Tracks the earliest Zig version that the package considers to be a - // supported use case. - .minimum_zig_version = "0.15.1", - // This field is optional. - // Each dependency must either provide a `url` and `hash`, or a `path`. - // `zig build --fetch` can be used to fetch all dependencies of a package, recursively. - // Once all dependencies are fetched, `zig build` no longer requires - // internet connectivity. - .dependencies = .{ - // See `zig fetch --save ` for a command-line interface for adding dependencies. - //.example = .{ - // // When updating this field to a new URL, be sure to delete the corresponding - // // `hash`, otherwise you are communicating that you expect to find the old hash at - // // the new URL. If the contents of a URL change this will result in a hash mismatch - // // which will prevent zig from using it. - // .url = "https://example.com/foo.tar.gz", - // - // // This is computed from the file contents of the directory of files that is - // // obtained after fetching `url` and applying the inclusion rules given by - // // `paths`. - // // - // // This field is the source of truth; packages do not come from a `url`; they - // // come from a `hash`. `url` is just one of many possible mirrors for how to - // // obtain a package matching this `hash`. - // // - // // Uses the [multihash](https://multiformats.io/multihash/) format. - // .hash = "...", - // - // // When this is provided, the package is found in a directory relative to the - // // build root. In this case the package's hash is irrelevant and therefore not - // // computed. This field and `url` are mutually exclusive. - // .path = "foo", - // - // // When this is set to `true`, a package is declared to be lazily - // // fetched. This makes the dependency only get fetched if it is - // // actually used. - // .lazy = false, - //}, - }, - // Specifies the set of files and directories that are included in this package. - // Only files and directories listed here are included in the `hash` that - // is computed for this package. Only files listed here will remain on disk - // when using the zig package manager. As a rule of thumb, one should list - // files required for compilation plus any license(s). - // Paths are relative to the build root. Use the empty string (`""`) to refer to - // the build root itself. - // A directory listed here means that all files within, recursively, are included. - .paths = .{ - "build.zig", - "build.zig.zon", - "src", - // For example... - //"LICENSE", - //"README.md", - }, -} diff --git a/packages/js/build.zig.zon b/packages/js/build.zig.zon index 1ece98d..7d280d4 100644 --- a/packages/js/build.zig.zon +++ b/packages/js/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .js, .version = "0.0.0", - .minimum_zig_version = "0.15.1", + .minimum_zig_version = "0.15.2", .paths = .{ "src", "vendor", diff --git a/packages/media/build.zig.zon b/packages/media/build.zig.zon index 5d73260..0f375f6 100644 --- a/packages/media/build.zig.zon +++ b/packages/media/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .media, .version = "0.0.0", - .minimum_zig_version = "0.15.1", + .minimum_zig_version = "0.15.2", .paths = .{ "src", "build.zig", diff --git a/packages/media/src/color.zig b/packages/media/src/color.zig index 3f1bae9..eb30cb7 100644 --- a/packages/media/src/color.zig +++ b/packages/media/src/color.zig @@ -1,86 +1,227 @@ const std = @import("std"); -pub const Color = extern struct { - vector: Vector, +pub const ColorU8 = extern struct { + r: u8, + g: u8, + b: u8, + a: u8, + pub const Array = [4]u8; pub const Vector = @Vector(4, u8); - pub const clear = Color.init(0, 0, 0, 0); - pub const black = Color.init(0, 0, 0, 255); - pub const white = Color.init(255, 255, 255, 255); + pub const clear = ColorU8.init(0, 0, 0, 0); + pub const black = ColorU8.init(0, 0, 0, 255); + pub const white = ColorU8.init(255, 255, 255, 255); - pub fn init(r: u8, g: u8, b: u8, a: u8) Color { - return .{ .vector = .{ r, g, b, a } }; + pub inline fn init(r: u8, g: u8, b: u8, a: u8) ColorU8 { + return .{ .r = r, .g = g, .b = b, .a = a }; } - pub fn fromFloat(color: ColorFloat) Color { - const clamped = std.math.clamp(color, @splat(0.0), @splat(1.0)); - const vector = @round(clamped * @as(ColorFloat.Vector, @splat(255.0))); + pub inline fn initArray(array: Array) ColorU8 { + return @bitCast(array); + } + + pub inline fn initVector(vector: Vector) ColorU8 { + return @bitCast(@as(Array, vector)); + } + + pub inline fn initColorF16(color: ColorF16) ColorU8 { + const zero: ColorF16.Vector = @splat(0); + const one: ColorF16.Vector = @splat(1); + const scale: ColorF16.Vector = @splat(255); + + const vector = @round(std.math.clamp(color.asVector(), zero, one) * scale); return .{ - .vector = .{ - @intFromFloat(vector[0]), - @intFromFloat(vector[1]), - @intFromFloat(vector[2]), - @intFromFloat(vector[3]), - }, + .r = @intFromFloat(vector[0]), + .g = @intFromFloat(vector[1]), + .b = @intFromFloat(vector[2]), + .a = @intFromFloat(vector[3]), }; } + + pub inline fn initColorF32(color: ColorF32) ColorU8 { + const zero: ColorF32.Vector = @splat(0); + const one: ColorF32.Vector = @splat(1); + const scale: ColorF32.Vector = @splat(255); + + const vector = @round(std.math.clamp(color.asVector(), zero, one) * scale); + return .{ + .r = @intFromFloat(vector[0]), + .g = @intFromFloat(vector[1]), + .b = @intFromFloat(vector[2]), + .a = @intFromFloat(vector[3]), + }; + } + + pub inline fn asArray(self: ColorU8) Array { + return @bitCast(self); + } + + pub inline fn asVector(self: ColorU8) Vector { + return @as(Array, @bitCast(self)); + } }; -pub const ColorFloat = extern struct { - vector: Vector, +pub const ColorF16 = extern struct { + r: f16, + g: f16, + b: f16, + a: f16, - pub const Vector = @Vector(4, f32); + pub const Array = [4]f16; + pub const Vector = @Vector(4, f16); - pub const clear = ColorFloat.init(0, 0, 0, 0); - pub const black = ColorFloat.init(0, 0, 0, 255); - pub const white = ColorFloat.init(255, 255, 255, 255); + pub const clear = ColorF16.init(0.0, 0.0, 0.0, 0.0); + pub const black = ColorF16.init(0.0, 0.0, 0.0, 1.0); + pub const white = ColorF16.init(1.0, 1.0, 1.0, 1.0); - pub inline fn init(r: f32, g: f32, b: f32, a: f32) ColorFloat { - return .{ .vector = .{ r, g, b, a } }; + pub inline fn init(r: f16, g: f16, b: f16, a: f16) ColorF16 { + return .{ .r = r, .g = g, .b = b, .a = a }; } - pub inline fn fromInteger(color: Color) ColorFloat { - return .{ - .vector = .{ - @as(f32, @floatFromInt(color.r)) / 255.0, - @as(f32, @floatFromInt(color.g)) / 255.0, - @as(f32, @floatFromInt(color.b)) / 255.0, - @as(f32, @floatFromInt(color.a)) / 255.0, - }, - }; + pub inline fn initArray(array: Array) ColorF16 { + return @bitCast(array); } - pub inline fn add(self: ColorFloat, other: ColorFloat) ColorFloat { - return .{ .vector = self.vector + other.vector }; + pub inline fn initVector(vector: Vector) ColorF16 { + return @bitCast(@as(Array, vector)); } - pub inline fn sub(self: ColorFloat, other: ColorFloat) ColorFloat { - return .{ .vector = self.vector - other.vector }; + pub inline fn initColorU8(color: ColorU8) ColorF16 { + const vector = Vector{ + @as(f32, color.r), + @as(f32, color.g), + @as(f32, color.b), + @as(f32, color.a), + } / @as(Vector, @splat(255.0)); + + return @bitCast(@as(Array, vector)); } - pub inline fn mul(self: ColorFloat, other: ColorFloat) ColorFloat { - return .{ .vector = self.vector * other.vector }; + pub inline fn initColorF32(color: ColorF32) ColorF16 { + return @bitCast(@as(Array, @as(Vector, @floatCast(color.asVector())))); } - pub inline fn div(self: ColorFloat, other: ColorFloat) ColorFloat { - return .{ .vector = self.vector / other.vector }; + pub inline fn asArray(self: ColorF16) Array { + return @bitCast(self); } - pub inline fn mulScalar(self: ColorFloat, scalar: f32) ColorFloat { - const vector: Vector = @splat(scalar); - return .{ .vector = self.vector * vector }; + pub inline fn asVector(self: ColorF16) Vector { + return @as(Array, @bitCast(self)); } - pub inline fn divScalar(self: ColorFloat, scalar: f32) ColorFloat { - const vector: Vector = @splat(scalar); - return .{ .vector = self.vector / vector }; + pub inline fn add(self: ColorF16, other: ColorF16) ColorF16 { + return .initVector(self.asVector() + other.asVector()); } - pub inline fn lerp(self: ColorFloat, other: ColorFloat, t: f32) ColorFloat { + pub inline fn sub(self: ColorF16, other: ColorF16) ColorF16 { + return .initVector(self.asVector() - other.asVector()); + } + + pub inline fn mul(self: ColorF16, other: ColorF16) ColorF16 { + return .initVector(self.asVector() * other.asVector()); + } + + pub inline fn div(self: ColorF16, other: ColorF16) ColorF16 { + return .initVector(self.asVector() / other.asVector()); + } + + pub inline fn mulScalar(self: ColorF16, scalar: f16) ColorF16 { + const scalar_vector: Vector = @splat(scalar); + return .initVector(self.asVector() * scalar_vector); + } + + pub inline fn divScalar(self: ColorF16, scalar: f16) ColorF16 { + const scalar_vector: Vector = @splat(scalar); + return .initVector(self.asVector() / scalar_vector); + } + + pub inline fn lerp(self: ColorF16, other: ColorF16, t: f16) ColorF16 { const s = 1.0 - t; const t_vector: Vector = @splat(t); const s_vector: Vector = @splat(s); - return .{ .vector = self * t_vector + other * s_vector }; + return .initVector(self.asVector() * s_vector + other.asVector() * t_vector); + } +}; + +pub const ColorF32 = extern struct { + r: f32, + g: f32, + b: f32, + a: f32, + + pub const Array = [4]f32; + pub const Vector = @Vector(4, f32); + + pub const clear = ColorF32.init(0.0, 0.0, 0.0, 0.0); + pub const black = ColorF32.init(0.0, 0.0, 0.0, 1.0); + pub const white = ColorF32.init(1.0, 1.0, 1.0, 1.0); + + pub inline fn init(r: f32, g: f32, b: f32, a: f32) ColorF32 { + return .{ .r = r, .g = g, .b = b, .a = a }; + } + + pub inline fn initArray(array: Array) ColorF32 { + return @bitCast(array); + } + + pub inline fn initVector(vector: Vector) ColorF32 { + return @bitCast(@as(Array, vector)); + } + + pub inline fn initColorU8(color: ColorU8) ColorF32 { + const vector = Vector{ + @as(f32, color.r), + @as(f32, color.g), + @as(f32, color.b), + @as(f32, color.a), + } / @as(Vector, @splat(255.0)); + + return @bitCast(@as(Array, vector)); + } + + pub inline fn initColorF16(color: ColorF16) ColorF32 { + return @bitCast(@as(Array, @as(Vector, @floatCast(color.asVector())))); + } + + pub inline fn asArray(self: ColorF32) Array { + return @bitCast(self); + } + + pub inline fn asVector(self: ColorF32) Vector { + return @as(Array, @bitCast(self)); + } + + pub inline fn add(self: ColorF32, other: ColorF32) ColorF32 { + return .initVector(self.asVector() + other.asVector()); + } + + pub inline fn sub(self: ColorF32, other: ColorF32) ColorF32 { + return .initVector(self.asVector() - other.asVector()); + } + + pub inline fn mul(self: ColorF32, other: ColorF32) ColorF32 { + return .initVector(self.asVector() * other.asVector()); + } + + pub inline fn div(self: ColorF32, other: ColorF32) ColorF32 { + return .initVector(self.asVector() / other.asVector()); + } + + pub inline fn mulScalar(self: ColorF32, scalar: f32) ColorF32 { + const scalar_vector: Vector = @splat(scalar); + return .initVector(self.asVector() * scalar_vector); + } + + pub inline fn divScalar(self: ColorF32, scalar: f32) ColorF32 { + const scalar_vector: Vector = @splat(scalar); + return .initVector(self.asVector() / scalar_vector); + } + + pub inline fn lerp(self: ColorF32, other: ColorF32, t: f32) ColorF32 { + const s = 1.0 - t; + const t_vector: Vector = @splat(t); + const s_vector: Vector = @splat(s); + return .initVector(self.asVector() * s_vector + other.asVector() * t_vector); } }; diff --git a/packages/myid/build.zig.zon b/packages/myid/build.zig.zon index bab0f66..d54074d 100644 --- a/packages/myid/build.zig.zon +++ b/packages/myid/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .myid, .version = "0.0.0", - .minimum_zig_version = "0.15.1", + .minimum_zig_version = "0.15.2", .paths = .{ "src", "build.zig", diff --git a/packages/sciter/build.zig.zon b/packages/sciter/build.zig.zon index 4cffc88..a567dae 100644 --- a/packages/sciter/build.zig.zon +++ b/packages/sciter/build.zig.zon @@ -1,7 +1,7 @@ .{ .name = .sciter, .version = "0.0.0", - .minimum_zig_version = "0.15.1", + .minimum_zig_version = "0.15.2", .paths = .{ "src", "vendor",