Added Swift support

polaris-engine-foundation · Jul 4, 2024 · b0b9a5c · b0b9a5c
1 parent 78a7831
commit b0b9a5c
Show file tree

Hide file tree

Showing 18 changed files with 437 additions and 231 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,14 +1,19 @@
 <html><head></head><body>
 
 <!-- BEGIN-LATEST-JP -->
+<li>Polaris Engine 2.0.5 2024/7/4
+  <ul>
+    <li>Swift対応の影響を受けた部分の修正 (機能的な変更はないが、出力ソースに変更あり)</li>
+  </ul>
+</li>
+<!-- END-LATEST-JP -->
+
 <li>Polaris Engine 2.0.4 2024/6/29
   <ul>
     <li>Unity版の修正</li>
     <li>Unity版にWindows Arm64のDLLを添付</li>
   </ul>
 </li>
-<!-- END-LATEST-JP -->
-
 <li>Polaris Engine 2.0.3 2024/6/28
   <ul>
     <li>Unity版が動作しなくなっていたのを修正</li>

diff --git a/README.md b/README.md
@@ -208,4 +208,4 @@ Polaris Engineで制作されたゲームは現行世代のほぼすべてのゲ
     * スクリプト言語 `WMS` は、あえてAPIに制限をかけて、ストーリー分岐のロジック記述用に特化させています
 
 ## 連絡先
-* `info@polaris-engine.org`
+* メンテナ `info@polaris-engine.com`
diff --git a/build/engine-android/app/CMakeLists.txt b/build/engine-android/app/CMakeLists.txt
@@ -4,6 +4,9 @@ project(polarisengine-lib)
 # Find Android NDK log library.
 find_library(log-lib log)
 
+# CFLAGS
+add_definitions(-DUSE_DLL)
+
 # We make libpolarisengine.so
 add_library(
   polarisengine

diff --git a/build/engine-ios/engine-ios/GameView.m b/build/engine-ios/engine-ios/GameView.m
@@ -103,8 +103,3 @@ - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
 }
 
 @end
-
-void set_continuous_swipe_enabled(bool is_enabled)
-{
-	isContinuousSwipeEnabled = is_enabled;
-}
diff --git a/build/engine-ios/engine-ios/ViewController.m b/build/engine-ios/engine-ios/ViewController.m
@@ -314,3 +314,8 @@ bool make_sav_dir(void)
         return strdup("dummy");
     }
 }
+
+void set_continuous_swipe_enabled(bool is_enabled)
+{
+	isContinuousSwipeEnabled = is_enabled;
+}
diff --git a/build/engine-macos/engine-macos/ViewController.m b/build/engine-macos/engine-macos/ViewController.m
@@ -714,3 +714,7 @@ bool log_error(const char *s, ...)
     return fp;
 }
 
+void set_continuous_swipe_enabled(bool is_enabled)
+{
+    UNUSED_PARAMETER(is_enabled);
+}
diff --git a/build/engine-unity/Makefile b/build/engine-unity/Makefile
@@ -47,7 +47,8 @@ libpolarisengine-win64.dll: $(SRCS_UNITY)
 		-fPIC \
 		-o libpolarisengine-win64.dll \
 		-O2 \
-		-DPOLARIS_ENGINE_TARGET_UNITY \
+		-DUSE_UNITY \
+		-DUSE_DLL \
 		-DNO_CDECL \
 		-I../engine-windows-64/libroot/include \
 		-I../engine-windows-64/libroot/include/png \
@@ -74,7 +75,8 @@ libpolarisengine-arm64.dll: $(SRCS_UNITY)
 		-fPIC \
 		-o libpolarisengine-arm64.dll \
 		-O2 \
-		-DPOLARIS_ENGINE_TARGET_UNITY \
+		-DUSE_UNITY \
+		-DUSE_DLL \
 		-DNO_CDECL \
 		-I../engine-windows-arm64/libroot/include \
 		-I../engine-windows-arm64/libroot/include/png \
@@ -104,7 +106,8 @@ libpolarisengine-macos.dylib: ../engine-macos/libroot $(SRCS_UNITY)
 		-undefined dynamic_lookup \
 		-fPIC \
 		-o libpolarisengine-macos.dylib \
