Skip to content

Commit

Permalink
mach-core: Update to latest mach libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
foxnne committed Oct 7, 2023
1 parent 8b76663 commit 7f83000
Show file tree
Hide file tree
Showing 38 changed files with 45 additions and 45 deletions.
16 changes: 8 additions & 8 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
.version = "0.0.1",
.dependencies = .{
.mach_core = .{
.url = "https://pkg.machengine.org/mach-core/9243a331a3eb0d4ba97aec7f793e60f1cf90bd8b.tar.gz",
.hash = "12206e93994d37b3ce5c790e391736130f2a26bec06eca01ca51ab08a6d8105ab7f9",
.url = "https://pkg.machengine.org/mach-core/71ea86090c3095acdbc13bcc45b0666e39b53114.tar.gz",
.hash = "12203917ad7153ba955004d3b436ead6fc314de29d21ef0a7fda142025dd631c2709",
},
// .mach_sysjs = .{
// .url = "https://pkg.machengine.org/mach-sysjs/cd011058993f39a3ab473921ff51e0eda5635f99.tar.gz",
Expand All @@ -19,8 +19,8 @@
// .hash = "12208531803f37e906974a4a4bd58b81200ae313f46f62f6384c91a32601b0a07eb6",
// },
.mach_gpu_dawn = .{
.url = "https://pkg.machengine.org/mach-gpu-dawn/5d463ceb63246b3b73070c774465c67dd657e045.tar.gz",
.hash = "12205cd22eb1e26ea16e973fe57fb297535246d64454e3ccae8a39783c97ea488a83",
.url = "https://pkg.machengine.org/mach-gpu-dawn/3690dfbd0b8b64203b83d651ca95b8c0d776019e.tar.gz",
.hash = "122037f1ecd3b4b4da9bb1b0507984d1d5286720ca8a39d562c3b6178d6dfdd199e4",
},
// .mach_glfw = .{
// .url = "https://pkg.machengine.org/mach-glfw/58a16012c33b047b9468cccb53ecd95835456121.tar.gz",
Expand All @@ -30,10 +30,10 @@
// .url = "https://pkg.machengine.org/glfw/bad964824403ba34c935a90013024957dae795aa.tar.gz",
// .hash = "1220fe0763e9722d56d3f93f8740e077fccf338d9697f08239d79a1ee27ae5833e62",
// },
// .direct3d_headers = .{
// .url = "https://pkg.machengine.org/direct3d-headers/c02ba4ba3f9473560e41487090ee6bfbbc44c75b.tar.gz",
// .hash = "1220b4a3be5bd4d0c4a206c909b07579070f4fa8c83dd82170ed1db846b0eea1ae9d",
// },
.direct3d_headers = .{
.url = "https://pkg.machengine.org/direct3d-headers/4b9e3c969d537ea09a6e512f8251e540ab5bbaca.tar.gz",
.hash = "1220f786406f31ae794a8eabf1f7f40c386d93755bfde2f677eb480af559130b499a",
},
// .vulkan_headers = .{
// .url = "https://pkg.machengine.org/vulkan-headers/0212dd8b71531d0cec8378ce8fb1721a0df7420a.tar.gz",
// .hash = "1220a8b642edf8ef522e468cfe9a1803507472461b1041be717294ca484d1361afb0",
Expand Down
2 changes: 1 addition & 1 deletion src/Cursors.zig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const pixi = @import("root");
const core = @import("core");
const core = @import("mach-core");

const Self = @This();

Expand Down
2 changes: 1 addition & 1 deletion src/deps/zig-gamedev/zgui/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ pub fn Package(comptime deps: anytype) type {
.mach => {
zgui_c_cpp.addCSourceFile(.{ .file = .{ .path = thisDir() ++ "/libs/imgui/backends/imgui_impl_wgpu.cpp" }, .flags = cflags });
zgui_c_cpp.addCSourceFile(.{ .file = .{ .path = thisDir() ++ "/libs/imgui/imgui_impl_mach.cpp" }, .flags = cflags });
try deps.gpu_dawn.link(b, zgui_c_cpp, args.gpu_dawn_options);
deps.gpu_dawn.link(b, zgui_c_cpp, args.gpu_dawn_options);
},
.glfw_wgpu => {
zgui_c_cpp.addIncludePath(.{ .path = thisDir() ++ "/../zglfw/libs/glfw/include" });
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/artboard.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const editor = pixi.editor;
const nfd = @import("nfd");
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/canvas.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw(file: *pixi.storage.Internal.Pixi) void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/canvas_pack.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub const PackTexture = enum {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/flipbook/canvas.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw(file: *pixi.storage.Internal.Pixi) void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/flipbook/menu.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const nfd = @import("nfd");

Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/infobar.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

const spacer: [:0]const u8 = " ";
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/menu.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const settings = pixi.settings;
const zstbi = @import("zstbi");
Expand Down
2 changes: 1 addition & 1 deletion src/editor/artboard/rulers.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw(file: *pixi.storage.Internal.Pixi) void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/editor.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const zip = @import("zip");
const zstbi = @import("zstbi");
Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/animations.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const tools = @import("tools.zig");

Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/explorer.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const nfd = @import("nfd");

Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/files.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const nfd = @import("nfd");
const zstbi = @import("zstbi");
Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/layers.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const History = pixi.storage.Internal.Pixi.History;

Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/pack.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const nfd = @import("nfd");

Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/settings.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const nfd = @import("nfd");

Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/sprites.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/explorer/tools.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/about.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/animation.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

const History = pixi.storage.Internal.Pixi.History;
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/export_png.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const nfd = @import("nfd");
const zstbi = @import("zstbi");
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/file_confirm_close.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/file_setup.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/heightmap.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/layer_setup.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/popups/rename.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/sidebar/sidebar.zig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const pixi = @import("../../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);

pub fn draw() void {
Expand Down
2 changes: 1 addition & 1 deletion src/editor/theme.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const std = @import("std");
const builtin = @import("builtin");
const zgui = @import("zgui").MachImgui(core);
const core = @import("core");
const core = @import("mach-core");
const pixi = @import("../pixi.zig");
const Color = pixi.math.Color;

Expand Down
2 changes: 1 addition & 1 deletion src/gfx/camera.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const std = @import("std");
const zm = @import("zmath");
const pixi = @import("../pixi.zig");
const core = @import("core");
const core = @import("mach-core");
const gpu = core.gpu;
const zgui = @import("zgui").MachImgui(core);

Expand Down
2 changes: 1 addition & 1 deletion src/gfx/texture.zig
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const zstbi = @import("zstbi");
const wgpu = zgpu.wgpu;
const zm = @import("zmath");

const core = @import("core");
const core = @import("mach-core");
const gpu = core.gpu;

const game = @import("game");
Expand Down
2 changes: 1 addition & 1 deletion src/input/Hotkeys.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const zm = @import("zmath");
const math = @import("../math/math.zig");
const pixi = @import("../pixi.zig");
const nfd = @import("nfd");
const core = @import("core");
const core = @import("mach-core");

const Key = core.Key;
const Mods = core.KeyMods;
Expand Down
2 changes: 1 addition & 1 deletion src/input/Mouse.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const std = @import("std");
const zm = @import("zmath");
const math = @import("../math/math.zig");
const pixi = @import("../pixi.zig");
const core = @import("core");
const core = @import("mach-core");

const builtin = @import("builtin");

Expand Down
2 changes: 1 addition & 1 deletion src/pixi.zig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const std = @import("std");

const core = @import("core");
const core = @import("mach-core");
const gpu = core.gpu;

const zgui = @import("zgui").MachImgui(core);
Expand Down
2 changes: 1 addition & 1 deletion src/storage/History.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const std = @import("std");
const pixi = @import("../pixi.zig");
const zgui = @import("zgui");
const History = @This();
const core = @import("core");
const core = @import("mach-core");

pub const Action = enum { undo, redo };
pub const RestoreDelete = enum { restore, delete };
Expand Down
2 changes: 1 addition & 1 deletion src/storage/internal.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ const pixi = @import("../pixi.zig");
const zstbi = @import("zstbi");
const storage = @import("storage.zig");
const zip = @import("zip");
const core = @import("core");
const core = @import("mach-core");
const zgui = @import("zgui").MachImgui(core);
const gpu = core.gpu;

Expand Down
2 changes: 1 addition & 1 deletion src/tools/Packer.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const std = @import("std");
const zstbi = @import("zstbi");
const pixi = @import("../pixi.zig");
const core = @import("core");
const core = @import("mach-core");

const Packer = @This();

Expand Down

0 comments on commit 7f83000

Please sign in to comment.