ed/raddebugger
1
0
Fork 0
mirror of https://github.com/Ed94/raddebugger.git synced 2026-08-04 12:58:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix flipped y transform application in upgraded shader

Browse Source
This commit is contained in:
Ryan Fleury
2024-01-23 15:31:40 -08:00
parent 37a0d9e148
commit 4e561b1b38
3 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/df/gfx/df_gfx.c
+1 -1
View File
@@ -8232,7 +8232,7 @@ df_box_equip_fuzzy_match_range_list_vis(UI_Box *box, DF_FuzzyMatchRangeList rang
f_dim_from_tag_size_string(box->font, box->font_size, str8_prefix(display_string, match_n->range.max)).x, f_dim_from_tag_size_string(box->font, box->font_size, str8_prefix(display_string, match_n->range.max)).x,
}; };
ui_set_next_fixed_x(match_pixel_range.min + box->text_padding + 2.f); ui_set_next_fixed_x(match_pixel_range.min + box->text_padding + 2.f);
ui_set_next_fixed_y(box->font_size/4.f); ui_set_next_fixed_y(box->font_size/2.f);
ui_set_next_fixed_width(match_pixel_range.max-match_pixel_range.min); ui_set_next_fixed_width(match_pixel_range.max-match_pixel_range.min);
ui_set_next_fixed_height(line_height*1.2f); ui_set_next_fixed_height(line_height*1.2f);
ui_set_next_corner_radius_00(box->font_size/2.f); ui_set_next_corner_radius_00(box->font_size/2.f);
src/render/d3d11/generated/render_d3d11.meta.h
+8 -7
View File
@@ -102,10 +102,10 @@ str8_lit_comp(
" //- rjf: prep per-vertex arrays to sample from (p: position, t: texcoord, c: colorcoord, r: cornerradius)\n" " //- rjf: prep per-vertex arrays to sample from (p: position, t: texcoord, c: colorcoord, r: cornerradius)\n"
" float2 dst_p_verts_px[] =\n" " float2 dst_p_verts_px[] =\n"
" {\n" " {\n"
" float2(dst_p0_px.x, viewport_size_px.y - dst_p1_px.y),\n" " float2(dst_p0_px.x, dst_p1_px.y),\n"
" float2(dst_p0_px.x, viewport_size_px.y - dst_p0_px.y),\n" " float2(dst_p0_px.x, dst_p0_px.y),\n"
" float2(dst_p1_px.x, viewport_size_px.y - dst_p1_px.y),\n" " float2(dst_p1_px.x, dst_p1_px.y),\n"
" float2(dst_p1_px.x, viewport_size_px.y - dst_p0_px.y),\n" " float2(dst_p1_px.x, dst_p0_px.y),\n"
" };\n" " };\n"
" float2 src_p_verts_px[] =\n" " float2 src_p_verts_px[] =\n"
" {\n" " {\n"
@@ -127,14 +127,15 @@ str8_lit_comp(
" cpu2vertex.color11,\n" " cpu2vertex.color11,\n"
" cpu2vertex.color10,\n" " cpu2vertex.color10,\n"
" };\n" " };\n"
" float2 dst_verts_pct = float2(\n" " float2 dst_verts_pct = float2((cpu2vertex.vertex_id >> 1) ? 1.f : 0.f,\n"
" (cpu2vertex.vertex_id >> 1) ? 1.f : 0.f,\n"
" (cpu2vertex.vertex_id & 1) ? 0.f : 1.f);\n" " (cpu2vertex.vertex_id & 1) ? 0.f : 1.f);\n"
" \n" " \n"
" // rjf: fill vertex -> pixel data\n" " // rjf: fill vertex -> pixel data\n"
" Vertex2Pixel vertex2pixel;\n" " Vertex2Pixel vertex2pixel;\n"
" {\n" " {\n"
" vertex2pixel.position.xy = 2.f * mul(xform, float3(dst_p_verts_px[cpu2vertex.vertex_id], 1.f)).xy / viewport_size_px - 1.f;\n" " float2 xformed_pos = mul(xform, float3(dst_p_verts_px[cpu2vertex.vertex_id], 1.f)).xy;\n"
" xformed_pos.y = viewport_size_px.y - xformed_pos.y;\n"
" vertex2pixel.position.xy = 2.f * xformed_pos/viewport_size_px - 1.f;\n"
" vertex2pixel.position.z = 0.f;\n" " vertex2pixel.position.z = 0.f;\n"
" vertex2pixel.position.w = 1.f;\n" " vertex2pixel.position.w = 1.f;\n"
" vertex2pixel.rect_half_size_px = dst_size_px / 2.f * xform_scale;\n" " vertex2pixel.rect_half_size_px = dst_size_px / 2.f * xform_scale;\n"
src/render/d3d11/render_d3d11.mdesk
+8 -7
View File
@@ -101,10 +101,10 @@ vs_main(CPU2Vertex cpu2vertex)
//- rjf: prep per-vertex arrays to sample from (p: position, t: texcoord, c: colorcoord, r: cornerradius) //- rjf: prep per-vertex arrays to sample from (p: position, t: texcoord, c: colorcoord, r: cornerradius)
float2 dst_p_verts_px[] = float2 dst_p_verts_px[] =
{ {
float2(dst_p0_px.x, viewport_size_px.y - dst_p1_px.y), float2(dst_p0_px.x, dst_p1_px.y),
float2(dst_p0_px.x, viewport_size_px.y - dst_p0_px.y), float2(dst_p0_px.x, dst_p0_px.y),
float2(dst_p1_px.x, viewport_size_px.y - dst_p1_px.y), float2(dst_p1_px.x, dst_p1_px.y),
float2(dst_p1_px.x, viewport_size_px.y - dst_p0_px.y), float2(dst_p1_px.x, dst_p0_px.y),
}; };
float2 src_p_verts_px[] = float2 src_p_verts_px[] =
{ {
@@ -126,14 +126,15 @@ vs_main(CPU2Vertex cpu2vertex)
cpu2vertex.color11, cpu2vertex.color11,
cpu2vertex.color10, cpu2vertex.color10,
}; };
float2 dst_verts_pct = float2( float2 dst_verts_pct = float2((cpu2vertex.vertex_id >> 1) ? 1.f : 0.f,
(cpu2vertex.vertex_id >> 1) ? 1.f : 0.f,
(cpu2vertex.vertex_id & 1) ? 0.f : 1.f); (cpu2vertex.vertex_id & 1) ? 0.f : 1.f);
// rjf: fill vertex -> pixel data // rjf: fill vertex -> pixel data
Vertex2Pixel vertex2pixel; Vertex2Pixel vertex2pixel;
{ {
vertex2pixel.position.xy = 2.f * mul(xform, float3(dst_p_verts_px[cpu2vertex.vertex_id], 1.f)).xy / viewport_size_px - 1.f; float2 xformed_pos = mul(xform, float3(dst_p_verts_px[cpu2vertex.vertex_id], 1.f)).xy;
xformed_pos.y = viewport_size_px.y - xformed_pos.y;
vertex2pixel.position.xy = 2.f * xformed_pos/viewport_size_px - 1.f;
vertex2pixel.position.z = 0.f; vertex2pixel.position.z = 0.f;
vertex2pixel.position.w = 1.f; vertex2pixel.position.w = 1.f;
vertex2pixel.rect_half_size_px = dst_size_px / 2.f * xform_scale; vertex2pixel.rect_half_size_px = dst_size_px / 2.f * xform_scale;