SDL2 platform

CMake/Dependencies.cmake

@@ -79,6 +79,8 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 6)
 		find_package(DirectX11)
 		macro_log_feature(DirectX_FOUND "DirectX11" "Support for the DirectX11 render system" "http://msdn.microsoft.com/en-us/directx/" TRUE "" "")
 	endif()
+elseif(MYGUI_RENDERSYSTEM EQUAL 9)
+	find_package(SDL2_image)
 #elseif for RENDERSYSTEM 7 is covered with RENDERSYSTEM 4
 endif()
 

CMake/Utils/MyGUIConfigTargets.cmake

@@ -39,6 +39,8 @@ function(mygui_set_platform_name PLATFORM_ID)
 		set(MYGUI_PLATFORM_NAME OpenGL3 PARENT_SCOPE)
 	elseif(${PLATFORM_ID} EQUAL 8)
 		set(MYGUI_PLATFORM_NAME OpenGLES PARENT_SCOPE)
+	elseif(${PLATFORM_ID} EQUAL 9)
+		set(MYGUI_PLATFORM_NAME SDL2 PARENT_SCOPE)
 	endif()
 endfunction(mygui_set_platform_name)
 
@@ -150,6 +152,14 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
 			${OPENGL_LIB_DIR}
 			${SDL2_IMAGE_LIB_DIR}
 		)
+	elseif(MYGUI_RENDERSYSTEM EQUAL 9)
+		add_definitions("-DMYGUI_SDL2_PLATFORM")
+		include_directories(SYSTEM
+			${SDL2_IMAGE_INCLUDE_DIRS}
+		)
+		link_directories(
+			${SDL2_IMAGE_LIB_DIR}
+		)
 	endif()
 
 	# setup demo target
@@ -192,6 +202,8 @@ function(mygui_app PROJECTNAME SOLUTIONFOLDER)
 		target_link_libraries(${PROJECTNAME} ${SDL2_IMAGE_LIBRARIES})
 	elseif(MYGUI_RENDERSYSTEM EQUAL 8)
 		target_link_libraries(${PROJECTNAME} ${SDL2_IMAGE_LIBRARIES})
+	elseif(MYGUI_RENDERSYSTEM EQUAL 9)
+		target_link_libraries(${PROJECTNAME} ${SDL2_IMAGE_LIBRARIES})
 	endif()
 	target_link_libraries(${PROJECTNAME}
 		MyGUIEngine
@@ -265,6 +277,8 @@ function(mygui_dll PROJECTNAME SOLUTIONFOLDER)
 			${OPENGL_INCLUDE_DIR}
 		)
 		link_directories(${OPENGL_LIB_DIR})
+	elseif(MYGUI_RENDERSYSTEM EQUAL 9)
+		add_definitions("-DMYGUI_SDL2_PLATFORM")
 	endif()
 
 
@@ -304,6 +318,8 @@ function(mygui_dll PROJECTNAME SOLUTIONFOLDER)
 		target_link_libraries(${PROJECTNAME} ${SDL2_IMAGE_LIBRARIES})
 	elseif(MYGUI_RENDERSYSTEM EQUAL 8)
 		target_link_libraries(${PROJECTNAME} ${SDL2_IMAGE_LIBRARIES})
