matthew/The-Powder-Toy
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strealine icon and Erase icon

Browse Source
This commit is contained in:
Simon Robertshaw 2012-07-22 14:46:09 +01:00
parent f7d8556965
commit f445b80e8a
3 changed files with 42 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/GameView.cpp
View File

@ -441,7 +441,7 @@ void GameView::NotifyToolListChanged(GameModel * sender)
currentX -= 31; currentX -= 31;
tempButton->SetActionCallback(new ToolAction(this, toolList[i])); tempButton->SetActionCallback(new ToolAction(this, toolList[i]));
VideoBuffer * tempTexture = toolList[i]->GetTexture(30, 18); VideoBuffer * tempTexture = toolList[i]->GetTexture(26, 14);
tempButton->Appearance.SetTexture(tempTexture); tempButton->Appearance.SetTexture(tempTexture);
if(tempTexture) if(tempTexture)
delete tempTexture; delete tempTexture;

2
src/game/ToolButton.cpp
View File

@ -42,7 +42,7 @@ void ToolButton::Draw(const ui::Point& screenPos)
if(Appearance.GetTexture()) if(Appearance.GetTexture())
{ {
g->draw_image(Appearance.GetTexture(), screenPos.X, screenPos.Y, 255); g->draw_image(Appearance.GetTexture(), screenPos.X+2, screenPos.Y+2, 255);
} }
else else
{ {

40
src/graphics/Renderer.cpp
View File

@ -480,6 +480,46 @@ VideoBuffer * Renderer::WallIcon(int wallID, int width, int height)
newTexture->SetPixel(i, j, PIXR(pc), PIXG(pc), PIXB(pc), 255); newTexture->SetPixel(i, j, PIXR(pc), PIXG(pc), PIXB(pc), 255);
} }
} }
else if (wt == WL_ERASE)
{
for (j=0; j<height; j+=2)
{
for (i=1+(1&(j>>1)); i<width/2; i+=2)
{
newTexture->SetPixel(i, j, PIXR(pc), PIXG(pc), PIXB(pc), 255);
}
}
for (j=0; j<height; j++)
{
for (i=width/2; i<width; i++)
{
newTexture->SetPixel(i, j, PIXR(pc), PIXG(pc), PIXB(pc), 255);
}
}
for (j=4; j<width/2; j++)
{
newTexture->SetPixel(j+6, j, 0xFF, 0, 0, 255);
newTexture->SetPixel(j+7, j, 0xFF, 0, 0, 255);
newTexture->SetPixel(-j+21, j, 0xFF, 0, 0, 255);
newTexture->SetPixel(-j+22, j, 0xFF, 0, 0, 255);
}
}
else if(wt == WL_STREAM)
{
for (j=0; j<height; j++)
{
for (i=0; i<width; i++)
{
pc = i==0||i==width-1||j==0||j==height-1 ? PIXPACK(0xA0A0A0) : PIXPACK(0x000000);
newTexture->SetPixel(i, j, PIXR(pc), PIXG(pc), PIXB(pc), 255);
}
}
newTexture->SetCharacter(4, 3, 0x8D, 255, 255, 255, 255);
for (i=width/3; i<width; i++)
{
newTexture->SetPixel(i, 8+(int)(3.9f*cos(i*0.3f)), 255, 255, 255, 255);
}
}
return newTexture; return newTexture;
} }