Updating pkpy, seika, and removing 'audio wav sample rate' property (#…

…234)
Chukobyte · Feb 13, 2025 · d8a1e24 · d8a1e24
1 parent fb0bdef
commit d8a1e24
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 38 deletions.
diff --git a/Dependencies.cmake b/Dependencies.cmake
@@ -9,7 +9,7 @@ if (NOT TARGET seika)
     FetchContent_Declare(
             seika_content
             GIT_REPOSITORY https://github.com/Chukobyte/seika.git
-            GIT_TAG v0.2.3
+            GIT_TAG v0.2.16
     )
     FetchContent_MakeAvailable(seika_content)
 endif ()
@@ -20,7 +20,7 @@ if (NOT TARGET pocketpy)
     FetchContent_Declare(
             pocketpy_content
             GIT_REPOSITORY https://github.com/blueloveTH/pocketpy.git
-            GIT_TAG v2.0.1
+            GIT_TAG v2.0.3
     )
     FetchContent_MakeAvailable(pocketpy_content)
     target_include_directories(pocketpy PUBLIC ${pocketpy_content_SOURCE_DIR} ${pocketpy_content_SOURCE_DIR}/include)

diff --git a/editor/src/core/asset_manager.cpp b/editor/src/core/asset_manager.cpp
@@ -71,8 +71,6 @@ void AssetManager::RefreshFromProperties(ProjectProperties* projectProperties) {
             LoadFont(fontAsset.file_path.c_str(), fontAsset.uid.c_str(), fontAsset.size, fontAsset.applyNearestNeighbor);
         }
     }
-    // Set wav sample rate for audio system
-    ska_audio_set_wav_sample_rate(projectProperties->audioWavSampleRate);
 }
 
 // Texture