+	elseif(MYGUI_RENDERSYSTEM EQUAL 9)
+		target_link_libraries(${PROJECTNAME} ${SDL2_IMAGE_LIBRARIES})
 	endif()
 
 	target_link_libraries(${PROJECTNAME}

CMakeLists.txt

@@ -143,7 +143,9 @@ set(MYGUI_RENDERSYSTEM 3 CACHE STRING
   5 - Direct3D 9
   6 - Direct3D 11
   7 - OpenGL 3.x
-  8 - OpenGL ES 2.0 (Emscripten)"
+  8 - OpenGL ES 2.0 (Emscripten)
+  9 - SDL2 (>=2.0.18)
+"
 )
 
 if(MYGUI_RENDERSYSTEM EQUAL 4 OR MYGUI_RENDERSYSTEM EQUAL 7)

Common/Base/PlatformBaseManager/SdlBaseManager.cpp

@@ -12,7 +12,9 @@ namespace base
 
 	void SdlBaseManager::_windowResized(int w, int h)
 	{
-		resizeRender(w, h);
+		int fbWidth, fbHeight;
+		SDL_GL_GetDrawableSize(mSdlWindow, &fbWidth, &fbHeight);
+		resizeRender(fbWidth, fbHeight);
 
 		if (mPlatformReady)
 			MyGUI::RenderManager::getInstance().setViewSize(w, h);
@@ -43,13 +45,16 @@ namespace base
 		int left = (currDisp.w - width) / 2;
 		int top = (currDisp.h - height) / 2;
 
-		mSdlWindow = SDL_CreateWindow("MyGUI Render Window", left, top, width, height, (mIsOpenGlWindow ? SDL_WINDOW_OPENGL : 0) | SDL_WINDOW_RESIZABLE);
+		mSdlWindow = SDL_CreateWindow("MyGUI Render Window", left, top, width, height, (mIsOpenGlWindow ? SDL_WINDOW_OPENGL : 0) | SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI);
 		if (mSdlWindow == nullptr)
 		{
 			std::cerr << "Failed to create SDL window.";
 			exit(1);
 		}
 		mWindowOn = true;
+		int realW, realH;
+		SDL_GL_GetDrawableSize(mSdlWindow, &realW, &realH);
+		mScale = (double)realW / (double)width;
 
 #if MYGUI_PLATFORM == MYGUI_PLATFORM_WIN32
 		// set icon
@@ -73,7 +78,7 @@ namespace base
 			::SendMessageA((HWND)handle, WM_SETICON, 1, (LPARAM)hIconBig);
 #endif
 
-		if (!createRender(width, height, windowed))
+		if (!createRender(realW, realH, windowed))
 		{
 			return false;
 		}
@@ -107,6 +112,9 @@ namespace base
 			{
 				switch (mEvent.type)
 				{
+				case SDL_QUIT:
+					mExit = true;
+					break;
 					// keyboard events
 				case SDL_KEYDOWN:
 					mKeyCode = mEvent.key.keysym.sym;

Common/Base/PlatformBaseManager/SdlBaseManager.h

@@ -81,6 +81,8 @@ namespace base
 		bool mWindowOn = false;
 		SDL_Keycode	mKeyCode;
 		int mFpsCounter = 0;
+
+		double mScale = 0;
 	};
 
 }

Common/Base/SDL2/BaseManager.cpp

@@ -0,0 +1,109 @@
+#include "Precompiled.h"
+#include "BaseManager.h"
+
+#include <SDL_image.h>
+
+namespace base
+{
+	bool BaseManager::createRender(int _width, int _height, bool _windowed)
+	{
+		mRenderer = SDL_CreateRenderer(mSdlWindow, 0, SDL_RENDERER_ACCELERATED | SDL_RENDERER_TARGETTEXTURE | SDL_RENDERER_PRESENTVSYNC);
+
+		if (mRenderer == nullptr) {
+			std::cerr << "Failed to initialize SDL_Renderer: " << SDL_GetError();
+			exit(1);
+		}
+
+		// TODO: Why do we need this? We need to understand why SubSkin::doRender() multiplies the size of the quad by 2
+//		SDL_RenderSetScale(mRenderer, 0.5, 0.5);
+
+		if (IMG_Init(~0) == 0)
+		{
+			std::cerr << "Failed to initialize SDL_image: " << IMG_GetError();
+			exit(1);
+		}
+		return true;
+	}
+
+	void BaseManager::destroyRender()
+	{
+		SDL_DestroyRenderer(mRenderer);
+		IMG_Quit();
+	}
+
+	void BaseManager::createGuiPlatform()
+	{
+		mPlatform = new MyGUI::SDL2Platform();
+		setupResources();
+		mPlatform->initialise(this, mRenderer);
+	}
+
+	void BaseManager::destroyGuiPlatform()
+	{
+		if (mPlatform)
+		{
+			mPlatform->shutdown();
+			delete mPlatform;
+			mPlatform = nullptr;
+		}
+	}
+
+	void BaseManager::drawOneFrame()
+	{
+		SDL_SetRenderDrawColor(mRenderer, 10, 20, 30, 0xFF);
+		SDL_RenderClear(mRenderer);
+
+		if (mPlatform)
+			mPlatform->getRenderManagerPtr()->drawOneFrame();
+
+		SDL_RenderPresent(mRenderer);
+	}
+
+	void BaseManager::resizeRender(int _width, int _height)
+	{
+		// TODO: Maybe we need to resize the renderer?
+		printf("Resized\n");
+	}
+
+	void BaseManager::addResourceLocation(const std::string& _name, bool _recursive)
+	{
+		mPlatform->getDataManagerPtr()->addResourceLocation(_name, _recursive);
+	}
+
+
+	SDL_Texture* BaseManager::loadTexture(const std::string& _filename)
+	{
+		std::string fullname = MyGUI::SDL2DataManager::getInstance().getDataPath(_filename);
+
+		SDL_Texture *texture = NULL;
+		SDL_Surface *surface = IMG_Load(fullname.c_str());
+
+		MYGUI_ASSERT(surface != nullptr, "Failed to load image: " + fullname);
+
+		auto bpp = surface->format->BytesPerPixel;
+		auto newFormat = SDL_PIXELFORMAT_UNKNOWN;
+		switch (bpp) {
+			case 4:
+				newFormat = SDL_PIXELFORMAT_RGBA32;
+				break;
+			case 3:
+				newFormat = SDL_PIXELFORMAT_RGB24;
+				break;
+		}
+		surface = SDL_ConvertSurfaceFormat(surface, newFormat, 0);
+
+		MYGUI_ASSERT(surface != nullptr, "Failed to convert image: " + fullname);
+
+		texture = SDL_CreateTextureFromSurface(mRenderer, surface);
+		SDL_FreeSurface(surface);
+
+		return texture;
+	}
+
+	void BaseManager::saveImage(int _width, int _height, MyGUI::PixelFormat _format, void* _texture, const std::string& _filename)
+	{
+		SDL_Surface* surface = SDL_CreateRGBSurface(0, _width, _height, _format.getBytesPerPixel() * 8, 0, 0, 0, 0);
+		std::memcpy(surface->pixels, _texture, _width * _height * _format.getBytesPerPixel());
+		IMG_SavePNG(surface, _filename.c_str());
+	}
+}

Common/Base/SDL2/BaseManager.h

@@ -0,0 +1,34 @@
+#pragma once
+
+#include "Base/PlatformBaseManager/SdlBaseManager.h"
+
+#include <MyGUI_SDL2Platform.h>
+#include <MyGUI_SDL2ImageLoader.h>
+
+namespace base
+{
+
+	class BaseManager :
+		public SdlBaseManager,
+		public MyGUI::SDL2ImageLoader
+	{
+	public:
+        BaseManager() : SdlBaseManager(false) { }
+		bool createRender(int _width, int _height, bool _windowed) override;
+		void destroyRender() override;
+		void drawOneFrame() override;
+		void resizeRender(int _width, int _height) override;
+		void addResourceLocation(const std::string& _name, bool _recursive = false) override;
+		void createGuiPlatform() override;
+		void destroyGuiPlatform() override;
+
+//		/*internal:*/
+		SDL_Texture* loadTexture(const std::string& _filename) override;
+		void saveImage(int _width, int _height, MyGUI::PixelFormat _format, void* _texture, const std::string& _filename) override;
+
+	private:
+		MyGUI::SDL2Platform* mPlatform = nullptr;
+		SDL_Renderer *mRenderer = nullptr;
+	};
+
+}

Common/CMakeLists.txt

@@ -77,6 +77,12 @@ elseif(MYGUI_RENDERSYSTEM EQUAL 8)
 	)
 	link_directories(${OPENGL_LIB_DIR})
 	link_directories(${SDL2_IMAGE_LIB_DIR})
+elseif(MYGUI_RENDERSYSTEM EQUAL 9)
+	add_definitions("-DMYGUI_SDL2_PLATFORM")
+	include_directories(SYSTEM
+		${SDL2_IMAGE_INCLUDE_DIRS}
+	)
+	link_directories(${SDL2_IMAGE_LIB_DIR})
 endif()
 
 include_directories(Input/SDL)

Platforms/SDL2/SDL2Platform/CMakeLists.txt

@@ -0,0 +1,22 @@
+set(PROJECTNAME MyGUI.SDL2Platform)
+
+include_directories(
+	include
+	${MYGUI_SOURCE_DIR}/MyGUIEngine/include
+	${MYGUI_SOURCE_DIR}/Common
+	${SDL2_INCLUDE_DIRS}
+)
+
+include(${PROJECTNAME}.list)
+
+add_library(${PROJECTNAME} ${HEADER_FILES} ${SOURCE_FILES})
+
+add_dependencies(${PROJECTNAME} MyGUIEngine)
+
+target_link_libraries(${PROJECTNAME} MyGUIEngine ${SDL2_LIBRARIES})
+
+# installation rules
+install(FILES ${HEADER_FILES}
+	DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/MYGUI"
+)
+mygui_install_target(${PROJECTNAME} "")

Platforms/SDL2/SDL2Platform/MyGUI.SDL2Platform.list

@@ -0,0 +1,28 @@
+set (HEADER_FILES
+  include/MyGUI_SDL2DataManager.h
+  include/MyGUI_SDL2Diagnostic.h
+  include/MyGUI_SDL2Platform.h
+  include/MyGUI_SDL2RenderManager.h
+  include/MyGUI_SDL2Texture.h
+  include/MyGUI_SDL2VertexBuffer.h
+)
+set (SOURCE_FILES
+  src/MyGUI_SDL2DataManager.cpp
+  src/MyGUI_SDL2RenderManager.cpp
+  src/MyGUI_SDL2Texture.cpp
+  src/MyGUI_SDL2VertexBuffer.cpp
+)
+SOURCE_GROUP("Header Files" FILES
+  include/MyGUI_SDL2DataManager.h
+  include/MyGUI_SDL2Diagnostic.h
+  include/MyGUI_SDL2Platform.h
+  include/MyGUI_SDL2RenderManager.h
+  include/MyGUI_SDL2Texture.h
+  include/MyGUI_SDL2VertexBuffer.h
+)
+SOURCE_GROUP("Source Files" FILES
+  src/MyGUI_SDL2DataManager.cpp
+  src/MyGUI_SDL2RenderManager.cpp
+  src/MyGUI_SDL2Texture.cpp
+  src/MyGUI_SDL2VertexBuffer.cpp
+)