thirdparty/ppsspp
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Guaranteed gap-free rendering of waves background

Browse source
This commit is contained in:
Henrik Rydgård 2023-10-04 17:07:55 +02:00
parent 4e2759713f
commit 931ff4eb1e
3 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Common/Render/DrawBuffer.cpp
View file

@ -106,7 +106,7 @@ void DrawBuffer::V(float x, float y, float z, uint32_t color, float u, float v)
void DrawBuffer::Rect(float x, float y, float w, float h, uint32_t color, int align) { void DrawBuffer::Rect(float x, float y, float w, float h, uint32_t color, int align) {
DoAlign(align, &x, &y, &w, &h); DoAlign(align, &x, &y, &w, &h);
RectVGradient(x, y, w, h, color, color); RectVGradient(x, y, x + w, y + h, color, color);
} }
void DrawBuffer::hLine(float x1, float y, float x2, uint32_t color) { void DrawBuffer::hLine(float x1, float y, float x2, uint32_t color) {
@ -121,13 +121,13 @@ void DrawBuffer::vLine(float x, float y1, float y2, uint32_t color) {
Rect(x, y1, g_display.pixel_in_dps_x, y2 - y1, color); Rect(x, y1, g_display.pixel_in_dps_x, y2 - y1, color);
} }
void DrawBuffer::RectVGradient(float x, float y, float w, float h, uint32_t colorTop, uint32_t colorBottom) { void DrawBuffer::RectVGradient(float x1, float y1, float x2, float y2, uint32_t colorTop, uint32_t colorBottom) {
V(x, y, 0, colorTop, 0, 0); V(x1, y1, 0, colorTop, 0, 0);
V(x + w, y, 0, colorTop, 1, 0); V(x2, y1, 0, colorTop, 1, 0);
V(x + w, y + h, 0, colorBottom, 1, 1); V(x2, y2, 0, colorBottom, 1, 1);
V(x, y, 0, colorTop, 0, 0); V(x1, y1, 0, colorTop, 0, 0);
V(x + w, y + h, 0, colorBottom, 1, 1); V(x2, y2, 0, colorBottom, 1, 1);
V(x, y + h, 0, colorBottom, 0, 1); V(x1, y2, 0, colorBottom, 0, 1);
} }
void DrawBuffer::RectOutline(float x, float y, float w, float h, uint32_t color, int align) { void DrawBuffer::RectOutline(float x, float y, float w, float h, uint32_t color, int align) {
@ -142,7 +142,7 @@ void DrawBuffer::MultiVGradient(float x, float y, float w, float h, const Gradie
for (int i = 0; i < numStops - 1; i++) { for (int i = 0; i < numStops - 1; i++) {
float t0 = stops[i].t, t1 = stops[i+1].t; float t0 = stops[i].t, t1 = stops[i+1].t;
uint32_t c0 = stops[i].color, c1 = stops[i+1].color; uint32_t c0 = stops[i].color, c1 = stops[i+1].color;
RectVGradient(x, y + h * t0, w, h * (t1 - t0), c0, c1); RectVGradient(x, y + h * t0, x + w, y + h * (t1 - t0), c0, c1);
} }
} }

5
Common/Render/DrawBuffer.h
View file

@ -83,9 +83,10 @@ public:
void RectOutline(float x, float y, float w, float h, uint32_t color, int align = ALIGN_TOPLEFT); void RectOutline(float x, float y, float w, float h, uint32_t color, int align = ALIGN_TOPLEFT);
void RectVGradient(float x, float y, float w, float h, uint32_t colorTop, uint32_t colorBottom); // NOTE: This one takes x2/y2 instead of w/h, better for gap-free graphics.
void RectVGradient(float x1, float y1, float x2, float y2, uint32_t colorTop, uint32_t colorBottom);
void RectVDarkFaded(float x, float y, float w, float h, uint32_t colorTop) { void RectVDarkFaded(float x, float y, float w, float h, uint32_t colorTop) {
RectVGradient(x, y, w, h, colorTop, darkenColor(colorTop)); RectVGradient(x, y, x + w, y + h, colorTop, darkenColor(colorTop));
} }
void MultiVGradient(float x, float y, float w, float h, const GradientStop *stops, int numStops); void MultiVGradient(float x, float y, float w, float h, const GradientStop *stops, int numStops);

9
UI/MiscScreens.cpp
View file

@ -141,16 +141,17 @@ public:
for (int n = 0; n < steps; n++) { for (int n = 0; n < steps; n++) {
float x = (float)n * step; float x = (float)n * step;
float nextX = (float)(n + 1) * step;
float i = x * 1280 / bounds.w; float i = x * 1280 / bounds.w;
float wave0 = sin(i*0.005+t*0.8)*0.05 + sin(i*0.002+t*0.25)*0.02 + sin(i*0.001+t*0.3)*0.03 + 0.625; float wave0 = sin(i*0.005+t*0.8)*0.05 + sin(i*0.002+t*0.25)*0.02 + sin(i*0.001+t*0.3)*0.03 + 0.625;
float wave1 = sin(i*0.0044+t*0.4)*0.07 + sin(i*0.003+t*0.1)*0.02 + sin(i*0.001+t*0.3)*0.01 + 0.625; float wave1 = sin(i*0.0044+t*0.4)*0.07 + sin(i*0.003+t*0.1)*0.02 + sin(i*0.001+t*0.3)*0.01 + 0.625;
dc.Draw()->RectVGradient(x, wave0*bounds.h, step, (1.0-wave0)*bounds.h, color, 0x00000000); dc.Draw()->RectVGradient(x, wave0*bounds.h, nextX, bounds.h, color, 0x00000000);
dc.Draw()->RectVGradient(x, wave1*bounds.h, step, (1.0-wave1)*bounds.h, color, 0x00000000); dc.Draw()->RectVGradient(x, wave1*bounds.h, nextX, bounds.h, color, 0x00000000);
// Add some "antialiasing" // Add some "antialiasing"
dc.Draw()->RectVGradient(x, wave0*bounds.h-3.0f * g_display.pixel_in_dps_y, step, 3.0f * g_display.pixel_in_dps_y, 0x00000000, color); dc.Draw()->RectVGradient(x, wave0*bounds.h-3.0f * g_display.pixel_in_dps_y, nextX, wave0 * bounds.h, 0x00000000, color);
dc.Draw()->RectVGradient(x, wave1*bounds.h-3.0f * g_display.pixel_in_dps_y, step, 3.0f * g_display.pixel_in_dps_y, 0x00000000, color); dc.Draw()->RectVGradient(x, wave1*bounds.h-3.0f * g_display.pixel_in_dps_y, nextX, wave1 * bounds.h, 0x00000000, color);
} }
dc.Flush(); dc.Flush();