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

Fullscreen and scale setting from sim options

Browse Source
This commit is contained in:
Simon Robertshaw 2012-08-08 14:35:27 +01:00
parent 152bc8f092
commit 10e82df543
9 changed files with 190 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
src/PowderToySDL.cpp
View File

@ -40,6 +40,8 @@ extern "C" IMAGE_DOS_HEADER __ImageBase;
#endif
SDL_Surface * sdl_scrn;
int scale = 1;
bool fullscreen = false;
#ifdef OGLI
void blit()
@ -51,18 +53,96 @@ void blit(pixel * vid)
{
if(sdl_scrn)
{
pixel * dst;
pixel * src = vid;
int j, x = 0, y = 0, w = XRES+BARSIZE, h = YRES+MENUSIZE, pitch = XRES+BARSIZE;
pixel *dst;
if (SDL_MUSTLOCK(sdl_scrn))
if (SDL_LockSurface(sdl_scrn)<0)
return;
dst=(pixel *)sdl_scrn->pixels+y*sdl_scrn->pitch/PIXELSIZE+x;
for (j=0; j<h; j++)
if (SDL_MapRGB(sdl_scrn->format,0x33,0x55,0x77)!=PIXPACK(0x335577))
{
memcpy(dst, src, w*PIXELSIZE);
dst+=sdl_scrn->pitch/PIXELSIZE;
src+=pitch;
//pixel format conversion
int i;
pixel px;
SDL_PixelFormat *fmt = sdl_scrn->format;
for (j=0; j<h; j++)
{
for (i=0; i<w; i++)
{
px = src[i];
dst[i] = ((PIXR(px)>>fmt->Rloss)<<fmt->Rshift)|
((PIXG(px)>>fmt->Gloss)<<fmt->Gshift)|
((PIXB(px)>>fmt->Bloss)<<fmt->Bshift);
}
dst+=sdl_scrn->pitch/PIXELSIZE;
src+=pitch;
}
}
else
{
for (j=0; j<h; j++)
{
memcpy(dst, src, w*PIXELSIZE);
dst+=sdl_scrn->pitch/PIXELSIZE;
src+=pitch;
}
}
if (SDL_MUSTLOCK(sdl_scrn))
SDL_UnlockSurface(sdl_scrn);
SDL_UpdateRect(sdl_scrn,0,0,0,0);
}
}
void blit2(pixel * vid, int currentScale)
{
if(sdl_scrn)
{
pixel * src = vid;
int j, x = 0, y = 0, w = XRES+BARSIZE, h = YRES+MENUSIZE, pitch = XRES+BARSIZE;
pixel *dst;
int i,k;
if (SDL_MUSTLOCK(sdl_scrn))
if (SDL_LockSurface(sdl_scrn)<0)
return;
dst=(pixel *)sdl_scrn->pixels+y*sdl_scrn->pitch/PIXELSIZE+x;
if (SDL_MapRGB(sdl_scrn->format,0x33,0x55,0x77)!=PIXPACK(0x335577))
{
//pixel format conversion
pixel px;
SDL_PixelFormat *fmt = sdl_scrn->format;
for (j=0; j<h; j++)
{
for (k=0; k<currentScale; k++)
{
for (i=0; i<w; i++)
{
px = src[i];
px = ((PIXR(px)>>fmt->Rloss)<<fmt->Rshift)|
((PIXG(px)>>fmt->Gloss)<<fmt->Gshift)|
((PIXB(px)>>fmt->Bloss)<<fmt->Bshift);
dst[i*2]=px;
dst[i*2+1]=px;
}
dst+=sdl_scrn->pitch/PIXELSIZE;
}
src+=pitch;
}
}
else
{
for (j=0; j<h; j++)
{
for (k=0; k<currentScale; k++)
{
for (i=0; i<w; i++)
{
dst[i*2]=src[i];
dst[i*2+1]=src[i];
}
dst+=sdl_scrn->pitch/PIXELSIZE;
}
src+=pitch;
}
}
if (SDL_MUSTLOCK(sdl_scrn))
SDL_UnlockSurface(sdl_scrn);
@ -71,7 +151,7 @@ void blit(pixel * vid)
}
#endif
SDL_Surface * SDLOpen()
int SDLOpen()
{
SDL_Surface * surface;
#if defined(WIN) && defined(WINCONSOLE)
@ -80,7 +160,7 @@ SDL_Surface * SDLOpen()
if (SDL_Init(SDL_INIT_VIDEO)<0)
{
fprintf(stderr, "Initializing SDL: %s\n", SDL_GetError());
return 0;
return 1;
}
SDL_EnableUNICODE(1);
#if defined(WIN) && defined(WINCONSOLE)
@ -112,11 +192,6 @@ SDL_Surface * SDLOpen()
SDL_WM_SetCaption("The Powder Toy", "Powder Toy");
//SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
atexit(SDL_Quit);
#ifndef OGLI
surface = SDL_SetVideoMode(XRES + BARSIZE, YRES + MENUSIZE, 32, SDL_SWSURFACE);
#else
surface = SDL_SetVideoMode((XRES + BARSIZE), (YRES + MENUSIZE), 32, SDL_OPENGL | SDL_RESIZABLE);
#endif
#if defined(OGLI)
int status = glewInit();
@ -126,8 +201,20 @@ SDL_Surface * SDLOpen()
exit(-1);
}
#endif
return 0;
}
return surface;
SDL_Surface * SDLSetScreen(int newScale, bool newFullscreen)
{
scale = newScale;
fullscreen = newFullscreen;
SDL_Surface * surface;
#ifndef OGLI
surface = SDL_SetVideoMode((XRES + BARSIZE) * newScale, (YRES + MENUSIZE) * newScale, 32, SDL_SWSURFACE | (newFullscreen?SDL_FULLSCREEN:0));
#else
surface = SDL_SetVideoMode((XRES + BARSIZE) * newScale, (YRES + MENUSIZE) * newScale, 32, SDL_OPENGL | SDL_RESIZABLE | (newFullscreen?SDL_FULLSCREEN:0));
#endif
return surface;
}
std::map<std::string, std::string> readArguments(int argc, char * argv[])
@ -200,7 +287,8 @@ int main(int argc, char * argv[])
std::map<std::string, std::string> arguments = readArguments(argc, argv);
sdl_scrn = SDLOpen();
int sdlStatus = SDLOpen();
sdl_scrn = SDLSetScreen(1, false);
#ifdef OGLI
SDL_GL_SetAttribute (SDL_GL_DOUBLEBUFFER, 1);
//glScaled(2.0f, 2.0f, 1.0f);
@ -290,10 +378,19 @@ int main(int argc, char * argv[])
Client::Ref().Tick();
}
if(scale != engine->Scale || fullscreen != engine->Fullscreen)
{
sdl_scrn = SDLSetScreen(engine->Scale, engine->Fullscreen);
inputScale = 1.0f/float(scale);
}
#ifdef OGLI
blit();
#else
blit(engine->g->vid);
if(engine->Scale==2)
blit2(engine->g->vid, engine->Scale);
else
blit(engine->g->vid);
#endif
currentFrame++;

