[Bf-blender-cvs] [0dfc0f51085] uvimage-editor-drawing: CleanUp: renamed image_tiling to tiled_image
Jeroen Bakker
noreply at git.blender.org
Mon Aug 17 16:41:37 CEST 2020
Commit: 0dfc0f5108548ddb89d6156eec416b53a20ab415
Author: Jeroen Bakker
Date: Mon Aug 17 16:38:12 2020 +0200
Branches: uvimage-editor-drawing
https://developer.blender.org/rB0dfc0f5108548ddb89d6156eec416b53a20ab415
CleanUp: renamed image_tiling to tiled_image
===================================================================
M source/blender/draw/CMakeLists.txt
M source/blender/draw/engines/overlay2d/overlay2d_engine.c
M source/blender/draw/engines/overlay2d/overlay2d_private.h
M source/blender/draw/engines/overlay2d/overlay2d_shaders.c
R085 source/blender/draw/engines/overlay2d/overlay2d_image_tiling.c source/blender/draw/engines/overlay2d/overlay2d_tiled_image.c
R100 source/blender/draw/engines/overlay2d/shaders/overlay2d_image_tiling_border_vert.glsl source/blender/draw/engines/overlay2d/shaders/overlay2d_tiled_image_border_vert.glsl
===================================================================
diff --git a/source/blender/draw/CMakeLists.txt b/source/blender/draw/CMakeLists.txt
index 434e5e6003c..ed5fdac38e3 100644
--- a/source/blender/draw/CMakeLists.txt
+++ b/source/blender/draw/CMakeLists.txt
@@ -152,7 +152,7 @@ set(SRC
engines/overlay/overlay_wireframe.c
engines/overlay2d/overlay2d_background.c
engines/overlay2d/overlay2d_engine.c
- engines/overlay2d/overlay2d_image_tiling.c
+ engines/overlay2d/overlay2d_tiled_image.c
engines/overlay2d/overlay2d_shaders.c
engines/overlay2d/overlay2d_uv.c
engines/overlay2d/overlay2d_uv_shadow.c
@@ -413,7 +413,7 @@ data_to_c_simple(engines/overlay/shaders/xray_fade_frag.glsl SRC)
data_to_c_simple(engines/overlay2d/shaders/common_overlay2d_lib.glsl SRC)
data_to_c_simple(engines/overlay2d/shaders/overlay2d_background_frag.glsl SRC)
-data_to_c_simple(engines/overlay2d/shaders/overlay2d_image_tiling_border_vert.glsl SRC)
+data_to_c_simple(engines/overlay2d/shaders/overlay2d_tiled_image_border_vert.glsl SRC)
data_to_c_simple(engines/overlay2d/shaders/overlay2d_wireframe_frag.glsl SRC)
data_to_c_simple(engines/overlay2d/shaders/overlay2d_wireframe_geom.glsl SRC)
data_to_c_simple(engines/overlay2d/shaders/overlay2d_wireframe_vert.glsl SRC)
diff --git a/source/blender/draw/engines/overlay2d/overlay2d_engine.c b/source/blender/draw/engines/overlay2d/overlay2d_engine.c
index 47425b5d5c3..430246dcaa9 100644
--- a/source/blender/draw/engines/overlay2d/overlay2d_engine.c
+++ b/source/blender/draw/engines/overlay2d/overlay2d_engine.c
@@ -90,7 +90,7 @@ static void OVERLAY2D_engine_init_space_image(OVERLAY2D_Data *vedata, SpaceImage
pd->do_uv_stretching_overlay = is_image_type && is_uv_editor && is_edit_mode &&
((sima->flag & SI_DRAW_STRETCH) != 0);
pd->uv_opacity = sima->uv_opacity;
- pd->do_image_tiling_overlay = is_image_type && is_tiled_image;
+ pd->do_tiled_image_overlay = is_image_type && is_tiled_image;
pd->wireframe.line_style = overlay2d_line_style_from_space_image(sima);
pd->wireframe.do_smooth_wire = (sima->flag & SI_SMOOTH_UV) != 0;
@@ -150,8 +150,8 @@ static void OVERLAY2D_cache_init(void *vedata)
if (pd->do_uv_stretching_overlay) {
OVERLAY2D_uv_stretching_cache_init(od);
}
- if (pd->do_image_tiling_overlay) {
- OVERLAY2D_image_tiling_cache_init(od);
+ if (pd->do_tiled_image_overlay) {
+ OVERLAY2D_tiled_image_cache_init(od);
}
OVERLAY2D_background_cache_init(od);
@@ -194,8 +194,8 @@ static void OVERLAY2D_draw_scene(void *vedata)
OVERLAY2D_background_draw_scene(od);
/* Image Tiling */
- if (pd->do_image_tiling_overlay) {
- OVERLAY2D_image_tiling_draw_scene(od);
+ if (pd->do_tiled_image_overlay) {
+ OVERLAY2D_tiled_image_draw_scene(od);
}
/* Draw faces */
diff --git a/source/blender/draw/engines/overlay2d/overlay2d_private.h b/source/blender/draw/engines/overlay2d/overlay2d_private.h
index f025583a06e..83b218def9d 100644
--- a/source/blender/draw/engines/overlay2d/overlay2d_private.h
+++ b/source/blender/draw/engines/overlay2d/overlay2d_private.h
@@ -24,7 +24,7 @@
typedef struct OVERLAY2D_PassList {
DRWPass *background;
- DRWPass *image_tiling_borders;
+ DRWPass *tiled_image_borders;
DRWPass *uv_faces;
DRWPass *uv_verts;
DRWPass *uv_stretching;
@@ -52,7 +52,7 @@ typedef struct OVERLAY2D_PrivateData {
bool do_uv_overlay;
bool do_uv_shadow_overlay;
bool do_uv_stretching_overlay;
- bool do_image_tiling_overlay;
+ bool do_tiled_image_overlay;
float uv_opacity;
@@ -129,12 +129,12 @@ GPUShader *OVERLAY2D_shaders_uv_verts_get(void);
GPUShader *OVERLAY2D_shaders_uv_stretching_area_get(void);
GPUShader *OVERLAY2D_shaders_uv_stretching_angle_get(void);
GPUShader *OVERLAY2D_shaders_background_get(void);
-GPUShader *OVERLAY2D_shaders_image_tiling_border_get(void);
+GPUShader *OVERLAY2D_shaders_tiled_image_border_get(void);
GPUShader *OVERLAY2D_shaders_wireframe_resolve_get(void);
GPUShader *OVERLAY2D_shaders_wireframe_get(void);
void OVERLAY2D_shader_library_ensure(void);
void OVERLAY2D_shaders_free(void);
-/* overlay2d_image_tiling.c */
-void OVERLAY2D_image_tiling_cache_init(OVERLAY2D_Data *vedata);
-void OVERLAY2D_image_tiling_draw_scene(OVERLAY2D_Data *vedata);
+/* overlay2d_tiled_image.c */
+void OVERLAY2D_tiled_image_cache_init(OVERLAY2D_Data *vedata);
+void OVERLAY2D_tiled_image_draw_scene(OVERLAY2D_Data *vedata);
diff --git a/source/blender/draw/engines/overlay2d/overlay2d_shaders.c b/source/blender/draw/engines/overlay2d/overlay2d_shaders.c
index f4890b2c227..e093c2abdf5 100644
--- a/source/blender/draw/engines/overlay2d/overlay2d_shaders.c
+++ b/source/blender/draw/engines/overlay2d/overlay2d_shaders.c
@@ -46,7 +46,7 @@ extern char datatoc_overlay2d_wireframe_frag_glsl[];
extern char datatoc_overlay2d_wireframe_geom_glsl[];
extern char datatoc_overlay2d_wireframe_vert_glsl[];
extern char datatoc_overlay2d_uv_stretching_vert_glsl[];
-extern char datatoc_overlay2d_image_tiling_border_vert_glsl[];
+extern char datatoc_overlay2d_tiled_image_border_vert_glsl[];
typedef struct OVERLAY2D_Shaders {
GPUShader *background_sh;
@@ -56,7 +56,7 @@ typedef struct OVERLAY2D_Shaders {
GPUShader *uv_stretching_angle_sh;
GPUShader *uv_stretching_area_sh;
GPUShader *wireframe_sh;
- GPUShader *image_tiling_border_sh;
+ GPUShader *tiled_image_border_sh;
} OVERLAY2D_Shaders;
static struct {
@@ -168,18 +168,18 @@ GPUShader *OVERLAY2D_shaders_background_get(void)
return sh_data->background_sh;
}
-GPUShader *OVERLAY2D_shaders_image_tiling_border_get(void)
+GPUShader *OVERLAY2D_shaders_tiled_image_border_get(void)
{
OVERLAY2D_Shaders *sh_data = &e_data.shaders;
- if (!sh_data->image_tiling_border_sh) {
- sh_data->image_tiling_border_sh = DRW_shader_create_with_shaderlib(
- datatoc_overlay2d_image_tiling_border_vert_glsl,
+ if (!sh_data->tiled_image_border_sh) {
+ sh_data->tiled_image_border_sh = DRW_shader_create_with_shaderlib(
+ datatoc_overlay2d_tiled_image_border_vert_glsl,
NULL,
datatoc_gpu_shader_uniform_color_frag_glsl,
e_data.lib,
"#define INSTANCED_ATTR\n#define blender_srgb_to_framebuffer_space(a) a\n");
}
- return sh_data->image_tiling_border_sh;
+ return sh_data->tiled_image_border_sh;
}
void OVERLAY2D_shaders_free(void)
diff --git a/source/blender/draw/engines/overlay2d/overlay2d_image_tiling.c b/source/blender/draw/engines/overlay2d/overlay2d_tiled_image.c
similarity index 85%
rename from source/blender/draw/engines/overlay2d/overlay2d_image_tiling.c
rename to source/blender/draw/engines/overlay2d/overlay2d_tiled_image.c
index 5300f16fefc..cdd2211faa3 100644
--- a/source/blender/draw/engines/overlay2d/overlay2d_image_tiling.c
+++ b/source/blender/draw/engines/overlay2d/overlay2d_tiled_image.c
@@ -45,7 +45,7 @@ static struct {
GPUBatch *gpu_batch_instances;
} e_data = {0}; /* Engine data */
-void OVERLAY2D_image_tiling_cache_init(OVERLAY2D_Data *vedata)
+void OVERLAY2D_tiled_image_cache_init(OVERLAY2D_Data *vedata)
{
OVERLAY2D_PassList *psl = vedata->psl;
@@ -55,8 +55,8 @@ void OVERLAY2D_image_tiling_cache_init(OVERLAY2D_Data *vedata)
/* Image tiling borders */
{
- DRW_PASS_CREATE(psl->image_tiling_borders, DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_ALWAYS);
- GPUShader *sh = OVERLAY2D_shaders_image_tiling_border_get();
+ DRW_PASS_CREATE(psl->tiled_image_borders, DRW_STATE_WRITE_COLOR | DRW_STATE_DEPTH_ALWAYS);
+ GPUShader *sh = OVERLAY2D_shaders_tiled_image_border_get();
float theme_color[4], selected_color[4];
UI_GetThemeColorShade4fv(TH_BACK, 60, theme_color);
@@ -64,7 +64,7 @@ void OVERLAY2D_image_tiling_cache_init(OVERLAY2D_Data *vedata)
srgb_to_linearrgb_v4(theme_color, theme_color);
srgb_to_linearrgb_v4(selected_color, selected_color);
- DRWShadingGroup *grp = DRW_shgroup_create(sh, psl->image_tiling_borders);
+ DRWShadingGroup *grp = DRW_shgroup_create(sh, psl->tiled_image_borders);
DRW_shgroup_uniform_vec4_copy(grp, "color", theme_color);
DRW_shgroup_uniform_vec3_copy(grp, "offset", (float[3]){0.0f, 0.0f, 0.0f});
@@ -76,7 +76,7 @@ void OVERLAY2D_image_tiling_cache_init(OVERLAY2D_Data *vedata)
/* Active tile border */
ImageTile *tile = BLI_findlink(&image->tiles, image->active_tile_index);
float offset[3] = {((tile->tile_number - 1001) % 10), ((tile->tile_number - 1001) / 10), 0.0f};
- grp = DRW_shgroup_create(sh, psl->image_tiling_borders);
+ grp = DRW_shgroup_create(sh, psl->tiled_image_borders);
DRW_shgroup_uniform_vec4_copy(grp, "color", selected_color);
DRW_shgroup_uniform_vec3_copy(grp, "offset", offset);
DRW_shgroup_call(grp, DRW_cache_quad_image_wires_get(), NULL);
@@ -104,15 +104,15 @@ void OVERLAY2D_image_tiling_cache_init(OVERLAY2D_Data *vedata)
}
}
-static void overlay2d_image_tiling_draw_finish(OVERLAY2D_Data *UNUSED(vedata))
+static void overlay2d_tiled_image_draw_finish(OVERLAY2D_Data *UNUSED(vedata))
{
GPU_BATCH_DISCARD_SAFE(e_data.gpu_batch_instances);
}
-void OVERLAY2D_image_tiling_draw_scene(OVERLAY2D_Data *vedata)
+void OVERLAY2D_tiled_image_draw_scene(OVERLAY2D_Data *vedata)
{
OVERLAY2D_PassList *psl = vedata->psl;
- DRW_draw_pass(psl->image_tiling_borders);
+ DRW_draw_pass(psl->tiled_image_borders);
- overlay2d_image_tiling_draw_finish(vedata);
+ overlay2d_tiled_image_draw_finish(vedata);
}
diff --git a/source/blender/draw/engines/overlay2d/shaders/overlay2d_image_tiling_border_vert.glsl b/source/blender/draw/engines/overlay2d/shaders/overlay2d_tiled_image_border_vert.glsl
similarity index 100%
rename from source/blender/draw/engines/overlay2d/shaders/overlay2d_image_tiling_border_vert.glsl
rename to source/blender/draw/engines/overlay2d/shaders/overlay2d_tiled_image_border_vert.glsl
More information about the Bf-blender-cvs
mailing list