Overlay-Next: Grid 2D #127285

Laurynas Duburas · 2024-09-07T16:45:40+02:00

Laurynas Duburas commented

2024-09-07 16:45:40 +02:00

Overlay-Next version of Grid 2D

Rel #102179

Overlay-Next version of Grid 2D Rel #102179

Laurynas Duburas added 1 commit 2024-09-07 16:45:51 +02:00

Overlay-Next: Grid 2D b6e4f60b95

Laurynas Duburas requested review from Clément Foucault 2024-09-07 16:46:07 +02:00

Laurynas Duburas changed title from ~~WIP: Overlay-Next: Grid 2D~~ to Overlay-Next: Grid 2D

2024-09-07 16:46:11 +02:00

Laurynas Duburas changed title from ~~Overlay-Next: Grid 2D~~ to WIP: Overlay-Next: Grid 2D

2024-09-07 17:17:52 +02:00

Laurynas Duburas added 1 commit 2024-09-07 17:35:28 +02:00

fix hide overlays in image space eca2fb4a2c

Laurynas Duburas changed title from ~~WIP: Overlay-Next: Grid 2D~~ to Overlay-Next: Grid 2D

2024-09-07 17:38:09 +02:00

Clément Foucault requested changes 2024-09-07 21:03:54 +02:00

Dismissed

Clément Foucault left a comment

It is a bit hard to see the actual change interleived with just .

Do you think it would be wise to split the 2D grid into its own class? I believe it would reduce the spaghettiness.

Eventually we would have the Grid as a Virtual class. But for now I would just have both Grid3D and Grid2D side by side, each enabled only for the correct area type.

It is a bit hard to see the actual change interleived with just . Do you think it would be wise to split the 2D grid into its own class? I believe it would reduce the spaghettiness. Eventually we would have the Grid as a Virtual class. But for now I would just have both `Grid3D` and `Grid2D` side by side, each enabled only for the correct area type.

source/blender/draw/engines/overlay/overlay_next_grid.hh Outdated

						
				@ -53,0 +55,4 @@

				      sub.bind_texture("depthBuffer", &res.depth_tx);

				      float4x4 mat;

				      unit_m4(mat.ptr());

				      mat[0][0] = data_.size[0];

Clément Foucault commented

2024-09-07 20:56:15 +02:00

Use from_scale<float4x4>

Use `from_scale<float4x4>`

laurynas marked this conversation as resolved

Laurynas Duburas commented

2024-09-07 21:35:26 +02:00

Do you think it would be wise to split the 2D grid into its own class? I believe it would reduce the spaghettiness.

I had same thoughts while looking at overlay_engine.c. 2D is always used with == SPACE_IMAGE there. Inside of Grid also == SPACE_IMAGE.

Eventually we would have the Grid as a Virtual class.
You want to create some particular implementation Grid inInstance::init() and to use it without extra ifs in other Instance methods?

Yet I'm not sure about two classes. Most of the code is common so it would still be twisted. I'll try to reorganize things in single class first.

> Do you think it would be wise to split the 2D grid into its own class? I believe it would reduce the spaghettiness. > I had same thoughts while looking at `overlay_engine.c`. 2D is always used with ` == SPACE_IMAGE` there. Inside of `Grid` also `== SPACE_IMAGE`. > Eventually we would have the Grid as a Virtual class. You want to create some particular implementation `Grid` in`Instance::init()` and to use it without extra `if`s in other `Instance` methods? Yet I'm not sure about two classes. Most of the code is common so it would still be twisted. I'll try to reorganize things in single class first.

Laurynas Duburas changed title from ~~Overlay-Next: Grid 2D~~ to WIP: Overlay-Next: Grid 2D

2024-09-07 22:55:39 +02:00

Laurynas Duburas added 1 commit 2024-09-07 22:58:02 +02:00

init_2d and init_3d 26827091cf

Laurynas Duburas added 1 commit 2024-09-09 21:36:39 +02:00

fix tiles drawing 07534517da

Laurynas Duburas commented

2024-09-09 21:51:08 +02:00

I've reorganized code, now I think single class for both is better.

I had to move to MainPass because of:

         ResourceHandle handle = manager.resource_handle(mat);
         sub.draw(shapes.quad_wire.get(), handle);

Maybe it is possible to collect matrices in one StorageVectorBuffer<float4x4>, override with it model matrix and draw with a single call like sub.draw(shapes.quad_wire.get(), size)?

I've reorganized code, now I think single class for both is better. I had to move to `MainPass` because of: ```c ResourceHandle handle = manager.resource_handle(mat); sub.draw(shapes.quad_wire.get(), handle); ``` Maybe it is possible to collect matrices in one `StorageVectorBuffer<float4x4>`, override with it model matrix and draw with a single call like `sub.draw(shapes.quad_wire.get(), size)`?

Laurynas Duburas changed title from ~~WIP: Overlay-Next: Grid 2D~~ to Overlay-Next: Grid 2D

2024-09-09 21:51:14 +02:00

Clément Foucault commented

2024-09-09 22:50:02 +02:00

Maybe it is possible to collect matrices in one StorageVectorBuffer<float4x4>, override with it model matrix and draw with a single call like sub.draw(shapes.quad_wire.get(), size)?

Yes. You can modify the shader create info from the patch lambda function for that purpose.

> Maybe it is possible to collect matrices in one `StorageVectorBuffer<float4x4>`, override with it model matrix and draw with a single call like sub.draw(shapes.quad_wire.get(), size)? Yes. You can modify the shader create info from the patch lambda function for that purpose.

Laurynas Duburas added 1 commit 2024-09-10 10:39:22 +02:00

back to PassSimple by adding tile_matrix_buf 1e0c5b6a27

Clément Foucault requested changes 2024-09-10 11:04:57 +02:00

Dismissed

source/blender/draw/engines/overlay/overlay_next_grid.hh

						
				@ -82,4 +129,1 @@

				      return;

				    }

				    float grid_steps[SI_GRID_STEPS_LEN] = {

Clément Foucault commented

2024-09-10 11:00:40 +02:00

Move that to init_2d and init_3d and add x or y suffix when applicable. This would clearer.

Also should be std::array since size is known at compile time.

Move that to `init_2d` and `init_3d` and add `x` or `y` suffix when applicable. This would clearer. Also should be `std::array` since size is known at compile time.

fclem marked this conversation as resolved

source/blender/draw/engines/overlay/overlay_next_grid.hh Outdated

						
				@ -92,0 +136,4 @@

				                                               init_3d(state, view, grid_steps);

				  }

				  void copy_steps_to_data(float grid_steps_x[], float grid_steps_y[])