Details

Reviewers

Clément Foucault (fclem)
Brecht Van Lommel (brecht)

Commits

rB4bf37bafc270: View3D Grid: fix imperial grid drawing

Summary

This is a step to finish the D4325 and fix the T61286.
Currently the grid is highlighted in steps of 10 out of 10, which is wrong for the imperial units as seen in buImperialLenDef.
The idea of the code is to pass the steps of the grid already dimensioned as a uniform.

Another important thing to note is that subdivisions now only affect the grid without unity.
This matches with previous versions of Blender.

*Performance Considerations:
After unrolling the loop, I see no significant change in peformanse.

Diff Detail

Repository: rB Blender

Event Timeline

Germano Cavalcante (mano-wii) created this revision.Feb 19 2019, 5:49 PM

Harbormaster completed remote builds in B2957: Diff 13753.Feb 19 2019, 5:49 PM

unroll loop;

Harbormaster completed remote builds in B2959: Diff 13758.Feb 19 2019, 10:58 PM

Germano Cavalcante (mano-wii) edited the summary of this revision. (Show Details)Feb 19 2019, 11:24 PM

Fix loop with non-detectable array size
Cleanup

Harbormaster completed remote builds in B2965: Diff 13772.Feb 20 2019, 4:10 PM

Germano Cavalcante (mano-wii) retitled this revision from View3D Grid: Draw each step as one of the imperial units to View3D Grid: fix drawing of grid with imperial units.Feb 20 2019, 4:12 PM

Germano Cavalcante (mano-wii) edited the summary of this revision. (Show Details)

rename ARRAY_SIZE(r_grid_steps) to STEP_LEN

Harbormaster completed remote builds in B2966: Diff 13773.Feb 20 2019, 4:24 PM

Germano Cavalcante (mano-wii) mentioned this in T61286: Viewport grid units should be visible.Feb 20 2019, 7:31 PM

update to master.

Harbormaster completed remote builds in B3010: Diff 13875.Feb 26 2019, 5:25 PM

This looks good to me. The only thing I would change is the blending factor. Here is a cubic interpolation that matches the old look better than the smoothstep.

diff --git a/source/blender/draw/modes/shaders/object_grid_frag.glsl b/source/blender/draw/modes/shaders/object_grid_frag.glsl
index f2293c1ee2e..9866406e57b 100644
--- a/source/blender/draw/modes/shaders/object_grid_frag.glsl
+++ b/source/blender/draw/modes/shaders/object_grid_frag.glsl
@@ -70,6 +70,8 @@ vec3 get_axes(vec3 co, vec3 fwidthCos, float line_size)
 	return 1.0 - smoothstep(GRID_LINE_SMOOTH_START, GRID_LINE_SMOOTH_END, axes_domain - (line_size + lineKernel));
 }
 
+#define linearstep(p0, p1, v) (clamp(((v) - (p0)) / abs((p1) - (p0)), 0.0, 1.0))
+
 void main()
 {
 	vec3 wPos = local_pos * meshSize;
@@ -159,7 +161,8 @@ void main()
 			scale = vec4(grid_steps[6], grid_steps[7], grid_steps[7], grid_steps[7]);
 		}
 #endif
-		float blend = 1.0 - smoothstep(scale[0], scale[1], grid_res);
+		float blend = 1.0 - linearstep(scale[0], scale[1], grid_res);
+		blend = blend * blend * blend;
 
 		vec2 grid_pos, grid_fwidth;
 		if ((gridFlag & PLANE_XZ) != 0) {

After that I would accept the patch.

source/blender/draw/modes/shaders/object_grid_frag.glsl
13	Style: Uniform should be camelCase

Remove unused UBO members;
Rename grid_distance -> gridDistance;
Use interpolation of type cubic;

Harbormaster completed remote builds in B3017: Diff 13915.Feb 28 2019, 12:16 AM

Germano Cavalcante (mano-wii) marked an inline comment as done.Feb 28 2019, 12:17 AM

Germano Cavalcante (mano-wii) edited the summary of this revision. (Show Details)Feb 28 2019, 12:20 AM

Rey Leonard M. Amorato (rl.amorato) added a subscriber: Rey Leonard M. Amorato (rl.amorato).Apr 15 2019, 7:14 AM

Germano Cavalcante (mano-wii) mentioned this in D5265: Restore grid spacing info in 3D views (as present in 2.79).Jul 16 2019, 7:44 PM

Forest Katsch (zlsa) awarded a token.Jul 16 2019, 8:36 PM

Forest Katsch (zlsa) added a subscriber: Forest Katsch (zlsa).

Rebase Master
Improve comment
Fix cubic interpolation being operated in the opposite way

Harbormaster completed remote builds in B4472: Diff 17214.Aug 17 2019, 12:58 AM

Remove unnecessary fov calculation

Harbormaster completed remote builds in B4489: Diff 17258.Aug 19 2019, 1:09 PM

Just some style comments which you can fix before commit.

source/blender/draw/modes/shaders/object_grid_frag.glsl
12–13	This should be camel case as well then.
23	Camel case.
125–126	Don't leave commented out code without explaining why it is commented out.
source/blender/draw/modes/shaders/object_grid_vert.glsl
5–6	Camel case.