-		-DPOLARIS_ENGINE_TARGET_UNITY \
+		-DUSE_UNITY \
+		-DUSE_DLL \
 		-I../engine-macos/libroot/include \
 		-I../engine-macos/libroot/include/freetype2 \
 		$(SRCS_UNITY) \

diff --git a/build/engine-unity/ps45.mk b/build/engine-unity/ps45.mk
@@ -70,7 +70,8 @@ all:
 		-o ../Assets/libpolarisengine.so \
 		-O2 \
 		-fPIC \
-		-DPOLARIS_ENGINE_TARGET_UNITY \
+		-DUSE_UNITY \
+		-DUSE_DLL \
 		-DNO_CDECL \
 		-I./libroot-ps45/include \
 		-I./libroot-ps45/include/png \

diff --git a/build/engine-unity/switch.mk b/build/engine-unity/switch.mk
@@ -70,7 +70,8 @@ all:
 		-o ../Assets/libpolarisengine.nso \
 		-O2 \
 		-fPIC \
-		-DPOLARIS_ENGINE_TARGET_UNITY \
+		-DUSE_UNITY \
+		-DUSE_DLL \
 		-DNO_CDECL \
 		-I./libroot-switch/include \
 		-I./libroot-switch/include/png \

diff --git a/build/engine-unity/xbox.mk b/build/engine-unity/xbox.mk
@@ -70,7 +70,8 @@ all:
 		-o ../Assets/libpolarisengine.dll \
 		-O2 \
 		-fPIC \
-		-DPOLARIS_ENGINE_TARGET_UNITY \
+		-DUSE_UNITY \
+		-DUSE_DLL \
 		-DNO_CDECL \
 		-I./libroot-xbox/include \
 		-I./libroot-xbox/include/png \

diff --git a/build/pro-macos/pro-macos/ViewController.m b/build/pro-macos/pro-macos/ViewController.m
@@ -1814,6 +1814,11 @@ bool make_sav_dir(void)
     }
 }
 
+void set_continuous_swipe_enabled(bool is_enabled)
+{
+    UNUSED_PARAMETER(is_enabled);
+}
+
 //
 // Pro HAL
 //

diff --git a/src/hal.h b/src/hal.h
@@ -380,93 +380,130 @@ void speak_text(const char *text);
 /*
  * Enable/disable message skip by touch move.
  */
-#if defined(POLARIS_ENGINE_TARGET_IOS) || defined(POLARIS_ENGINE_TARGET_ANDROID) || defined(POLARIS_ENGINE_TARGET_WASM)
 void set_continuous_swipe_enabled(bool is_enabled);
-#else
-static inline void set_continuous_swipe_enabled(bool is_enabled) { UNUSED_PARAMETER(is_enabled); }
-#endif
 
 /*
- * For Foreign Languages (Swift and C#)
+ * Foreign Languages Support (Swift and C#)
  */
-#ifdef POLARIS_ENGINE_DLL
+#ifdef USE_DLL
 
-#ifndef NO_CDECL
-#define POLARISENGINEAPI __cdecl
+/*
+ * Use cdecl for DLL export functions.
+ */
+#if !defined(NO_CDECL)
+#define CDECL __cdecl
 #else
-#define POLARISENGINEAPI
+#define CDECL
 #endif
 
