mirrors/ClassiCube
1
0
Fork 0
mirror of https://github.com/ClassiCube/ClassiCube.git synced 2025-01-23 01:21:57 -05:00
Code Issues Projects Releases Packages Wiki Activity

Vita: Spam a bit less

Browse source
This commit is contained in:
UnknownShadow200 2023-09-18 21:47:40 +10:00
parent 163c6d6493
commit 5f09f90a57
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/Graphics_PSVita.c
View file

@ -65,20 +65,20 @@ static void* gxm_shader_patcher_fragment_usse_addr;
static unsigned int shader_patcher_fragment_usse_offset;
#include "../misc/vita/colored_fs.h"
#include "../misc/vita/colored_vs.h"
static SceGxmProgram* gxm_colored_VP = (SceGxmProgram *)&colored_vs;
static SceGxmProgram* gxm_colored_FP = (SceGxmProgram *)&colored_fs;
#include "../misc/vita/colored_f.h"
#include "../misc/vita/colored_v.h"
static SceGxmProgram* gxm_colored_VP = (SceGxmProgram *)&colored_v;
static SceGxmProgram* gxm_colored_FP = (SceGxmProgram *)&colored_f;
#include "../misc/vita/textured_fs.h"
#include "../misc/vita/textured_vs.h"
static SceGxmProgram* gxm_textured_VP = (SceGxmProgram *)&textured_vs;
static SceGxmProgram* gxm_textured_FP = (SceGxmProgram *)&textured_fs;
#include "../misc/vita/textured_f.h"
#include "../misc/vita/textured_v.h"
static SceGxmProgram* gxm_textured_VP = (SceGxmProgram *)&textured_v;
static SceGxmProgram* gxm_textured_FP = (SceGxmProgram *)&textured_f;
#include "../misc/vita/colored_alpha_fs.h"
static SceGxmProgram* gxm_colored_alpha_FP = (SceGxmProgram *)&colored_alpha_fs;
#include "../misc/vita/textured_alpha_fs.h"
static SceGxmProgram* gxm_textured_alpha_FP = (SceGxmProgram *)&textured_alpha_fs;
#include "../misc/vita/colored_alpha_f.h"
static SceGxmProgram* gxm_colored_alpha_FP = (SceGxmProgram *)&colored_alpha_f;
#include "../misc/vita/textured_alpha_f.h"
static SceGxmProgram* gxm_textured_alpha_FP = (SceGxmProgram *)&textured_alpha_f;
typedef struct CCVertexProgram {

14
src/SystemFonts.c
View file

@ -1313,7 +1313,7 @@ int SysFont_TextWidth(struct DrawTextArgs* args) {
}
width = TEXT_CEIL(width);
Platform_Log2("TEXT WIDTH: %i (%s)", &width, &args->text);
//Platform_Log2("TEXT WIDTH: %i (%s)", &width, &args->text);
if (args->useShadow) width += 2;
return max(1, width);
}
@ -1367,7 +1367,7 @@ static int DrawGlyph(struct SysFont* font, int size, struct Bitmap* bmp, int x,
//glyph.yPos64 = +charInfo.glyphMetrics.horizontalBearingY64;
// TODO: use charInfo.glyphMetrics.horizontalBearingX64 and Y64
Platform_Log1("ABOUT %r:", &c);
//Platform_Log1("ABOUT %r:", &c);
int BX = charInfo.glyphMetrics.horizontalBearingX64, BX2 = TEXT_CEIL(BX);
int BY = charInfo.glyphMetrics.horizontalBearingY64, BY2 = TEXT_CEIL(BY);
//Platform_Log4(" Bitmap: %i,%i --> %i, %i", &charInfo.bitmapLeft, &charInfo.bitmapTop, &charInfo.bitmapWidth, &charInfo.bitmapHeight);
@ -1377,12 +1377,12 @@ static int DrawGlyph(struct SysFont* font, int size, struct Bitmap* bmp, int x,
int A = charInfo.glyphMetrics.ascender64, A2 =TEXT_CEIL(A);
int D = charInfo.glyphMetrics.descender64, D2 =TEXT_CEIL(D);
Platform_Log4(" Size: %i,%i (%i, %i)", &W, &H, &W2, &H2);
Platform_Log4(" Vert: %i,%i (%i, %i)", &A, &D, &A2, &D2);
Platform_Log4(" Bear: %i,%i (%i, %i)", &BX, &BY, &BX2, &BY2);
//Platform_Log4(" Size: %i,%i (%i, %i)", &W, &H, &W2, &H2);
//Platform_Log4(" Vert: %i,%i (%i, %i)", &A, &D, &A2, &D2);
//Platform_Log4(" Bear: %i,%i (%i, %i)", &BX, &BY, &BX2, &BY2);
int CW = charRect.width, CH = charRect.height;
Platform_Log2(" CharSize: %i,%i", &CW, &CH);
//Platform_Log2(" CharSize: %i,%i", &CW, &CH);
if (A2 < size) y += (size - A2);
@ -1402,7 +1402,7 @@ void SysFont_DrawText(struct DrawTextArgs* args, struct Bitmap* bmp, int x, int
int W = SysFont_TextWidth(args);
int S = args->font->size;
int H = args->font->height;
Platform_Log3("TOTAL: %i (%i/%i)", &W, &S, &H);
//Platform_Log3("TOTAL: %i (%i/%i)", &W, &S, &H);
cc_string left = args->text, part;
char colorCode = 'f';