LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 00:02:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Slightly reduced internal reliance on specific module backends

Browse Source
This commit is contained in:
Alex Szpakowski
2013-08-03 16:30:37 -03:00
parent 2106ff2403
commit 3e57cfd174
7 changed files with 39 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/Window.h
+1 -2
View File
@@ -27,7 +27,6 @@
// LOVE
#include "common/Module.h"
#include "image/ImageData.h"
#include "graphics/Graphics.h"
namespace love
{
@@ -56,7 +55,7 @@ public:
virtual ~Window();
virtual bool setWindow(int width = 800, int height = 600, graphics::Graphics *graphics = 0, WindowFlags *flags = 0) = 0;
virtual bool setWindow(int width = 800, int height = 600, WindowFlags *flags = 0) = 0;
virtual void getWindow(int &width, int &height, WindowFlags &flags) const = 0;
virtual bool checkWindowSize(int width, int height, bool fullscreen) const = 0;
src/modules/window/sdl/Window.cpp
+7 -5
View File
@@ -20,6 +20,7 @@
// LOVE
#include "common/config.h"
#include "graphics/Graphics.h"
#include "Window.h"
// SDL
@@ -59,10 +60,11 @@ Window::_currentMode::_currentMode()
{
}
bool Window::setWindow(int width, int height, graphics::Graphics *graphics, WindowFlags *flags)
bool Window::setWindow(int width, int height, WindowFlags *flags)
{
if (graphics)
graphics->unSetMode();
graphics::Graphics *gfx = (graphics::Graphics *) Module::findInstance("love.graphics.");
if (gfx)
gfx->unSetMode();
bool fullscreen = false;
bool vsync = true;
@@ -191,8 +193,8 @@ bool Window::setWindow(int width, int height, graphics::Graphics *graphics, Wind
currentMode.flags.borderless = ((surface->flags & SDL_NOFRAME) != 0);
currentMode.flags.centered = centered;
if (graphics)
graphics->setMode(width, height);
if (gfx)
gfx->setMode(width, height);
return true;
}
src/modules/window/sdl/Window.h
+1 -1
View File
@@ -38,7 +38,7 @@ public:
Window();
~Window();
bool setWindow(int width = 800, int height = 600, graphics::Graphics *graphics = 0, WindowFlags *flags = 0);
bool setWindow(int width = 800, int height = 600, WindowFlags *flags = 0);
void getWindow(int &width, int &height, WindowFlags &flags) const;
bool checkWindowSize(int width, int height, bool fullscreen) const;
src/modules/window/wrap_Window.cpp
+3 -7
View File
@@ -42,11 +42,9 @@ int w_setMode(lua_State *L)
int w = luaL_checkint(L, 1);
int h = luaL_checkint(L, 2);
graphics::Graphics *g = luax_optmodule<graphics::Graphics>(L, "graphics", MODULE_GRAPHICS_T);
if (lua_isnoneornil(L, 3))
{
luax_pushboolean(L, instance->setWindow(w, h, g, 0));
luax_pushboolean(L, instance->setWindow(w, h, 0));
return 1;
}
@@ -63,7 +61,7 @@ int w_setMode(lua_State *L)
try
{
luax_pushboolean(L, instance->setWindow(w, h, g, &flags));
luax_pushboolean(L, instance->setWindow(w, h, &flags));
}
catch (love::Exception &e)
{
@@ -138,8 +136,6 @@ int w_getModes(lua_State *L)
int w_toggleFullscreen(lua_State *L)
{
graphics::Graphics *g = luax_optmodule<graphics::Graphics>(L, "graphics", MODULE_GRAPHICS_T);
int width, height;
WindowFlags flags;
instance->getWindow(width, height, flags);
@@ -147,7 +143,7 @@ int w_toggleFullscreen(lua_State *L)
try
{
luax_pushboolean(L, instance->setWindow(width, height, g, &flags));
luax_pushboolean(L, instance->setWindow(width, height, &flags));
}
catch (love::Exception &e)
{