Merge pull request #820 from JiepengTan/pr_merge_next_frame

Feat: add nextFrame

Author: JiepengTan

cmd/gox/template/platform/web/game.js

@@ -201,6 +201,13 @@ class GameApp {
             funPtr()
         }
     }
+
+    stepNextFrame() {
+        let funPtr = this.game.rtenv["_gdspx_ext_next_frame"]
+        if(funPtr != null){
+            funPtr()
+        }
+    }
     //------------------ misc ------------------
     onProgress(value) {
         if (this.config.onProgress != null) {

cmd/gox/template/platform/web/index.html

@@ -70,6 +70,7 @@
 	<button id="screenshotBtn">Screenshot</button>
 	<button id="pauseGameBtn">Pause</button>
 	<button id="resumeGameBtn">Resume</button>
+	<button id="stepNextFrameBtn">NextFrame</button>
 	<progress id="progress-bar" value="0" max="1" style="display: none;"></progress>
 	<div id="tabs">
 		<div id="tab-loader">
@@ -115,6 +116,8 @@ <h2>Test Animation</h2>
 		document.getElementById('screenshotBtn').addEventListener('click', takeScreenshot);
 		document.getElementById('pauseGameBtn').addEventListener('click', pauseGame);
 		document.getElementById('resumeGameBtn').addEventListener('click', resumeGame);
+		document.getElementById('stepNextFrameBtn').addEventListener('click', stepNextFrame);
+		
 		runnerWindow = document.getElementById('runnerFrame').contentWindow;
 		function onProgress(value) {
 			document.getElementById('progress-bar').value = value;
@@ -160,6 +163,14 @@ <h2>Test Animation</h2>
 				console.warn("Resume function not available");
 			}
 		}
+
+		async function stepNextFrame() {
+			if (runnerWindow.stepNextFrame) {
+				runnerWindow.stepNextFrame();
+			} else {
+				console.warn("StepNextFrame function not available");
+			}
+		}
 		async function takeScreenshot() {
 			try {
 				const blob = await runnerWindow.getScreenshot()

cmd/gox/template/platform/web/runner.html

@@ -241,6 +241,14 @@
 			gameApp.resume();
 		}
 
+		window.stepNextFrame = () => {
+			if (gameApp == null) {
+				console.error("gameApp is null, should call startGame first")
+				return
+			}
+			gameApp.stepNextFrame();
+		}
+		
 		// Inform the parent window that the runner is ready (methods on the window object are callable)
 		window.dispatchEvent(new Event('runnerReady'));
 	</script>

internal/enginewrap/sync.gen.go

@@ -264,6 +264,11 @@ func (pself *extMgrImpl) IsPaused() bool {
 	})
 	return _ret1
 }
