From ada139c26fa88bbf15763dcfc269973924201b0a Mon Sep 17 00:00:00 2001 From: frank <420@shampoo.ooo> Date: Thu, 2 Sep 2021 18:23:48 -0400 Subject: [PATCH] change sfw namespace to sb --- demo/2d_collision/CollisionTest.cpp | 2 +- demo/cube/Cube.cpp | 2 +- demo/squircle/Makefile | 10 ++-- demo/squircle/Squircle.cpp | 4 +- src/Audio.hpp | 2 +- src/Game.cpp | 8 ++-- src/Input.cpp | 4 +- src/Pixels.cpp | 14 +++--- src/Pixels.hpp | 4 +- src/Recorder.cpp | 10 ++-- src/Sprite.cpp | 10 ++-- src/extension.cpp | 74 ++++++++++++++--------------- src/extension.hpp | 2 +- 13 files changed, 73 insertions(+), 73 deletions(-) diff --git a/demo/2d_collision/CollisionTest.cpp b/demo/2d_collision/CollisionTest.cpp index d84d847..2fddfa6 100644 --- a/demo/2d_collision/CollisionTest.cpp +++ b/demo/2d_collision/CollisionTest.cpp @@ -159,7 +159,7 @@ void CollisionTest::update() } screen_subsection_pixels.apply(); SDL_SetRenderTarget(get_renderer(), nullptr); - Box canvas_box = sfw::get_texture_box(canvas); + Box canvas_box = sb::get_texture_box(canvas); canvas_box.nw({340, 200}); SDL_RenderCopyF(get_renderer(), canvas, nullptr, &canvas_box); } diff --git a/demo/cube/Cube.cpp b/demo/cube/Cube.cpp index 6075e33..1233842 100644 --- a/demo/cube/Cube.cpp +++ b/demo/cube/Cube.cpp @@ -208,7 +208,7 @@ void Cube::load_gl_context() SDL_Log("tile.png bytes per pixel %i", surface->format->BytesPerPixel); space_texture_id = get_gl_texture_from_surface(surface, GL_LINEAR, true); SDL_FreeSurface(surface); - // std::vector paths = sfw::glob("/home/frank/projects/public/games/buddi/local/face03/[0-9]+\\-.+\\.png"); + // std::vector paths = sb::glob("/home/frank/projects/public/games/buddi/local/face03/[0-9]+\\-.+\\.png"); // for (fs::path path : paths) // { // surface = zoomSurface(rotateSurface90Degrees(IMG_Load(path.c_str()), 2), -1, 1, SMOOTHING_OFF); diff --git a/demo/squircle/Makefile b/demo/squircle/Makefile index 4fb0d36..f3fe5f4 100644 --- a/demo/squircle/Makefile +++ b/demo/squircle/Makefile @@ -10,7 +10,7 @@ # # [ Makefile for squircle demo ] # -# This should build the squircle for Linux. Compilation to other platforms hasn't been +# This should build the squircle demo for Linux. Compilation to other platforms hasn't been # attempted yet. # # Edit the parameters as necessary and run `make linux` in the current directory. @@ -20,7 +20,7 @@ # Location parameters # ####################### -# Location of source files for the demo +# Location of project specific source files SRC_DIR := ./ # Locations of [SPACE BOX] source and dependencies required to be compiled from source. These @@ -54,9 +54,9 @@ SB_O_FILES := $(filter-out $(addprefix $(SB_SRC_DIR),filesystem.o),$(SB_H_FILES: SRC_H_FILES := $(wildcard $(addprefix $(SRC_DIR),*.hpp)) SRC_O_FILES := $(SRC_H_FILES:.hpp=.o) -################################################################## -# Targets for building [SPACE BOX], dependencies and demo source # -################################################################## +##################################################################### +# Targets for building [SPACE BOX], dependencies and project source # +##################################################################### $(SDLGFX2_DIR)%.o: $(SDLGFX2_DIR)%.c $(SDLGFX2_DIR)%.h $(GLEW_DIR)%.o: $(GLEW_DIR)%.c $(GLEW_DIR)%.h diff --git a/demo/squircle/Squircle.cpp b/demo/squircle/Squircle.cpp index 5543099..889d2f7 100644 --- a/demo/squircle/Squircle.cpp +++ b/demo/squircle/Squircle.cpp @@ -41,7 +41,7 @@ void Squircle::load_gl_context() {-1.0f, 1.0f}, {1.0f, 1.0f}, {-1.0f, -1.0f}, {1.0f, 1.0f}, {1.0f, -1.0f}, {-1.0f, -1.0f} }}; - std::vector circle_vertices = sfw::points_on_circle(get_configuration()["circle-resolution"]); + std::vector circle_vertices = sb::points_on_circle(get_configuration()["circle-resolution"]); circle_vertices.insert(circle_vertices.begin(), {0.0f, 0.0f}); circle_vertices.insert(circle_vertices.end(), circle_vertices[1]); circle_vertices_count = circle_vertices.size(); @@ -103,7 +103,7 @@ GLuint Squircle::load_file_into_texture(fs::path path) const void Squircle::load_image_index(int index) { - std::vector paths = sfw::glob("images/.*"); + std::vector paths = sb::glob("images/.*"); fs::path path = paths[index % paths.size()]; std::ostringstream message; message << "loading " << path; diff --git a/src/Audio.hpp b/src/Audio.hpp index 3cb2557..d70d08f 100644 --- a/src/Audio.hpp +++ b/src/Audio.hpp @@ -69,7 +69,7 @@ struct Audio : Node SDL_Log("looking for audio files in %s", root.c_str()); if (fs::exists(root)) { - for (const fs::path& path : sfw::glob(root / ".*")) + for (const fs::path& path : sb::glob(root / ".*")) { std::regex pattern("([^.]+).*$"); std::smatch match; diff --git a/src/Game.cpp b/src/Game.cpp index b2e4084..b46cd37 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -16,7 +16,7 @@ void FramerateIndicator::respond(SDL_Event& event) SDL_Surface* FramerateIndicator::get_surface() { - std::string padded = sfw::pad(get_root()->frame_count_this_second, 2); + std::string padded = sb::pad(get_root()->frame_count_this_second, 2); SDL_Surface* shaded = TTF_RenderText_Shaded( get_root()->bp_mono_font, padded.c_str(), {0, 0, 0, 255}, {255, 255, 255, 255}); if (!shaded) @@ -286,12 +286,12 @@ void Game::sdl_log_override(void* userdata, int category, SDL_LogPriority priori void Game::print_error(const std::string& message) { - sfw::print_error(message); + sb::print_error(message); } void Game::print_sdl_error(const std::string& message) { - sfw::print_sdl_error(message); + sb::print_sdl_error(message); } void Game::print_frame_length_history() @@ -309,7 +309,7 @@ GLuint Game::load_shader(const fs::path& path, GLenum type) const GLuint shader = glCreateShader(type); std::fstream file = std::fstream(path); std::ostringstream message; - std::string contents = sfw::file_to_string(path); + std::string contents = sb::file_to_string(path); glShaderSource(shader, 1, reinterpret_cast(&contents), 0); // glShaderSource(shader, 1, const_cast(&buf), 0); glCompileShader(shader); diff --git a/src/Input.cpp b/src/Input.cpp index 9a66642..92377d7 100644 --- a/src/Input.cpp +++ b/src/Input.cpp @@ -98,8 +98,8 @@ void Input::respond(SDL_Event &event) (!combination.alt || alt)) { post_command(combination.command, cancel); - if (!sfw::is_in_container(system_any_key_ignore, combination.command) && !found_command && - !sfw::is_in_container(any_key_ignore, combination.command) && !suppress_any_key) + if (!sb::is_in_container(system_any_key_ignore, combination.command) && !found_command && + !sb::is_in_container(any_key_ignore, combination.command) && !suppress_any_key) { post_command(any, cancel); } diff --git a/src/Pixels.cpp b/src/Pixels.cpp index 25aa277..af66605 100644 --- a/src/Pixels.cpp +++ b/src/Pixels.cpp @@ -11,11 +11,11 @@ Pixels::Pixels(SDL_Renderer* renderer, SDL_Texture* texture, const Box& box) : SDL_DisplayMode display_mode; if (SDL_GetCurrentDisplayMode(0, &display_mode) < 0) { - sfw::print_sdl_error("could not get current display mode"); + sb::print_sdl_error("could not get current display mode"); } if (SDL_GetRendererOutputSize(renderer, &w, &h) < 0) { - sfw::print_sdl_error("could not get renderer output size"); + sb::print_sdl_error("could not get renderer output size"); } format_enum = display_mode.format; texture_access = TEXTURE_ACCESS_SCREEN; @@ -45,7 +45,7 @@ Pixels::Pixels(SDL_Renderer* renderer, SDL_Texture* texture, const Box& box) : } else if (texture_access == SDL_TEXTUREACCESS_STATIC) { - base = sfw::duplicate_texture(renderer, texture); + base = sb::duplicate_texture(renderer, texture); is_duplicate = true; } else @@ -57,7 +57,7 @@ Pixels::Pixels(SDL_Renderer* renderer, SDL_Texture* texture, const Box& box) : source = operator new(bytes_total); if (SDL_RenderReadPixels(renderer, &rect, format->format, source, format->BytesPerPixel * rect.w) < 0) { - sfw::print_sdl_error("could not read pixels"); + sb::print_sdl_error("could not read pixels"); operator delete(source); } else @@ -74,16 +74,16 @@ Pixels::Pixels(SDL_Renderer* renderer, SDL_Texture* texture, const Box& box) : int pitch; if (SDL_LockTexture(texture, &rect, &source, &pitch) < 0) { - sfw::print_sdl_error("could not lock texture"); + sb::print_sdl_error("could not lock texture"); } } else { - sfw::print_error("unknown texture format for loading pixels"); + sb::print_error("unknown texture format for loading pixels"); } } -Pixels::Pixels(SDL_Renderer* renderer, SDL_Texture* texture) : Pixels(renderer, texture, sfw::get_texture_box(texture)) {} +Pixels::Pixels(SDL_Renderer* renderer, SDL_Texture* texture) : Pixels(renderer, texture, sb::get_texture_box(texture)) {} int Pixels::get_bytes_per_row() const { diff --git a/src/Pixels.hpp b/src/Pixels.hpp index e86e8fb..9d345ea 100644 --- a/src/Pixels.hpp +++ b/src/Pixels.hpp @@ -37,11 +37,11 @@ struct Pixels std::uint8_t* access = static_cast(source); if (x < 0 || x >= rect.w) { - x = sfw::mod(x, static_cast(rect.w)); + x = sb::mod(x, static_cast(rect.w)); } if (y < 0 || y >= rect.y) { - y = sfw::mod(y, static_cast(rect.h)); + y = sb::mod(y, static_cast(rect.h)); } return reinterpret_cast(access + y * get_bytes_per_row() + x * format->BytesPerPixel); } diff --git a/src/Recorder.cpp b/src/Recorder.cpp index e78131a..e3ef537 100644 --- a/src/Recorder.cpp +++ b/src/Recorder.cpp @@ -69,7 +69,7 @@ void Recorder::capture_screen() std::string prefix = config["recording"]["screenshot-prefix"].get(); std::string extension = config["recording"]["screenshot-extension"].get(); int zfill = config["recording"]["screenshot-zfill"]; - fs::path path = sfw::get_next_file_name(directory, zfill, prefix, extension); + fs::path path = sb::get_next_file_name(directory, zfill, prefix, extension); IMG_SavePNG(surface, path.c_str()); SDL_FreeSurface(surface); std::ostringstream message; @@ -180,7 +180,7 @@ void Recorder::add_frame() // SDL_Surface* frame = get_display().screen_surface_from_pixels( // pixel_buffers[ii - frame_offset], flipped[ii - frame_offset]); // std::stringstream name; - // name << sfw::pad(ii, 5) << ".png"; + // name << sb::pad(ii, 5) << ".png"; // fs::path path = current_video_directory / name.str(); // SDL_Log("%s (%i, %i) (%i, %i, %i, %i)", path.c_str(), frame->w, frame->h, // ((unsigned char*) frame->pixels)[0], ((unsigned char*) frame->pixels)[1], @@ -232,7 +232,7 @@ void Recorder::make_directory() nlohmann::json config = get_configuration(); fs::path root = config["recording"]["video-directory"]; fs::create_directories(root); - fs::path directory = sfw::get_next_file_name(root, 5, "video-"); + fs::path directory = sb::get_next_file_name(root, 5, "video-"); fs::create_directories(directory); current_video_directory = directory; } @@ -243,7 +243,7 @@ void Recorder::write_stash_frames(Stash* stash) SDL_Surface* frame; GifWriter gif_writer; int gif_frame_length = get_configuration()["recording"]["gif-frame-length"]; - fs::path gif_path = sfw::get_next_file_name( + fs::path gif_path = sb::get_next_file_name( current_video_directory, 3, "gif-", ".gif"); float elapsed = 0, last_gif_write = 0, gif_write_overflow = 0; for (int ii = stash->frame_offset; not stash->pixel_buffers.empty(); ii++) @@ -251,7 +251,7 @@ void Recorder::write_stash_frames(Stash* stash) frame = get_display().screen_surface_from_pixels( stash->pixel_buffers.front(), stash->flipped.front()); std::stringstream name; - name << sfw::pad(ii, 5) << ".png"; + name << sb::pad(ii, 5) << ".png"; fs::path path = current_video_directory / name.str(); IMG_SavePNG(frame, path.string().c_str()); if (ii == stash->frame_offset or diff --git a/src/Sprite.cpp b/src/Sprite.cpp index c77fba1..6620a4c 100644 --- a/src/Sprite.cpp +++ b/src/Sprite.cpp @@ -74,7 +74,7 @@ void Sprite::load_file(fs::path path) SDL_Texture *base = IMG_LoadTexture(game->renderer, path.string().c_str()), *texture; if (texture_access == SDL_TEXTUREACCESS_TARGET) { - texture = sfw::duplicate_texture(get_renderer(), base); + texture = sb::duplicate_texture(get_renderer(), base); SDL_DestroyTexture(base); } else @@ -498,7 +498,7 @@ void Sprite::add_hue_shift_frames(int count) SDL_Texture* base = get_current_frame(); for (float offset = step; offset <= 359.9; offset += step) { - add_frames(sfw::get_hue_shifted_texture(get_renderer(), base, offset)); + add_frames(sb::get_hue_shifted_texture(get_renderer(), base, offset)); } } @@ -625,7 +625,7 @@ bool Sprite::collide(const Box& box, bool precise, Box* overlap, bool all, SDL_T } else { - collision_check_frame = sfw::duplicate_texture( + collision_check_frame = sb::duplicate_texture( const_cast(get_renderer()), get_current_frame(), get_box(ii).size()); } Pixels region_pixels = Pixels( @@ -710,7 +710,7 @@ bool Sprite::collide(const Sprite& sprite, bool precise, Box* overlap, bool all, } else { - other_sprite_collision_check_texture = sfw::duplicate_texture( + other_sprite_collision_check_texture = sb::duplicate_texture( const_cast(get_renderer()), sprite.get_current_frame(), sprite.get_box(ii).size()); } } @@ -734,7 +734,7 @@ bool Sprite::collide(const Sprite& sprite, Box& overlap, bool precise, bool all, void Sprite::wipe(float delay) { - wipe_blinds = sfw::get_blinds_boxes(get_size()); + wipe_blinds = sb::get_blinds_boxes(get_size()); if (wipe_increment < 0) { wipe_index = static_cast(wipe_blinds.size() - 1); diff --git a/src/extension.cpp b/src/extension.cpp index fb02688..08408c4 100644 --- a/src/extension.cpp +++ b/src/extension.cpp @@ -2,25 +2,25 @@ #include "extension.hpp" /* Edit a vector in place, giving it the specified magnitude while maintaining the direction */ -void sfw::set_magnitude(glm::vec2& vector, float magnitude) +void sb::set_magnitude(glm::vec2& vector, float magnitude) { vector = glm::normalize(vector) * magnitude; } /* Return coordinates of a point x, y at specified angle on a circle described by center and radius */ -glm::vec2 sfw::point_on_circle(const glm::vec2& center, float radius, float angle) +glm::vec2 sb::point_on_circle(const glm::vec2& center, float radius, float angle) { return {center.x + std::sin(angle) * radius, center.y - std::cos(angle) * radius}; } /* Return a point x, y at specified angle on a circle at the origin with specified radius (default 1) */ -glm::vec2 sfw::point_on_circle(float angle, float radius) +glm::vec2 sb::point_on_circle(float angle, float radius) { return point_on_circle({0, 0}, radius, angle); } /* Fill a pre-initialized vector with points evenly spaced around a circle starting at the angle offset (defaults to 0) */ -void sfw::points_on_circle(std::vector& points, int count, float radius, const glm::vec2& center, float offset) +void sb::points_on_circle(std::vector& points, int count, float radius, const glm::vec2& center, float offset) { float step = glm::two_pi() / count; for (int ii = 0; ii < count; ii++) @@ -30,7 +30,7 @@ void sfw::points_on_circle(std::vector& points, int count, float radi } /* Return a vector of count number of points evenly spaced around a circle starting at the angle offset (defaults to 0) */ -std::vector sfw::points_on_circle(int count, float radius, const glm::vec2& center, float offset) +std::vector sb::points_on_circle(int count, float radius, const glm::vec2& center, float offset) { std::vector points; points.reserve(count); @@ -38,14 +38,14 @@ std::vector sfw::points_on_circle(int count, float radius, const glm: return points; } -Box sfw::get_texture_box(SDL_Texture* texture) +Box sb::get_texture_box(SDL_Texture* texture) { int width, height; SDL_QueryTexture(texture, nullptr, nullptr, &width, &height); return Box(glm::vec2(0, 0), glm::vec2(width, height)); } -glm::vec2 sfw::fit_and_preserve_aspect(const glm::vec2& inner, const glm::vec2& outer) +glm::vec2 sb::fit_and_preserve_aspect(const glm::vec2& inner, const glm::vec2& outer) { glm::vec2 delta = inner - outer; float aspect = inner.x / inner.y; @@ -63,7 +63,7 @@ glm::vec2 sfw::fit_and_preserve_aspect(const glm::vec2& inner, const glm::vec2& return fit; } -std::vector> sfw::get_blinds_boxes(glm::vec2 size, float step, int count) +std::vector> sb::get_blinds_boxes(glm::vec2 size, float step, int count) { std::vector blinds; float blind_height = size.y / count; @@ -88,12 +88,12 @@ std::vector> sfw::get_blinds_boxes(glm::vec2 size, float step, return frames; } -void sfw::populate_pixel_2d_array(SDL_Renderer* renderer, SDL_Texture* texture, std::vector>& pixels) +void sb::populate_pixel_2d_array(SDL_Renderer* renderer, SDL_Texture* texture, std::vector>& pixels) { populate_pixel_2d_array(renderer, texture, pixels, get_texture_box(texture)); } -void sfw::populate_pixel_2d_array( +void sb::populate_pixel_2d_array( SDL_Renderer* renderer, SDL_Texture* texture, std::vector>& pixels, const Box& region) { int access; @@ -145,7 +145,7 @@ void sfw::populate_pixel_2d_array( } } -std::vector sfw::get_halo_frames( +std::vector sb::get_halo_frames( SDL_Renderer* renderer, float radius, int segment_count, const std::vector& colors, float min_radius, bool fade) { std::vector frames; @@ -161,7 +161,7 @@ std::vector sfw::get_halo_frames( { alpha = alpha_step; } - frame = sfw::get_filled_texture(renderer, {2 * radius, 2 * radius}, {0, 0, 0, 0}); + frame = get_filled_texture(renderer, {2 * radius, 2 * radius}, {0, 0, 0, 0}); SDL_SetTextureBlendMode(frame, SDL_BLENDMODE_BLEND); SDL_SetRenderTarget(renderer, frame); for (int segment_ii = 0; segment_ii < segment_count; segment_ii++) @@ -181,7 +181,7 @@ std::vector sfw::get_halo_frames( return frames; } -std::vector sfw::get_portal_frames( +std::vector sb::get_portal_frames( SDL_Renderer* renderer, glm::vec2 size, float hue_start, float hue_end, int dy, int count) { std::vector frames; @@ -193,7 +193,7 @@ std::vector sfw::get_portal_frames( Color color; for (int frame_ii = 0; frame_ii < count; frame_ii++) { - frame = sfw::get_filled_texture(renderer, size, {255, 255, 255, 0}); + frame = get_filled_texture(renderer, size, {255, 255, 255, 0}); SDL_SetRenderTarget(renderer, frame); SDL_SetTextureBlendMode(frame, SDL_BLENDMODE_BLEND); for (int ellipse_ii = 0, y = max_y; y > y_margin - 3; ellipse_ii++, y -= dy) @@ -207,7 +207,7 @@ std::vector sfw::get_portal_frames( return frames; } -void sfw::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color& color, const Box& box) +void sb::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color& color, const Box& box) { SDL_SetRenderTarget(renderer, texture); SDL_SetRenderDrawBlendMode(renderer, SDL_BLENDMODE_NONE); @@ -215,12 +215,12 @@ void sfw::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_C SDL_RenderFillRectF(renderer, &box); } -void sfw::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color& color) +void sb::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Color& color) { fill_texture(renderer, texture, color, get_texture_box(texture)); } -void sfw::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Texture* tile, const Box& box) +void sb::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Texture* tile, const Box& box) { Box texture_box = get_texture_box(texture), tile_box = get_texture_box(tile); SDL_FRect draw_rect; @@ -250,12 +250,12 @@ void sfw::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Texture } } -void sfw::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Texture* tile) +void sb::fill_texture(SDL_Renderer* renderer, SDL_Texture* texture, SDL_Texture* tile) { fill_texture(renderer, texture, tile, get_texture_box(texture)); } -SDL_Texture* sfw::get_filled_texture(SDL_Renderer* renderer, glm::vec2 size, const SDL_Color& color, Uint32 format) +SDL_Texture* sb::get_filled_texture(SDL_Renderer* renderer, glm::vec2 size, const SDL_Color& color, Uint32 format) { SDL_Texture* texture; if ((texture = SDL_CreateTexture(renderer, format, SDL_TEXTUREACCESS_TARGET, size.x, size.y)) == nullptr) @@ -264,12 +264,12 @@ SDL_Texture* sfw::get_filled_texture(SDL_Renderer* renderer, glm::vec2 size, con } else { - sfw::fill_texture(renderer, texture, color); + fill_texture(renderer, texture, color); } return texture; } -SDL_Texture* sfw::get_filled_texture(SDL_Renderer* renderer, glm::vec2 size, SDL_Texture* tile, Uint32 format) +SDL_Texture* sb::get_filled_texture(SDL_Renderer* renderer, glm::vec2 size, SDL_Texture* tile, Uint32 format) { SDL_Texture* texture; if ((texture = SDL_CreateTexture(renderer, format, SDL_TEXTUREACCESS_TARGET, size.x, size.y)) == nullptr) @@ -278,14 +278,14 @@ SDL_Texture* sfw::get_filled_texture(SDL_Renderer* renderer, glm::vec2 size, SDL } else { - sfw::fill_texture(renderer, texture, tile); + fill_texture(renderer, texture, tile); } return texture; } -SDL_Texture* sfw::get_hue_shifted_texture(SDL_Renderer* renderer, SDL_Texture* base, float offset) +SDL_Texture* sb::get_hue_shifted_texture(SDL_Renderer* renderer, SDL_Texture* base, float offset) { - SDL_Texture* hue_shifted_texture = sfw::duplicate_texture(renderer, base); + SDL_Texture* hue_shifted_texture = duplicate_texture(renderer, base); Uint32 pixel_format; int w, h; if (SDL_QueryTexture(hue_shifted_texture, &pixel_format, nullptr, &w, &h) < 0) @@ -326,13 +326,13 @@ SDL_Texture* sfw::get_hue_shifted_texture(SDL_Renderer* renderer, SDL_Texture* b return hue_shifted_texture; } -SDL_Texture* sfw::duplicate_texture(SDL_Renderer* renderer, SDL_Texture* base) +SDL_Texture* sb::duplicate_texture(SDL_Renderer* renderer, SDL_Texture* base) { Box box = get_texture_box(base); return duplicate_texture(renderer, base, box.size()); } -SDL_Texture* sfw::duplicate_texture(SDL_Renderer* renderer, SDL_Texture* base, const glm::vec2& size) +SDL_Texture* sb::duplicate_texture(SDL_Renderer* renderer, SDL_Texture* base, const glm::vec2& size) { SDL_BlendMode original_blend_mode; SDL_GetTextureBlendMode(base, &original_blend_mode); @@ -361,7 +361,7 @@ SDL_Texture* sfw::duplicate_texture(SDL_Renderer* renderer, SDL_Texture* base, c return duplicate; } -SDL_Texture* sfw::get_remapped_texture( +SDL_Texture* sb::get_remapped_texture( SDL_Renderer* renderer, SDL_Texture* base, const std::map& map) { SDL_Texture* remapped = duplicate_texture(renderer, base); @@ -393,7 +393,7 @@ SDL_Texture* sfw::get_remapped_texture( return remapped; } -SDL_Texture* sfw::get_remapped_texture( +SDL_Texture* sb::get_remapped_texture( SDL_Renderer* renderer, const std::string& path, const std::map& map) { SDL_Texture* base = IMG_LoadTexture(renderer, path.c_str()); @@ -418,7 +418,7 @@ SDL_Texture* sfw::get_remapped_texture( - Base texture must be set to SDL_TEXTUREACCESS_TARGET - Scale2x implementation based on http://www.scale2x.it/algorithm.html */ -SDL_Texture* sfw::get_pixel_scaled_texture(SDL_Renderer* renderer, SDL_Texture* base, int count, int version) +SDL_Texture* sb::get_pixel_scaled_texture(SDL_Renderer* renderer, SDL_Texture* base, int count, int version) { if ((SDL_SetRenderTarget(renderer, base)) < 0) { @@ -529,7 +529,7 @@ SDL_Texture* sfw::get_pixel_scaled_texture(SDL_Renderer* renderer, SDL_Texture* return scaled; } -std::vector sfw::glob(fs::path query) +std::vector sb::glob(fs::path query) { fs::path basename = query.parent_path(); if (basename == "") @@ -549,7 +549,7 @@ std::vector sfw::glob(fs::path query) return files; } -SDL_Surface* sfw::get_surface_from_pixels(Pixels& pixels) +SDL_Surface* sb::get_surface_from_pixels(Pixels& pixels) { SDL_Surface* surface = SDL_CreateRGBSurfaceFrom( pixels.source, pixels.rect.w, pixels.rect.h, pixels.format->BitsPerPixel, @@ -566,12 +566,12 @@ SDL_Surface* sfw::get_surface_from_pixels(Pixels& pixels) return nullptr; } -fs::path sfw::get_next_file_name(fs::path directory, int zfill, std::string prefix, std::string extension) +fs::path sb::get_next_file_name(fs::path directory, int zfill, std::string prefix, std::string extension) { std::stringstream file_pattern; file_pattern << prefix << "([0-9]+)" << extension; fs::path query = directory / file_pattern.str(); - std::vector files = sfw::glob(query); + std::vector files = glob(query); int index = 1; if (files.size()) { @@ -584,7 +584,7 @@ fs::path sfw::get_next_file_name(fs::path directory, int zfill, std::string pref fs::path path; do { - filename << prefix << sfw::pad(index++, zfill) << extension; + filename << prefix << pad(index++, zfill) << extension; path = directory / filename.str(); filename.str(""); filename.clear(); @@ -594,7 +594,7 @@ fs::path sfw::get_next_file_name(fs::path directory, int zfill, std::string pref } /* Read the file at path into a string and return the string */ -std::string sfw::file_to_string(const fs::path& path) +std::string sb::file_to_string(const fs::path& path) { std::fstream file; file.open(path); @@ -624,12 +624,12 @@ std::string sfw::file_to_string(const fs::path& path) } } -void sfw::print_error(const std::string& message) +void sb::print_error(const std::string& message) { std::cerr << message << std::endl; } -void sfw::print_sdl_error(const std::string& message) +void sb::print_sdl_error(const std::string& message) { std::cerr << message << " " << SDL_GetError() << std::endl; } diff --git a/src/extension.hpp b/src/extension.hpp index 2e8aef8..68982ec 100644 --- a/src/extension.hpp +++ b/src/extension.hpp @@ -30,7 +30,7 @@ struct Pixels; -namespace sfw +namespace sb { enum scaler {scale2x, xbr};