Skip to content

Move the gui windows to comptime modding #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move the gui windows to comptime modding #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion assets/cubyz/blocks/workbench.zig.zon
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
.drops = .{
.{.items = .{.auto}},
},
.gui = .workbench,
.gui = "cubyz:workbench",
.model = "cubyz:cube",
.rotation = "cubyz:planar",
.texture = "cubyz:workbench_back",
Expand Down
2 changes: 2 additions & 0 deletions build.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,10 +141,12 @@ fn addModFeatures(b: *std.Build, exe: *std.Build.Step.Compile) !void {
exe.step.dependOn(step);

try addModFeatureModule(b, exe, "rotation");
try addModFeatureModule(b, exe, "windows");
}

pub fn makeModFeaturesStep(step: *std.Build.Step, _: std.Build.Step.MakeOptions) anyerror!void {
try makeModFeature(step, "rotation");
try makeModFeature(step, "windows");
}

pub fn build(b: *std.Build) !void {
Expand Down
12 changes: 6 additions & 6 deletions src/gui/windows/advanced_controls.zig → mods/cubyz/windows/advanced_controls.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const CheckBox = @import("../components/CheckBox.zig");
const ContinuousSlider = @import("../components/ContinuousSlider.zig");
const DiscreteSlider = @import("../components/DiscreteSlider.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = GuiComponent.Button;
const CheckBox = GuiComponent.CheckBox;
const ContinuousSlider = GuiComponent.ContinuousSlider;
const DiscreteSlider = GuiComponent.DiscreteSlider;
const VerticalList = GuiComponent.VerticalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand Down
12 changes: 6 additions & 6 deletions src/gui/windows/change_name.zig → mods/cubyz/windows/change_name.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const Label = @import("../components/Label.zig");
const TextInput = @import("../components/TextInput.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = GuiComponent.Button;
const Label = GuiComponent.Label;
const TextInput = GuiComponent.TextInput;
const VerticalList = GuiComponent.VerticalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand All @@ -32,7 +32,7 @@ fn apply(_: usize) void {

gui.closeWindowFromRef(&window);
if(oldName.len == 0) {
gui.openWindow("main");
gui.openWindow("cubyz:main");
}
}

Expand Down
6 changes: 3 additions & 3 deletions src/gui/windows/chat.zig → mods/cubyz/windows/chat.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ const std = @import("std");
const main = @import("main");
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const Button = GuiComponent.Button;
const Label = GuiComponent.Label;
const MutexComponent = GuiComponent.MutexComponent;
const TextInput = GuiComponent.TextInput;
const VerticalList = @import("../components/VerticalList.zig");
const VerticalList = GuiComponent.VerticalList;
const FixedSizeCircularBuffer = main.utils.FixedSizeCircularBuffer;

pub var window: GuiWindow = GuiWindow{
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/chest.zig → mods/cubyz/windows/chest.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ItemStack = main.items.ItemStack;
const Vec2f = main.vec.Vec2f;
const Texture = main.graphics.Texture;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = GuiComponent.Button;
Expand Down
12 changes: 6 additions & 6 deletions src/gui/windows/controls.zig → mods/cubyz/windows/controls.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@ const std = @import("std");
const main = @import("main");
const Vec2f = main.vec.Vec2f;
const c = main.Window.c;
const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const HorizontalList = @import("../components/HorizontalList.zig");
const Label = @import("../components/Label.zig");
const VerticalList = @import("../components/VerticalList.zig");
const ContinuousSlider = @import("../components/ContinuousSlider.zig");
const Button = GuiComponent.Button;
const HorizontalList = GuiComponent.HorizontalList;
const Label = GuiComponent.Label;
const VerticalList = GuiComponent.VerticalList;
const ContinuousSlider = GuiComponent.ContinuousSlider;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 192},
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/creative_inventory.zig → mods/cubyz/windows/creative_inventory.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Inventory = main.items.Inventory;
const Player = main.game.Player;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const HorizontalList = GuiComponent.HorizontalList;
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/crosshair.zig → mods/cubyz/windows/crosshair.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ const graphics = main.graphics;
const Texture = graphics.Texture;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/debug.zig → mods/cubyz/windows/debug.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Texture = graphics.Texture;
const Vec2f = main.vec.Vec2f;
const TaskType = main.utils.ThreadPool.TaskType;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/debug_network.zig → mods/cubyz/windows/debug_network.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Texture = graphics.Texture;
const network = main.network;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/debug_network_advanced.zig → .../cubyz/windows/debug_network_advanced.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const Texture = graphics.Texture;
const network = main.network;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
10 changes: 5 additions & 5 deletions ...gui/windows/delete_world_confirmation.zig → ...byz/windows/delete_world_confirmation.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ const std = @import("std");
const main = @import("main");
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const Label = @import("../components/Label.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = GuiComponent.Button;
const Label = GuiComponent.Label;
const VerticalList = GuiComponent.VerticalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand All @@ -33,7 +33,7 @@ pub fn setDeleteWorldName(name: []const u8) void {

fn flawedDeleteWorld(name: []const u8) !void {
try main.files.deleteDir("saves", name);
gui.windowlist.save_selection.needsUpdate = true;
gui.windowlist.@"cubyz:save_selection".needsUpdate = true;
}

fn deleteWorld(_: usize) void {
Expand Down
12 changes: 6 additions & 6 deletions .../windows/download_controller_mappings.zig → .../windows/download_controller_mappings.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ const files = main.files;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const CheckBox = @import("../components/CheckBox.zig");
const Label = @import("../components/Label.zig");
const VerticalList = @import("../components/VerticalList.zig");
const HorizontalList = @import("../components/HorizontalList.zig");
const Button = GuiComponent.Button;
const CheckBox = GuiComponent.CheckBox;
const Label = GuiComponent.Label;
const VerticalList = GuiComponent.VerticalList;
const HorizontalList = GuiComponent.HorizontalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 64},
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/energybar.zig → mods/cubyz/windows/energybar.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const draw = graphics.draw;
const Texture = graphics.Texture;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
9 changes: 5 additions & 4 deletions src/gui/windows/error_prompt.zig → mods/cubyz/windows/error_prompt.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,12 @@ const settings = main.settings;
const Vec2f = main.vec.Vec2f;
const Texture = main.graphics.Texture;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const Label = @import("../components/Label.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = @import("../components/Button.zig");
const GuiComponent = gui.GuiComponent;
const Label = GuiComponent.Label;
const VerticalList = GuiComponent.VerticalList;
const Button = GuiComponent.Button;

var fileExplorerIcon: Texture = undefined;

Expand Down
2 changes: 1 addition & 1 deletion ...gui/windows/gpu_performance_measuring.zig → ...byz/windows/gpu_performance_measuring.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ const draw = graphics.draw;
const Texture = graphics.Texture;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
12 changes: 6 additions & 6 deletions src/gui/windows/graphics.zig → mods/cubyz/windows/graphics.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ const main = @import("main");
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const CheckBox = @import("../components/CheckBox.zig");
const ContinuousSlider = @import("../components/ContinuousSlider.zig");
const DiscreteSlider = @import("../components/DiscreteSlider.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = GuiComponent.Button;
const CheckBox = GuiComponent.CheckBox;
const ContinuousSlider = GuiComponent.ContinuousSlider;
const DiscreteSlider = GuiComponent.DiscreteSlider;
const VerticalList = GuiComponent.VerticalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/healthbar.zig → mods/cubyz/windows/healthbar.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const draw = graphics.draw;
const Texture = graphics.Texture;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiWindow = gui.GuiWindow;
const GuiComponent = gui.GuiComponent;

Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/hotbar.zig → mods/cubyz/windows/hotbar.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const Player = main.game.Player;
const Vec2f = main.vec.Vec2f;
const Texture = main.graphics.Texture;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const HorizontalList = GuiComponent.HorizontalList;
Expand Down
4 changes: 2 additions & 2 deletions src/gui/windows/inventory.zig → mods/cubyz/windows/inventory.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ItemStack = main.items.ItemStack;
const Vec2f = main.vec.Vec2f;
const Texture = main.graphics.Texture;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = GuiComponent.Button;
Expand Down Expand Up @@ -45,7 +45,7 @@ pub fn onOpen() void {
// TODO: armor slots, backpack slot + stack-based backpack inventory, other items maybe?
{
const row = HorizontalList.init();
row.add(Button.initIcon(.{0, 0}, .{32, 32}, craftingIcon, true, gui.openWindowCallback("inventory_crafting")));
row.add(Button.initIcon(.{0, 0}, .{32, 32}, craftingIcon, true, gui.openWindowCallback("cubyz:inventory_crafting")));
list.add(row);
}
for(0..2) |y| {
Expand Down
2 changes: 1 addition & 1 deletion src/gui/windows/inventory_crafting.zig → mods/cubyz/windows/inventory_crafting.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Player = main.game.Player;
const Texture = main.graphics.Texture;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = GuiComponent.Button;
Expand Down
14 changes: 7 additions & 7 deletions src/gui/windows/invite.zig → mods/cubyz/windows/invite.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const CheckBox = @import("../components/CheckBox.zig");
const Label = @import("../components/Label.zig");
const TextInput = @import("../components/TextInput.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = GuiComponent.Button;
const CheckBox = GuiComponent.CheckBox;
const Label = GuiComponent.Label;
const TextInput = GuiComponent.TextInput;
const VerticalList = GuiComponent.VerticalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand Down Expand Up @@ -73,7 +73,7 @@ pub fn onOpen() void {
ipAddressEntry = TextInput.init(.{0, 0}, width, 32, settings.lastUsedIPAddress, .{.callback = &invite}, .{});
list.add(ipAddressEntry);
list.add(Button.initText(.{0, 0}, 100, "Invite", .{.callback = &invite}));
list.add(Button.initText(.{0, 0}, 100, "Manage Players", gui.openWindowCallback("manage_players")));
list.add(Button.initText(.{0, 0}, 100, "Manage Players", gui.openWindowCallback("cubyz:manage_players")));
list.add(CheckBox.init(.{0, 0}, width, "Allow anyone to join (requires a publicly visible IP address+port which may need some configuration in your router)", main.server.connectionManager.allowNewConnections.load(.monotonic), &makePublic));
list.finish(.center);
window.rootComponent = list.toComponent();
Expand Down
12 changes: 6 additions & 6 deletions src/gui/windows/main.zig → mods/cubyz/windows/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ const std = @import("std");
const main = @import("main");
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const VerticalList = @import("../components/VerticalList.zig");
const Button = GuiComponent.Button;
const VerticalList = GuiComponent.VerticalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand All @@ -21,9 +21,9 @@ fn exitGame(_: usize) void {
}
pub fn onOpen() void {
const list = VerticalList.init(.{padding, 16 + padding}, 300, 16);
list.add(Button.initText(.{0, 0}, 128, "Singleplayer", gui.openWindowCallback("save_selection")));
list.add(Button.initText(.{0, 0}, 128, "Multiplayer", gui.openWindowCallback("multiplayer")));
list.add(Button.initText(.{0, 0}, 128, "Settings", gui.openWindowCallback("settings")));
list.add(Button.initText(.{0, 0}, 128, "Singleplayer", gui.openWindowCallback("cubyz:save_selection")));
list.add(Button.initText(.{0, 0}, 128, "Multiplayer", gui.openWindowCallback("cubyz:multiplayer")));
list.add(Button.initText(.{0, 0}, 128, "Settings", gui.openWindowCallback("cubyz:settings")));
list.add(Button.initText(.{0, 0}, 128, "Touch Grass", .{.callback = &exitGame}));
list.finish(.center);
window.rootComponent = list.toComponent();
Expand Down
12 changes: 6 additions & 6 deletions src/gui/windows/manage_players.zig → mods/cubyz/windows/manage_players.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ const ConnectionManager = main.network.ConnectionManager;
const settings = main.settings;
const Vec2f = main.vec.Vec2f;

const gui = @import("../gui.zig");
const gui = main.gui;
const GuiComponent = gui.GuiComponent;
const GuiWindow = gui.GuiWindow;
const Button = @import("../components/Button.zig");
const Label = @import("../components/Label.zig");
const TextInput = @import("../components/TextInput.zig");
const VerticalList = @import("../components/VerticalList.zig");
const HorizontalList = @import("../components/HorizontalList.zig");
const Button = GuiComponent.Button;
const Label = GuiComponent.Label;
const TextInput = GuiComponent.TextInput;
const VerticalList = GuiComponent.VerticalList;
const HorizontalList = GuiComponent.HorizontalList;

pub var window = GuiWindow{
.contentSize = Vec2f{128, 256},
Expand Down
Loading