diff options
Diffstat (limited to 'servers')
| -rw-r--r-- | servers/physics_3d/collision_solver_3d_sat.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/rasterizer_rd/rasterizer_effects_rd.cpp | 2 | ||||
| -rw-r--r-- | servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/servers/physics_3d/collision_solver_3d_sat.cpp b/servers/physics_3d/collision_solver_3d_sat.cpp index 5096b080ab..d663209f6d 100644 --- a/servers/physics_3d/collision_solver_3d_sat.cpp +++ b/servers/physics_3d/collision_solver_3d_sat.cpp @@ -194,7 +194,7 @@ static void _generate_contacts_face_face(const Vector3 *p_points_A, int p_point_ // calculate intersection Vector3 rel = edge1_A - edge0_A; real_t den = clip.normal.dot(rel); - real_t dist = -(clip.normal.dot(edge0_A) - clip.d) / den; + real_t dist = -(clip.normal.dot(edge0_A) - clip.distance) / den; Vector3 inters = edge0_A + rel * dist; ERR_FAIL_COND(dst_idx >= max_clip); diff --git a/servers/rendering/rasterizer_rd/rasterizer_effects_rd.cpp b/servers/rendering/rasterizer_rd/rasterizer_effects_rd.cpp index d469dd97ca..afd1296002 100644 --- a/servers/rendering/rasterizer_rd/rasterizer_effects_rd.cpp +++ b/servers/rendering/rasterizer_rd/rasterizer_effects_rd.cpp @@ -558,7 +558,7 @@ void RasterizerEffectsRD::sub_surface_scattering(RID p_diffuse, RID p_diffuse2, int32_t y_groups = (p_screen_size.height - 1) / 8 + 1; Plane p = p_camera.xform4(Plane(1, 0, -1, 1)); - p.normal /= p.d; + p.normal /= p.distance; float unit_size = p.normal.x; { //scale color and depth to half diff --git a/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp b/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp index 8d299d623a..8ca8446c23 100644 --- a/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp +++ b/servers/rendering/rasterizer_rd/rasterizer_storage_rd.cpp @@ -1368,7 +1368,7 @@ _FORCE_INLINE_ static void _fill_std140_variant_ubo_value(ShaderLanguage::DataTy gui[0] = v.normal.x; gui[1] = v.normal.y; gui[2] = v.normal.z; - gui[3] = v.d; + gui[3] = v.distance; } } break; case ShaderLanguage::TYPE_MAT2: { @@ -4929,7 +4929,7 @@ void RasterizerStorageRD::_global_variable_store_in_buffer(int32_t p_index, RS:: bv.x = v.normal.x; bv.y = v.normal.y; bv.z = v.normal.z; - bv.w = v.d; + bv.w = v.distance; } break; case RS::GLOBAL_VAR_TYPE_COLOR: { GlobalVariables::Value &bv = global_variables.buffer_values[p_index]; |