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

TPT: Old nothing display mode in the form of Basic colour mode fe82685257

Browse Source
This commit is contained in:
Simon Robertshaw 2012-04-18 14:43:09 +01:00
parent df2d698ed5
commit 82a1933400
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Renderer.cpp
View File

@ -701,7 +701,7 @@ void Renderer::render_parts()
fireg = graphicscache[t].fireg; fireg = graphicscache[t].fireg;
fireb = graphicscache[t].fireb; fireb = graphicscache[t].fireb;
} }
else else if(!(colour_mode & COLOUR_BASC))
{ {
if (ptypes[t].graphics_func) if (ptypes[t].graphics_func)
{ {
@ -789,6 +789,13 @@ void Renderer::render_parts()
colb = sin(frequency*q) * 16 + colb; colb = sin(frequency*q) * 16 + colb;
if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR; if(pixel_mode & (FIREMODE | PMODE_GLOW)) pixel_mode = (pixel_mode & ~(FIREMODE|PMODE_GLOW)) | PMODE_BLUR;
} }
else if(colour_mode & COLOUR_BASC)
{
colr = PIXR(ptypes[t].pcolors);
colg = PIXG(ptypes[t].pcolors);
colb = PIXB(ptypes[t].pcolors);
pixel_mode = PMODE_FLAT;
}
//Apply decoration colour //Apply decoration colour
if(!colour_mode) if(!colour_mode)

5
src/render/RenderView.cpp
View File

@ -157,6 +157,11 @@ RenderView::RenderView():
colourModes.push_back(tCheckbox); colourModes.push_back(tCheckbox);
tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_GRAD)); tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_GRAD));
AddComponent(tCheckbox); AddComponent(tCheckbox);
tCheckbox = new ui::Checkbox(ui::Point(536, YRES+4), ui::Point(50, 16), "Basic");
colourModes.push_back(tCheckbox);
tCheckbox->SetActionCallback(new ColourModeAction(this, COLOUR_BASC));
AddComponent(tCheckbox);
} }
void RenderView::OnMouseDown(int x, int y, unsigned button) void RenderView::OnMouseDown(int x, int y, unsigned button)

1
src/simulation/ElementGraphics.h
View File

@ -37,6 +37,7 @@
#define COLOUR_HEAT 0x00000001 #define COLOUR_HEAT 0x00000001
#define COLOUR_LIFE 0x00000002 #define COLOUR_LIFE 0x00000002
#define COLOUR_GRAD 0x00000004 #define COLOUR_GRAD 0x00000004
#define COLOUR_BASC 0x00000008
#define COLOUR_DEFAULT 0x00000000 #define COLOUR_DEFAULT 0x00000000