1
0

ライブラリ初期化場所変更

This commit is contained in:
otya128
2015-08-26 23:53:15 +09:00
parent 9ebb872c51
commit 42f62fc407

View File

@@ -339,8 +339,6 @@ class PetitComputer
} }
void init() void init()
{ {
DerelictSDL2.load();
DerelictSDL2Image.load();
// DerelictGL.load(); // DerelictGL.load();
for(int i = 0; i < consoleColor.length; i++) for(int i = 0; i < consoleColor.length; i++)
consoleColorGL[i] = toGLColor(consoleColor[i]); consoleColorGL[i] = toGLColor(consoleColor[i]);
@@ -354,8 +352,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);
GRPF = createGRPF(fontFile);//createGraphicPage(fontFile, 0);
//s8x8 = SDL_CreateRGBSurface(0, 8, 8, 32, 0, 0, 0, 0); //s8x8 = SDL_CreateRGBSurface(0, 8, 8, 32, 0, 0, 0, 0);
/*auto pixels = (cast(uint*)s8x8.pixels); /*auto pixels = (cast(uint*)s8x8.pixels);
for(int x = 0; x < 8; x++) for(int x = 0; x < 8; x++)
@@ -402,15 +399,6 @@ class PetitComputer
{ {
loadFontTable(); loadFontTable();
} }
GRP = new GraphicPage[6];
for(int i = 0; i < 4; i++)
{
GRP[i] = createEmptyPage();
}
sppage = 4;
GRP[4] = createGRPF(spriteFile);
bgpage = 5;
GRP[5] = createGRPF(BGFile);
writeln("OK"); writeln("OK");
screenWidth = 400; screenWidth = 400;
screenHeight = 240; screenHeight = 240;
@@ -606,6 +594,20 @@ class PetitComputer
protected BG[4] bg; protected BG[4] bg;
void render() void render()
{ {
DerelictSDL2.load();
DerelictSDL2Image.load();
GRPF = createGRPF(fontFile);
GRP = new GraphicPage[6];
for(int i = 0; i < 4; i++)
{
GRP[i] = createEmptyPage();
}
sppage = 4;
GRP[4] = createGRPF(spriteFile);
bgpage = 5;
GRP[5] = createGRPF(BGFile);
SDL_Init(SDL_INIT_VIDEO);
DerelictGL.load(); DerelictGL.load();
DerelictGL3.load(); DerelictGL3.load();
buttonTable = new Button[SDL_SCANCODE_SLEEP + 1]; buttonTable = new Button[SDL_SCANCODE_SLEEP + 1];
@@ -834,7 +836,6 @@ class PetitComputer
{ {
keybuffer = new wchar[128]; keybuffer = new wchar[128];
init(); init();
SDL_Init(SDL_INIT_VIDEO);
/+for(int i = 0; i < GRPFColor.length; i++) /+for(int i = 0; i < GRPFColor.length; i++)
{ {
for(int j = 0; j < GRPFColor.length; j++) for(int j = 0; j < GRPFColor.length; j++)
@@ -847,10 +848,11 @@ class PetitComputer
keybuffermutex = new Mutex(); keybuffermutex = new Mutex();
grpmutex = new Mutex(); grpmutex = new Mutex();
sprite = new Sprite(this); sprite = new Sprite(this);
core.thread.Thread thread = new core.thread.Thread(&render);
thread.start();
for(int i = 0; i < bg.length; i++) for(int i = 0; i < bg.length; i++)
bg[i] = new BG(this); bg[i] = new BG(this);
core.thread.Thread thread = new core.thread.Thread(&render);
thread.start();
while(!buttonTable){}
auto startTicks = SDL_GetTicks(); auto startTicks = SDL_GetTicks();
//とりあえず //とりあえず
auto parser = new Parser( auto parser = new Parser(