bonkmaykr/otyaSMILEBASIC
1
0
Fork 0
Code Activity

とりあえず疑似16bit color

Browse Source
This commit is contained in:
otya128
2015-08-28 23:23:22 +09:00
parent 61c1fd06f4
commit 9fc91d6f48
1 changed files with 169 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
SMILEBASIC/petitcomputer.d
View File

@@ -357,31 +357,7 @@ class PetitComputer
writeln("download font"); writeln("download font");
download("http://smileboom.com/special/ptcm3/download/unicode/image/res_font_table-320.png", download("http://smileboom.com/special/ptcm3/download/unicode/image/res_font_table-320.png",
fontFile); fontFile);
}//createGraphicPage(fontFile, 0);
//s8x8 = SDL_CreateRGBSurface(0, 8, 8, 32, 0, 0, 0, 0);
/*auto pixels = (cast(uint*)s8x8.pixels);
for(int x = 0; x < 8; x++)
{
for(int y = 0; y < 8; y++)
{
*pixels = SDL_MapRGBA(s8x8.format, 255, 255, 255, 255);
pixels++;
} }
}*/
//GRPFColor = new GraphicPage[consoleColor.length];
//GRPFColorFore = new GraphicPage[][consoleColor.length];
//for(int i = 0; i < GRPFColor.length; i++)
//{
// GRPFColor[i] = createGRPF(i, GRPF.surface);
//}
/+for(int i = 0; i < GRPFColor.length; i++)
{
GRPFColorFore[i] = new GraphicPage[consoleColor.length];
for(int j = 0; j < GRPFColor.length; j++)
{
GRPFColorFore[i][j] = createGRPF(i, j, GRPF.surface);
}
}+/
if(!exists(spriteFile)) if(!exists(spriteFile))
{ {
writeln("download sprite"); writeln("download sprite");
@@ -476,6 +452,8 @@ class PetitComputer
} }
Mutex grpmutex; Mutex grpmutex;
int displaynum; int displaynum;
struct Paint
{
uint[] buffer; uint[] buffer;
static const MAXSIZE = 1024; /* バッファサイズ */ static const MAXSIZE = 1024; /* バッファサイズ */
@@ -616,15 +594,14 @@ class PetitComputer
if(dx == int.max) return; if(dx == int.max) return;
int h = dy2 - dy; int h = dy2 - dy;
glTexSubImage2D(GL_TEXTURE_2D , 0, 0, dy, 512, h, tf, GL_UNSIGNED_BYTE, pixels + (dy * 512)); glTexSubImage2D(GL_TEXTURE_2D , 0, 0, dy, 512, h, tf, GL_UNSIGNED_BYTE, pixels + (dy * 512));
// glDrawPixels(512, dy2, tf, GL_UNSIGNED_BYTE, buffer.ptr); // glDrawPixels(512, dy2, tf, GL_UNSIGNED_BYTE, buffer.ptr);
} }
}
Paint paint;
int renderstartpos; int renderstartpos;
void renderGraphic() void renderGraphic()
{ {
if(!drawMessageLength) return; if(!drawMessageLength) return;
//grpmutex.lock();
//scope(exit)
// grpmutex.unlock();
drawflag = true; drawflag = true;
//betuni kouzoutai demo sonnnani sokudo kawaranasasou //betuni kouzoutai demo sonnnani sokudo kawaranasasou
auto len = drawMessageLength; auto len = drawMessageLength;
@@ -635,10 +612,8 @@ class PetitComputer
int oldpage = drawMessageQueue[0].page; int oldpage = drawMessageQueue[0].page;
glBindFramebufferEXT(GL_FRAMEBUFFER, this.GRP[oldpage].buffer); glBindFramebufferEXT(GL_FRAMEBUFFER, this.GRP[oldpage].buffer);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
//glDisable(GL_ALPHA_TEST);
glDisable(GL_ALPHA_TEST); glDisable(GL_ALPHA_TEST);
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
//
//glAlphaFunc(GL_GEQUAL, 0.0); //glAlphaFunc(GL_GEQUAL, 0.0);
glViewport(0, 0, 512, 512); glViewport(0, 0, 512, 512);
DrawType dt; DrawType dt;
@@ -704,9 +679,9 @@ class PetitComputer
{ {
glFinish(); glFinish();
//glGetTexImage(GL_TEXTURE_2D,0,GRP[oldpage].textureFormat,GL_UNSIGNED_BYTE,buffer.ptr); //glGetTexImage(GL_TEXTURE_2D,0,GRP[oldpage].textureFormat,GL_UNSIGNED_BYTE,buffer.ptr);
glReadPixels(0, 0, 512, 512, GRP[oldpage].textureFormat, GL_UNSIGNED_BYTE, buffer.ptr); glReadPixels(0, 0, 512, 512, GRP[oldpage].textureFormat, GL_UNSIGNED_BYTE, paint.buffer.ptr);
} }
gpaintBuffer(buffer.ptr, dm.x, dm.y, dm.color, GRP[oldpage].textureFormat); paint.gpaintBuffer(paint.buffer.ptr, dm.x, dm.y, dm.color, GRP[oldpage].textureFormat);
//gpaintBufferExW(oldpage, dm.x, dm.y, dm.color); //gpaintBufferExW(oldpage, dm.x, dm.y, dm.color);
if(SDL_GetTicks() - start >= 16 && i != len - 1) if(SDL_GetTicks() - start >= 16 && i != len - 1)
{ {
@@ -776,7 +751,7 @@ class PetitComputer
bool quit; bool quit;
void render() void render()
{ {
buffer = new uint[512 * 512]; paint.buffer = new uint[512 * 512];
DerelictSDL2.load(); DerelictSDL2.load();
DerelictSDL2Image.load(); DerelictSDL2Image.load();
GRPF = createGRPF(fontFile); GRPF = createGRPF(fontFile);
@@ -806,22 +781,40 @@ class PetitComputer
{ {
auto imm32 = LoadLibraryA("imm32.dll".toStringz); auto imm32 = LoadLibraryA("imm32.dll".toStringz);
ImmDisableIME ImmDisableIME = cast(ImmDisableIME)GetProcAddress(imm32, "ImmDisableIME".toStringz); ImmDisableIME ImmDisableIME = cast(ImmDisableIME)GetProcAddress(imm32, "ImmDisableIME".toStringz);
ImmDisableIME(0); if(ImmDisableIME) ImmDisableIME(0);
} }
SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1); SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
window = SDL_CreateWindow("SMILEBASIC", SDL_WINDOWPOS_UNDEFINED, window = SDL_CreateWindow("SMILEBASIC", SDL_WINDOWPOS_UNDEFINED,
SDL_WINDOWPOS_UNDEFINED, 400, 240, SDL_WINDOWPOS_UNDEFINED, 400, 240,
SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL); SDL_WINDOW_SHOWN | SDL_WINDOW_OPENGL);
if(!window)
{
write("can't create window: ");
writeln(SDL_GetError.to!string);
return;
}
scope(exit) scope(exit)
{ {
quit = true;
SDL_DestroyWindow(window); SDL_DestroyWindow(window);
SDL_Quit(); SDL_Quit();
} }
renderer = SDL_CreateRenderer(window, -1, 0); renderer = SDL_CreateRenderer(window, -1, 0);
if(!renderer)
{
write("can't create renderer: ");
writeln(SDL_GetError.to!string);
return;
}
SDL_Event event; SDL_Event event;
SDL_GLContext context; SDL_GLContext context;
context = SDL_GL_CreateContext(window); context = SDL_GL_CreateContext(window);
if (!context) return; if(!context)
{
write("can't create OpenGL context: ");
writeln(SDL_GetError.to!string);
return;
}
GRPF.createTexture(renderer); GRPF.createTexture(renderer);
glViewport(0, 0, 400, 240); glViewport(0, 0, 400, 240);
glClearColor(0.0f, 0.0f, 0.0f, 0.0f); glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
@@ -832,10 +825,12 @@ class PetitComputer
if(SDL_GetWindowWMInfo(window, &wm)) if(SDL_GetWindowWMInfo(window, &wm))
{ {
ImmAssociateContext ImmAssociateContext = cast(ImmAssociateContext)GetProcAddress(imm32, "ImmAssociateContext".toStringz); ImmAssociateContext ImmAssociateContext = cast(ImmAssociateContext)GetProcAddress(imm32, "ImmAssociateContext".toStringz);
auto aa = wm.info.win.window; if(ImmAssociateContext)
{
auto c = ImmAssociateContext(wm.info.win.window, null); auto c = ImmAssociateContext(wm.info.win.window, null);
} }
} }
}
int loopcnt; int loopcnt;
DerelictGL3.reload(); DerelictGL3.reload();
foreach(g; GRP) foreach(g; GRP)
@@ -843,13 +838,10 @@ class PetitComputer
g.createTexture(renderer); g.createTexture(renderer);
g.createBuffer(); g.createBuffer();
} }
//GRP[0] = GRPF;
//glEnable(GL_BLEND); //glEnable(GL_BLEND);
//glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); //glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
//glAlphaFunc(GL_GEQUAL, 0.5); //glAlphaFunc(GL_GEQUAL, 0.5);
//glEnable(GL_ALPHA_TEST); //glEnable(GL_ALPHA_TEST);
// sprite.spset(0, 0);
// sprite.spofs(0, 9, 8);
glAlphaFunc(GL_GEQUAL, 0.1f); glAlphaFunc(GL_GEQUAL, 0.1f);
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
@@ -878,7 +870,6 @@ class PetitComputer
} }
//描画の順位 //描画の順位
//sprite>GRP>console>BG //sprite>GRP>console>BG
glDisable(GL_BLEND);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT); glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glEnable(GL_BLEND); glEnable(GL_BLEND);
version(test) glLoadIdentity(); version(test) glLoadIdentity();
@@ -967,7 +958,6 @@ class PetitComputer
switch (event.type) switch (event.type)
{ {
case SDL_QUIT: case SDL_QUIT:
quit = true;
return; return;
case SDL_KEYUP: case SDL_KEYUP:
{ {
@@ -1023,14 +1013,6 @@ class PetitComputer
{ {
keybuffer = new wchar[128]; keybuffer = new wchar[128];
init(); init();
/+for(int i = 0; i < GRPFColor.length; i++)
{
for(int j = 0; j < GRPFColor.length; j++)
{
GRPFColorFore[i][j].createTexture(renderer);
}
}+/
consolem = new Mutex(); consolem = new Mutex();
keybuffermutex = new Mutex(); keybuffermutex = new Mutex();
grpmutex = new Mutex(); grpmutex = new Mutex();
@@ -1048,12 +1030,13 @@ class PetitComputer
version(NDirectMode) version(NDirectMode)
{ {
parser = new Parser( parser = new Parser(
"FOR Y=0TO 240GLINE 0,Y,399,Y,RGB(0,Y,0)NEXT"
//readText("./SYS/GAME6TALK.TXT").to!wstring //readText("./SYS/GAME6TALK.TXT").to!wstring
//readText("./SYS/GAME4SHOOTER.TXT").to!wstring //readText("./SYS/GAME4SHOOTER.TXT").to!wstring
//readText("./SYS/GAME2RPG.TXT").to!wstring //readText("./SYS/GAME2RPG.TXT").to!wstring
//readText("./SYS/GAME1DOTRC.TXT").to!wstring //readText("./SYS/GAME1DOTRC.TXT").to!wstring
//readText(input("LOAD PROGRAM:", true).to!string).to!wstring //readText(input("LOAD PROGRAM:", true).to!string).to!wstring
readText("./SYS/EX8TECDEMO.TXT").to!wstring //readText("./SYS/EX8TECDEMO.TXT").to!wstring
//readText("./SYS/EX1TEXT.TXT").to!wstring //readText("./SYS/EX1TEXT.TXT").to!wstring
//readText("FIZZBUZZ.TXT").to!wstring //readText("FIZZBUZZ.TXT").to!wstring
//readText("TEST.TXT").to!wstring //readText("TEST.TXT").to!wstring
@@ -1354,9 +1337,9 @@ class PetitComputer
byte page; byte page;
short x; short x;
short y; short y;
uint color;
short x2; short x2;
short y2; short y2;
uint color;
// //
} }
static const int dmqqueuelen = 8192; static const int dmqqueuelen = 8192;
@@ -1380,7 +1363,7 @@ class PetitComputer
drawMessageQueue[drawMessageLength].page = page; drawMessageQueue[drawMessageLength].page = page;
drawMessageQueue[drawMessageLength].x = x; drawMessageQueue[drawMessageLength].x = x;
drawMessageQueue[drawMessageLength].y = y; drawMessageQueue[drawMessageLength].y = y;
drawMessageQueue[drawMessageLength].color = toGLColor(this.GRP[0].textureFormat, color); drawMessageQueue[drawMessageLength].color = toGLColor(this.GRP[0].textureFormat, color & 0xFFF8F8F8);
drawMessageLength++; drawMessageLength++;
} }
void sendDrawMessage(DrawType type, byte page, short x, short y, short x2, short y2, uint color) void sendDrawMessage(DrawType type, byte page, short x, short y, short x2, short y2, uint color)
@@ -1398,7 +1381,7 @@ class PetitComputer
drawMessageQueue[drawMessageLength].y = y; drawMessageQueue[drawMessageLength].y = y;
drawMessageQueue[drawMessageLength].x2 = x2; drawMessageQueue[drawMessageLength].x2 = x2;
drawMessageQueue[drawMessageLength].y2 = y2; drawMessageQueue[drawMessageLength].y2 = y2;
drawMessageQueue[drawMessageLength].color = toGLColor(this.GRP[0].textureFormat, color); drawMessageQueue[drawMessageLength].color = toGLColor(this.GRP[0].textureFormat, color & 0xFFF8F8F8);
drawMessageLength++; drawMessageLength++;
} }
//TODO:範囲チェック //TODO:範囲チェック
@@ -1469,8 +1452,6 @@ class PetitComputer
glEnd(); glEnd();
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
//glAlphaFunc(GL_GEQUAL, 0.5);
//glEnable(GL_ALPHA_TEST);
glBegin(GL_QUADS); glBegin(GL_QUADS);
for(int y = 0; y < consoleHeight; y++) for(int y = 0; y < consoleHeight; y++)
for(int x = 0; x < consoleWidth; x++) for(int x = 0; x < consoleWidth; x++)
@@ -1490,8 +1471,6 @@ class PetitComputer
glEnd(); glEnd();
return; return;
} }
//consolem.lock();
//scope(exit) consolem.unlock();
glBindTexture(GL_TEXTURE_2D, GRPF.glTexture); glBindTexture(GL_TEXTURE_2D, GRPF.glTexture);
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);
glBegin(GL_QUADS); glBegin(GL_QUADS);
@@ -1516,8 +1495,6 @@ class PetitComputer
glEnd(); glEnd();
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
//glAlphaFunc(GL_GEQUAL, 0.5);
//glEnable(GL_ALPHA_TEST);
glBegin(GL_QUADS); glBegin(GL_QUADS);
for(int y = 0; y < consoleHeight; y++) for(int y = 0; y < consoleHeight; y++)
for(int x = 0; x < consoleWidth; x++) for(int x = 0; x < consoleWidth; x++)
@@ -1566,8 +1543,6 @@ class PetitComputer
glEnd(); glEnd();
glEnable(GL_TEXTURE_2D); glEnable(GL_TEXTURE_2D);
//glAlphaFunc(GL_GEQUAL, 0.5);
//glEnable(GL_ALPHA_TEST);
glBegin(GL_QUADS); glBegin(GL_QUADS);
for(int y = 0; y < consoleHeightDisplay1; y++) for(int y = 0; y < consoleHeightDisplay1; y++)
for(int x = 0; x < consoleWidthDisplay1; x++) for(int x = 0; x < consoleWidthDisplay1; x++)
@@ -1586,7 +1561,6 @@ class PetitComputer
glVertex3f((x * 8 + 8) / 200f - 1, 1 - (y * 8 + 8) / 120f, z); glVertex3f((x * 8 + 8) / 200f - 1, 1 - (y * 8 + 8) / 120f, z);
} }
glEnd(); glEnd();
// glFlush();
} }
void printConsole(T...)(T args) void printConsole(T...)(T args)
{ {
@@ -1630,7 +1604,6 @@ class PetitComputer
} }
consoleC[consoleHeightC - 1] = tmp; consoleC[consoleHeightC - 1] = tmp;
tmp[] = ConsoleCharacter(0, consoleForeColor, consoleBackColor, consoleAttr, CSRZ); tmp[] = ConsoleCharacter(0, consoleForeColor, consoleBackColor, consoleAttr, CSRZ);
//assert(console[0] != console[2]);
CSRY = consoleHeightC - 1; CSRY = consoleHeightC - 1;
} }
} }