summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNao Pross <naopross@thearcway.org>2019-01-25 15:53:39 +0100
committerNao Pross <naopross@thearcway.org>2019-01-25 15:53:39 +0100
commit71b593ebd1a015a4cb9bfe0eebafc78d897ff284 (patch)
tree6a1f1b95caa2e6745f85f134dc5e8d50ba64a519
parentMove renderer code in video.cpp to reflect header decl order (diff)
downloadlibwsdl2-71b593ebd1a015a4cb9bfe0eebafc78d897ff284.tar.gz
libwsdl2-71b593ebd1a015a4cb9bfe0eebafc78d897ff284.zip
Add basic texture wrapperready
-rw-r--r--include/video.hpp104
-rw-r--r--video.cpp37
2 files changed, 138 insertions, 3 deletions
diff --git a/include/video.hpp b/include/video.hpp
index dc315ed..1d71d21 100644
--- a/include/video.hpp
+++ b/include/video.hpp
@@ -13,6 +13,8 @@ extern "C" {
namespace wsdl2 {
// forward declarations
+ class texture;
+ class renderer;
class window;
// name aliases
@@ -23,13 +25,111 @@ namespace wsdl2 {
std::uint8_t r, g, b, a;
};
+ enum class blend_mode {
+ // TODO: map blend modes
+ unimplemented
+ };
+
+ /// a graphic object allocated in the VRAM,
+ /// the CPU has not much control of this buffer
+ class texture {
+ public:
+ enum class pixformat : Uint32 {
+ unknown = SDL_PIXELFORMAT_UNKNOWN,
+ index1lsb = SDL_PIXELFORMAT_INDEX1LSB,
+ index1msb = SDL_PIXELFORMAT_INDEX1MSB,
+ index4lsb = SDL_PIXELFORMAT_INDEX4LSB,
+ index4msb = SDL_PIXELFORMAT_INDEX4MSB,
+ index8 = SDL_PIXELFORMAT_INDEX8,
+ rgb332 = SDL_PIXELFORMAT_RGB332,
+ rgb444 = SDL_PIXELFORMAT_RGB444,
+ rgb555 = SDL_PIXELFORMAT_RGB555,
+ bgr555 = SDL_PIXELFORMAT_BGR555,
+ argb4444 = SDL_PIXELFORMAT_ARGB4444,
+ rgba4444 = SDL_PIXELFORMAT_RGBA4444,
+ abgr4444 = SDL_PIXELFORMAT_ABGR4444,
+ bgra4444 = SDL_PIXELFORMAT_BGRA4444,
+ argb1555 = SDL_PIXELFORMAT_ARGB1555,
+ rgba5551 = SDL_PIXELFORMAT_RGBA5551,
+ abgr1555 = SDL_PIXELFORMAT_ABGR1555,
+ bgra5551 = SDL_PIXELFORMAT_BGRA5551,
+ rgb565 = SDL_PIXELFORMAT_RGB565,
+ bgr565 = SDL_PIXELFORMAT_BGR565,
+ rgb24 = SDL_PIXELFORMAT_RGB24,
+ bgr24 = SDL_PIXELFORMAT_BGR24,
+ rgb888 = SDL_PIXELFORMAT_RGB888,
+ rgbx8888 = SDL_PIXELFORMAT_RGBX8888,
+ bgr888 = SDL_PIXELFORMAT_BGR888,
+ bgrx8888 = SDL_PIXELFORMAT_BGRX8888,
+ argb8888 = SDL_PIXELFORMAT_ARGB8888,
+ rgba8888 = SDL_PIXELFORMAT_RGBA8888,
+ abgr8888 = SDL_PIXELFORMAT_ABGR8888,
+ bgra8888 = SDL_PIXELFORMAT_BGRA8888,
+ argb2101010 = SDL_PIXELFORMAT_ARGB2101010,
+ };
+
+ enum class access : int {
+ static_ = SDL_TEXTUREACCESS_STATIC,
+ streaming = SDL_TEXTUREACCESS_STREAMING,
+ target = SDL_TEXTUREACCESS_TARGET
+ };
+
+ const pixformat _format;
+ const access _access;
+
+ texture() = delete;
+
+ // TODO: create a texture copy constructor?
+ texture(const texture& other) = delete;
+ // TODO: create surface wrapper class
+ // texture(const surface& surf);
+
+ texture(renderer& r, pixformat p, access a, std::size_t width, std::size_t height);
+ virtual ~texture();
+
+ /// lock a portion to be write-only
+ // TODO: needs surface wrapper class
+ // bool lock(const rect& region, const surface&);
+ inline void unlock() { SDL_UnlockTexture(m_texture); }
+
+ inline bool alpha(std::uint8_t val) {
+ int supported = SDL_SetTextureAlphaMod(m_texture, val);
+ if (supported == -1)
+ return false;
+ else if (supported == 0)
+ return true;
+
+ util::check(supported);
+ return false;
+
+ }
+
+ inline std::uint8_t alpha() {
+ std::uint8_t val;
+ util::check(0 == SDL_GetTextureAlphaMod(m_texture, &val));
+
+ return val;
+ }
+
+ private:
+ renderer& m_renderer;
+ SDL_Texture *m_texture;
+
+ // dirty C code
+ SDL_Texture* sdl();
+ };
+
+ /// the guy who does the actual hard stuff
class renderer {
public:
friend class window;
+ friend class texture;
renderer(window& w);
+ renderer(texture& t);
virtual ~renderer();
+ inline void set_target() {}
inline void clear() { SDL_RenderClear(sdl()); }
inline void present() { SDL_RenderPresent(sdl()); }
@@ -133,6 +233,8 @@ namespace wsdl2 {
SDL_Renderer* sdl();
};
+
+ /// a basic wrapper around a SDL window
class window {
public:
friend class renderer;
@@ -170,4 +272,4 @@ namespace wsdl2 {
-} \ No newline at end of file
+}
diff --git a/video.cpp b/video.cpp
index 47d5756..5a5e933 100644
--- a/video.cpp
+++ b/video.cpp
@@ -12,6 +12,39 @@ extern "C" {
using namespace wsdl2;
+
+/* class texture */
+
+texture::texture(renderer& r, texture::pixformat p, texture::access a,
+ std::size_t width, std::size_t height)
+
+ : _format(p), _access(a), m_renderer(r)
+{
+ m_texture = SDL_CreateTexture(r.m_renderer,
+ static_cast<Uint32>(p), static_cast<int>(a),
+ static_cast<int>(width), static_cast<int>(height)
+ );
+}
+
+texture::~texture() {
+ if (m_texture != NULL)
+ SDL_DestroyTexture(m_texture);
+ else
+ npdebug("warning: m_texture is NULL");
+}
+
+SDL_Texture* texture::sdl() {
+#ifdef DEBUG
+ if (m_texture == NULL) {
+ throw std::runtime_error(
+ "attempted to call texture::sdl() when m_texture is NULL"
+ );
+ }
+#endif
+
+ return m_texture;
+}
+
/* class renderer */
renderer::renderer() {
@@ -19,7 +52,7 @@ renderer::renderer() {
}
SDL_Renderer * renderer::sdl() {
-#ifndef DEBUG
+#ifdef DEBUG
if (m_renderer == NULL) {
throw std::runtime_error(
"attempted to call renderer::sdl() when m_renderer is NULL"
@@ -107,7 +140,7 @@ void window::update() {
}
SDL_Window * window::sdl() {
-#ifndef DEBUG
+#ifdef DEBUG
if (m_window == NULL) {
throw std::runtime_error(
"attempted to call window::sdl() when m_window is NULL"