diff --git a/editor/src/core/project_properties.cpp b/editor/src/core/project_properties.cpp
@@ -93,7 +93,6 @@ void ProjectProperties::LoadPropertiesFromConfig(const char* filePath) {
     windowHeight = JsonHelper::Get<int>(propertyJson, "window_height");
     resolutionWidth = JsonHelper::Get<int>(propertyJson, "resolution_width");
     resolutionHeight = JsonHelper::Get<int>(propertyJson, "resolution_height");
-    audioWavSampleRate = JsonHelper::GetDefault<uint32_t>(propertyJson, "audio_wav_sample_rate", SKA_AUDIO_SOURCE_DEFAULT_WAV_SAMPLE_RATE);
     maintainAspectRatio = JsonHelper::GetDefault<bool>(propertyJson, "maintain_aspect_ratio", false);
     targetFPS = JsonHelper::Get<int>(propertyJson, "target_fps");
     areCollidersVisible = JsonHelper::Get<bool>(propertyJson, "colliders_visible");
@@ -171,7 +170,6 @@ nlohmann::ordered_json ProjectProperties::ToJson() const {
     configJson["resolution_width"] = resolutionWidth;
     configJson["resolution_height"] = resolutionHeight;
     configJson["maintain_aspect_ratio"] = maintainAspectRatio;
-    configJson["audio_wav_sample_rate"] = audioWavSampleRate;
     configJson["target_fps"] = targetFPS;
     configJson["initial_node_path"] = initialNodePath;
     configJson["colliders_visible"] = areCollidersVisible;

diff --git a/editor/src/core/project_properties.h b/editor/src/core/project_properties.h
@@ -89,7 +89,6 @@ class ProjectProperties : public Singleton<ProjectProperties> {
     int32 windowHeight;
     int32 resolutionWidth;
     int32 resolutionHeight;
-    uint32 audioWavSampleRate = SKA_AUDIO_SOURCE_DEFAULT_WAV_SAMPLE_RATE;
     bool maintainAspectRatio = false;
     int32 targetFPS;
     bool areCollidersVisible = false;

diff --git a/editor/src/core/ui/views/opened_project/menu_bar_ui.cpp b/editor/src/core/ui/views/opened_project/menu_bar_ui.cpp
@@ -175,25 +175,6 @@ ImGuiHelper::MenuBar OpenedProjectUI::MenuBar::GetMenuBar() {
                                     static ImGuiHelper::DragInt resolutionHeightInt("Resolution Height", projectProperties->resolutionHeight);
                                     ImGuiHelper::BeginDragInt(resolutionHeightInt);
 
-                                    static std::string selectedAudioWavSampleRate = "";
-                                    static ImGuiHelper::ComboBox audioWavSampleRateComboBox(
-                                        "Audio Wav Sample Rate",
-                                    { "44100", "48000" },
-                                    [](const char* newItem) {
-                                        selectedAudioWavSampleRate = newItem;
-                                        if (selectedAudioWavSampleRate == "44100") {
-                                            projectProperties->audioWavSampleRate = 44100;
-                                        } else if (selectedAudioWavSampleRate == "48000") {
-                                            projectProperties->audioWavSampleRate = 48000;
-                                        } else {
-                                            ska_logger_error("Unsupported audio wav sample rate '%s'", selectedAudioWavSampleRate.c_str());
-                                        }
-                                        // Update wav sample rate for audio system
-                                        ska_audio_set_wav_sample_rate(projectProperties->audioWavSampleRate);
-                                    }
-                                    );
-                                    ImGuiHelper::BeginComboBox(audioWavSampleRateComboBox);
-
                                     static ImGuiHelper::CheckBox maintainAspectRatioCheckBox("Maintain Aspect Ratio", projectProperties->maintainAspectRatio);
                                     ImGuiHelper::BeginCheckBox(maintainAspectRatioCheckBox);
 

diff --git a/engine/src/core/core_info.h b/engine/src/core/core_info.h
@@ -3,7 +3,7 @@
 #include <seika/macro_utils.h>
 
 #define CRE_VERSION_MAJOR 0
-#define CRE_VERSION_MINOR 18
+#define CRE_VERSION_MINOR 19
 #define CRE_VERSION_PATCH 0
 
 #define CRE_CORE_VERSION (SKA_MACRO_TO_STRING(CRE_VERSION_MAJOR) "." SKA_MACRO_TO_STRING(CRE_VERSION_MINOR) "." SKA_MACRO_TO_STRING(CRE_VERSION_PATCH))
diff --git a/engine/src/core/game_properties.h b/engine/src/core/game_properties.h
@@ -59,7 +59,6 @@ typedef struct CREGameProperties {
     int32 windowWidth;
     int32 windowHeight;
     bool maintainAspectRatio;
-    uint32_t audioWavSampleRate;
     int32 targetFPS;
     char* initialScenePath;
     bool areCollidersVisible;

diff --git a/engine/src/core/json/json_file_loader.c b/engine/src/core/json/json_file_loader.c
@@ -108,9 +108,6 @@ CREGameProperties* cre_json_load_config_file(const char* filePath) {
         // Maintain Aspect Ratio
         properties->maintainAspectRatio = json_get_bool_default(configJson, "maintain_aspect_ratio", false);
         ska_logger_debug("Maintain Aspect Ratio '%s'", properties->maintainAspectRatio == true ? "true" : "false");
-        // Wav Sample Rate
-        properties->audioWavSampleRate = json_get_int_default(configJson, "audio_wav_sample_rate", SKA_AUDIO_SOURCE_DEFAULT_WAV_SAMPLE_RATE);
-        ska_logger_debug("Wav Sample Rate '%u'", properties->audioWavSampleRate);
         // Target FPS
         properties->targetFPS = json_get_int(configJson, "target_fps");
         ska_logger_debug("Target FPS '%d'", properties->targetFPS);

diff --git a/engine/src/core/scripting/python/pocketpy/api/pkpy_api_impl.c b/engine/src/core/scripting/python/pocketpy/api/pkpy_api_impl.c
@@ -890,7 +890,7 @@ bool cre_pkpy_api_audio_manager_play_sound(int argc, py_StackRef argv) {
     const char* path = py_tostr(py_arg(0));
     const bool loops = py_tobool(py_arg(1));
 
-    ska_audio_manager_play_sound(path, loops);
+    ska_audio_manager_play_sound2(path, loops);
     py_newnone(py_retval());
     return true;
 }
@@ -900,7 +900,7 @@ bool cre_pkpy_api_audio_manager_stop_sound(int argc, py_StackRef argv) {
     PY_CHECK_ARG_TYPE(0, tp_str);
     const char* path = py_tostr(py_arg(0));
 
-    ska_audio_manager_stop_sound(path);
+    ska_audio_manager_stop_sound2(path);
     py_newnone(py_retval());
     return true;
 }

diff --git a/engine/src/core/tick.c b/engine/src/core/tick.c
@@ -36,16 +36,16 @@ void cre_tick_update() {
     const uint64 newTime = ska_get_ticks();
     const uint64 deltaTime = newTime - mainTick.currentTime;
     mainTick.currentTime = newTime;
-    // Handle variable update first
+    // Handle variable updates
     const f32 deltaTimeSeconds = (f32)deltaTime / 1000.f;
     mainTick.updateFunc(deltaTimeSeconds);
-    // Follow by fixed update
-    mainTick.accumulator += deltaTime;
+    // Handle fixed updates
+    mainTick.accumulator += (uint64)mainTick.fixedDeltaTime;
     while (mainTick.accumulator >= mainTick.fixedUpdateInterval) {
-        mainTick.fixedUpdateFunc(deltaTimeSeconds);
+        mainTick.fixedUpdateFunc(mainTick.fixedDeltaTime);
         mainTick.accumulator -= mainTick.fixedUpdateInterval;
     }
-    // Last delay os based on target fps and frame time
+    // Apply delay to control frame rate based on target FPS
     const uint64 frameTime = ska_get_ticks() - mainTick.currentTime;
     if (frameTime < mainTick.updateInterval) {
         ska_delay(mainTick.updateInterval - frameTime);