examples: add textured-cube example
Signed-off-by: Stephen Gutekanst <stephen@hexops.com>
This commit is contained in:
Stephen Gutekanst
Stephen Gutekanst
parent
f8e7f96a4a
commit
d0d0db8725
6 changed files with 383 additions and 7 deletions
13
build.zig
13
build.zig
|
|
@ -34,6 +34,7 @@ pub fn build(b: *std.build.Builder) void {
|
|||
.{ .name = "two-cubes", .packages = &[_]Pkg{Packages.zmath} },
|
||||
.{ .name = "instanced-cube", .packages = &[_]Pkg{Packages.zmath} },
|
||||
.{ .name = "advanced-gen-texture-light", .packages = &[_]Pkg{Packages.zmath} },
|
||||
.{ .name = "textured-cube", .packages = &[_]Pkg{ Packages.zmath, Packages.zigimg } },
|
||||
}) |example| {
|
||||
const example_exe = b.addExecutable("example-" ++ example.name, "examples/" ++ example.name ++ "/main.zig");
|
||||
example_exe.setTarget(target);
|
||||
|
|
@ -79,13 +80,15 @@ const ExampleDefinition = struct {
|
|||
};
|
||||
|
||||
const Packages = struct {
|
||||
const zmath = zmath_pkg;
|
||||
};
|
||||
|
||||
// Declared here because submodule may not be cloned at the time build.zig runs.
|
||||
const zmath_pkg = std.build.Pkg{
|
||||
// Declared here because submodule may not be cloned at the time build.zig runs.
|
||||
const zmath = std.build.Pkg{
|
||||
.name = "zmath",
|
||||
.path = .{ .path = "examples/libs/zmath/src/zmath.zig" },
|
||||
};
|
||||
const zigimg = std.build.Pkg{
|
||||
.name = "zigimg",
|
||||
.path = .{ .path = "examples/libs/zigimg/zigimg.zig" },
|
||||
};
|
||||
};
|
||||
|
||||
pub const pkg = std.build.Pkg{
|
||||
|
|
|
|||
|
|
@ -4,3 +4,4 @@ The following examples have been ported from https://github.com/austinEng/webgpu
|
|||
* ./rotating-cube/
|
||||
* ./two-cubes/
|
||||
* ./instanced-cube
|
||||
* ./textured-cube
|
||||
|
|
|
|||
49
examples/textured-cube/cube_mesh.zig
Normal file
49
examples/textured-cube/cube_mesh.zig
Normal file
|
|
@ -0,0 +1,49 @@
|
|||
pub const Vertex = struct {
|
||||
pos: @Vector(4, f32),
|
||||
col: @Vector(4, f32),
|
||||
uv: @Vector(2, f32),
|
||||
};
|
||||
|
||||
pub const vertices = [_]Vertex{
|
||||
.{ .pos = .{ 1, -1, 1, 1 }, .col = .{ 1, 0, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, -1, 1, 1 }, .col = .{ 0, 0, 1, 1 }, .uv = .{ 1, 1 } },
|
||||
.{ .pos = .{ -1, -1, -1, 1 }, .col = .{ 0, 0, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ 1, -1, -1, 1 }, .col = .{ 1, 0, 0, 1 }, .uv = .{ 0, 0 } },
|
||||
.{ .pos = .{ 1, -1, 1, 1 }, .col = .{ 1, 0, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, -1, -1, 1 }, .col = .{ 0, 0, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
|
||||
.{ .pos = .{ 1, 1, 1, 1 }, .col = .{ 1, 1, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ 1, -1, 1, 1 }, .col = .{ 1, 0, 1, 1 }, .uv = .{ 1, 1 } },
|
||||
.{ .pos = .{ 1, -1, -1, 1 }, .col = .{ 1, 0, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ 1, 1, -1, 1 }, .col = .{ 1, 1, 0, 1 }, .uv = .{ 0, 0 } },
|
||||
.{ .pos = .{ 1, 1, 1, 1 }, .col = .{ 1, 1, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ 1, -1, -1, 1 }, .col = .{ 1, 0, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
|
||||
.{ .pos = .{ -1, 1, 1, 1 }, .col = .{ 0, 1, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ 1, 1, 1, 1 }, .col = .{ 1, 1, 1, 1 }, .uv = .{ 1, 1 } },
|
||||
.{ .pos = .{ 1, 1, -1, 1 }, .col = .{ 1, 1, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ -1, 1, -1, 1 }, .col = .{ 0, 1, 0, 1 }, .uv = .{ 0, 0 } },
|
||||
.{ .pos = .{ -1, 1, 1, 1 }, .col = .{ 0, 1, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ 1, 1, -1, 1 }, .col = .{ 1, 1, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
|
||||
.{ .pos = .{ -1, -1, 1, 1 }, .col = .{ 0, 0, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, 1, 1, 1 }, .col = .{ 0, 1, 1, 1 }, .uv = .{ 1, 1 } },
|
||||
.{ .pos = .{ -1, 1, -1, 1 }, .col = .{ 0, 1, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ -1, -1, -1, 1 }, .col = .{ 0, 0, 0, 1 }, .uv = .{ 0, 0 } },
|
||||
.{ .pos = .{ -1, -1, 1, 1 }, .col = .{ 0, 0, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, 1, -1, 1 }, .col = .{ 0, 1, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
|
||||
.{ .pos = .{ 1, 1, 1, 1 }, .col = .{ 1, 1, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, 1, 1, 1 }, .col = .{ 0, 1, 1, 1 }, .uv = .{ 1, 1 } },
|
||||
.{ .pos = .{ -1, -1, 1, 1 }, .col = .{ 0, 0, 1, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ -1, -1, 1, 1 }, .col = .{ 0, 0, 1, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ 1, -1, 1, 1 }, .col = .{ 1, 0, 1, 1 }, .uv = .{ 0, 0 } },
|
||||
.{ .pos = .{ 1, 1, 1, 1 }, .col = .{ 1, 1, 1, 1 }, .uv = .{ 0, 1 } },
|
||||
|
||||
.{ .pos = .{ 1, -1, -1, 1 }, .col = .{ 1, 0, 0, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, -1, -1, 1 }, .col = .{ 0, 0, 0, 1 }, .uv = .{ 1, 1 } },
|
||||
.{ .pos = .{ -1, 1, -1, 1 }, .col = .{ 0, 1, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
.{ .pos = .{ 1, 1, -1, 1 }, .col = .{ 1, 1, 0, 1 }, .uv = .{ 0, 0 } },
|
||||
.{ .pos = .{ 1, -1, -1, 1 }, .col = .{ 1, 0, 0, 1 }, .uv = .{ 0, 1 } },
|
||||
.{ .pos = .{ -1, 1, -1, 1 }, .col = .{ 0, 1, 0, 1 }, .uv = .{ 1, 0 } },
|
||||
};
|
||||
8
examples/textured-cube/frag.wgsl
Normal file
8
examples/textured-cube/frag.wgsl
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
@group(0) @binding(1) var mySampler: sampler;
|
||||
@group(0) @binding(2) var myTexture: texture_2d<f32>;
|
||||
|
||||
@stage(fragment)
|
||||
fn main(@location(0) fragUV: vec2<f32>,
|
||||
@location(1) fragPosition: vec4<f32>) -> @location(0) vec4<f32> {
|
||||
return textureSample(myTexture, mySampler, fragUV);
|
||||
}
|
||||
295
examples/textured-cube/main.zig
Normal file
295
examples/textured-cube/main.zig
Normal file
|
|
@ -0,0 +1,295 @@
|
|||
const std = @import("std");
|
||||
const mach = @import("mach");
|
||||
const gpu = @import("gpu");
|
||||
const glfw = @import("glfw");
|
||||
const zm = @import("zmath");
|
||||
const zigimg = @import("zigimg");
|
||||
const Vertex = @import("cube_mesh.zig").Vertex;
|
||||
const vertices = @import("cube_mesh.zig").vertices;
|
||||
|
||||
const App = mach.App(*FrameParams, .{});
|
||||
|
||||
const UniformBufferObject = struct {
|
||||
mat: zm.Mat,
|
||||
};
|
||||
|
||||
var timer: std.time.Timer = undefined;
|
||||
|
||||
pub fn main() !void {
|
||||
timer = try std.time.Timer.start();
|
||||
var gpa = std.heap.GeneralPurposeAllocator(.{}){};
|
||||
var allocator = gpa.allocator();
|
||||
|
||||
const ctx = try allocator.create(FrameParams);
|
||||
var app = try App.init(allocator, ctx, .{});
|
||||
|
||||
app.window.setKeyCallback(struct {
|
||||
fn callback(window: glfw.Window, key: glfw.Key, scancode: i32, action: glfw.Action, mods: glfw.Mods) void {
|
||||
_ = scancode;
|
||||
_ = mods;
|
||||
if (action == .press) {
|
||||
switch (key) {
|
||||
.space => window.setShouldClose(true),
|
||||
else => {},
|
||||
}
|
||||
}
|
||||
}
|
||||
}.callback);
|
||||
try app.window.setSizeLimits(.{ .width = 20, .height = 20 }, .{ .width = null, .height = null });
|
||||
|
||||
const vs_module = app.device.createShaderModule(&.{
|
||||
.label = "my vertex shader",
|
||||
.code = .{ .wgsl = @embedFile("vert.wgsl") },
|
||||
});
|
||||
|
||||
const vertex_attributes = [_]gpu.VertexAttribute{
|
||||
.{ .format = .float32x4, .offset = @offsetOf(Vertex, "pos"), .shader_location = 0 },
|
||||
.{ .format = .float32x2, .offset = @offsetOf(Vertex, "uv"), .shader_location = 1 },
|
||||
};
|
||||
const vertex_buffer_layout = gpu.VertexBufferLayout{
|
||||
.array_stride = @sizeOf(Vertex),
|
||||
.step_mode = .vertex,
|
||||
.attribute_count = vertex_attributes.len,
|
||||
.attributes = &vertex_attributes,
|
||||
};
|
||||
|
||||
const fs_module = app.device.createShaderModule(&.{
|
||||
.label = "my fragment shader",
|
||||
.code = .{ .wgsl = @embedFile("frag.wgsl") },
|
||||
});
|
||||
|
||||
const blend = gpu.BlendState{
|
||||
.color = .{
|
||||
.operation = .add,
|
||||
.src_factor = .src_alpha,
|
||||
.dst_factor = .one_minus_src_alpha,
|
||||
},
|
||||
.alpha = .{
|
||||
.operation = .add,
|
||||
.src_factor = .one,
|
||||
.dst_factor = .zero,
|
||||
},
|
||||
};
|
||||
const color_target = gpu.ColorTargetState{
|
||||
.format = app.swap_chain_format,
|
||||
.blend = &blend,
|
||||
.write_mask = gpu.ColorWriteMask.all,
|
||||
};
|
||||
const fragment = gpu.FragmentState{
|
||||
.module = fs_module,
|
||||
.entry_point = "main",
|
||||
.targets = &.{color_target},
|
||||
.constants = null,
|
||||
};
|
||||
|
||||
const pipeline_descriptor = gpu.RenderPipeline.Descriptor{
|
||||
.fragment = &fragment,
|
||||
// Enable depth testing so that the fragment closest to the camera
|
||||
// is rendered in front.
|
||||
.depth_stencil = &.{
|
||||
.format = .depth24_plus,
|
||||
.depth_write_enabled = true,
|
||||
.depth_compare = .less,
|
||||
},
|
||||
.vertex = .{
|
||||
.module = vs_module,
|
||||
.entry_point = "main",
|
||||
.buffers = &.{vertex_buffer_layout},
|
||||
},
|
||||
.primitive = .{
|
||||
.topology = .triangle_list,
|
||||
|
||||
// Backface culling since the cube is solid piece of geometry.
|
||||
// Faces pointing away from the camera will be occluded by faces
|
||||
// pointing toward the camera.
|
||||
.cull_mode = .back,
|
||||
},
|
||||
};
|
||||
const pipeline = app.device.createRenderPipeline(&pipeline_descriptor);
|
||||
|
||||
const vertex_buffer = app.device.createBuffer(&.{
|
||||
.usage = .{ .vertex = true },
|
||||
.size = @sizeOf(Vertex) * vertices.len,
|
||||
.mapped_at_creation = true,
|
||||
});
|
||||
var vertex_mapped = vertex_buffer.getMappedRange(Vertex, 0, vertices.len);
|
||||
std.mem.copy(Vertex, vertex_mapped, vertices[0..]);
|
||||
vertex_buffer.unmap();
|
||||
defer vertex_buffer.release();
|
||||
|
||||
// Create a sampler with linear filtering for smooth interpolation.
|
||||
const sampler = app.device.createSampler(&.{
|
||||
.mag_filter = .linear,
|
||||
.min_filter = .linear,
|
||||
});
|
||||
const queue = app.device.getQueue();
|
||||
const img = try zigimg.Image.fromFilePath(allocator, "examples/assets/gotta-go-fast.png");
|
||||
const img_size = gpu.Extent3D{ .width = @intCast(u32, img.width), .height = @intCast(u32, img.height) };
|
||||
const cube_texture = app.device.createTexture(&.{
|
||||
.size = img_size,
|
||||
.format = .rgba8_unorm,
|
||||
.usage = .{
|
||||
.texture_binding = true,
|
||||
.copy_dst = true,
|
||||
.render_attachment = true,
|
||||
},
|
||||
});
|
||||
const data_layout = gpu.Texture.DataLayout{
|
||||
.bytes_per_row = @intCast(u32, img.width * 4),
|
||||
.rows_per_image = @intCast(u32, img.height),
|
||||
};
|
||||
switch (img.pixels.?) {
|
||||
.Rgba32 => |pixels| queue.writeTexture(&.{ .texture = cube_texture }, pixels, &data_layout, &img_size),
|
||||
.Rgb24 => |pixels| {
|
||||
const data = try rgb24ToRgba32(allocator, pixels);
|
||||
//defer data.deinit(allocator);
|
||||
queue.writeTexture(&.{ .texture = cube_texture }, data.Rgba32, &data_layout, &img_size);
|
||||
},
|
||||
else => @panic("unsupported image color format"),
|
||||
}
|
||||
|
||||
const uniform_buffer = app.device.createBuffer(&.{
|
||||
.usage = .{ .copy_dst = true, .uniform = true },
|
||||
.size = @sizeOf(UniformBufferObject),
|
||||
.mapped_at_creation = false,
|
||||
});
|
||||
defer uniform_buffer.release();
|
||||
const bind_group = app.device.createBindGroup(
|
||||
&gpu.BindGroup.Descriptor{
|
||||
.layout = pipeline.getBindGroupLayout(0),
|
||||
.entries = &.{
|
||||
gpu.BindGroup.Entry.buffer(0, uniform_buffer, 0, @sizeOf(UniformBufferObject)),
|
||||
gpu.BindGroup.Entry.sampler(1, sampler),
|
||||
gpu.BindGroup.Entry.textureView(2, cube_texture.createView(&gpu.TextureView.Descriptor{})),
|
||||
},
|
||||
},
|
||||
);
|
||||
defer bind_group.release();
|
||||
|
||||
const size = try app.window.getFramebufferSize();
|
||||
const depth_texture = app.device.createTexture(&gpu.Texture.Descriptor{
|
||||
.size = gpu.Extent3D{
|
||||
.width = size.width,
|
||||
.height = size.height,
|
||||
},
|
||||
.format = .depth24_plus,
|
||||
.usage = .{
|
||||
.render_attachment = true,
|
||||
.texture_binding = true,
|
||||
},
|
||||
});
|
||||
|
||||
ctx.* = FrameParams{
|
||||
.pipeline = pipeline,
|
||||
.queue = queue,
|
||||
.vertex_buffer = vertex_buffer,
|
||||
.uniform_buffer = uniform_buffer,
|
||||
.bind_group = bind_group,
|
||||
.depth_texture = depth_texture,
|
||||
.depth_size = size,
|
||||
};
|
||||
|
||||
vs_module.release();
|
||||
fs_module.release();
|
||||
|
||||
try app.run(.{ .frame = frame });
|
||||
}
|
||||
|
||||
const FrameParams = struct {
|
||||
pipeline: gpu.RenderPipeline,
|
||||
queue: gpu.Queue,
|
||||
vertex_buffer: gpu.Buffer,
|
||||
uniform_buffer: gpu.Buffer,
|
||||
bind_group: gpu.BindGroup,
|
||||
depth_texture: gpu.Texture,
|
||||
depth_size: glfw.Window.Size,
|
||||
};
|
||||
|
||||
fn frame(app: *App, params: *FrameParams) !void {
|
||||
// If window is resized, recreate depth buffer otherwise we cannot use it.
|
||||
const size = app.window.getFramebufferSize() catch unreachable; // TODO: return type inference can't handle this
|
||||
if (size.width != params.depth_size.width or size.height != params.depth_size.height) {
|
||||
params.depth_texture = app.device.createTexture(&gpu.Texture.Descriptor{
|
||||
.size = gpu.Extent3D{
|
||||
.width = size.width,
|
||||
.height = size.height,
|
||||
},
|
||||
.format = .depth24_plus,
|
||||
.usage = .{
|
||||
.render_attachment = true,
|
||||
.texture_binding = true,
|
||||
},
|
||||
});
|
||||
params.depth_size = size;
|
||||
}
|
||||
|
||||
const back_buffer_view = app.swap_chain.?.getCurrentTextureView();
|
||||
const color_attachment = gpu.RenderPassColorAttachment{
|
||||
.view = back_buffer_view,
|
||||
.clear_value = .{ .r = 0.5, .g = 0.5, .b = 0.5, .a = 0.0 },
|
||||
.load_op = .clear,
|
||||
.store_op = .store,
|
||||
};
|
||||
|
||||
const encoder = app.device.createCommandEncoder(null);
|
||||
const render_pass_info = gpu.RenderPassEncoder.Descriptor{
|
||||
.color_attachments = &.{color_attachment},
|
||||
.depth_stencil_attachment = &.{
|
||||
.view = params.depth_texture.createView(&gpu.TextureView.Descriptor{
|
||||
.format = .depth24_plus,
|
||||
.dimension = .dimension_2d,
|
||||
.array_layer_count = 1,
|
||||
.mip_level_count = 1,
|
||||
}),
|
||||
.depth_clear_value = 1.0,
|
||||
.depth_load_op = .clear,
|
||||
.depth_store_op = .store,
|
||||
},
|
||||
};
|
||||
|
||||
{
|
||||
const time = @intToFloat(f32, timer.read()) / @as(f32, std.time.ns_per_s);
|
||||
const model = zm.mul(zm.rotationX(time * (std.math.pi / 2.0)), zm.rotationZ(time * (std.math.pi / 2.0)));
|
||||
const view = zm.lookAtRh(
|
||||
zm.f32x4(0, 4, 2, 1),
|
||||
zm.f32x4(0, 0, 0, 1),
|
||||
zm.f32x4(0, 0, 1, 0),
|
||||
);
|
||||
const proj = zm.perspectiveFovRh(
|
||||
(std.math.pi / 4.0),
|
||||
@intToFloat(f32, app.current_desc.width) / @intToFloat(f32, app.current_desc.height),
|
||||
0.1,
|
||||
10,
|
||||
);
|
||||
const mvp = zm.mul(zm.mul(model, view), proj);
|
||||
const ubo = UniformBufferObject{
|
||||
.mat = zm.transpose(mvp),
|
||||
};
|
||||
encoder.writeBuffer(params.uniform_buffer, 0, UniformBufferObject, &.{ubo});
|
||||
}
|
||||
|
||||
const pass = encoder.beginRenderPass(&render_pass_info);
|
||||
pass.setPipeline(params.pipeline);
|
||||
pass.setVertexBuffer(0, params.vertex_buffer, 0, @sizeOf(Vertex) * vertices.len);
|
||||
pass.setBindGroup(0, params.bind_group, &.{});
|
||||
pass.draw(vertices.len, 1, 0, 0);
|
||||
pass.end();
|
||||
pass.release();
|
||||
|
||||
var command = encoder.finish(null);
|
||||
encoder.release();
|
||||
|
||||
params.queue.submit(&.{command});
|
||||
command.release();
|
||||
app.swap_chain.?.present();
|
||||
back_buffer_view.release();
|
||||
}
|
||||
|
||||
fn rgb24ToRgba32(allocator: std.mem.Allocator, in: []zigimg.color.Rgb24) !zigimg.color.ColorStorage {
|
||||
const out = try zigimg.color.ColorStorage.init(allocator, .Rgba32, in.len);
|
||||
var i: usize = 0;
|
||||
while (i < in.len) : (i += 1) {
|
||||
out.Rgba32[i] = zigimg.color.Rgba32{ .R = in[i].R, .G = in[i].G, .B = in[i].B, .A = 255 };
|
||||
}
|
||||
return out;
|
||||
}
|
||||
20
examples/textured-cube/vert.wgsl
Normal file
20
examples/textured-cube/vert.wgsl
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
struct Uniforms {
|
||||
modelViewProjectionMatrix : mat4x4<f32>;
|
||||
};
|
||||
@binding(0) @group(0) var<uniform> uniforms : Uniforms;
|
||||
|
||||
struct VertexOutput {
|
||||
@builtin(position) Position : vec4<f32>;
|
||||
@location(0) fragUV : vec2<f32>;
|
||||
@location(1) fragPosition: vec4<f32>;
|
||||
};
|
||||
|
||||
@stage(vertex)
|
||||
fn main(@location(0) position : vec4<f32>,
|
||||
@location(1) uv : vec2<f32>) -> VertexOutput {
|
||||
var output : VertexOutput;
|
||||
output.Position = position * uniforms.modelViewProjectionMatrix;
|
||||
output.fragUV = uv;
|
||||
output.fragPosition = 0.5 * (position + vec4<f32>(1.0, 1.0, 1.0, 1.0));
|
||||
return output;
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue