From 592a4bbae44f7d7baea260e51a0092f77170f3de Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Wed, 5 Apr 2017 09:23:13 +0800
Subject: [PATCH 1/5] Add Font Style Support

---
 MiniEngine.cpp | 25 +++++++++++++++++++++++++
 MiniEngine.h   | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)

diff --git a/MiniEngine.cpp b/MiniEngine.cpp
index 0dc49e1..1938803 100644
--- a/MiniEngine.cpp
+++ b/MiniEngine.cpp
@@ -579,6 +579,31 @@ namespace MiniEngine
 		return (font.get() != nullptr);
 	}
 
+    void Font::_real_setFontStyle(int Style)
+    {
+        TTF_SetFontStyle(font.get(),Style);
+    }
+
+    int Font::_style_caster(Style style)
+    {
+        switch(style)
+        {
+        case Style::Bold:
+            return TTF_STYLE_BOLD;
+        case Style::Italic:
+            return TTF_STYLE_ITALIC;
+        case Style::Normal:
+            return TTF_STYLE_NORMAL;
+        case Style::StrikeThrough:
+            return TTF_STYLE_STRIKETHROUGH;
+        case Style::UnderLine:
+            return TTF_STYLE_UNDERLINE;
+        }
+
+        /// If an error occurs, return 0 instead of -1.
+        return 0;
+    }
+
 	Texture Font::renderText(Renderer rnd, std::string Text, RGBA fg)
 	{
 		Surface surf;
diff --git a/MiniEngine.h b/MiniEngine.h
index c1864f7..678ae22 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -216,10 +216,27 @@ namespace MiniEngine
 	class Font
 	{
 	public:
+	    enum class Style { Normal, Bold, Italic, UnderLine, StrikeThrough };
+
 		Font() = default;
 		Font(std::string FontFileName, int size) throw(ErrorViewer);
 		int use(std::string FontFileName, int size);
 		bool isReady();
+
+		template<typename... Args>
+		void setFontStyle(Style style,Args&&... args)
+		{
+            _internal_fontcalc=0;
+            _setFontStyle(style,std::forward(args...));
+		}
+
+		void setFontStyle(Style style)
+		{
+            _real_setFontStyle(_style_caster(style));
+		}
+
+		std::tuple<Style> getFontStyles();
+
 		Texture renderText(Renderer rnd, std::string Text, RGBA fg);
 		Texture renderTextWrapped(Renderer rnd, std::string Text, RGBA fg, int WrapLength);
 		Texture renderTextShaded(Renderer rnd, std::string Text, RGBA fg, RGBA bg);
@@ -229,7 +246,23 @@ namespace MiniEngine
 		Texture renderUTF8Wrapped(Renderer rnd, std::string Text, RGBA fg, int WrapLength);
 		Texture renderUTF8Shaded(Renderer rnd, std::string Text, RGBA fg, RGBA bg);
 		Texture renderUTF8Solid(Renderer rnd, std::string Text, RGBA fg);
+    protected:
+		template<typename... Args>
+        void _setFontStyle(Style style,Args&&... args)
+        {
+            _internal_fontcalc|=_style_caster(style);
+            _setFontStyle(args...);
+        }
+
+        void _setFontStyle(Style style)
+        {
+            _internal_fontcalc|=_style_caster(style);
+            _real_setFontStyle(_internal_fontcalc);
+        }
 	private:
+	    void _real_setFontStyle(int);
+	    int _style_caster(Style);
+        int _internal_fontcalc;
 		std::shared_ptr<TTF_Font> font;
 	};
 

From f78eb839bfc97cc1eae0d596c116bdbb26b2c184 Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Wed, 5 Apr 2017 11:16:44 +0800
Subject: [PATCH 2/5] Rewrite setRenderer with template

---
 MiniEngine.cpp | 22 ++++++++++++++++++++--
 MiniEngine.h   | 38 +++++++++++++++++++++++++++++++++-----
 2 files changed, 53 insertions(+), 7 deletions(-)

diff --git a/MiniEngine.cpp b/MiniEngine.cpp
index 1938803..2025cff 100644
--- a/MiniEngine.cpp
+++ b/MiniEngine.cpp
@@ -435,10 +435,10 @@ namespace MiniEngine
 
 	void Window::setRenderer(std::initializer_list<RendererType> RendererFlags)
 	{
-		int flag = 0;
+		Uint32 flag = 0;
 		for (auto v : RendererFlags)
 		{
-			flag |= static_cast<int>(v);
+			flag |= _render_caster(v);
 		}
 		_setRenderer_Real(flag);
 	}
@@ -533,6 +533,24 @@ namespace MiniEngine
 		return s;
 	}
 
+	Uint32 Window::_render_caster(RendererType Type)
+	{
+	    switch(Type)
+	    {
+        case RendererType::Accelerated:
+            return SDL_RENDERER_ACCELERATED;
+        case RendererType::PresentSync:
+            return SDL_RENDERER_PRESENTVSYNC;
+        case RendererType::Software:
+            return SDL_RENDERER_SOFTWARE;
+        case RendererType::TargetTexture:
+            return SDL_RENDERER_TARGETTEXTURE;
+	    }
+
+	    /// If an error occurs, return 0 by default.
+	    return 0;
+	}
+
 	void Window::_setRenderer_Real(Uint32 flags)
 	{
 		winrnd.rnd.reset(SDL_CreateRenderer(wnd.get(), -1, flags), SDL_DestroyRenderer);
diff --git a/MiniEngine.h b/MiniEngine.h
index 678ae22..afaaa0b 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -124,10 +124,10 @@ namespace MiniEngine
 
 	enum class RendererType
 	{
-		Software = SDL_RENDERER_SOFTWARE,
-		Accelerated = SDL_RENDERER_ACCELERATED,
-		PresentSync = SDL_RENDERER_PRESENTVSYNC,
-		TargetTexture = SDL_RENDERER_TARGETTEXTURE
+		Software,
+		Accelerated,
+		PresentSync,
+		TargetTexture
 	};
 
 	enum class FlipMode { None, Horizontal, Vertical };
@@ -178,7 +178,20 @@ namespace MiniEngine
 		Window(std::string Title, int Width, int Height, std::initializer_list<RendererType> RendererFlags = { RendererType::Accelerated,RendererType::TargetTexture }) throw(ErrorViewer);
 		Renderer getRenderer() const;
 
-		void setRenderer(std::initializer_list<RendererType> RendererFlags);
+		template<typename... Args>
+		void setRenderer(RendererType Type,Args&&... args)
+		{
+            _internal_rndflagcalc=0;
+            _setRenderer(Type,std::forward(args...));
+		}
+
+		void setRenderer(RendererType Type)
+		{
+		    _internal_rndflagcalc=0;
+            _setRenderer(Type);
+		}
+
+		void setRenderer(std::initializer_list<RendererType>);
 
 		Rect getSize();
 		void setSize(Rect sizeRect);
@@ -207,8 +220,23 @@ namespace MiniEngine
 
 
 		_DECL_DEPRECATED Surface getSurface();
+    protected:
+        template<typename... Args>
+        void _setRenderer(RendererType Type,Args&&... args)
+        {
+            _internal_rndflagcalc|=_render_caster(Type);
+            _setRenderer(args...);
+        }
+
+        void _setRenderer(RendererType Type)
+        {
+            _internal_rndflagcalc|=_render_caster(Type);
+            _setRenderer_Real(_internal_rndflagcalc);
+        }
 	private:
 		void _setRenderer_Real(Uint32 flags);
+		Uint32 _internal_rndflagcalc;
+		Uint32 _render_caster(RendererType);
 		std::shared_ptr<SDL_Window> wnd;
 		Renderer winrnd;
 	};

From af18ae23dae6613ba975b5931815f6b5313eee6c Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Wed, 5 Apr 2017 11:43:01 +0800
Subject: [PATCH 3/5] Fix bug in setRenderer

---
 MiniEngine.h | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/MiniEngine.h b/MiniEngine.h
