blender
/
blender
136
408
Fork 592
Code Issues 6.3k Pull Requests 775 Projects 19 Wiki Activity

#70267 Retopology Overlay #104599

Merged
Clément Foucault merged 30 commits from bonj/blender:retopology-overlay into main 2023-03-03 00:35:56 +01:00
Conversation 39 Commits 30 Files Changed 25 +4 -4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3a90751a0b - Show all commits

8
source/blender/draw/intern/shaders/common_view_lib.glsl
View File

@ -257,18 +257,18 @@ vec3 point_world_to_view(vec3 p)
return (ViewMatrix * vec4(p, 1.0)).xyz;
}
/* View Z is used to adjust for perspective projection.
/* Viewspace Z is used to adjust for perspective projection.
* Homogenous W is used to convert from NDC to homogenous space.
bonj marked this conversation as resolved
Clément Foucault commented 2023-02-26 18:38:07 +01:00
Review
Copy Link

My bad. The equation is actually comming from page 24.

My bad. The equation is actually comming from page 24.
Jorijn de Graaf commented 2023-02-26 19:35:55 +01:00
Review
Copy Link

I thought you picked 18 because it's the start of the section about depth modification. I think it makes sense to point to the whole range of pages (18-26).

I thought you picked 18 because it's the start of the section about depth modification. I think it makes sense to point to the whole range of pages (18-26).
Clément Foucault commented 2023-02-26 21:55:56 +01:00
Review
Copy Link

Yes, but here it is the reference to a specific formula. I also think this reference should be inside the function. Comment on top of function is only for documentation of the function usage.

Yes, but here it is the reference to a specific formula. I also think this reference should be inside the function. Comment on top of function is only for documentation of the function usage.
Jorijn de Graaf commented 2023-02-26 22:35:19 +01:00
Review
Copy Link

Done.

Done.
* Offset is in viewspace, so positive values are closer to the camera. */
float get_homogenous_z_offset(float vs_z, float hs_w, float offset)
float get_homogenous_z_offset(float vs_z, float hs_w, float vs_offset)
{
if (ProjectionMatrix[3][3] == 0.0) {
bonj marked this conversation as resolved
Clément Foucault commented 2023-02-26 18:45:55 +01:00
Review
Copy Link

Maybe also add a note that offset is in viewspace. So positive values are closer to camera.

Maybe also add a note that offset is in viewspace. So positive values are closer to camera.
Jorijn de Graaf commented 2023-02-27 00:33:49 +01:00
Review
Copy Link

Done, now each parameter has an explanation.

Done, now each parameter has an explanation.
/* From "Projection Matrix Tricks" by Eric Lengyel:
* http://www.terathon.com/gdc07_lengyel.pdf (p. 24 Depth Modification) */
return ProjectionMatrix[3][2] * (offset / (vs_z * (vs_z + offset))) * hs_w;
return ProjectionMatrix[3][2] * (vs_offset / (vs_z * (vs_z + vs_offset))) * hs_w;
bonj marked this conversation as resolved
Clément Foucault commented 2023-02-26 18:39:10 +01:00
Review
Copy Link

Remove the negative sign here and everywhere get_homogenous_z_offset is called.
The negative sign in the equation from the slide is inside ProjectionMatrix[3][2].

Remove the negative sign here and everywhere `get_homogenous_z_offset` is called. The negative sign in the equation from the slide is inside `ProjectionMatrix[3][2]`.
Jorijn de Graaf commented 2023-02-27 00:35:48 +01:00
Review
Copy Link

Done and done.
I negated it because then you can subtract from the Z, which is what other offsets in the shader do, but yeah it was unnecessary so now they just use += for this.

Done and done. I negated it because then you can subtract from the Z, which is what other offsets in the shader do, but yeah it was unnecessary so now they just use += for this.
}
else {
return ProjectionMatrix[2][2] * offset * hs_w;
return ProjectionMatrix[2][2] * vs_offset * hs_w;
}
}