+func (pself *extMgrImpl) NextFrame() {
+	callInMainThread(func() {
+		gdx.ExtMgr.NextFrame()
+	})
+}
 func (pself *extMgrImpl) DestroyAllPens() {
 	callInMainThread(func() {
 		gdx.ExtMgr.DestroyAllPens()

internal/enginewrap/sync_pure.gen.go

@@ -164,6 +164,7 @@ func (pself *extMgrImpl) IsPaused() bool {
 	var _ret1 bool
 	return _ret1
 }
+func (pself *extMgrImpl) NextFrame()      {}
 func (pself *extMgrImpl) DestroyAllPens() {}
 func (pself *extMgrImpl) CreatePen() gdx.Object {
 	var _ret1 gdx.Object

pkg/gdspx/internal/ffi/ffi.gen.go

@@ -46,6 +46,7 @@ type GDExtensionInterface struct {
 	SpxExtPause                              GDExtensionSpxExtPause
 	SpxExtResume                             GDExtensionSpxExtResume
 	SpxExtIsPaused                           GDExtensionSpxExtIsPaused
+	SpxExtNextFrame                          GDExtensionSpxExtNextFrame
 	SpxExtDestroyAllPens                     GDExtensionSpxExtDestroyAllPens
 	SpxExtCreatePen                          GDExtensionSpxExtCreatePen
 	SpxExtDestroyPen                         GDExtensionSpxExtDestroyPen
@@ -280,6 +281,7 @@ func (x *GDExtensionInterface) loadProcAddresses() {
 	x.SpxExtPause = (GDExtensionSpxExtPause)(dlsymGD("spx_ext_pause"))
 	x.SpxExtResume = (GDExtensionSpxExtResume)(dlsymGD("spx_ext_resume"))
 	x.SpxExtIsPaused = (GDExtensionSpxExtIsPaused)(dlsymGD("spx_ext_is_paused"))
+	x.SpxExtNextFrame = (GDExtensionSpxExtNextFrame)(dlsymGD("spx_ext_next_frame"))
 	x.SpxExtDestroyAllPens = (GDExtensionSpxExtDestroyAllPens)(dlsymGD("spx_ext_destroy_all_pens"))
 	x.SpxExtCreatePen = (GDExtensionSpxExtCreatePen)(dlsymGD("spx_ext_create_pen"))
 	x.SpxExtDestroyPen = (GDExtensionSpxExtDestroyPen)(dlsymGD("spx_ext_destroy_pen"))

pkg/gdspx/internal/ffi/ffi_wrapper.gen.go

@@ -101,6 +101,7 @@ type GDExtensionSpxExtOnRuntimePanic C.GDExtensionSpxExtOnRuntimePanic
 type GDExtensionSpxExtPause C.GDExtensionSpxExtPause
 type GDExtensionSpxExtResume C.GDExtensionSpxExtResume
 type GDExtensionSpxExtIsPaused C.GDExtensionSpxExtIsPaused
+type GDExtensionSpxExtNextFrame C.GDExtensionSpxExtNextFrame
 type GDExtensionSpxExtDestroyAllPens C.GDExtensionSpxExtDestroyAllPens
 type GDExtensionSpxExtCreatePen C.GDExtensionSpxExtCreatePen
 type GDExtensionSpxExtDestroyPen C.GDExtensionSpxExtDestroyPen
@@ -550,6 +551,11 @@ func CallExtIsPaused() GdBool {
 	C.cgo_callfn_GDExtensionSpxExtIsPaused(arg0, &ret_val)
 	return (GdBool)(ret_val)
 }
+func CallExtNextFrame() {
+	arg0 := (C.GDExtensionSpxExtNextFrame)(api.SpxExtNextFrame)
+
+	C.cgo_callfn_GDExtensionSpxExtNextFrame(arg0)
+}
 func CallExtDestroyAllPens() {
 	arg0 := (C.GDExtensionSpxExtDestroyAllPens)(api.SpxExtDestroyAllPens)
 

pkg/gdspx/internal/ffi/ffi_wrapper.gen.h

@@ -96,6 +96,9 @@ void cgo_callfn_GDExtensionSpxExtResume(const GDExtensionSpxExtResume fn) {
 void cgo_callfn_GDExtensionSpxExtIsPaused(const GDExtensionSpxExtIsPaused fn, GdBool* ret_val) {
 	fn(ret_val);
 }
+void cgo_callfn_GDExtensionSpxExtNextFrame(const GDExtensionSpxExtNextFrame fn) {
+	fn();
+}
 void cgo_callfn_GDExtensionSpxExtDestroyAllPens(const GDExtensionSpxExtDestroyAllPens fn) {
 	fn();
 }

pkg/gdspx/internal/ffi/gdextension_spx_ext.h

@@ -228,6 +228,7 @@ typedef void (*GDExtensionSpxExtOnRuntimePanic)(GdString msg);
 typedef void (*GDExtensionSpxExtPause)();
 typedef void (*GDExtensionSpxExtResume)();
 typedef void (*GDExtensionSpxExtIsPaused)(GdBool* ret_value);
+typedef void (*GDExtensionSpxExtNextFrame)();
 typedef void (*GDExtensionSpxExtDestroyAllPens)();
 typedef void (*GDExtensionSpxExtCreatePen)(GdObj* ret_value);
 typedef void (*GDExtensionSpxExtDestroyPen)(GdObj obj);

pkg/gdspx/internal/webffi/ffi.gen.go

@@ -50,6 +50,7 @@ type GDExtensionInterface struct {
 	SpxExtPause                              js.Value
 	SpxExtResume                             js.Value
 	SpxExtIsPaused                           js.Value
+	SpxExtNextFrame                          js.Value
 	SpxExtDestroyAllPens                     js.Value
 	SpxExtCreatePen                          js.Value
 	SpxExtDestroyPen                         js.Value
@@ -284,6 +285,7 @@ func (x *GDExtensionInterface) loadProcAddresses() {
 	x.SpxExtPause = dlsymGD("gdspx_ext_pause")
 	x.SpxExtResume = dlsymGD("gdspx_ext_resume")
 	x.SpxExtIsPaused = dlsymGD("gdspx_ext_is_paused")
+	x.SpxExtNextFrame = dlsymGD("gdspx_ext_next_frame")
 	x.SpxExtDestroyAllPens = dlsymGD("gdspx_ext_destroy_all_pens")
 	x.SpxExtCreatePen = dlsymGD("gdspx_ext_create_pen")
 	x.SpxExtDestroyPen = dlsymGD("gdspx_ext_destroy_pen")