diff --git a/src/app/editor/editor.cmake b/src/app/editor/editor.cmake index af7b473a..c54feacc 100644 --- a/src/app/editor/editor.cmake +++ b/src/app/editor/editor.cmake @@ -14,7 +14,6 @@ set( app/editor/graphics/tile16_editor.cc app/editor/graphics/gfx_group_editor.cc app/editor/utils/gfx_context.cc - app/editor/overworld/refresh.cc app/editor/overworld/entity.cc app/editor/system/settings_editor.cc app/editor/system/extension_manager.cc diff --git a/src/app/editor/overworld/overworld_editor.cc b/src/app/editor/overworld/overworld_editor.cc index e6e16564..4243280e 100644 --- a/src/app/editor/overworld/overworld_editor.cc +++ b/src/app/editor/overworld/overworld_editor.cc @@ -1093,8 +1093,8 @@ absl::Status OverworldEditor::LoadGraphics() { overworld_.set_current_map(i); auto palette = overworld_.current_area_palette(); RETURN_IF_ERROR(Renderer::GetInstance().CreateAndRenderBitmap( - kOverworldMapSize, kOverworldMapSize, 0x200, overworld_.current_map_bitmap_data(), - maps_bmp_[i], palette)); + kOverworldMapSize, kOverworldMapSize, 0x200, + overworld_.current_map_bitmap_data(), maps_bmp_[i], palette)); } if (flags()->overworld.kDrawOverworldSprites) { @@ -1119,6 +1119,148 @@ absl::Status OverworldEditor::LoadSpriteGraphics() { return absl::OkStatus(); } +void OverworldEditor::RefreshChildMap(int map_index) { + overworld_.mutable_overworld_map(map_index)->LoadAreaGraphics(); + status_ = overworld_.mutable_overworld_map(map_index)->BuildTileset(); + PRINT_IF_ERROR(status_); + status_ = overworld_.mutable_overworld_map(map_index)->BuildTiles16Gfx( + *overworld_.mutable_tiles16(), overworld_.tiles16().size()); + PRINT_IF_ERROR(status_); + status_ = overworld_.mutable_overworld_map(map_index)->BuildBitmap( + overworld_.GetMapTiles(current_world_)); + maps_bmp_[map_index].set_data( + overworld_.mutable_overworld_map(map_index)->bitmap_data()); + maps_bmp_[map_index].set_modified(true); + PRINT_IF_ERROR(status_); +} + +void OverworldEditor::RefreshOverworldMap() { + std::vector> futures; + int indices[4]; + + auto refresh_map_async = [this](int map_index) { + RefreshChildMap(map_index); + }; + + int source_map_id = current_map_; + bool is_large = overworld_.overworld_map(current_map_)->is_large_map(); + if (is_large) { + source_map_id = current_parent_; + // We need to update the map and its siblings if it's a large map + for (int i = 1; i < 4; i++) { + int sibling_index = overworld_.overworld_map(source_map_id)->parent() + i; + if (i >= 2) sibling_index += 6; + futures.push_back( + std::async(std::launch::async, refresh_map_async, sibling_index)); + indices[i] = sibling_index; + } + } + indices[0] = source_map_id; + futures.push_back( + std::async(std::launch::async, refresh_map_async, source_map_id)); + + for (auto &each : futures) { + each.get(); + } + int n = is_large ? 4 : 1; + // We do texture updating on the main thread + for (int i = 0; i < n; ++i) { + Renderer::GetInstance().UpdateBitmap(&maps_bmp_[indices[i]]); + } +} + +absl::Status OverworldEditor::RefreshMapPalette() { + RETURN_IF_ERROR( + overworld_.mutable_overworld_map(current_map_)->LoadPalette()); + const auto current_map_palette = overworld_.current_area_palette(); + + if (overworld_.overworld_map(current_map_)->is_large_map()) { + // We need to update the map and its siblings if it's a large map + for (int i = 1; i < 4; i++) { + int sibling_index = overworld_.overworld_map(current_map_)->parent() + i; + if (i >= 2) sibling_index += 6; + RETURN_IF_ERROR( + overworld_.mutable_overworld_map(sibling_index)->LoadPalette()); + RETURN_IF_ERROR( + maps_bmp_[sibling_index].ApplyPalette(current_map_palette)); + } + } + + RETURN_IF_ERROR(maps_bmp_[current_map_].ApplyPalette(current_map_palette)); + return absl::OkStatus(); +} + +void OverworldEditor::RefreshMapProperties() { + auto ¤t_ow_map = *overworld_.mutable_overworld_map(current_map_); + if (current_ow_map.is_large_map()) { + // We need to copy the properties from the parent map to the children + for (int i = 1; i < 4; i++) { + int sibling_index = current_ow_map.parent() + i; + if (i >= 2) { + sibling_index += 6; + } + auto &map = *overworld_.mutable_overworld_map(sibling_index); + map.set_area_graphics(current_ow_map.area_graphics()); + map.set_area_palette(current_ow_map.area_palette()); + map.set_sprite_graphics(game_state_, + current_ow_map.sprite_graphics(game_state_)); + map.set_sprite_palette(game_state_, + current_ow_map.sprite_palette(game_state_)); + map.set_message_id(current_ow_map.message_id()); + } + } +} + +absl::Status OverworldEditor::RefreshTile16Blockset() { + if (current_blockset_ == + overworld_.overworld_map(current_map_)->area_graphics()) { + return absl::OkStatus(); + } + current_blockset_ = overworld_.overworld_map(current_map_)->area_graphics(); + + overworld_.set_current_map(current_map_); + palette_ = overworld_.current_area_palette(); + // Create the tile16 blockset image + Renderer::GetInstance().UpdateBitmap(&tile16_blockset_bmp_); + RETURN_IF_ERROR(tile16_blockset_bmp_.ApplyPalette(palette_)); + + // Copy the tile16 data into individual tiles. + const auto tile16_data = overworld_.tile16_blockset_data(); + + std::vector> futures; + // Loop through the tiles and copy their pixel data into separate vectors + for (uint i = 0; i < zelda3::overworld::kNumTile16Individual; i++) { + futures.push_back(std::async( + std::launch::async, + [&](int index) { + std::vector tile_data(16 * 16, 0x00); + for (int ty = 0; ty < 16; ty++) { + for (int tx = 0; tx < 16; tx++) { + int position = tx + (ty * 0x10); + uint8_t value = + tile16_data[(index % 8 * 16) + (index / 8 * 16 * 0x80) + + (ty * 0x80) + tx]; + tile_data[position] = value; + } + } + tile16_individual_[index].set_data(tile_data); + }, + i)); + } + + for (auto &future : futures) { + future.get(); + } + + // Render the bitmaps of each tile. + for (uint id = 0; id < zelda3::overworld::kNumTile16Individual; id++) { + RETURN_IF_ERROR(tile16_individual_[id].ApplyPalette(palette_)); + Renderer::GetInstance().UpdateBitmap(&tile16_individual_[id]); + } + + return absl::OkStatus(); +} + void OverworldEditor::DrawOverworldProperties() { static bool init_properties = false; diff --git a/src/app/editor/overworld/refresh.cc b/src/app/editor/overworld/refresh.cc deleted file mode 100644 index afeba866..00000000 --- a/src/app/editor/overworld/refresh.cc +++ /dev/null @@ -1,154 +0,0 @@ -#include "app/core/platform/renderer.h" -#include "app/editor/overworld/overworld_editor.h" - -namespace yaze { -namespace app { -namespace editor { - -using core::Renderer; - -void OverworldEditor::RefreshChildMap(int map_index) { - overworld_.mutable_overworld_map(map_index)->LoadAreaGraphics(); - status_ = overworld_.mutable_overworld_map(map_index)->BuildTileset(); - PRINT_IF_ERROR(status_); - status_ = overworld_.mutable_overworld_map(map_index)->BuildTiles16Gfx( - *overworld_.mutable_tiles16(), overworld_.tiles16().size()); - PRINT_IF_ERROR(status_); - status_ = overworld_.mutable_overworld_map(map_index)->BuildBitmap( - overworld_.GetMapTiles(current_world_)); - maps_bmp_[map_index].set_data( - overworld_.mutable_overworld_map(map_index)->bitmap_data()); - maps_bmp_[map_index].set_modified(true); - PRINT_IF_ERROR(status_); -} - -void OverworldEditor::RefreshOverworldMap() { - std::vector> futures; - int indices[4]; - - auto refresh_map_async = [this](int map_index) { - RefreshChildMap(map_index); - }; - - int source_map_id = current_map_; - bool is_large = overworld_.overworld_map(current_map_)->is_large_map(); - if (is_large) { - source_map_id = current_parent_; - // We need to update the map and its siblings if it's a large map - for (int i = 1; i < 4; i++) { - int sibling_index = overworld_.overworld_map(source_map_id)->parent() + i; - if (i >= 2) sibling_index += 6; - futures.push_back( - std::async(std::launch::async, refresh_map_async, sibling_index)); - indices[i] = sibling_index; - } - } - indices[0] = source_map_id; - futures.push_back( - std::async(std::launch::async, refresh_map_async, source_map_id)); - - for (auto &each : futures) { - each.get(); - } - int n = is_large ? 4 : 1; - // We do texture updating on the main thread - for (int i = 0; i < n; ++i) { - Renderer::GetInstance().UpdateBitmap(&maps_bmp_[indices[i]]); - } -} - -absl::Status OverworldEditor::RefreshMapPalette() { - RETURN_IF_ERROR( - overworld_.mutable_overworld_map(current_map_)->LoadPalette()); - const auto current_map_palette = overworld_.current_area_palette(); - - if (overworld_.overworld_map(current_map_)->is_large_map()) { - // We need to update the map and its siblings if it's a large map - for (int i = 1; i < 4; i++) { - int sibling_index = overworld_.overworld_map(current_map_)->parent() + i; - if (i >= 2) sibling_index += 6; - RETURN_IF_ERROR( - overworld_.mutable_overworld_map(sibling_index)->LoadPalette()); - RETURN_IF_ERROR( - maps_bmp_[sibling_index].ApplyPalette(current_map_palette)); - } - } - - RETURN_IF_ERROR(maps_bmp_[current_map_].ApplyPalette(current_map_palette)); - return absl::OkStatus(); -} - -void OverworldEditor::RefreshMapProperties() { - auto ¤t_ow_map = *overworld_.mutable_overworld_map(current_map_); - if (current_ow_map.is_large_map()) { - // We need to copy the properties from the parent map to the children - for (int i = 1; i < 4; i++) { - int sibling_index = current_ow_map.parent() + i; - if (i >= 2) { - sibling_index += 6; - } - auto &map = *overworld_.mutable_overworld_map(sibling_index); - map.set_area_graphics(current_ow_map.area_graphics()); - map.set_area_palette(current_ow_map.area_palette()); - map.set_sprite_graphics(game_state_, - current_ow_map.sprite_graphics(game_state_)); - map.set_sprite_palette(game_state_, - current_ow_map.sprite_palette(game_state_)); - map.set_message_id(current_ow_map.message_id()); - } - } -} - -absl::Status OverworldEditor::RefreshTile16Blockset() { - if (current_blockset_ == - overworld_.overworld_map(current_map_)->area_graphics()) { - return absl::OkStatus(); - } - current_blockset_ = overworld_.overworld_map(current_map_)->area_graphics(); - - overworld_.set_current_map(current_map_); - palette_ = overworld_.current_area_palette(); - // Create the tile16 blockset image - Renderer::GetInstance().UpdateBitmap(&tile16_blockset_bmp_); - RETURN_IF_ERROR(tile16_blockset_bmp_.ApplyPalette(palette_)); - - // Copy the tile16 data into individual tiles. - const auto tile16_data = overworld_.tile16_blockset_data(); - - std::vector> futures; - // Loop through the tiles and copy their pixel data into separate vectors - for (uint i = 0; i < zelda3::overworld::kNumTile16Individual; i++) { - futures.push_back(std::async( - std::launch::async, - [&](int index) { - std::vector tile_data(16 * 16, 0x00); - for (int ty = 0; ty < 16; ty++) { - for (int tx = 0; tx < 16; tx++) { - int position = tx + (ty * 0x10); - uint8_t value = - tile16_data[(index % 8 * 16) + (index / 8 * 16 * 0x80) + - (ty * 0x80) + tx]; - tile_data[position] = value; - } - } - tile16_individual_[index].set_data(tile_data); - }, - i)); - } - - for (auto &future : futures) { - future.get(); - } - - // Render the bitmaps of each tile. - for (uint id = 0; id < zelda3::overworld::kNumTile16Individual; id++) { - RETURN_IF_ERROR(tile16_individual_[id].ApplyPalette(palette_)); - Renderer::GetInstance().UpdateBitmap(&tile16_individual_[id]); - } - - return absl::OkStatus(); -} - -} // namespace editor -} // namespace app -} // namespace yaze \ No newline at end of file diff --git a/src/ios/yaze.xcodeproj/project.pbxproj b/src/ios/yaze.xcodeproj/project.pbxproj index 4ced27bc..256f3472 100644 --- a/src/ios/yaze.xcodeproj/project.pbxproj +++ b/src/ios/yaze.xcodeproj/project.pbxproj @@ -66,8 +66,6 @@ E318D9202C59C08300091322 /* music_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8732C59C08300091322 /* music_editor.cc */; }; E318D9212C59C08300091322 /* entity.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8762C59C08300091322 /* entity.cc */; }; E318D9222C59C08300091322 /* entity.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8762C59C08300091322 /* entity.cc */; }; - E318D9232C59C08300091322 /* refresh.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8782C59C08300091322 /* refresh.cc */; }; - E318D9242C59C08300091322 /* refresh.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8782C59C08300091322 /* refresh.cc */; }; E318D9252C59C08300091322 /* sprite_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D87A2C59C08300091322 /* sprite_editor.cc */; }; E318D9262C59C08300091322 /* sprite_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D87A2C59C08300091322 /* sprite_editor.cc */; }; E318D9272C59C08300091322 /* gfx_context.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8802C59C08300091322 /* gfx_context.cc */; }; @@ -113,8 +111,6 @@ E318D95E2C59C08300091322 /* snes_tile.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C22C59C08300091322 /* snes_tile.cc */; }; E318D95F2C59C08300091322 /* tilesheet.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C42C59C08300091322 /* tilesheet.cc */; }; E318D9602C59C08300091322 /* tilesheet.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C42C59C08300091322 /* tilesheet.cc */; }; - E318D9612C59C08300091322 /* asset_browser.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C72C59C08300091322 /* asset_browser.cc */; }; - E318D9622C59C08300091322 /* asset_browser.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C72C59C08300091322 /* asset_browser.cc */; }; E318D9632C59C08300091322 /* canvas.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C92C59C08300091322 /* canvas.cc */; }; E318D9642C59C08300091322 /* canvas.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8C92C59C08300091322 /* canvas.cc */; }; E318D9652C59C08300091322 /* color.cc in Sources */ = {isa = PBXBuildFile; fileRef = E318D8CB2C59C08300091322 /* color.cc */; }; @@ -742,6 +738,7 @@ E384E2D62C76C6E800147029 /* message_data.cc in Sources */ = {isa = PBXBuildFile; fileRef = E384E2D52C76C6C800147029 /* message_data.cc */; }; E38A97F72C6C4CE3005FB662 /* extension_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = E38A97F22C6C4CE3005FB662 /* extension_manager.cc */; }; E38A97F82C6C4CE3005FB662 /* settings_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E38A97F42C6C4CE3005FB662 /* settings_editor.cc */; }; + E3B864952C8214B500122951 /* asset_browser.cc in Sources */ = {isa = PBXBuildFile; fileRef = E3B864902C82144A00122951 /* asset_browser.cc */; }; E3BE958D2C68379B008DD1E7 /* editor_manager.cc in Sources */ = {isa = PBXBuildFile; fileRef = E3BE958B2C68379B008DD1E7 /* editor_manager.cc */; }; E3BE95902C6837C8008DD1E7 /* overworld_editor.cc in Sources */ = {isa = PBXBuildFile; fileRef = E3BE958F2C6837C8008DD1E7 /* overworld_editor.cc */; }; /* End PBXBuildFile section */ @@ -910,7 +907,6 @@ E318D8742C59C08300091322 /* music_editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = music_editor.h; sourceTree = ""; }; E318D8762C59C08300091322 /* entity.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = entity.cc; sourceTree = ""; }; E318D8772C59C08300091322 /* entity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entity.h; sourceTree = ""; }; - E318D8782C59C08300091322 /* refresh.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = refresh.cc; sourceTree = ""; }; E318D87A2C59C08300091322 /* sprite_editor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sprite_editor.cc; sourceTree = ""; }; E318D87B2C59C08300091322 /* sprite_editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sprite_editor.h; sourceTree = ""; }; E318D87C2C59C08300091322 /* zsprite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = zsprite.h; sourceTree = ""; }; @@ -967,8 +963,6 @@ E318D8C32C59C08300091322 /* snes_tile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = snes_tile.h; sourceTree = ""; }; E318D8C42C59C08300091322 /* tilesheet.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = tilesheet.cc; sourceTree = ""; }; E318D8C52C59C08300091322 /* tilesheet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tilesheet.h; sourceTree = ""; }; - E318D8C72C59C08300091322 /* asset_browser.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = asset_browser.cc; sourceTree = ""; }; - E318D8C82C59C08300091322 /* asset_browser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = asset_browser.h; sourceTree = ""; }; E318D8C92C59C08300091322 /* canvas.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = canvas.cc; sourceTree = ""; }; E318D8CA2C59C08300091322 /* canvas.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = canvas.h; sourceTree = ""; }; E318D8CB2C59C08300091322 /* color.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = color.cc; sourceTree = ""; }; @@ -2418,6 +2412,8 @@ E38A97F32C6C4CE3005FB662 /* extension_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = extension_manager.h; sourceTree = ""; }; E38A97F42C6C4CE3005FB662 /* settings_editor.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = settings_editor.cc; sourceTree = ""; }; E38A97F52C6C4CE3005FB662 /* settings_editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = settings_editor.h; sourceTree = ""; }; + E3B8648F2C82144A00122951 /* asset_browser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = asset_browser.h; sourceTree = ""; }; + E3B864902C82144A00122951 /* asset_browser.cc */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = asset_browser.cc; sourceTree = ""; }; E3BE958B2C68379B008DD1E7 /* editor_manager.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = editor_manager.cc; sourceTree = ""; }; E3BE958C2C68379B008DD1E7 /* editor_manager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = editor_manager.h; sourceTree = ""; }; E3BE958E2C6837C8008DD1E7 /* overworld_editor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = overworld_editor.h; sourceTree = ""; }; @@ -2649,7 +2645,6 @@ E3BE958E2C6837C8008DD1E7 /* overworld_editor.h */, E318D8762C59C08300091322 /* entity.cc */, E318D8772C59C08300091322 /* entity.h */, - E318D8782C59C08300091322 /* refresh.cc */, ); path = overworld; sourceTree = ""; @@ -2815,8 +2810,7 @@ E318D8D42C59C08300091322 /* gui */ = { isa = PBXGroup; children = ( - E318D8C72C59C08300091322 /* asset_browser.cc */, - E318D8C82C59C08300091322 /* asset_browser.h */, + E3B864942C82146700122951 /* modules */, E318D8C92C59C08300091322 /* canvas.cc */, E318D8CA2C59C08300091322 /* canvas.h */, E318D8CB2C59C08300091322 /* color.cc */, @@ -5083,6 +5077,15 @@ path = system; sourceTree = ""; }; + E3B864942C82146700122951 /* modules */ = { + isa = PBXGroup; + children = ( + E3B864902C82144A00122951 /* asset_browser.cc */, + E3B8648F2C82144A00122951 /* asset_browser.h */, + ); + path = modules; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -5286,6 +5289,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + E3B864952C8214B500122951 /* asset_browser.cc in Sources */, E384E2D62C76C6E800147029 /* message_data.cc in Sources */, E318E7932C5A542700091322 /* distribution_test_util.cc in Sources */, E318E7942C5A542700091322 /* distribution_test_util.h in Sources */, @@ -5369,7 +5373,6 @@ E318DFF32C5A4FBF00091322 /* examine_stack.cc in Sources */, E318E1BB2C5A4FC200091322 /* cord_buffer.cc in Sources */, E318D8FB2C59C08300091322 /* app_delegate.mm in Sources */, - E318D9612C59C08300091322 /* asset_browser.cc in Sources */, E318D9192C59C08300091322 /* tile16_editor.cc in Sources */, 83BBEA0720EB54E700295997 /* imgui_demo.cpp in Sources */, E318E1992C5A4FC200091322 /* ostringstream.cc in Sources */, @@ -5434,7 +5437,6 @@ E318D9152C59C08300091322 /* palette_editor.cc in Sources */, E3BE95902C6837C8008DD1E7 /* overworld_editor.cc in Sources */, E318E0AB2C5A4FC000091322 /* exponential_biased.cc in Sources */, - E318D9232C59C08300091322 /* refresh.cc in Sources */, E318D9332C59C08300091322 /* addressing.cc in Sources */, E318E0B12C5A4FC000091322 /* periodic_sampler.cc in Sources */, E318DF6F2C5A4FBE00091322 /* unscaledcycleclock.cc in Sources */, @@ -5717,7 +5719,6 @@ E318E0362C5A4FBF00091322 /* private_handle_accessor.cc in Sources */, E318D9202C59C08300091322 /* music_editor.cc in Sources */, E318D97A2C59C08300091322 /* overworld.cc in Sources */, - E318D9622C59C08300091322 /* asset_browser.cc in Sources */, E318E1F62C5A4FC200091322 /* strip_test.cc in Sources */, E318E0A82C5A4FC000091322 /* int128.cc in Sources */, E318E1002C5A4FC000091322 /* beta_distribution_test.cc in Sources */, @@ -5856,7 +5857,6 @@ E318DF842C5A4FBE00091322 /* invoke_test.cc in Sources */, E318E1422C5A4FC100091322 /* checker_test.cc in Sources */, E318E1B22C5A4FC200091322 /* charconv_test.cc in Sources */, - E318D9242C59C08300091322 /* refresh.cc in Sources */, E318E1BC2C5A4FC200091322 /* cord_buffer.cc in Sources */, E318D9082C59C08300091322 /* common.cc in Sources */, E318E1DE2C5A4FC200091322 /* str_format_test.cc in Sources */, diff --git a/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate b/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate index 86640efa..4d45eda1 100644 Binary files a/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate and b/src/ios/yaze.xcodeproj/project.xcworkspace/xcuserdata/scawful.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist b/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist index e72418bf..02f8b682 100644 --- a/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/src/ios/yaze.xcodeproj/xcuserdata/scawful.xcuserdatad/xcschemes/xcschememanagement.plist @@ -27,12 +27,12 @@ yaze_ios.xcscheme_^#shared#^_ orderHint - 3 + 10 yaze_macos.xcscheme_^#shared#^_ orderHint - 5 + 3 diff --git a/src/py/yaze_py.cmake b/src/py/yaze_py.cmake index bc05fbad..7275029c 100644 --- a/src/py/yaze_py.cmake +++ b/src/py/yaze_py.cmake @@ -1,4 +1,4 @@ -find_package(PythonLibs REQUIRED) +find_package(PythonLibs 3.11 REQUIRED) find_package(Boost COMPONENTS python3 REQUIRED) # target x86_64 for module