diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/blr3.dtp | bin | 459997 -> 460367 bytes | |||
| -rw-r--r-- | src/core/gamescene.cpp | 20 | ||||
| -rw-r--r-- | src/master/intro.cpp | 13 | ||||
| -rw-r--r-- | src/ui/mainmenu.cpp | 8 |
4 files changed, 23 insertions, 18 deletions
diff --git a/src/blr3.dtp b/src/blr3.dtp Binary files differindex 58a5de6..05a4f8d 100644 --- a/src/blr3.dtp +++ b/src/blr3.dtp diff --git a/src/core/gamescene.cpp b/src/core/gamescene.cpp index 99f61c3..535a3df 100644 --- a/src/core/gamescene.cpp +++ b/src/core/gamescene.cpp @@ -11,10 +11,10 @@ gameScene::gameScene() rtarget=sm->smTargetCreate(800,600); tgquad.tex=sm->smTargetTexture(rtarget); tgquad.blend=BLEND_ALPHABLEND; - tgquad.v[0].x=190;tgquad.v[0].y=75; - tgquad.v[1].x=950;tgquad.v[1].y=75; - tgquad.v[2].x=950;tgquad.v[2].y=645; - tgquad.v[3].x=190;tgquad.v[3].y=645; + tgquad.v[0].x=420;tgquad.v[0].y=60; + tgquad.v[1].x=1220;tgquad.v[1].y=60; + tgquad.v[2].x=1220;tgquad.v[2].y=660; + tgquad.v[3].x=420;tgquad.v[3].y=660; for(int i=0;i<4;++i)tgquad.v[i].z=0.5,tgquad.v[i].col=0xFFFFFFFF; int rw=sm->smTextureGetWidth(tgquad.tex); int rh=sm->smTextureGetHeight(tgquad.tex); @@ -26,7 +26,7 @@ gameScene::gameScene() player=new playerBase; vm=new blrScriptVM; utime=0; - ttfont.loadTTFFromMemory(blrdtp.getFilePtr("FreeMono.ttf"),blrdtp.getFileSize("FreeMono.ttf"),12); + ttfont.loadTTFFromMemory(blrdtp.getFilePtr("FreeMono.ttf"),blrdtp.getFileSize("FreeMono.ttf"),18); bmInstance->init(); vm->vmInit(61616); vm->loadLSBFromMemory(blrdtp.getFilePtr("test.lsb"),blrdtp.getFileSize("test.lsb")); @@ -61,15 +61,15 @@ bool gameScene::sceneRender() extern sceneManager *sceneMgr;float lps=sceneMgr->getLPS(); if(udly>1){udly=0;utime=sceneMgr->getTHUpdateTime();} ttfont.updateString(L"Coll: %d\n",player->coll); - ttfont.render(0,50,0xFFFFFFFF,ALIGN_LEFT); + ttfont.render(0,60,0xFFFFFFFF,ALIGN_LEFT); ttfont.updateString(L"SColl: %d\n",player->scoll); - ttfont.render(0,65,0xFFFFFFFF,ALIGN_LEFT); + ttfont.render(0,80,0xFFFFFFFF,ALIGN_LEFT); ttfont.updateString(L"LPS: %.2f",lps); - ttfont.render(0,680,0xFFFFFFFF,ALIGN_LEFT); + ttfont.render(0,660,0xFFFFFFFF,ALIGN_LEFT); ttfont.updateString(L"Update Time: %dns",utime); - ttfont.render(0,695,0xFFFFFFFF,ALIGN_LEFT); + ttfont.render(0,680,0xFFFFFFFF,ALIGN_LEFT); ttfont.updateString(L"FPS: %.2f",sm->smGetFPS()); - ttfont.render(0,710,0xFFFFFFFF,ALIGN_LEFT); + ttfont.render(0,700,0xFFFFFFFF,ALIGN_LEFT); return false; } bool gameScene::threadUpdate() diff --git a/src/master/intro.cpp b/src/master/intro.cpp index 1e45ddb..820a3f8 100644 --- a/src/master/intro.cpp +++ b/src/master/intro.cpp @@ -4,7 +4,7 @@ #include <cstdlib> #include <ctime> #include "../ui/menus.hpp" -#define XOFFSET 75 +#define XOFFSET 250 #define YOFFSET 100 extern sceneManager *sceneMgr; @@ -170,9 +170,15 @@ bool introScene::sceneUpdate() bool introScene::sceneRender() { if(ch!=11) - sm->smClrscr(0xFF000000); + { + sm->smClrscr(0xFF000000); + blt->setColor(0xC0FFFFFF); + } else - {int c=step*4>255?255:step*4;sm->smClrscr(ARGB(255,c,c,c));} + { + int c=step*4>255?255:step*4;sm->smClrscr(ARGB(255,c,c,c)); + blt->setColor(SETA(0x00FFFFFF,DWORD((1.-c/255.)*192))); + } for(int i=0;i<bcnt;++i) blt->render(pos[i].x,pos[i].y,0,scale[i],scale[i]); return false; @@ -186,7 +192,6 @@ introScene::introScene() smTexInfo *ti=ssanm.getTextureInfo(bsnames[rand()%8]); blt=new smEntity2D(ti->tex,ti->rect); blt->setCentre(12,12); - blt->setColor(0xC0FFFFFF); sceneMgr->registerScene(this,"Intro",1000); } void introScene::introInit() diff --git a/src/ui/mainmenu.cpp b/src/ui/mainmenu.cpp index 7bb62b8..a83630c 100644 --- a/src/ui/mainmenu.cpp +++ b/src/ui/mainmenu.cpp @@ -28,9 +28,9 @@ mainMenuScene::mainMenuScene() sm=smGetInterface(SMELT_APILEVEL); menubg.loadAnmFromMemory(blrdtp.getFilePtr("menu.anm"),blrdtp.getFileSize("menu.anm")); menubEnt=new smEntity2D(menubg.getTextureInfo("menubg")->tex,menubg.getTextureInfo("menubg")->rect); - whitexf=new smEntity2D(0,0,0,960,720);whitea=0xFF;whitexf->setZ(1); + whitexf=new smEntity2D(0,0,0,1280,720);whitea=0xFF;whitexf->setZ(1); sceneMgr->registerScene(this,"MainMenu",990); - menu=new menuLCD(43,20,7,360,370,&lcdfont); + menu=new menuLCD(43,20,7,520,370,&lcdfont); menu->addCtrl(new menuCtrlLCD(0,20,&lcdfont)); menu->getCtrl(0)->setText(NULL,"START"); menu->getCtrl(0)->onKeyPressed(startPressed); @@ -58,10 +58,10 @@ mainMenuScene::~mainMenuScene() bool mainMenuScene::sceneUpdate(){return menu->update();} bool mainMenuScene::sceneRender() { - sm->smClrscr(0xFF000000); + sm->smClrscr(0xFF102848); if(whitea>6)whitea-=6;else whitea=0; whitexf->setColor(SETA(0x00FFFFFF,whitea)); - menubEnt->render(0,0); + menubEnt->render(160,0); menu->render(); whitexf->render(0,0); return false; |