-extern void init_hal_func_table(
-	void POLARISENGINEAPI (*p_log_info)(intptr_t s),
-	void POLARISENGINEAPI (*p_log_warn)(intptr_t s),
-	void POLARISENGINEAPI (*p_log_error)(intptr_t s),
-	void POLARISENGINEAPI (*p_make_sav_dir)(void),
-	void POLARISENGINEAPI (*p_make_valid_path)(intptr_t dir, intptr_t fname, intptr_t dst, int len),
-	void POLARISENGINEAPI (*p_notify_image_update)(int id, int width, int height, intptr_t pixels),
-	void POLARISENGINEAPI (*p_notify_image_free)(int id),
-	void POLARISENGINEAPI (*p_render_image_normal)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
-	void POLARISENGINEAPI (*p_render_image_add)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
-	void POLARISENGINEAPI (*p_render_image_dim)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
-	void POLARISENGINEAPI (*p_render_image_rule)(int src_img, int rule_img, int threshold),
-	void POLARISENGINEAPI (*p_render_image_melt)(int src_img, int rule_img, int progress),
-	void POLARISENGINEAPI (*p_render_image_3d_normal)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
-	void POLARISENGINEAPI (*p_render_image_3d_add)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
-	void POLARISENGINEAPI (*p_reset_lap_timer)(intptr_t origin),
-	int64_t POLARISENGINEAPI (*p_get_lap_timer_millisec)(intptr_t origin),
-	void POLARISENGINEAPI (*p_play_sound)(int stream, intptr_t wave),
-	void POLARISENGINEAPI (*p_stop_sound)(int stream),
-	void POLARISENGINEAPI (*p_set_sound_volume)(int stream, float vol),
-	bool POLARISENGINEAPI (*p_is_sound_finished)(int stream),
-	bool POLARISENGINEAPI (*p_play_video)(intptr_t fname, bool is_skippable),
-	void POLARISENGINEAPI (*p_stop_video)(void),
-	bool POLARISENGINEAPI (*p_is_video_playing)(void),
-	void POLARISENGINEAPI (*p_update_window_title)(void),
-	bool POLARISENGINEAPI (*p_is_full_screen_supported)(void),
-	bool POLARISENGINEAPI (*p_is_full_screen_mode)(void),
-	void POLARISENGINEAPI (*p_enter_full_screen_mode)(void),
-	void POLARISENGINEAPI (*p_leave_full_screen_mode)(void),
-	void POLARISENGINEAPI (*p_get_system_locale)(intptr_t dst, int len),
-	void POLARISENGINEAPI (*p_speak_text)(intptr_t text),
-	void POLARISENGINEAPI (*p_set_continuous_swipe_enabled)(bool is_enabled),
-	void POLARISENGINEAPI (*p_free_shared)(intptr_t p),
-	bool POLARISENGINEAPI (*p_check_file_exist)(intptr_t file_name),
-	intptr_t POLARISENGINEAPI (*p_get_file_contents)(intptr_t file_name, intptr_t len),
-	void POLARISENGINEAPI (*p_open_save_file)(intptr_t file_name),
-	void POLARISENGINEAPI (*p_write_save_file)(int b),
-	void POLARISENGINEAPI (*p_close_save_file)(void));
-extern void POLARISENGINEAPI (*wrap_log_info)(intptr_t s);
-extern void POLARISENGINEAPI (*wrap_log_warn)(intptr_t s);
-extern void POLARISENGINEAPI (*wrap_log_error)(intptr_t s);
-extern void POLARISENGINEAPI (*wrap_make_sav_dir)(void);
-extern void POLARISENGINEAPI (*wrap_make_valid_path)(intptr_t dir, intptr_t fname, intptr_t dst, int len);
-extern void POLARISENGINEAPI (*wrap_notify_image_update)(int id, int width, int height, intptr_t pixels);
-extern void POLARISENGINEAPI (*wrap_notify_image_free)(int id);
-extern void POLARISENGINEAPI (*wrap_render_image_normal)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
-extern void POLARISENGINEAPI (*wrap_render_image_add)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
-extern void POLARISENGINEAPI (*wrap_render_image_dim)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
-extern void POLARISENGINEAPI (*wrap_render_image_rule)(int src_img, int rule_img, int threshold);
-extern void POLARISENGINEAPI (*wrap_render_image_melt)(int src_img, int rule_img, int progress);
-extern void POLARISENGINEAPI (*wrap_render_image_3d_normal)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
-extern void POLARISENGINEAPI (*wrap_render_image_3d_add)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
-extern void POLARISENGINEAPI (*wrap_reset_lap_timer)(intptr_t origin);
-extern int64_t POLARISENGINEAPI (*wrap_get_lap_timer_millisec)(intptr_t origin);
-extern void POLARISENGINEAPI (*wrap_play_sound)(int stream, intptr_t wave);
-extern void POLARISENGINEAPI (*wrap_stop_sound)(int stream);
-extern void POLARISENGINEAPI (*wrap_set_sound_volume)(int stream, float vol);
-extern bool POLARISENGINEAPI (*wrap_is_sound_finished)(int stream);
-extern bool POLARISENGINEAPI (*wrap_play_video)(intptr_t fname, bool is_skippable);
-extern void POLARISENGINEAPI (*wrap_stop_video)(void);
-extern bool POLARISENGINEAPI (*wrap_is_video_playing)(void);
-extern void POLARISENGINEAPI (*wrap_update_window_title)(void);
-extern bool POLARISENGINEAPI (*wrap_is_full_screen_supported)(void);
-extern bool POLARISENGINEAPI (*wrap_is_full_screen_mode)(void);
-extern void POLARISENGINEAPI (*wrap_enter_full_screen_mode)(void);
-extern void POLARISENGINEAPI (*wrap_leave_full_screen_mode)(void);
-extern void POLARISENGINEAPI (*wrap_get_system_locale)(intptr_t dst, int len);
-extern void POLARISENGINEAPI (*wrap_speak_text)(intptr_t text);
-extern void POLARISENGINEAPI (*wrap_set_continuous_swipe_enabled)(bool is_enabled);
+/*
+ * Define unsafe pointer wrapper.
+ */
+#if defined(USE_SWIFT)
+#define UNSAFEPTR(t)  t	/* For Swift */
+#else
+#define UNSAFEPTR(t)  intptr_t	/* For C# */
+#endif
 
