Convert examples to SDL2pp

Author: AMDmi3

CMakeLists.txt

@@ -18,8 +18,10 @@ elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "MSVC")
 	endif()
 endif()
 
-find_package(SDL2 REQUIRED)
-include_directories(${SDL2_INCLUDE_DIR})
+set(SDL2PP_WITH_IMAGE ON)
+set(SDL2PP_WITH_TTF ON)
+add_subdirectory(extlibs/SDL2pp)
+include_directories(${SDL2PP_INCLUDE_DIRS})
 include_directories(include)
 
 add_subdirectory(Lesson0)

Lesson0/CMakeLists.txt

@@ -1,5 +1,5 @@
 project(Lesson0)
 add_executable(Lesson0 src/main.cpp)
-target_link_libraries(Lesson0 ${SDL2_LIBRARY})
+target_link_libraries(Lesson0 ${SDL2PP_LIBRARIES})
 install(TARGETS Lesson0 RUNTIME DESTINATION ${BIN_DIR})
 

Lesson0/src/main.cpp

@@ -1,15 +1,17 @@
 #include <iostream>
 #include <SDL2/SDL.h>
+#include <SDL2pp/SDL2pp.hh>
 
 /*
  * Lesson 0: Test to make sure SDL is setup properly
  */
 int main(int, char**){
-	if (SDL_Init(SDL_INIT_VIDEO) != 0){
-		std::cout << "SDL_Init Error: " << SDL_GetError() << std::endl;
+	try {
+		SDL2pp::SDL(SDL_INIT_VIDEO);
+	} catch (SDL2pp::Exception& e) {
+		std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
 		return 1;
 	}
-	SDL_Quit();
 
 	return 0;
 }

Lesson1/CMakeLists.txt

@@ -1,5 +1,5 @@
 project(Lesson1)
 add_executable(Lesson1 src/main.cpp)
-target_link_libraries(Lesson1 ${SDL2_LIBRARY})
+target_link_libraries(Lesson1 ${SDL2PP_LIBRARIES})
 install(TARGETS Lesson1 RUNTIME DESTINATION ${BIN_DIR})
 

Lesson1/src/main.cpp

@@ -1,80 +1,50 @@
 #include <iostream>
 #include <SDL2/SDL.h>
+#include <SDL2pp/SDL2pp.hh>
 #include "res_path.h"
 
 /*
  * Lesson 1: Hello World!
  */
 int main(int, char**){
-	//First we need to start up SDL, and make sure it went ok
-	if (SDL_Init(SDL_INIT_VIDEO) != 0){
-		std::cout << "SDL_Init Error: " << SDL_GetError() << std::endl;
-		return 1;
-	}
-	
-	//Now create a window with title "Hello World" at 100, 100 on the screen with w:640 h:480 and show it
-	SDL_Window *win = SDL_CreateWindow("Hello World!", 100, 100, 640, 480, SDL_WINDOW_SHOWN);
-	//Make sure creating our window went ok
-	if (win == nullptr){
-		std::cout << "SDL_CreateWindow Error: " << SDL_GetError() << std::endl;
-		return 1;
-	}
+	try {
+		//First we need to start up SDL, and make sure it went ok
+		SDL2pp::SDL(SDL_INIT_VIDEO);
 
-	//Create a renderer that will draw to the window, -1 specifies that we want to load whichever
-	//video driver supports the flags we're passing
-	//Flags: SDL_RENDERER_ACCELERATED: We want to use hardware accelerated rendering
-	//SDL_RENDERER_PRESENTVSYNC: We want the renderer's present function (update screen) to be
-	//synchornized with the monitor's refresh rate
-	SDL_Renderer *ren = SDL_CreateRenderer(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-	if (ren == nullptr){
-		SDL_DestroyWindow(win);
-		std::cout << "SDL_CreateRenderer Error: " << SDL_GetError() << std::endl;
-		SDL_Quit();
-		return 1;
-	}
+		//Now create a window with title "Hello World" at 100, 100 on the screen with w:640 h:480 and show it
+		SDL2pp::Window win("Hello World!", 100, 100, 640, 480, SDL_WINDOW_SHOWN);
 
-	//SDL 2.0 now uses textures to draw things but SDL_LoadBMP returns a surface
-	//this lets us choose when to upload or remove textures from the GPU
-	std::string imagePath = getResourcePath("Lesson1") + "hello.bmp";
-	SDL_Surface *bmp = SDL_LoadBMP(imagePath.c_str());
-	if (bmp == nullptr){
-		SDL_DestroyRenderer(ren);
-		SDL_DestroyWindow(win);
-		std::cout << "SDL_LoadBMP Error: " << SDL_GetError() << std::endl;
-		SDL_Quit();
-		return 1;
-	}
+		//Create a renderer that will draw to the window, -1 specifies that we want to load whichever
+		//video driver supports the flags we're passing
+		//Flags: SDL_RENDERER_ACCELERATED: We want to use hardware accelerated rendering
+		//SDL_RENDERER_PRESENTVSYNC: We want the renderer's present function (update screen) to be
+		//synchornized with the monitor's refresh rate
+		SDL2pp::Renderer ren(win, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 
-	//To use a hardware accelerated texture for rendering we can create one from
-	//the surface we loaded
-	SDL_Texture *tex = SDL_CreateTextureFromSurface(ren, bmp);
-	//We no longer need the surface
-	SDL_FreeSurface(bmp);
-	if (tex == nullptr){
-		SDL_DestroyRenderer(ren);
-		SDL_DestroyWindow(win);
-		std::cout << "SDL_CreateTextureFromSurface Error: " << SDL_GetError() << std::endl;
-		SDL_Quit();
-		return 1;
-	}
-	
-	//Now lets draw our image
-	//First clear the renderer
-	SDL_RenderClear(ren);
-	//Draw the texture
-	SDL_RenderCopy(ren, tex, NULL, NULL);
-	//Update the screen
-	SDL_RenderPresent(ren);
+		//SDL 2.0 now uses textures to draw things but SDL_LoadBMP returns a surface
+		//this lets us choose when to upload or remove textures from the GPU
+		std::string imagePath = getResourcePath("Lesson1") + "hello.bmp";
+		SDL2pp::Surface bmp(imagePath);
 
-	//Have the program wait for 2000ms so we get a chance to see the screen
-	SDL_Delay(2000);
+		//To use a hardware accelerated texture for rendering we can create one from
+		//the surface we loaded
+		SDL2pp::Texture tex(ren, bmp);
+
+		//Now lets draw our image
+		//First clear the renderer
+		ren.Clear();
+		//Draw the texture
+		ren.Copy(tex, SDL2pp::NullOpt, SDL2pp::NullOpt);
+		//Update the screen
+		ren.Present();
+
+		//Have the program wait for 2000ms so we get a chance to see the screen
+		SDL_Delay(2000);
+
+	} catch (SDL2pp::Exception& e) {
+		std::cout << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+	}
 
-	//Clean up our objects and quit
-	SDL_DestroyTexture(tex);
-	SDL_DestroyRenderer(ren);
-	SDL_DestroyWindow(win);
-	SDL_Quit();
-	
 	return 0;
 }
 

Lesson2/CMakeLists.txt

@@ -1,5 +1,5 @@
 project(Lesson2)
 add_executable(Lesson2 src/main.cpp)
-target_link_libraries(Lesson2 ${SDL2_LIBRARY})
+target_link_libraries(Lesson2 ${SDL2PP_LIBRARIES})
 install(TARGETS Lesson2 RUNTIME DESTINATION ${BIN_DIR})
 

Lesson2/src/main.cpp

@@ -1,6 +1,7 @@
 #include <string>
 #include <iostream>
 #include <SDL2/SDL.h>
+#include <SDL2pp/SDL2pp.hh>
 #include "res_path.h"
 #include "cleanup.h"
 
@@ -11,38 +12,6 @@
 const int SCREEN_WIDTH  = 640;
 const int SCREEN_HEIGHT = 480;
 
-/*
- * Log an SDL error with some error message to the output stream of our choice
- * @param os The output stream to write the message too
- * @param msg The error message to write, format will be msg error: SDL_GetError()
- */
-void logSDLError(std::ostream &os, const std::string &msg){
-	os << msg << " error: " << SDL_GetError() << std::endl;
-}
-/*
- * Loads a BMP image into a texture on the rendering device
- * @param file The BMP image file to load
- * @param ren The renderer to load the texture onto
- * @return the loaded texture, or nullptr if something went wrong.
- */
-SDL_Texture* loadTexture(const std::string &file, SDL_Renderer *ren){
-	SDL_Texture *texture = nullptr;
-	//Load the image
-	SDL_Surface *loadedImage = SDL_LoadBMP(file.c_str());
-	//If the loading went ok, convert to texture and return the texture
-	if (loadedImage != nullptr){
-		texture = SDL_CreateTextureFromSurface(ren, loadedImage);
-		SDL_FreeSurface(loadedImage);
-		//Make sure converting went ok too
-		if (texture == nullptr){
-			logSDLError(std::cout, "CreateTextureFromSurface");
-		}
-	}
-	else {
-		logSDLError(std::cout, "LoadBMP");
-	}
-	return texture;
-}
 /*
  * Draw an SDL_Texture to an SDL_Renderer at position x, y, preserving
  * the texture's width and height
@@ -51,77 +20,55 @@ SDL_Texture* loadTexture(const std::string &file, SDL_Renderer *ren){
  * @param x The x coordinate to draw too
  * @param y The y coordinate to draw too
  */
-void renderTexture(SDL_Texture *tex, SDL_Renderer *ren, int x, int y){
+void renderTexture(SDL2pp::Texture &tex, SDL2pp::Renderer &ren, int x, int y){
 	//Setup the destination rectangle to be at the position we want
-	SDL_Rect dst;
-	dst.x = x;
-	dst.y = y;
-	//Query the texture to get its width and height to use
-	SDL_QueryTexture(tex, NULL, NULL, &dst.w, &dst.h);
-	SDL_RenderCopy(ren, tex, NULL, &dst);
+	SDL2pp::Rect dst(x, y, tex.GetWidth(), tex.GetHeight());
+	ren.Copy(tex, SDL2pp::NullOpt, dst);
 }
 
 int main(int, char**){
-	//Start up SDL and make sure it went ok
-	if (SDL_Init(SDL_INIT_VIDEO) != 0){
-		logSDLError(std::cout, "SDL_Init");
-		return 1;
-	}
+	try {
+		//Start up SDL and make sure it went ok
+		SDL2pp::SDL sdl(SDL_INIT_VIDEO);
 
-	//Setup our window and renderer
-	SDL_Window *window = SDL_CreateWindow("Lesson 2", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
-	if (window == nullptr){
-		logSDLError(std::cout, "CreateWindow");
-		SDL_Quit();
-		return 1;
-	}
-	SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
-	if (renderer == nullptr){
-		logSDLError(std::cout, "CreateRenderer");
-		cleanup(window);
-		SDL_Quit();
-		return 1;
-	}
+		//Setup our window and renderer
+		SDL2pp::Window window("Lesson 2", 100, 100, SCREEN_WIDTH, SCREEN_HEIGHT, SDL_WINDOW_SHOWN);
+		SDL2pp::Renderer renderer(window, -1, SDL_RENDERER_ACCELERATED | SDL_RENDERER_PRESENTVSYNC);
 
-	//The textures we'll be using
-	const std::string resPath = getResourcePath("Lesson2");
-	SDL_Texture *background = loadTexture(resPath + "background.bmp", renderer);
-	SDL_Texture *image = loadTexture(resPath + "image.bmp", renderer);
-	//Make sure they both loaded ok
-	if (background == nullptr || image == nullptr){
-		cleanup(background, image, renderer, window);
-		SDL_Quit();
-		return 1;
-	}
+		//The textures we'll be using
+		const std::string resPath = getResourcePath("Lesson2");
+		SDL2pp::Texture background(renderer, resPath + "background.bmp");
+		SDL2pp::Texture image(renderer, resPath + "image.bmp");
+
+		//Clear the window
+		renderer.Clear();
 
-	//Clear the window
-	SDL_RenderClear(renderer);
+		//Get the width and height from the texture so we know how much to move x,y by
+		//to tile it correctly
+		int bW = background.GetWidth(), bH = background.GetHeight();
 
-	//Get the width and height from the texture so we know how much to move x,y by
-	//to tile it correctly
-	int bW, bH;
-	SDL_QueryTexture(background, NULL, NULL, &bW, &bH);
-	//We want to tile our background so draw it 4 times
-	renderTexture(background, renderer, 0, 0);
-	renderTexture(background, renderer, bW, 0);
-	renderTexture(background, renderer, 0, bH);
-	renderTexture(background, renderer, bW, bH);
+		//We want to tile our background so draw it 4 times
+		renderTexture(background, renderer, 0, 0);
+		renderTexture(background, renderer, bW, 0);
+		renderTexture(background, renderer, 0, bH);
+		renderTexture(background, renderer, bW, bH);
 
-	//Draw our image in the center of the window
-	//We need the foreground image's width to properly compute the position
-	//of it's top left corner so that the image will be centered
-	int iW, iH;
-	SDL_QueryTexture(image, NULL, NULL, &iW, &iH);
-	int x = SCREEN_WIDTH / 2 - iW / 2;
-	int y = SCREEN_HEIGHT / 2 - iH / 2;
-	renderTexture(image, renderer, x, y);
+		//Draw our image in the center of the window
+		//We need the foreground image's width to properly compute the position
+		//of it's top left corner so that the image will be centered
+		int iW = image.GetWidth(), iH = image.GetHeight();
+		int x = SCREEN_WIDTH / 2 - iW / 2;
+		int y = SCREEN_HEIGHT / 2 - iH / 2;
+		renderTexture(image, renderer, x, y);
 
-	//Update the screen
-	SDL_RenderPresent(renderer);
-	SDL_Delay(2000);
+		//Update the screen
+		renderer.Present();
+		SDL_Delay(2000);
 
-	cleanup(background, image, renderer, window);
-	SDL_Quit();
+	} catch (SDL2pp::Exception& e) {
+		std::cerr << e.GetSDLFunction() << " Error: " << e.GetSDLError() << std::endl;
+		return 1;
+	}
 
 	return 0;
 }

Lesson3/CMakeLists.txt

@@ -1,9 +1,6 @@
 project(Lesson3)
 
-find_package(SDL2_image REQUIRED)
-include_directories(${SDL2_IMAGE_INCLUDE_DIR})
-
 add_executable(Lesson3 src/main.cpp)
-target_link_libraries(Lesson3 ${SDL2_LIBRARY} ${SDL2_IMAGE_LIBRARY})
+target_link_libraries(Lesson3 ${SDL2PP_LIBRARIES})
 install(TARGETS Lesson3 RUNTIME DESTINATION ${BIN_DIR})