diff options
Diffstat (limited to 'src/3d')
| -rw-r--r-- | src/3d/renderer_draw.cc | 3 | ||||
| -rw-r--r-- | src/3d/renderer_pipelines.cc | 12 | ||||
| -rw-r--r-- | src/3d/scene_loader.cc | 3 | ||||
| -rw-r--r-- | src/3d/sdf_cpu.h | 9 |
4 files changed, 14 insertions, 13 deletions
diff --git a/src/3d/renderer_draw.cc b/src/3d/renderer_draw.cc index f2d1323..8a08998 100644 --- a/src/3d/renderer_draw.cc +++ b/src/3d/renderer_draw.cc @@ -60,8 +60,7 @@ void Renderer3D::update_uniforms(const Scene& scene, const Camera& camera, float plane_distance = 0.0f; if (obj.type == ObjectType::PLANE && obj.shared_user_data) { // Safely cast shared_user_data to PlaneData* and get distance - plane_distance = - ((PlaneData*)(obj.shared_user_data.get()))->distance; + plane_distance = ((PlaneData*)(obj.shared_user_data.get()))->distance; } data.params = diff --git a/src/3d/renderer_pipelines.cc b/src/3d/renderer_pipelines.cc index 57e71ae..be4a317 100644 --- a/src/3d/renderer_pipelines.cc +++ b/src/3d/renderer_pipelines.cc @@ -17,8 +17,8 @@ void Renderer3D::create_pipeline() { WGPURenderPipeline Renderer3D::create_pipeline_impl(bool use_bvh) { // Main SDF shader size_t size; - const char* shader_code = (const char*)( - GetAsset(AssetId::ASSET_SHADER_RENDERER_3D, &size)); + const char* shader_code = + (const char*)(GetAsset(AssetId::ASSET_SHADER_RENDERER_3D, &size)); // Compose the final shader by substituting the scene query implementation ShaderComposer::CompositionMap composition_map; @@ -134,8 +134,8 @@ WGPURenderPipeline Renderer3D::create_pipeline_impl(bool use_bvh) { void Renderer3D::create_mesh_pipeline() { size_t size; - const char* shader_code = (const char*)( - GetAsset(AssetId::ASSET_SHADER_MESH, &size)); + const char* shader_code = + (const char*)(GetAsset(AssetId::ASSET_SHADER_MESH, &size)); ShaderComposer::CompositionMap composition_map; if (bvh_enabled_) { @@ -261,8 +261,8 @@ void Renderer3D::create_mesh_pipeline() { void Renderer3D::create_skybox_pipeline() { size_t size; - const char* shader_code = (const char*)( - GetAsset(AssetId::ASSET_SHADER_SKYBOX, &size)); + const char* shader_code = + (const char*)(GetAsset(AssetId::ASSET_SHADER_SKYBOX, &size)); std::string composed_shader = ShaderComposer::Get().Compose({}, std::string(shader_code, size)); diff --git a/src/3d/scene_loader.cc b/src/3d/scene_loader.cc index 1ff2cc2..eb20954 100644 --- a/src/3d/scene_loader.cc +++ b/src/3d/scene_loader.cc @@ -159,8 +159,7 @@ bool LoadScene(Scene& scene, const uint8_t* data, size_t size) { // Assign the plane distance // Safely cast void* to PlaneData* using C-style cast on the shared_ptr's // get() - ((PlaneData*)(obj.shared_user_data.get()))->distance = - plane_distance; + ((PlaneData*)(obj.shared_user_data.get()))->distance = plane_distance; } // Add to scene diff --git a/src/3d/sdf_cpu.h b/src/3d/sdf_cpu.h index e7f9f47..16776fb 100644 --- a/src/3d/sdf_cpu.h +++ b/src/3d/sdf_cpu.h @@ -44,9 +44,12 @@ inline float sdPlane(vec3 p, vec3 n, float h) { */ template <typename F> inline vec3 calc_normal(vec3 p, F sdf_func, float e = 0.001f) { - return vec3(sdf_func(vec3(p.x + e, p.y, p.z)) - sdf_func(vec3(p.x - e, p.y, p.z)), - sdf_func(vec3(p.x, p.y + e, p.z)) - sdf_func(vec3(p.x, p.y - e, p.z)), - sdf_func(vec3(p.x, p.y, p.z + e)) - sdf_func(vec3(p.x, p.y, p.z - e))) + return vec3(sdf_func(vec3(p.x + e, p.y, p.z)) - + sdf_func(vec3(p.x - e, p.y, p.z)), + sdf_func(vec3(p.x, p.y + e, p.z)) - + sdf_func(vec3(p.x, p.y - e, p.z)), + sdf_func(vec3(p.x, p.y, p.z + e)) - + sdf_func(vec3(p.x, p.y, p.z - e))) .normalize(); } |
