Merge pull request #3 from im-tem/master

Windows bringup v2 feat. vsync
This commit is contained in:
Shweet
2025-08-15 10:17:53 -04:00
committed by GitHub
6 changed files with 9 additions and 5 deletions

View File

@@ -25,7 +25,7 @@ file(GLOB SOURCES
if (WIN32) if (WIN32)
enable_language("RC") enable_language("RC")
set (WIN32_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/assets/win_icon.rc) set (WIN32_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/assets/Icon.rc)
endif() endif()
add_executable(${PROJECT_NAME} ${SOURCES} ${WIN32_RESOURCES}) add_executable(${PROJECT_NAME} ${SOURCES} ${WIN32_RESOURCES})
@@ -38,6 +38,7 @@ if (NOT MSVC)
set(CMAKE_CXX_FLAGS "-O2 -std=c++23 -Wall -Wextra -pedantic -fmax-errors=1") set(CMAKE_CXX_FLAGS "-O2 -std=c++23 -Wall -Wextra -pedantic -fmax-errors=1")
else() else()
set(CMAKE_CXX_FLAGS "/std:c++latest /EHsc") set(CMAKE_CXX_FLAGS "/std:c++latest /EHsc")
target_link_options(${PROJECT_NAME} PRIVATE "/STACK:0xffffff")
endif() endif()
if (CMAKE_BUILD_TYPE STREQUAL "Debug") if (CMAKE_BUILD_TYPE STREQUAL "Debug")

View File

@@ -189,7 +189,7 @@ static inline std::string working_directory_from_file_set(const std::string& pat
std::filesystem::path filePath = path; std::filesystem::path filePath = path;
std::filesystem::path parentPath = filePath.parent_path(); std::filesystem::path parentPath = filePath.parent_path();
std::filesystem::current_path(parentPath); std::filesystem::current_path(parentPath);
return parentPath; return parentPath.string();
}; };
static inline std::string path_extension_change(const std::string& path, const std::string& extension) static inline std::string path_extension_change(const std::string& path, const std::string& extension)

View File

@@ -1,6 +1,7 @@
#pragma once #pragma once
#include "anm2.h" #include "anm2.h"
#include <variant>
enum ClipboardItemType enum ClipboardItemType
{ {

View File

@@ -37,7 +37,7 @@ static void _imgui_spritesheet_add(Imgui* self, const std::string& path)
{ {
std::filesystem::path workingPath = std::filesystem::current_path(); std::filesystem::path workingPath = std::filesystem::current_path();
std::string anm2WorkingPath = working_directory_from_file_set(self->anm2->path); std::string anm2WorkingPath = working_directory_from_file_set(self->anm2->path);
std::string spritesheetPath = std::filesystem::relative(path, anm2WorkingPath); std::string spritesheetPath = std::filesystem::relative(path, anm2WorkingPath).string();
s32 id = map_next_id_get(self->resources->textures); s32 id = map_next_id_get(self->resources->textures);
self->anm2->spritesheets[id] = Anm2Spritesheet{}; self->anm2->spritesheets[id] = Anm2Spritesheet{};
@@ -1996,7 +1996,7 @@ static void _imgui_spritesheets(Imgui* self)
{ {
std::filesystem::path workingPath = std::filesystem::current_path(); std::filesystem::path workingPath = std::filesystem::current_path();
std::string anm2WorkingPath = working_directory_from_file_set(self->anm2->path); std::string anm2WorkingPath = working_directory_from_file_set(self->anm2->path);
std::string spritesheetPath = std::filesystem::relative(self->dialog->path, anm2WorkingPath); std::string spritesheetPath = std::filesystem::relative(self->dialog->path, anm2WorkingPath).string();
self->anm2->spritesheets[self->dialog->replaceID].path = spritesheetPath; self->anm2->spritesheets[self->dialog->replaceID].path = spritesheetPath;
resources_texture_init(self->resources, spritesheetPath, self->dialog->replaceID); resources_texture_init(self->resources, spritesheetPath, self->dialog->replaceID);

View File

@@ -255,7 +255,7 @@ static inline void imgui_explore(Imgui* self)
{ {
std::filesystem::path filePath = self->anm2->path; std::filesystem::path filePath = self->anm2->path;
std::filesystem::path parentPath = filePath.parent_path(); std::filesystem::path parentPath = filePath.parent_path();
dialog_explorer_open(parentPath); dialog_explorer_open(parentPath.string());
} }
static inline void imgui_undo_push(Imgui* self, const std::string& action = SNAPSHOT_ACTION) static inline void imgui_undo_push(Imgui* self, const std::string& action = SNAPSHOT_ACTION)

View File

@@ -96,6 +96,8 @@ void init(State* self)
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDisable(GL_LINE_SMOOTH); glDisable(GL_LINE_SMOOTH);
SDL_GL_SetSwapInterval(1);
resources_init(&self->resources); resources_init(&self->resources);
dialog_init(&self->dialog, self->window); dialog_init(&self->dialog, self->window);
clipboard_init(&self->clipboard, &self->anm2); clipboard_init(&self->clipboard, &self->anm2);