TheCloud/libSDL2pp
1
0
Fork 0
mirror of https://github.com/libSDL2pp/libSDL2pp.git synced 2025-08-03 10:55:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into ttf

Browse Source 
Conflicts:
	CMakeLists.txt
	SDL2pp/SDL2pp.hh
This commit is contained in:
Dmitry Marakasov 2014-12-28 06:14:12 +03:00
commit ffdeb9465d
17 changed files with 289 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
CMakeLists.txt
View File

@ -114,14 +114,6 @@ SET(LIBRARY_SOURCES
SDL2pp/Window.cc
)
IF(SDL2PP_WITH_TTF)
SET(LIBRARY_SOURCES
${LIBRARY_SOURCES}
SDL2pp/SDLTTF.cc
SDL2pp/Font.cc
)
ENDIF(SDL2PP_WITH_TTF)
SET(LIBRARY_HEADERS
SDL2pp/AudioDevice.hh
SDL2pp/AudioSpec.hh
@ -141,7 +133,13 @@ SET(LIBRARY_HEADERS
SDL2pp/Window.hh
)
# optional sources
IF(SDL2PP_WITH_TTF)
SET(LIBRARY_SOURCES
${LIBRARY_SOURCES}
SDL2pp/SDLTTF.cc
SDL2pp/Font.cc
)
SET(LIBRARY_HEADERS
${LIBRARY_HEADERS}
SDL2pp/SDLTTF.hh
@ -149,13 +147,24 @@ IF(SDL2PP_WITH_TTF)
)
ENDIF(SDL2PP_WITH_TTF)
IF(SDL2PP_WITH_IMAGE)
SET(LIBRARY_SOURCES
${LIBRARY_SOURCES}
SDL2pp/SDLImage.cc
)
SET(LIBRARY_HEADERS
${LIBRARY_HEADERS}
SDL2pp/SDLImage.hh
)
ENDIF(SDL2PP_WITH_IMAGE)
IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
MESSAGE(STATUS "libSDL2pp standalone build")
MESSAGE(STATUS "libSDL2pp ${SDL2PP_VERSION} standalone build")
# library
ADD_LIBRARY(SDL2pp SHARED ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})
TARGET_LINK_LIBRARIES(SDL2pp ${SDL2_ALL_LIBRARIES})
SET_TARGET_PROPERTIES(SDL2pp PROPERTIES VERSION 2.0.0 SOVERSION 2)
SET_TARGET_PROPERTIES(SDL2pp PROPERTIES VERSION 3.0.0 SOVERSION 3)
# examples and tests
OPTION(SDL2PP_WITH_EXAMPLES "Build examples" ON)
@ -193,7 +202,7 @@ IF(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
INSTALL(TARGETS SDL2pp LIBRARY DESTINATION lib)
INSTALL(FILES ${PROJECT_BINARY_DIR}/sdl2pp.pc DESTINATION ${PKGCONFIGDIR})
ELSE(CMAKE_SOURCE_DIR STREQUAL PROJECT_SOURCE_DIR)
MESSAGE(STATUS "libSDL2pp bundled build")
MESSAGE(STATUS "libSDL2pp ${SDL2PP_VERSION} bundled build")
# library
ADD_LIBRARY(SDL2pp STATIC ${LIBRARY_SOURCES} ${LIBRARY_HEADERS})

3
README.md
View File

@ -77,6 +77,9 @@ methods. These classes also support:
## Building ##
To build libSDL2pp, you need a compiler with C++11 support, for
example clang 3.4+ or gcc 4.8+.
Dependencies:
* cmake
* SDL2

2
SDL2pp/Exception.cc
View File

@ -36,7 +36,7 @@ const char* Exception::what() const noexcept {
}
const char* Exception::GetSDLError() const noexcept {
return sdl_error_;
return sdl_error_.c_str();
}
} // namespace SDL2pp

11
SDL2pp/Exception.hh
View File