4
src/interface/Engine.cpp
View File

@ -22,7 +22,9 @@ Engine::Engine():
lastBuffer(NULL),
prevBuffers(stack<pixel*>()),
windowTargetPosition(0, 0),
FrameIndex(0)
FrameIndex(0),
Fullscreen(false),
Scale(1)
{
}

7
src/interface/Engine.h
View File

@ -37,6 +37,11 @@ namespace ui
inline bool Running() { return running_; }
void Exit();
void SetFullscreen(bool fullscreen) { Fullscreen = fullscreen; }
inline bool GetFullscreen() { return Fullscreen; }
void SetScale(int scale) { Scale = scale; }
inline int GetScale() { return Scale; }
void Tick();
void Draw();
@ -55,6 +60,8 @@ namespace ui
inline Window* GetWindow() { return state_; }
float FpsLimit;
Graphics * g;
int Scale;
bool Fullscreen;
unsigned int FrameIndex;
private:

13
src/options/OptionsController.cpp
View File

@ -38,19 +38,32 @@ void OptionsController::SetWaterEqualisation(bool state)
{
model->SetWaterEqualisation(state);
}
void OptionsController::SetGravityMode(int gravityMode)
{
model->SetGravityMode(gravityMode);
}
void OptionsController::SetAirMode(int airMode)
{
model->SetAirMode(airMode);
}
void OptionsController::SetEdgeMode(int airMode)
{
model->SetEdgeMode(airMode);
}
void OptionsController::SetFullscreen(bool fullscreen)
{
model->SetFullscreen(fullscreen);
}
void OptionsController::SetScale(bool scale)
{
model->SetScale(scale);
}
OptionsView * OptionsController::GetView()
{
return view;

2
src/options/OptionsController.h
View File

@ -29,6 +29,8 @@ public:
void SetGravityMode(int gravityMode);
void SetAirMode(int airMode);
void SetEdgeMode(int airMode);
void SetFullscreen(bool fullscreen);
void SetScale(bool scale);
void Exit();
OptionsView * GetView();
virtual ~OptionsController();

21
src/options/OptionsModel.cpp
View File

@ -95,6 +95,27 @@ void OptionsModel::SetGravityMode(int gravityMode)
notifySettingsChanged();
}
bool OptionsModel::GetScale()
{
return ui::Engine::Ref().GetScale()==2;
}
void OptionsModel::SetScale(bool doubleScale)
{
ui::Engine::Ref().SetScale(doubleScale?2:1);
notifySettingsChanged();
}
bool OptionsModel::GetFullscreen()
{
return ui::Engine::Ref().GetFullscreen();
}
void OptionsModel::SetFullscreen(bool fullscreen)
{
ui::Engine::Ref().SetFullscreen(fullscreen);
notifySettingsChanged();
}
void OptionsModel::notifySettingsChanged()
{
for(int i = 0; i < observers.size(); i++)

4
src/options/OptionsModel.h
View File

@ -34,6 +34,10 @@ public:
void SetEdgeMode(int edgeMode);
int GetGravityMode();
void SetGravityMode(int gravityMode);
bool GetFullscreen();
void SetFullscreen(bool fullscreen);
bool GetScale();
void SetScale(bool scale);
virtual ~OptionsModel();
};

