Compare commits
7 Commits
1c49ffa07f
...
wasm
Author | SHA1 | Date | |
---|---|---|---|
|
f032509b12 | ||
|
2a10ffc55c | ||
|
de7b29c458 | ||
|
b9e39139bc | ||
|
ac6cb02184 | ||
|
2524dbf206 | ||
|
fc91b57f33 |
59
build.zig
59
build.zig
@@ -1,4 +1,7 @@
|
||||
const std = @import("std");
|
||||
const sokol = @import("sokol");
|
||||
|
||||
const title = "sok";
|
||||
|
||||
pub fn build(b: *std.Build) void {
|
||||
const target = b.standardTargetOptions(.{});
|
||||
@@ -6,8 +9,11 @@ pub fn build(b: *std.Build) void {
|
||||
|
||||
const dep_sokol = b.dependency("sokol", .{ .target = target, .optimize = optimize });
|
||||
|
||||
if (!target.result.isWasm()) {
|
||||
// Native exe
|
||||
|
||||
const exe = b.addExecutable(.{
|
||||
.name = "sok",
|
||||
.name = title,
|
||||
.root_source_file = b.path("src/main.zig"),
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
@@ -15,8 +21,27 @@ pub fn build(b: *std.Build) void {
|
||||
|
||||
exe.root_module.addImport("sokol", dep_sokol.module("sokol"));
|
||||
|
||||
// Set this to hide console on windows
|
||||
//exe.subsystem = .Windows;
|
||||
|
||||
b.installArtifact(exe);
|
||||
|
||||
// Check step (for ZLS)
|
||||
|
||||
const exe_check = b.addExecutable(.{
|
||||
.name = "check_step",
|
||||
.root_source_file = b.path("src/main.zig"),
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
});
|
||||
|
||||
exe_check.root_module.addImport("sokol", dep_sokol.module("sokol"));
|
||||
|
||||
const check = b.step("check", "Check if project compiles");
|
||||
check.dependOn(&exe_check.step);
|
||||
|
||||
// Run
|
||||
|
||||
const run_cmd = b.addRunArtifact(exe);
|
||||
|
||||
run_cmd.step.dependOn(b.getInstallStep());
|
||||
@@ -25,8 +50,38 @@ pub fn build(b: *std.Build) void {
|
||||
run_cmd.addArgs(args);
|
||||
}
|
||||
|
||||
const run_step = b.step("run", "Run the app");
|
||||
const run_step = b.step("run", "Run" ++ title ++ " as native app");
|
||||
run_step.dependOn(&run_cmd.step);
|
||||
} else {
|
||||
// Web
|
||||
|
||||
const wasmLib = b.addStaticLibrary(.{
|
||||
.name = title,
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
.root_source_file = b.path("src/pacman.zig"),
|
||||
});
|
||||
wasmLib.root_module.addImport("sokol", dep_sokol.module("sokol"));
|
||||
|
||||
// create a build step which invokes the Emscripten linker
|
||||
const emsdk = dep_sokol.builder.dependency("emsdk", .{});
|
||||
const link_step = try sokol.emLinkStep(b, .{
|
||||
.lib_main = wasmLib,
|
||||
.target = target,
|
||||
.optimize = optimize,
|
||||
.emsdk = emsdk,
|
||||
.use_webgl2 = true,
|
||||
.use_emmalloc = true,
|
||||
.use_filesystem = false,
|
||||
.shell_file_path = dep_sokol.path("src/sokol/web/shell.html").getPath(b),
|
||||
});
|
||||
// ...and a special run step to start the web build output via 'emrun'
|
||||
const run = sokol.emRunStep(b, .{ .name = "sok", .emsdk = emsdk });
|
||||
run.step.dependOn(&link_step.step);
|
||||
b.step("run", "Run " ++ title ++ " as wasm").dependOn(&run.step);
|
||||
}
|
||||
|
||||
// Tests
|
||||
|
||||
const exe_unit_tests = b.addTest(.{
|
||||
.root_source_file = b.path("src/main.zig"),
|
||||
|
@@ -1,18 +1,17 @@
|
||||
.{
|
||||
.name = "sok",
|
||||
.version = "0.0.0",
|
||||
.minimum_zig_version = "0.13.0",
|
||||
|
||||
.dependencies = .{
|
||||
.sokol = .{
|
||||
.url = "git+https://github.com/floooh/sokol-zig.git#d3e21f76498213d6d58179065756f5f2ed9b90cf",
|
||||
.hash = "122052a192829b377c637ce242ee8c9121e03d8cd10c889758dc6fb176368de7d67b",
|
||||
},
|
||||
},
|
||||
|
||||
.minimum_zig_version = "0.14.0-dev.144+a31fe8aa3",
|
||||
.paths = .{
|
||||
"build.zig",
|
||||
"build.zig.zon",
|
||||
"src",
|
||||
},
|
||||
|
||||
.dependencies = .{
|
||||
.sokol = .{
|
||||
.url = "git+https://github.com/floooh/sokol-zig.git#ed91d03b62ef9e5850f33a98a3f703c01d86798d",
|
||||
.hash = "12208af0258178372af254d34e32e7f6cdf2e0f6a51bfb8d6706aff159e2ec6d2c65",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
12
readme.md
12
readme.md
@@ -10,8 +10,20 @@ The goal of this project is not fixed, and is just to try out some sokol feature
|
||||
|
||||
To build, you need to have zig master (you can use [zvm](https://www.zvm.app/) to help you with this). Then just `zig build run` and that should be it!
|
||||
|
||||
To build for wasm, use `zig build -Dtarget=wasm32-emscripten run`
|
||||
|
||||
Note that if you change shaders, you have to recompile them manually - run compile_shaders.bat.
|
||||
|
||||
### Live error checking
|
||||
|
||||
This project has been configured so that zls can show live compile errors on save. To make it work, you need to set these zls config params (in VSCode just copy these to your preferences):
|
||||
```
|
||||
"zig.zls.enableBuildOnSave": true,
|
||||
"zig.zls.buildOnSaveStep": "check"
|
||||
```
|
||||
|
||||
Also, if you're in VSCode, install ErrorLens extension so you can see the errors inline.
|
||||
|
||||
## Why zig?
|
||||
|
||||
Zig is a low level language and toolchain that is designed as a "better C". Its main goal is to be simple, robust and fast. A few strong points:
|
||||
|
31
src/main.zig
31
src/main.zig
@@ -1,7 +1,7 @@
|
||||
const std = @import("std");
|
||||
const sokol = @import("sokol");
|
||||
|
||||
const sg = sokol.gfx;
|
||||
const Event = sokol.app.Event;
|
||||
|
||||
const shader = @import("shaders/triangle2.glsl.zig");
|
||||
|
||||
@@ -104,20 +104,27 @@ export fn init() void {
|
||||
|
||||
pass_action.colors[0] = .{
|
||||
.load_action = .CLEAR,
|
||||
.clear_value = .{ .r = 0, .g = 1, .b = 0, .a = 1 },
|
||||
.clear_value = .{},
|
||||
};
|
||||
|
||||
std.log.info("Backend: {}\n", .{sg.queryBackend()});
|
||||
|
||||
sokol.app.showMouse(false);
|
||||
}
|
||||
|
||||
fn timef() f32 {
|
||||
return @floatCast(sokol.time.sec(sokol.time.now()));
|
||||
}
|
||||
|
||||
var time: f32 = 0;
|
||||
|
||||
export fn frame() void {
|
||||
const dt: f32 = @floatCast(sokol.app.frameDuration());
|
||||
time += dt;
|
||||
|
||||
const col = &pass_action.colors[0].clear_value;
|
||||
col.g = @abs(@sin(timef()));
|
||||
col.r = @abs(@cos(timef()));
|
||||
col.g = @abs(@sin(time));
|
||||
col.r = @abs(@cos(time));
|
||||
|
||||
state.vsParams.aspectRatio = sokol.app.heightf() / sokol.app.widthf();
|
||||
|
||||
@@ -133,13 +140,27 @@ export fn frame() void {
|
||||
sg.commit();
|
||||
}
|
||||
|
||||
export fn cleanup() void {}
|
||||
export fn cleanup() void {
|
||||
std.log.info("Ended", .{});
|
||||
}
|
||||
|
||||
export fn event(eptr: [*c]const Event) void {
|
||||
const e: *const Event = @ptrCast(eptr);
|
||||
|
||||
const buttonPressed = e.type == .MOUSE_DOWN or e.type == .KEY_DOWN;
|
||||
const mouseMoved = e.type == .MOUSE_MOVE and (@abs(e.mouse_dx) > 2 or @abs(e.mouse_dy) > 2);
|
||||
|
||||
if (buttonPressed or mouseMoved) {
|
||||
sokol.app.quit();
|
||||
}
|
||||
}
|
||||
|
||||
pub fn main() !void {
|
||||
sokol.app.run(.{
|
||||
.init_cb = init,
|
||||
.frame_cb = frame,
|
||||
.cleanup_cb = cleanup,
|
||||
.event_cb = event,
|
||||
.width = 800,
|
||||
.height = 600,
|
||||
.fullscreen = true,
|
||||
|
Reference in New Issue
Block a user