@ -22,6 +22,7 @@
#ifndef SDL2PP_EXCEPTION_HH
#define SDL2PP_EXCEPTION_HH
#include <string>
#include <exception>
namespace SDL2pp {
@ -42,6 +43,13 @@ namespace SDL2pp {
/// what() usually contains a name of SDL2 function which failed,
/// e.g. "SDL_Init() failed"
///
/// Note: this Exception object is used to report errors from
/// SDL2 satellite libraries (SDL_image, SDL_mixer, SDL_ttf)
/// as well. Though they use their own error handling functions
/// (IMG_GetError, Mix_GetError, TTF_GetError), those are (currently)
/// just macros pointing to SDL_GetError. We currently rely on that.
/// If that changes, we'll need a hierarchy of specific exceptions.
///
/// Usage example:
/// \code
/// {
@ -61,7 +69,7 @@ namespace SDL2pp {
class Exception : public std::exception {
private:
const char* what_; ///< User-specified message
const char* sdl_error_; ///< SDL error string
std::string sdl_error_; ///< SDL error string
public:
////////////////////////////////////////////////////////////
@ -72,7 +80,6 @@ public:
////////////////////////////////////////////////////////////
Exception(const char* what = "");
////////////////////////////////////////////////////////////
/// \brief Destructor
///

3
SDL2pp/Renderer.cc
View File

@ -30,6 +30,9 @@
namespace SDL2pp {
Renderer::Renderer(SDL_Renderer* renderer) : renderer_(renderer) {
}
Renderer::Renderer(Window& window, int index, Uint32 flags) {
if ((renderer_ = SDL_CreateRenderer(window.Get(), index, flags)) == nullptr)
throw Exception("SDL_CreateRenderer failed");

8
SDL2pp/Renderer.hh
View File

@ -51,6 +51,14 @@ private:
SDL_Renderer* renderer_; ///< Contained SDL_Renderer structure
public:
////////////////////////////////////////////////////////////
/// \brief Construct from existing SDL_Renderer structure
///
/// \param renderer Existing SDL_Renderer to manage
///
////////////////////////////////////////////////////////////
Renderer(SDL_Renderer* renderer);
////////////////////////////////////////////////////////////
/// \brief Create renderer
///

22
SDL2pp/SDL2pp.hh
View File

@ -95,15 +95,25 @@
#include <SDL2pp/ContainerRWops.hh>
#include <SDL2pp/StreamRWops.hh>
////////////////////////////////////////////////////////////
/// \defgroup ttf SDL_ttf
///
/// \brief Text rendering throught SDL_ttf library
///
////////////////////////////////////////////////////////////
#ifdef SDL2PP_WITH_TTF
////////////////////////////////////////////////////////////
/// \defgroup ttf SDL_ttf
///
/// \brief Text rendering throught SDL_ttf library
///
////////////////////////////////////////////////////////////
# include <SDL2pp/SDLTTF.hh>
# include <SDL2pp/Font.hh>
#endif
////////////////////////////////////////////////////////////
/// \defgroup image SDL_image
///
/// \brief Functions that are specific to SDL_image library
///
////////////////////////////////////////////////////////////
#ifdef SDL2PP_WITH_IMAGE
# include <SDL2pp/SDLImage.hh>
#endif
#endif

49
SDL2pp/SDLImage.cc Normal file
View File

@ -0,0 +1,49 @@
/*
libSDL2pp - C++11 bindings/wrapper for SDL2
Copyright (C) 2014 Dmitry Marakasov <amdmi3@amdmi3.ru>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#include <SDL2/SDL_image.h>
#include <SDL2pp/SDLImage.hh>
#include <SDL2pp/Exception.hh>
namespace SDL2pp {
SDLImage::SDLImage(int flags) {
if ((IMG_Init(flags) & flags) != flags)
throw Exception("IMG_Init failed");
}
SDLImage::~SDLImage() {
IMG_Quit();
}
int SDLImage::InitMore(int flags) {
int ret;
if (((ret = IMG_Init(flags)) & flags) != flags)
throw Exception("IMG_Init failed");
return ret;
}
int SDLImage::GetInitFlags() {
return IMG_Init(0);
}
}

106
SDL2pp/SDLImage.hh Normal file
View File

@ -0,0 +1,106 @@
/*
libSDL2pp - C++11 bindings/wrapper for SDL2
Copyright (C) 2014 Dmitry Marakasov <amdmi3@amdmi3.ru>
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
*/
#ifndef SDL2PP_SDLIMAGE_HH
#define SDL2PP_SDLIMAGE_HH
namespace SDL2pp {
////////////////////////////////////////////////////////////
/// \brief Object taking care of SDL_image library (de-)initialization
///
/// \ingroup image
///
/// \headerfile SDL2pp/SDLImage.hh
///
/// Though it's possible to use SDL_image without initializing it,
/// library provide initialization/deinitialization functions to
/// be able to preload libraries for specific file format support
/// (png, jpeg or tiff) beforehand. In SDL2pp, this is handled by
/// this class.
///
/// Usage example:
/// \code
/// int main() {
/// SDL2pp::SDL sdl(SDL_INIT_VIDEO);
/// SDL2pp::SDLImage image(IMG_INIT_PNG);
///
/// // use SDL_image functions
/// SDL2pp::Texture t("/path/to/file.png");
///
/// // SDL_image library is automatically deinitialized before exit
/// return 0;
/// }
/// \endcode
///
////////////////////////////////////////////////////////////
class SDLImage {
public:
////////////////////////////////////////////////////////////
/// \brief Initializes SDL_image library
///
/// \param flags Flags to pass to IMG_Init()
///
/// \throws SDL2pp::Exception
///
/// \see https://www.libsdl.org/projects/SDL_image/docs/SDL_image.html#SEC8
///
////////////////////////////////////////////////////////////
SDLImage(int flags);
////////////////////////////////////////////////////////////
/// \brief Destructor, deinitializes SDL_image library
///
/// \see https://www.libsdl.org/projects/SDL_image/docs/SDL_image.html#SEC9
///
////////////////////////////////////////////////////////////
virtual ~SDLImage();
////////////////////////////////////////////////////////////
/// \brief Try to init more SDL_image formats
///
/// \param flags Flags to pass to IMG_Init()
///
/// \throws SDL2pp::Exception
///
/// \see https://www.libsdl.org/projects/SDL_image/docs/SDL_image.html#SEC8
///
////////////////////////////////////////////////////////////
int InitMore(int flags);
////////////////////////////////////////////////////////////
/// \brief Get mask of initialized SDL_image formats
///
/// \see https://www.libsdl.org/projects/SDL_image/docs/SDL_image.html#SEC8
///
////////////////////////////////////////////////////////////
int GetInitFlags();
// Deleted copy/move constructors and assignments
SDLImage(const SDLImage& other) = delete;
SDLImage(SDLImage&& other) = delete;
SDLImage& operator=(const SDLImage& other) = delete;
SDLImage& operator=(SDLImage&& other) = delete;
};
}
#endif

7
SDL2pp/Surface.hh
View File

@ -148,16 +148,15 @@ public:
const SDL_PixelFormat& GetFormat() const;
};
private:
public:
////////////////////////////////////////////////////////////
/// \brief Create surface taking existing SDL_surface structure
/// \brief Construct from existing SDL_Surface structure
///
/// \param surface Existing SDL_surface to manage
/// \param surface Existing SDL_Surface to manage
///
////////////////////////////////////////////////////////////
Surface(SDL_Surface* surface);
public:
////////////////////////////////////////////////////////////
/// \brief Create RGB surface
///

10
SDL2pp/Texture.cc
View File

@ -40,6 +40,9 @@
namespace SDL2pp {
Texture::Texture(SDL_Texture* texture) : texture_(texture) {
}
Texture::Texture(Renderer& renderer, Uint32 format, int access, int w, int h) {
if ((texture_ = SDL_CreateTexture(renderer.Get(), format, access, w, h)) == nullptr)
throw Exception("SDL_CreateTexture failed");
@ -47,12 +50,13 @@ Texture::Texture(Renderer& renderer, Uint32 format, int access, int w, int h) {
#ifdef SDL2PP_WITH_IMAGE
Texture::Texture(Renderer& renderer, RWops& rwops) {
texture_ = IMG_LoadTexture_RW(renderer.Get(), rwops.Get(), 0);
if ((texture_ = IMG_LoadTexture_RW(renderer.Get(), rwops.Get(), 0)) == nullptr)
throw Exception("IMG_LoadTexture_RW failed");
}
Texture::Texture(Renderer& renderer, const std::string& path) {
RWops rwops = RWops::FromFile(path);
texture_ = IMG_LoadTexture_RW(renderer.Get(), rwops.Get(), 0);
if ((texture_ = IMG_LoadTexture(renderer.Get(), path.c_str())) == nullptr)
throw Exception("IMG_LoadTexture failed");
}
#endif

24
SDL2pp/Texture.hh
View File

@ -50,7 +50,7 @@ class Surface;
////////////////////////////////////////////////////////////
class Texture {
private:
SDL_Texture* texture_; ///< SDL2 texture pointer
SDL_Texture* texture_; ///< Contained SDL_Texture structure
public:
////////////////////////////////////////////////////////////
@ -104,7 +104,7 @@ public:
///
/// \throws STL2pp::Exception
///
/// \see http://wiki.libsdl.org/SDL_LockAudioDevice
/// \see http://wiki.libsdl.org/SDL_LockTexture
///
////////////////////////////////////////////////////////////
LockHandle(Texture* texture, const Optional<Rect>& rect);
@ -126,7 +126,7 @@ public:
/// \details
/// Releases the lock
///
/// \see http://wiki.libsdl.org/SDL_UnlockAudioDevice
/// \see http://wiki.libsdl.org/SDL_UnlockTexture
///
////////////////////////////////////////////////////////////
~LockHandle();
@ -134,7 +134,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Move constructor
///
/// \param other SDL2pp::AudioDevice::LockHandle to move data from
/// \param other SDL2pp::Texture::LockHandle to move data from
///
////////////////////////////////////////////////////////////
LockHandle(LockHandle&& other) noexcept;
@ -142,7 +142,7 @@ public:
////////////////////////////////////////////////////////////
/// \brief Move assignment operator
///
/// \param other SDL2pp::AudioDevice::LockHandle to move data from
/// \param other SDL2pp::Texture::LockHandle to move data from
///
/// \returns Reference to self
///
@ -172,6 +172,14 @@ public:
};
public:
////////////////////////////////////////////////////////////
/// \brief Construct from existing SDL_Texture structure
///
/// \param texture Existing SDL_Texture to manage
///
////////////////////////////////////////////////////////////
Texture(SDL_Texture* texture);
////////////////////////////////////////////////////////////
/// \brief Create empty texture
///
@ -195,6 +203,8 @@ public:
/// \param renderer Rendering context to create texture for
/// \param rwops RWops used to access an image file
///
/// \throws SDL2pp::Exception
///
////////////////////////////////////////////////////////////
Texture(Renderer& renderer, RWops& rwops);
@ -204,6 +214,8 @@ public:
/// \param renderer Rendering context to create texture for
/// \param filename Path to an image file
///
/// \throws SDL2pp::Exception
///
////////////////////////////////////////////////////////////
Texture(Renderer& renderer, const std::string& filename);
#endif
@ -224,6 +236,8 @@ public:
////////////////////////////////////////////////////////////
/// \brief Destructor
///
/// \see http://wiki.libsdl.org/SDL_DestroyTexture
///
////////////////////////////////////////////////////////////
virtual ~Texture();

11
SDL2pp/Window.cc
View File

@ -26,6 +26,9 @@
namespace SDL2pp {
Window::Window(SDL_Window* window) : window_(window) {
}
Window::Window(const std::string& title, int x, int y, int w, int h, Uint32 flags) {
if ((window_ = SDL_CreateWindow(title.c_str(), x, y, w, h, flags)) == nullptr)
throw Exception("SDL_CreateWindow failed");
@ -50,6 +53,10 @@ Window& Window::operator=(Window&& other) noexcept {
return *this;
}
SDL_Window* Window::Get() const {
return window_;
}
Point Window::GetSize() const {
int w, h;
SDL_GetWindowSize(window_, &w, &h);
@ -72,10 +79,6 @@ void Window::SetTitle(const std::string& title) {
SDL_SetWindowTitle(window_, title.c_str());
}
SDL_Window* Window::Get() const {
return window_;
}
void Window::Maximize() {
SDL_MaximizeWindow(window_);
}

24
SDL2pp/Window.hh
View File

@ -64,6 +64,14 @@ private:
SDL_Window* window_; ///< Contained SDL2_Window structure
public:
////////////////////////////////////////////////////////////
/// \brief Construct from existing SDL_Window structure
///
/// \param window Existing SDL_Window to manage
///
////////////////////////////////////////////////////////////
Window(SDL_Window* window);
////////////////////////////////////////////////////////////
/// \brief Create window with specified title and fimensions
///
@ -111,6 +119,14 @@ public:
Window(const Window& other) = delete;
Window& operator=(const Window& other) = delete;
////////////////////////////////////////////////////////////
/// \brief Get pointer to contained SDL_Window structure
///
/// \returns Pointer to SDL_Window structure
///
////////////////////////////////////////////////////////////
SDL_Window* Get() const;
////////////////////////////////////////////////////////////
/// \brief Get dimensions of the window
///
@ -152,14 +168,6 @@ public:
////////////////////////////////////////////////////////////
void SetTitle(const std::string& title);
////////////////////////////////////////////////////////////
/// \brief Get pointer to contained SDL_Window structure
///
/// \returns Pointer to SDL_Window structure
///
////////////////////////////////////////////////////////////
SDL_Window* Get() const;
////////////////////////////////////////////////////////////
/// \brief Make a window as large as possible
///

3
examples/image.cc
View File

@ -22,8 +22,10 @@
#include <iostream>
#include <SDL2/SDL.h>
#include <SDL2/SDL_image.h>
#include <SDL2pp/SDL.hh>
#include <SDL2pp/SDLImage.hh>
#include <SDL2pp/Window.hh>
#include <SDL2pp/Renderer.hh>
#include <SDL2pp/Texture.hh>
@ -34,6 +36,7 @@ using namespace SDL2pp;
int Run() {
SDL sdl(SDL_INIT_VIDEO);
SDLImage image(IMG_INIT_PNG); // optional
Window window("libSDL2pp demo: loading", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED, 640, 480, SDL_WINDOW_RESIZABLE);
Renderer render(window, -1, SDL_RENDERER_ACCELERATED);

1
tests/CMakeLists.txt
View File

@ -3,6 +3,7 @@ SET(CLI_TESTS
test_pointrect
test_rwops
test_optional
test_error
)
# tests which test graphics functionality and thus requre working

18
tests/test_error.cc Normal file
View File

@ -0,0 +1,18 @@
#include <SDL2/SDL_error.h>
#include <SDL2pp/Exception.hh>
#include "testing.h"
using namespace SDL2pp;
BEGIN_TEST()
SDL_SetError("foo");
try {
throw Exception("");
} catch (SDL2pp::Exception& e) {
SDL_SetError("bar");
EXPECT_EQUAL((std::string)e.GetSDLError(), "foo");
}
END_TEST()