+/*
+ * For Swift
+ */
+#if defined(USE_SWIFT)
+extern void CDECL (*wrap_log_info)(UNSAFEPTR(const char *) s);
+extern void CDECL (*wrap_log_warn)(UNSAFEPTR(const char *) s);
+extern void CDECL (*wrap_log_error)(UNSAFEPTR(const char *) s);
+extern void CDECL (*wrap_make_sav_dir)(void);
+extern void CDECL (*wrap_make_valid_path)(UNSAFEPTR(const char *) dir, UNSAFEPTR(const char *) fname, UNSAFEPTR(const char *) dst, int len);
+extern void CDECL (*wrap_notify_image_update)(int id, int width, int height, UNSAFEPTR(const uint32_t *) pixels);
+extern void CDECL (*wrap_notify_image_free)(int id);
+extern void CDECL (*wrap_render_image_normal)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
+extern void CDECL (*wrap_render_image_add)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
+extern void CDECL (*wrap_render_image_dim)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
+extern void CDECL (*wrap_render_image_rule)(int src_img, int rule_img, int threshold);
+extern void CDECL (*wrap_render_image_melt)(int src_img, int rule_img, int progress);
+extern void CDECL (*wrap_render_image_3d_normal)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
+extern void CDECL (*wrap_render_image_3d_add)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha);
+extern void CDECL (*wrap_reset_lap_timer)(UNSAFEPTR(uint64_t *) origin);
+extern uint64_t CDECL (*wrap_get_lap_timer_millisec)(UNSAFEPTR(uint64_t *) origin);
+extern void CDECL (*wrap_play_sound)(int stream, UNSAFEPTR(void *) wave);
+extern void CDECL (*wrap_stop_sound)(int stream);
+extern void CDECL (*wrap_set_sound_volume)(int stream, float vol);
+extern int CDECL (*wrap_is_sound_finished)(int stream);
+extern bool CDECL (*wrap_play_video)(UNSAFEPTR(const char *) fname, bool is_skippable);
+extern void CDECL (*wrap_stop_video)(void);
+extern bool CDECL (*wrap_is_video_playing)(void);
+extern void CDECL (*wrap_update_window_title)(void);
+extern bool CDECL (*wrap_is_full_screen_supported)(void);
+extern bool CDECL (*wrap_is_full_screen_mode)(void);
+extern void CDECL (*wrap_enter_full_screen_mode)(void);
+extern void CDECL (*wrap_leave_full_screen_mode)(void);
+extern void CDECL (*wrap_get_system_locale)(UNSAFEPTR(char *) dst, int len);
+extern void CDECL (*wrap_speak_text)(UNSAFEPTR(const char *) text);
+extern void CDECL (*wrap_set_continuous_swipe_enabled)(bool is_enabled);
+extern void CDECL (*wrap_free_shared)(UNSAFEPTR(void *) p);
+extern bool CDECL (*wrap_check_file_exist)(UNSAFEPTR(const char *) file_name);
+extern UNSAFEPTR(void *) CDECL (*wrap_get_file_contents)(UNSAFEPTR(const char *) file_name, UNSAFEPTR(int *) len);
+extern void CDECL (*wrap_open_save_file)(UNSAFEPTR(const char *) file_name);
+extern void CDECL (*wrap_write_save_file)(int b);
+extern void CDECL (*wrap_close_save_file)(void);
+extern void CDECL (*wrap_set_continuous_swipe_enabled)(bool is_enabled);
+extern bool CDECL (*wrap_is_continue_pushed)(void);
+extern bool CDECL (*wrap_is_next_pushed)(void);
+extern bool CDECL (*wrap_is_stop_pushed)(void);
+extern bool CDECL (*wrap_is_script_opened)(void);
+extern UNSAFEPTR(const char *) CDECL (*wrap_get_opened_script)(void);
+extern bool CDECL (*wrap_is_exec_line_changed)(void);
+extern bool CDECL (*wrap_get_changed_exec_line)(void);
+extern void CDECL (*wrap_on_change_running_state)(int running, int request_stop);
+extern void CDECL (*wrap_on_load_script)(void);
+extern void CDECL (*wrap_on_change_position)(void);
+extern void CDECL (*wrap_on_update_variable)(void);
+#endif /* defined(USE_SWIFT) */
+
+/*
+ * For C#
+ */
+#if defined(USE_CSHARP)
+void init_hal_func_table(
+	void CDECL (*p_log_info)(UNSAFEPTR(const char *) s),
+	void CDECL (*p_log_warn)(UNSAFEPTR(const char *) s),
+	void CDECL (*p_log_error)(UNSAFEPTR(const char *) s),
+	void CDECL (*p_make_sav_dir)(void),
+	void CDECL (*p_make_valid_path)(UNSAFEPTR(const char *) dir, UNSAFEPTR(const char *) fname, UNSAFEPTR(const char *) dst, int len),
+	void CDECL (*p_notify_image_update)(int id, int width, int height, UNSAFEPTR(const uint32_t *) pixels),
+	void CDECL (*p_notify_image_free)(int id),
+	void CDECL (*p_render_image_normal)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
+	void CDECL (*p_render_image_add)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
+	void CDECL (*p_render_image_dim)(int dst_left, int dst_top, int dst_width, int dst_height, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
+	void CDECL (*p_render_image_rule)(int src_img, int rule_img, int threshold),
+	void CDECL (*p_render_image_melt)(int src_img, int rule_img, int progress),
+	void CDECL (*p_render_image_3d_normal)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
+	void CDECL (*p_render_image_3d_add)(float x1, float y1, float x2, float y2, float x3, float y3, float x4, float y4, int src_img, int src_left, int src_top, int src_width, int src_height, int alpha),
+	void CDECL (*p_reset_lap_timer)(UNSAFEPTR(uint64_t *) origin),
+	uint64_t CDECL (*p_get_lap_timer_millisec)(UNSAFEPTR(uint64_t *) origin),
+	void CDECL (*p_play_sound)(int stream, UNSAFEPTR(void *) wave),
+	void CDECL (*p_stop_sound)(int stream),
+	void CDECL (*p_set_sound_volume)(int stream, float vol),
+	bool CDECL (*p_is_sound_finished)(int stream),
+	bool CDECL (*p_play_video)(UNSAFEPTR(const char *) fname, bool is_skippable),
+	void CDECL (*p_stop_video)(void),
+	bool CDECL (*p_is_video_playing)(void),
+	void CDECL (*p_update_window_title)(void),
+	bool CDECL (*p_is_full_screen_supported)(void),
+	bool CDECL (*p_is_full_screen_mode)(void),
+	void CDECL (*p_enter_full_screen_mode)(void),
+	void CDECL (*p_leave_full_screen_mode)(void),
+	void CDECL (*p_get_system_locale)(UNSAFEPTR(char *) dst, int len),
+	void CDECL (*p_speak_text)(UNSAFEPTR(const char *) text),
+	void CDECL (*p_set_continuous_swipe_enabled)(bool is_enabled),
+	void CDECL (*)(UNSAFEPTR(void *) p),
+	bool CDECL (*p_check_file_exist)(UNSAFEPTR(const char *) file_name),
+	UNSAFEPTR(void *) CDECL (*p_get_file_contents)(UNSAFEPTR(const char *) file_name, PTR len),
+	void CDECL (*p_open_save_file)(UNSAFEPTR(const char *) file_name),
+	void CDECL (*p_write_save_file)(int b),
+	void CDECL (*p_close_save_file)(void)
+);
+#endif /* deinfed(USE_CSHARP) */
 #endif /* POLARIS_ENGINE_DLL */
 
 #endif /* POLARIS_ENGINE_HAL_H */