bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

Fix GRPF size

Browse Source
This commit is contained in:
otya128
2016-12-10 20:39:17 +09:00
parent 356951fb41
commit 2f19e886be
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
SMILEBASIC/console.d
View File

@@ -224,10 +224,10 @@ class Console
ConsoleAttribute rot = ch.attr & ConsoleAttribute.TROT270; ConsoleAttribute rot = ch.attr & ConsoleAttribute.TROT270;
int z = ch.z; int z = ch.z;
glColor4ubv(cast(ubyte*)&fore); glColor4ubv(cast(ubyte*)&fore);
float tx1 = (rect.x) / 512f - 1; float tx1 = (rect.x) / (cast(float)petitcom.graphic.GRPFWidth) - 1;
float ty1 = (rect.y + 8) / 512f - 1; float ty1 = (rect.y + 8) / (cast(float)petitcom.graphic.GRPFHeight) - 1;
float tx2 = (rect.x + 8) / 512f - 1; float tx2 = (rect.x + 8) / (cast(float)petitcom.graphic.GRPFWidth) - 1;
float ty2 = (rect.y) / 512f - 1; float ty2 = (rect.y) / (cast(float)petitcom.graphic.GRPFHeight) - 1;
int x1 = x * 8; int x1 = x * 8;
int x2 = x * 8 + 8; int x2 = x * 8 + 8;
int y1 = y * 8; int y1 = y * 8;

15
SMILEBASIC/graphic.d
View File

@@ -63,8 +63,8 @@ struct DrawMessage
class Graphic class Graphic
{ {
PetitComputer petitcom; PetitComputer petitcom;
protected int width; int width;
protected int height; int height;
this(PetitComputer p) this(PetitComputer p)
{ {
petitcom = p; petitcom = p;
@@ -90,7 +90,6 @@ class Graphic
} }
void initGraphicPages() void initGraphicPages()
{ {
petitcom.console.GRPF = createGRPF(petitcom.fontFile);
GRP = new GraphicPage[6]; GRP = new GraphicPage[6];
for(int i = 0; i < 4; i++) for(int i = 0; i < 4; i++)
{ {
@@ -106,7 +105,6 @@ class Graphic
g.createTexture(petitcom.renderer, petitcom.textureScaleMode); g.createTexture(petitcom.renderer, petitcom.textureScaleMode);
g.createBuffer(); g.createBuffer();
} }
petitcom.console.GRPF.createTexture(petitcom.renderer, petitcom.textureScaleMode);
} }
GraphicPage createGRPF(string file) GraphicPage createGRPF(string file)
{ {
@@ -405,13 +403,14 @@ class Graphic
x += 8; x += 8;
} }
} }
int GRPFWidth, GRPFHeight;
void drawCharacter(int x, int y, wchar character) void drawCharacter(int x, int y, wchar character)
{ {
auto rect = petitcom.console.fontTable[character]; auto rect = petitcom.console.fontTable[character];
float tx1 = (rect.x) / (cast(float)width) - 1; float tx1 = (rect.x) / (cast(float)GRPFWidth) - 1;
float ty1 = (rect.y + 8) / (cast(float)height) - 1; float ty1 = (rect.y + 8) / (cast(float)GRPFHeight) - 1;
float tx2 = (rect.x + 8) / (cast(float)width) - 1; float tx2 = (rect.x + 8) / (cast(float)GRPFWidth) - 1;
float ty2 = (rect.y) / (cast(float)height) - 1; float ty2 = (rect.y) / (cast(float)GRPFHeight) - 1;
glTexCoord2f(tx1 , ty1); glTexCoord2f(tx1 , ty1);
glVertex3i(x, y + 8, 0); glVertex3i(x, y + 8, 0);
glTexCoord2f(tx1, ty2); glTexCoord2f(tx1, ty2);

4
SMILEBASIC/petitcomputer.d
View File

@@ -550,6 +550,10 @@ class PetitComputer
writeln(SDL_GetError.to!string); writeln(SDL_GetError.to!string);
return; return;
} }
console.GRPF = graphic.createGRPF(fontFile);
graphic.GRPFWidth = console.GRPF.surface.w;
graphic.GRPFHeight = console.GRPF.surface.h;
console.GRPF.createTexture(renderer, textureScaleMode);
chScreen(0, 0, 400, 240); chScreen(0, 0, 400, 240);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);