index afaaa0b..e01195d 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -135,6 +135,7 @@ namespace MiniEngine
 	class Renderer
 	{
 	public:
+	    Renderer() = default;
 		int setColor(RGBA pack);
 		RGBA getColor();
 		int setBlendMode(BlendMode mode);
@@ -163,7 +164,6 @@ namespace MiniEngine
 		Texture loadTexture(std::string FileName) throw(ErrorViewer);
 		Texture createTexture(int Width, int Height) throw(ErrorViewer);
 
-		Renderer() = default;
 		bool isReady();
 	private:
 		std::shared_ptr<SDL_Renderer> rnd;
@@ -178,19 +178,19 @@ namespace MiniEngine
 		Window(std::string Title, int Width, int Height, std::initializer_list<RendererType> RendererFlags = { RendererType::Accelerated,RendererType::TargetTexture }) throw(ErrorViewer);
 		Renderer getRenderer() const;
 
-		template<typename... Args>
-		void setRenderer(RendererType Type,Args&&... args)
-		{
-            _internal_rndflagcalc=0;
-            _setRenderer(Type,std::forward(args...));
-		}
-
 		void setRenderer(RendererType Type)
 		{
 		    _internal_rndflagcalc=0;
             _setRenderer(Type);
 		}
 
+		template<typename... Args>
+		void setRenderer(RendererType Type,Args&&... args)
+		{
+            _internal_rndflagcalc=0;
+            _setRenderer(Type,std::forward<RendererType>(args...));
+		}
+
 		void setRenderer(std::initializer_list<RendererType>);
 
 		Rect getSize();

From 01735059fc71e1fc9a2bddb0f1c22dc0e3c172f4 Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Mon, 10 Apr 2017 15:27:24 +0800
Subject: [PATCH 4/5] Add Support for SDL_RWops

---
 MiniEngine.cpp | 21 +++++++++++++++++++++
 MiniEngine.h   | 14 ++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/MiniEngine.cpp b/MiniEngine.cpp
index 2025cff..783067f 100644
--- a/MiniEngine.cpp
+++ b/MiniEngine.cpp
@@ -129,6 +129,27 @@ namespace MiniEngine
 		return str.c_str();
 	}
 
+	RWOP::RWOP(FILE* fp,bool autoclose)
+	{
+	    SDL_bool b=autoclose?SDL_TRUE:SDL_FALSE;
+        op.reset(SDL_RWFromFP(fp,b),[](SDL_RWops* p){SDL_RWclose(p);});
+	}
+
+	RWOP::RWOP(const std::string& filename,const std::string& openmode)
+	{
+        op.reset(SDL_RWFromFile(filename.c_str(),openmode.c_str()),[](SDL_RWops* p){SDL_RWclose(p);});
+	}
+
+    RWOP::RWOP(const void* mem,int size)
+    {
+        op.reset(SDL_RWFromConstMem(mem,size),[](SDL_RWops* p){SDL_RWclose(p);});
+    }
+
+    RWOP::RWOP(void* mem,int size)
+    {
+        op.reset(SDL_RWFromMem(mem,size),[](SDL_RWops* p){SDL_RWclose(p);});
+    }
+
 	Texture::Texture()
 	{
         updateInfo();
diff --git a/MiniEngine.h b/MiniEngine.h
index e01195d..6cb3d2e 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -72,6 +72,20 @@ namespace MiniEngine
 		std::string str;
 	};
 
+    class RWOP
+	{
+    public:
+        RWOP(FILE* fp,bool autoclose);
+        RWOP(const std::string& filename,const std::string& openmode);
+        RWOP(const void* mem,int size);
+        RWOP(void* mem,int size);
+        RWOP()=default;
+        ~RWOP()=default;
+    private:
+        std::shared_ptr<SDL_RWops> op;
+	};
+
+
 	enum class BlendMode
 	{
 		None = SDL_BLENDMODE_NONE,

From 7570bee178217b673e675b7a74097aba1b76c011 Mon Sep 17 00:00:00 2001
From: kiritow <1362050620@qq.com>
Date: Mon, 10 Apr 2017 19:52:40 +0800
Subject: [PATCH 5/5] Add Surface::savePNG, powered by IMG_SavePNG.

---
 MiniEngine.cpp | 5 +++++
 MiniEngine.h   | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/MiniEngine.cpp b/MiniEngine.cpp
index 783067f..a9b235a 100644
--- a/MiniEngine.cpp
+++ b/MiniEngine.cpp
@@ -150,6 +150,11 @@ namespace MiniEngine
         op.reset(SDL_RWFromMem(mem,size),[](SDL_RWops* p){SDL_RWclose(p);});
     }
 
+    int Surface::savePNG(const std::string& filename)
+    {
+        return IMG_SavePNG(surf.get(),filename.c_str());
+    }
+
 	Texture::Texture()
 	{
         updateInfo();
diff --git a/MiniEngine.h b/MiniEngine.h
index 6cb3d2e..96db246 100644
--- a/MiniEngine.h
+++ b/MiniEngine.h
@@ -85,7 +85,6 @@ namespace MiniEngine
         std::shared_ptr<SDL_RWops> op;
 	};
 
-
 	enum class BlendMode
 	{
 		None = SDL_BLENDMODE_NONE,
@@ -98,6 +97,7 @@ namespace MiniEngine
 	{
 	public:
 		~Surface() = default;
+        int savePNG(const std::string& filename);
 	protected:
 		Surface() = default;
 	private: