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

Revert most render pass API changes. The APIs need more work and iteration before they’re better to use than the old setCanvas APIs.

Browse Source 
love.graphics.captureScreenshot has not been reverted.

--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2016-12-11 16:33:05 -04:00
parent 0a8c6f3ee6
commit 2a47a8c9e2
13 changed files with 512 additions and 661 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/window/sdl/Window.cpp
+6 -6
View File
@@ -411,8 +411,8 @@ bool Window::setWindow(int width, int height, WindowSettings *settings)
if (!graphics.get())
graphics.set(Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS));
if (graphics.get() && graphics->isPassActive())
throw love::Exception("setMode cannot be called while a render pass is active in love.graphics.");
if (graphics.get() && graphics->isCanvasActive())
throw love::Exception("setMode cannot be called while a Canvas is active in love.graphics.");
WindowSettings f;
@@ -627,8 +627,8 @@ void Window::close()
{
if (graphics.get())
{
if (graphics->isPassActive())
throw love::Exception("close cannot be called while a render pass is active in love.graphics.");
if (graphics->isCanvasActive())
throw love::Exception("close cannot be called while a Canvas is active in love.graphics.");
graphics->unSetMode();
}
@@ -657,8 +657,8 @@ bool Window::setFullscreen(bool fullscreen, Window::FullscreenType fstype)
if (!window)
return false;
if (graphics.get() && graphics->isPassActive())
throw love::Exception("setFullscreen cannot be called while a render pass is active in love.graphics.");
if (graphics.get() && graphics->isCanvasActive())
throw love::Exception("setFullscreen cannot be called while a Canvas is active in love.graphics.");
WindowSettings newsettings = settings;
newsettings.fullscreen = fullscreen;