Merge pull request #724 from JiepengTan/pr_fix_apply_custume_offset_2_animation

Add config to ApplyCustumeOffset2Animation

Author: JiepengTan

cmd/gox/template/project/.builds/web/runner.html

@@ -84,15 +84,15 @@
 			onGameError = callback
 		}
 
-		window.startGame = async (buffer, assetURLs = null, onSpxReady = null) => {
+		window.startGame = async (buffer, assetURLs = null, onSpxReady = null, logLevel = LOG_LEVEL_NONE) => {
 			isShowEditor = false
 			const config = {
 				'projectName': "spx_game",
 				'onProgress': onProgress,
 				"gameCanvas": document.getElementById('game-canvas'),
 				"editorCanvas": document.getElementById('editor-canvas'),
 				"projectData": new Uint8Array(buffer),
-				"logLevel": LOG_LEVEL_NONE,
+				"logLevel": logLevel,
 				"useAssetCache": false,
 				"isRuntimeMode": true,
 				"assetURLs": {

config.go

@@ -275,6 +275,8 @@ type spriteConfig struct {
 	TriggerCenter       mathf.Vec2            `json:"triggerCenter"`
 	TriggerSize         mathf.Vec2            `json:"triggerSize"`
 	TriggerRadius       float64               `json:"triggerRadius"`
+
+	ApplyCustumeOffset2Animation bool `json:"applyCustumeOffset2Animation"`
 }
 
 func (p *spriteConfig) getCostumeIndex() int {

gdspx.go

@@ -317,7 +317,7 @@ func applyRenderOffset(p *SpriteImpl, cx, cy *float64) {
 	*cy = *cy + y
 }
 
-func registerAnimToEngine(spriteName string, animName string, animCfg *aniConfig, costumes []*costume, isCostumeSet bool) {
+func registerAnimToEngine(spriteName string, animName string, animCfg *aniConfig, costumes []*costume, isCostumeSet bool, applyCustumeOffset2Animation bool) {
 	// TODO(jiepengtan): here we should optimize the implementation, it's better to use json to map, avoid manually writing parsing code
 	sb := strings.Builder{}
 	from, to := animCfg.IFrameFrom, animCfg.IFrameTo
@@ -356,10 +356,14 @@ func registerAnimToEngine(spriteName string, animName string, animCfg *aniConfig
 			if strings.Contains(assetPath, splitTag) {
 				panic("assetPath is invalid, should not contains " + splitTag + " " + costumes[i].path)
 			}
-			costume := costumes[i]
 			sb.WriteString(assetPath)
-			halfSize := mathf.Vec2.Mulf(costume.imageSize, 0.5)
-			sb.WriteString(splitTag + fmt.Sprintf("%f,%f", costume.center.X-halfSize.X, -costume.center.Y+halfSize.Y))
+			if applyCustumeOffset2Animation {
+				costume := costumes[i]
+				halfSize := mathf.Vec2.Mulf(costume.imageSize, 0.5)
+				sb.WriteString(splitTag + fmt.Sprintf("%f,%f", costume.center.X-halfSize.X, -costume.center.Y+halfSize.Y))
+			} else {
+				sb.WriteString(splitTag + fmt.Sprintf("%f,%f", 0.0, 0.0))
+			}
 			if i != to {
 				sb.WriteString(";")
 			}

sprite.go

@@ -330,7 +330,7 @@ func (p *SpriteImpl) init(
 
 	// register animations to engine
 	for animName, ani := range p.animations {
-		registerAnimToEngine(p.name, animName, ani, p.baseObj.costumes, p.isCostumeSet)
+		registerAnimToEngine(p.name, animName, ani, p.baseObj.costumes, p.isCostumeSet, spriteCfg.ApplyCustumeOffset2Animation)
 	}
 
 }