27
src/options/OptionsView.cpp
View File

@ -12,7 +12,7 @@
#include "interface/DropDown.h"
OptionsView::OptionsView():
ui::Window(ui::Point(-1, -1), ui::Point(300, 226)){
ui::Window(ui::Point(-1, -1), ui::Point(300, 266)){
ui::Label * tempLabel = new ui::Label(ui::Point(4, 5), ui::Point(Size.X-8, 14), "Simulation Options");
tempLabel->SetTextColour(style::Colour::InformationTitle);
@ -136,6 +136,29 @@ OptionsView::OptionsView():
tempLabel->Appearance.HorizontalAlign = ui::Appearance::AlignLeft; tempLabel->Appearance.VerticalAlign = ui::Appearance::AlignMiddle;
AddComponent(tempLabel);
class ScaleAction: public ui::CheckboxAction
{
OptionsView * v;
public:
ScaleAction(OptionsView * v_){ v = v_; }
virtual void ActionCallback(ui::Checkbox * sender){ v->c->SetScale(sender->GetChecked()); }
};
scale = new ui::Checkbox(ui::Point(8, 206), ui::Point(Size.X-6, 16), "Large screen");
scale->SetActionCallback(new ScaleAction(this));
AddComponent(scale);
class FullscreenAction: public ui::CheckboxAction
{
OptionsView * v;
public:
FullscreenAction(OptionsView * v_){ v = v_; }
virtual void ActionCallback(ui::Checkbox * sender){ v->c->SetFullscreen(sender->GetChecked()); }
};
fullscreen = new ui::Checkbox(ui::Point(8, 226), ui::Point(Size.X-6, 16), "Fullscreen");
fullscreen->SetActionCallback(new FullscreenAction(this));
AddComponent(fullscreen);
class CloseAction: public ui::ButtonAction
{
@ -164,6 +187,8 @@ void OptionsView::NotifySettingsChanged(OptionsModel * sender)
airMode->SetOption(sender->GetAirMode());
gravityMode->SetOption(sender->GetGravityMode());
edgeMode->SetOption(sender->GetEdgeMode());
scale->SetChecked(sender->GetScale());
fullscreen->SetChecked(sender->GetFullscreen());
}
void OptionsView::AttachController(OptionsController * c_)

2
src/options/OptionsView.h
View File

@ -25,6 +25,8 @@ class OptionsView: public ui::Window {
ui::DropDown * airMode;
ui::DropDown * gravityMode;
ui::DropDown * edgeMode;
ui::Checkbox * scale;
ui::Checkbox * fullscreen;
public:
OptionsView();
void NotifySettingsChanged(OptionsModel * sender);