summaryrefslogtreecommitdiff
path: root/src/3d/renderer.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/3d/renderer.cc')
-rw-r--r--src/3d/renderer.cc286
1 files changed, 44 insertions, 242 deletions
diff --git a/src/3d/renderer.cc b/src/3d/renderer.cc
index 9dfc1f8..eea3ff0 100644
--- a/src/3d/renderer.cc
+++ b/src/3d/renderer.cc
@@ -1,5 +1,5 @@
// This file is part of the 64k demo project.
-// It implements the Renderer3D class.
+// It implements the core Renderer3D class logic.
#include "3d/renderer.h"
#include "generated/assets.h"
@@ -37,93 +37,6 @@ void Renderer3D::init(WGPUDevice device, WGPUQueue queue,
#endif
}
-void Renderer3D::create_skybox_pipeline() {
- WGPUBindGroupLayoutEntry entries[3] = {};
- entries[0].binding = 0;
- entries[0].visibility = WGPUShaderStage_Fragment;
- entries[0].texture.sampleType = WGPUTextureSampleType_Float;
- entries[0].texture.viewDimension = WGPUTextureViewDimension_2D;
-
- entries[1].binding = 1;
- entries[1].visibility = WGPUShaderStage_Fragment;
- entries[1].sampler.type = WGPUSamplerBindingType_Filtering;
-
- entries[2].binding = 2;
- entries[2].visibility = WGPUShaderStage_Fragment;
- entries[2].buffer.type = WGPUBufferBindingType_Uniform;
- entries[2].buffer.minBindingSize = sizeof(GlobalUniforms);
-
- WGPUBindGroupLayoutDescriptor bgl_desc = {};
- bgl_desc.entryCount = 3;
- bgl_desc.entries = entries;
- WGPUBindGroupLayout bgl = wgpuDeviceCreateBindGroupLayout(device_, &bgl_desc);
-
- WGPUPipelineLayoutDescriptor pl_desc = {};
- pl_desc.bindGroupLayoutCount = 1;
- pl_desc.bindGroupLayouts = &bgl;
- WGPUPipelineLayout pipeline_layout =
- wgpuDeviceCreatePipelineLayout(device_, &pl_desc);
-
- const uint8_t* shader_code_asset =
- GetAsset(AssetId::ASSET_SHADER_SKYBOX, nullptr);
- std::string shader_source =
- ShaderComposer::Get().Compose({}, (const char*)shader_code_asset);
-
-#if defined(DEMO_CROSS_COMPILE_WIN32)
- WGPUShaderModuleWGSLDescriptor wgsl_desc = {};
- wgsl_desc.chain.sType = WGPUSType_ShaderModuleWGSLDescriptor;
- wgsl_desc.code = shader_source.c_str();
- WGPUShaderModuleDescriptor shader_desc = {};
- shader_desc.nextInChain = (const WGPUChainedStruct*)&wgsl_desc.chain;
-#else
- WGPUShaderSourceWGSL wgsl_desc = {};
- wgsl_desc.chain.sType = WGPUSType_ShaderSourceWGSL;
- wgsl_desc.code = str_view(shader_source.c_str());
- WGPUShaderModuleDescriptor shader_desc = {};
- shader_desc.nextInChain = (const WGPUChainedStruct*)&wgsl_desc.chain;
-#endif
- WGPUShaderModule shader_module =
- wgpuDeviceCreateShaderModule(device_, &shader_desc);
-
- WGPURenderPipelineDescriptor desc = {};
- desc.layout = pipeline_layout;
- desc.vertex.module = shader_module;
-#if defined(DEMO_CROSS_COMPILE_WIN32)
- desc.vertex.entryPoint = "vs_main";
-#else
- desc.vertex.entryPoint = {"vs_main", 7};
-#endif
- WGPUColorTargetState color_target = {};
- color_target.format = format_;
- color_target.writeMask = WGPUColorWriteMask_All;
- WGPUFragmentState fragment = {};
- fragment.module = shader_module;
-#if defined(DEMO_CROSS_COMPILE_WIN32)
- fragment.entryPoint = "fs_main";
-#else
- fragment.entryPoint = {"fs_main", 7};
-#endif
- fragment.targetCount = 1;
- fragment.targets = &color_target;
- desc.fragment = &fragment;
- desc.primitive.topology = WGPUPrimitiveTopology_TriangleList;
- desc.primitive.cullMode = WGPUCullMode_Back;
- desc.primitive.frontFace = WGPUFrontFace_CCW;
- desc.multisample.count = 1;
- desc.multisample.mask = 0xFFFFFFFF;
-
- WGPUDepthStencilState depth_stencil = {};
- depth_stencil.format = WGPUTextureFormat_Depth24Plus;
- depth_stencil.depthWriteEnabled = WGPUOptionalBool_False;
- depth_stencil.depthCompare = WGPUCompareFunction_Always;
- desc.depthStencil = &depth_stencil;
-
- skybox_pipeline_ = wgpuDeviceCreateRenderPipeline(device_, &desc);
- wgpuBindGroupLayoutRelease(bgl);
- wgpuPipelineLayoutRelease(pipeline_layout);
- wgpuShaderModuleRelease(shader_module);
-}
-
void Renderer3D::shutdown() {
#if !defined(STRIP_ALL)
visual_debug_.shutdown();
@@ -137,6 +50,8 @@ void Renderer3D::shutdown() {
wgpuRenderPipelineRelease(pipeline_no_bvh_);
if (bind_group_)
wgpuBindGroupRelease(bind_group_);
+ if (mesh_pipeline_)
+ wgpuRenderPipelineRelease(mesh_pipeline_);
if (skybox_pipeline_)
wgpuRenderPipelineRelease(skybox_pipeline_);
if (skybox_bind_group_)
@@ -151,6 +66,15 @@ void Renderer3D::shutdown() {
wgpuTextureViewRelease(depth_view_);
if (depth_texture_)
wgpuTextureRelease(depth_texture_);
+
+ // Clear mesh cache
+ for (auto& pair : mesh_cache_) {
+ if (pair.second.vertex_buffer)
+ wgpuBufferRelease(pair.second.vertex_buffer);
+ if (pair.second.index_buffer)
+ wgpuBufferRelease(pair.second.index_buffer);
+ }
+ mesh_cache_.clear();
}
void Renderer3D::resize(int width, int height) {
@@ -214,157 +138,6 @@ void Renderer3D::add_debug_aabb(const vec3& min, const vec3& max,
#endif
}
-void Renderer3D::create_pipeline() {
- pipeline_ = create_pipeline_impl(true); // BVH enabled
- pipeline_no_bvh_ = create_pipeline_impl(false); // BVH disabled
-}
-
-WGPURenderPipeline Renderer3D::create_pipeline_impl(bool use_bvh) {
- std::vector<WGPUBindGroupLayoutEntry> entries;
-
- // Binding 0: Global Uniforms
- {
- WGPUBindGroupLayoutEntry e = {};
- e.binding = 0;
- e.visibility = WGPUShaderStage_Vertex | WGPUShaderStage_Fragment;
- e.buffer.type = WGPUBufferBindingType_Uniform;
- e.buffer.minBindingSize = sizeof(GlobalUniforms);
- entries.push_back(e);
- }
-
- // Binding 1: Object Data
- {
- WGPUBindGroupLayoutEntry e = {};
- e.binding = 1;
- e.visibility = WGPUShaderStage_Vertex | WGPUShaderStage_Fragment;
- e.buffer.type = WGPUBufferBindingType_ReadOnlyStorage;
- e.buffer.minBindingSize = sizeof(ObjectData) * kMaxObjects;
- entries.push_back(e);
- }
-
- // Binding 2: BVH Nodes (only if BVH is used)
- if (use_bvh) {
- WGPUBindGroupLayoutEntry e = {};
- e.binding = 2;
- e.visibility = WGPUShaderStage_Fragment;
- e.buffer.type = WGPUBufferBindingType_ReadOnlyStorage;
- e.buffer.minBindingSize = sizeof(BVHNode) * kMaxObjects * 2;
- entries.push_back(e);
- }
-
- // Binding 3: Noise Texture
- {
- WGPUBindGroupLayoutEntry e = {};
- e.binding = 3;
- e.visibility = WGPUShaderStage_Fragment;
- e.texture.sampleType = WGPUTextureSampleType_Float;
- e.texture.viewDimension = WGPUTextureViewDimension_2D;
- entries.push_back(e);
- }
-
- // Binding 4: Default Sampler
- {
- WGPUBindGroupLayoutEntry e = {};
- e.binding = 4;
- e.visibility = WGPUShaderStage_Fragment;
- e.sampler.type = WGPUSamplerBindingType_Filtering;
- entries.push_back(e);
- }
-
- // Binding 5: Sky Texture
- {
- WGPUBindGroupLayoutEntry e = {};
- e.binding = 5;
- e.visibility = WGPUShaderStage_Fragment;
- e.texture.sampleType = WGPUTextureSampleType_Float;
- e.texture.viewDimension = WGPUTextureViewDimension_2D;
- entries.push_back(e);
- }
-
- WGPUBindGroupLayoutDescriptor bgl_desc = {};
- bgl_desc.entryCount = (uint32_t)entries.size();
- bgl_desc.entries = entries.data();
- WGPUBindGroupLayout bgl = wgpuDeviceCreateBindGroupLayout(device_, &bgl_desc);
-
- WGPUPipelineLayoutDescriptor pl_desc = {};
- pl_desc.bindGroupLayoutCount = 1;
- pl_desc.bindGroupLayouts = &bgl;
- WGPUPipelineLayout pipeline_layout =
- wgpuDeviceCreatePipelineLayout(device_, &pl_desc);
-
- const char* asset_data =
- (const char*)GetAsset(AssetId::ASSET_SHADER_RENDERER_3D);
- std::string main_code = asset_data;
-
- // Use ShaderComposer to dynamically include the correct scene_query snippet
- ShaderComposer::CompositionMap composition_map;
- if (use_bvh) {
- composition_map["render/scene_query_mode"] = "render/scene_query_bvh";
- } else {
- composition_map["render/scene_query_mode"] = "render/scene_query_linear";
- }
- std::string shader_source = ShaderComposer::Get().Compose({}, main_code, composition_map);
-
- // DEBUG: Print shader source to check for include errors
- std::cout << "Shader Source (BVH=" << use_bvh << "):" << std::endl << shader_source << std::endl;
-
-#if defined(DEMO_CROSS_COMPILE_WIN32)
- WGPUShaderModuleWGSLDescriptor wgsl_desc = {};
- wgsl_desc.chain.sType = WGPUSType_ShaderModuleWGSLDescriptor;
- wgsl_desc.code = shader_source.c_str();
- WGPUShaderModuleDescriptor shader_desc = {};
- shader_desc.nextInChain = (const WGPUChainedStruct*)&wgsl_desc.chain;
-#else
- WGPUShaderSourceWGSL wgsl_desc = {};
- wgsl_desc.chain.sType = WGPUSType_ShaderSourceWGSL;
- wgsl_desc.code = str_view(shader_source.c_str());
- WGPUShaderModuleDescriptor shader_desc = {};
- shader_desc.nextInChain = (const WGPUChainedStruct*)&wgsl_desc.chain;
-#endif
- WGPUShaderModule shader_module =
- wgpuDeviceCreateShaderModule(device_, &shader_desc);
-
- WGPUDepthStencilState depth_stencil = {};
- depth_stencil.format = WGPUTextureFormat_Depth24Plus;
- depth_stencil.depthWriteEnabled = WGPUOptionalBool_True;
- depth_stencil.depthCompare = WGPUCompareFunction_Less;
-
- WGPURenderPipelineDescriptor desc = {};
- desc.layout = pipeline_layout;
- desc.vertex.module = shader_module;
-#if defined(DEMO_CROSS_COMPILE_WIN32)
- desc.vertex.entryPoint = "vs_main";
-#else
- desc.vertex.entryPoint = {"vs_main", 7};
-#endif
- WGPUColorTargetState color_target = {};
- color_target.format = format_;
- color_target.writeMask = WGPUColorWriteMask_All;
- WGPUFragmentState fragment = {};
- fragment.module = shader_module;
-#if defined(DEMO_CROSS_COMPILE_WIN32)
- fragment.entryPoint = "fs_main";
-#else
- fragment.entryPoint = {"fs_main", 7};
-#endif
- fragment.targetCount = 1;
- fragment.targets = &color_target;
- desc.fragment = &fragment;
- desc.primitive.topology = WGPUPrimitiveTopology_TriangleList;
- desc.primitive.cullMode = WGPUCullMode_Back;
- desc.primitive.frontFace = WGPUFrontFace_CCW;
- desc.depthStencil = &depth_stencil;
- desc.multisample.count = 1;
- desc.multisample.mask = 0xFFFFFFFF;
-
- WGPURenderPipeline pipeline = wgpuDeviceCreateRenderPipeline(device_, &desc);
- wgpuBindGroupLayoutRelease(bgl);
- wgpuPipelineLayoutRelease(pipeline_layout);
- wgpuShaderModuleRelease(shader_module);
-
- return pipeline;
-}
-
void Renderer3D::update_uniforms(const Scene& scene, const Camera& camera,
float time) {
GlobalUniforms globals;
@@ -399,7 +172,9 @@ void Renderer3D::update_uniforms(const Scene& scene, const Camera& camera,
type_id = 3.0f;
else if (obj.type == ObjectType::PLANE)
type_id = 4.0f;
- data.params = vec4(type_id, 0, 0, 0);
+ else if (obj.type == ObjectType::MESH)
+ type_id = 5.0f;
+ data.params = vec4(type_id, obj.local_extent.x, obj.local_extent.y, obj.local_extent.z);
obj_data.push_back(data);
if (obj_data.size() >= kMaxObjects)
break;
@@ -497,15 +272,42 @@ void Renderer3D::draw(WGPURenderPassEncoder pass, const Scene& scene,
(uint32_t)std::min((size_t)kMaxObjects, scene.objects.size());
if (instance_count > 0) {
+ wgpuRenderPassEncoderSetPipeline(pass, current_pipeline);
+ wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
wgpuRenderPassEncoderDraw(pass, 36, instance_count, 0, 0);
+
+ // Mesh pass
+ if (mesh_pipeline_) {
+ wgpuRenderPassEncoderSetPipeline(pass, mesh_pipeline_);
+ // Bind group is the same layout
+ wgpuRenderPassEncoderSetBindGroup(pass, 0, bind_group_, 0, nullptr);
+
+ for (uint32_t i = 0; i < instance_count; ++i) {
+ const auto& obj = scene.objects[i];
+ if (obj.type == ObjectType::MESH) {
+ const MeshGpuData* mesh = temp_mesh_override_ ? temp_mesh_override_ : get_or_create_mesh(obj.mesh_asset_id);
+ if (mesh) {
+ wgpuRenderPassEncoderSetVertexBuffer(pass, 0, mesh->vertex_buffer, 0,
+ WGPU_WHOLE_SIZE);
+ wgpuRenderPassEncoderSetIndexBuffer(
+ pass, mesh->index_buffer, WGPUIndexFormat_Uint32, 0,
+ WGPU_WHOLE_SIZE);
+ wgpuRenderPassEncoderDrawIndexed(pass, mesh->num_indices, 1, 0, 0,
+ i);
+ }
+ }
+ }
+ }
}
#if !defined(STRIP_ALL)
if (s_debug_enabled_) {
for (const auto& obj : scene.objects) {
- vec3 extent(1.0f, 1.0f, 1.0f);
+ vec3 extent = obj.local_extent;
if (obj.type == ObjectType::TORUS) {
extent = vec3(1.5f, 0.5f, 1.5f);
+ } else if (obj.type != ObjectType::MESH) {
+ extent = vec3(1.0f, 1.0f, 1.0f);
}
visual_debug_.add_box(obj.get_model_matrix(), extent,
vec3(1.0f, 1.0f, 0.0f)); // Yellow boxes
@@ -620,4 +422,4 @@ void Renderer3D::render(const Scene& scene, const Camera& camera, float time,
wgpuCommandBufferRelease(commands);
wgpuCommandEncoderRelease(encoder);
-}
+} \ No newline at end of file
generated by cgit v1.2.3 (git 2.51.0) at 2026-02-06 10:19:16 +0000