Temp update to remove use of MakeFullWrapper for reducing redundant CPU time in profiling.

2025-10-09 00:26:39 +00:00 · 2023-02-16 08:17:50 +08:00
parent 9dff989e02
commit fb42533f55
15 changed files with 7661 additions and 170 deletions
--- a/jsexport/battle/battle.go
+++ b/jsexport/battle/battle.go
@@ -101,6 +101,7 @@ var inAirSet = map[int32]bool{
 	ATK_CHARACTER_STATE_INAIR_ATKED1:        true,
 	ATK_CHARACTER_STATE_BLOWN_UP1:           true,
 	ATK_CHARACTER_STATE_ONWALL:              true,
+	ATK_CHARACTER_STATE_DASHING:             true, // Yes dashing is an inair state even if you dashed on the ground :)
 }

 var noOpSet = map[int32]bool{
@@ -259,11 +260,15 @@ func isPolygonPairOverlapped(a, b *resolv.ConvexPolygon, result *SatResult) bool
 	return true
 }

-func IsMeleeBulletActive(meleeBullet *MeleeBullet, currRenderFrame *RoomDownsyncFrame) bool {
-	if BULLET_EXPLODING == meleeBullet.BlState {
+func IsGeneralBulletActive(blState, originatedRenderFrameId, startupFrames, activeFrames, renderFrameId int32) bool {
+	if BULLET_EXPLODING == blState {
 		return false
 	}
-	return (meleeBullet.BattleAttr.OriginatedRenderFrameId+meleeBullet.Bullet.StartupFrames <= currRenderFrame.Id) && (meleeBullet.BattleAttr.OriginatedRenderFrameId+meleeBullet.Bullet.StartupFrames+meleeBullet.Bullet.ActiveFrames > currRenderFrame.Id)
+	return (originatedRenderFrameId+startupFrames < renderFrameId) && (originatedRenderFrameId+startupFrames+activeFrames > renderFrameId)
+}
+
+func IsMeleeBulletActive(meleeBullet *MeleeBullet, currRenderFrame *RoomDownsyncFrame) bool {
+    return IsGeneralBulletActive(meleeBullet.BlState, meleeBullet.BattleAttr.OriginatedRenderFrameId, meleeBullet.Bullet.StartupFrames, meleeBullet.Bullet.ActiveFrames, currRenderFrame.Id)
 }

 func IsMeleeBulletAlive(meleeBullet *MeleeBullet, currRenderFrame *RoomDownsyncFrame) bool {
@@ -274,10 +279,7 @@ func IsMeleeBulletAlive(meleeBullet *MeleeBullet, currRenderFrame *RoomDownsyncF
 }

 func IsFireballBulletActive(fireballBullet *FireballBullet, currRenderFrame *RoomDownsyncFrame) bool {
-	if BULLET_EXPLODING == fireballBullet.BlState {
-		return false
-	}
-	return (fireballBullet.BattleAttr.OriginatedRenderFrameId+fireballBullet.Bullet.StartupFrames < currRenderFrame.Id) && (fireballBullet.BattleAttr.OriginatedRenderFrameId+fireballBullet.Bullet.StartupFrames+fireballBullet.Bullet.ActiveFrames > currRenderFrame.Id)
+    return IsGeneralBulletActive(fireballBullet.BlState, fireballBullet.BattleAttr.OriginatedRenderFrameId, fireballBullet.Bullet.StartupFrames, fireballBullet.Bullet.ActiveFrames, currRenderFrame.Id)
 }

 func IsFireballBulletAlive(fireballBullet *FireballBullet, currRenderFrame *RoomDownsyncFrame) bool {
--- a/jsexport/battle/getter.go
+++ b/jsexport/battle/getter.go
@@ -0,0 +1,264 @@
+package battle
+
+// CharacterConfig
+func (c *CharacterConfig) GetSpeed() int32 {
+	return c.Speed
+}
+func (c *CharacterConfig) GetSpeciesId() int {
+	return c.SpeciesId
+}
+func (c *CharacterConfig) GetSpeciesName() string {
+	return c.SpeciesName
+}
+
+// InputFrameDownsync
+func (ifd *InputFrameDownsync) GetInputFrameId() int32 {
+	return ifd.InputFrameId
+}
+
+func (ifd *InputFrameDownsync) GetInputList() []uint64 {
+	return ifd.InputList
+}
+
+func (ifd *InputFrameDownsync) GetConfirmedList() uint64 {
+	return ifd.ConfirmedList
+}
+
+// PlayerDownsync
+func (p *PlayerDownsync) GetId() int32 {
+	return p.Id
+}
+
+func (p *PlayerDownsync) GetJoinIndex() int32 {
+	return p.JoinIndex
+}
+
+func (p *PlayerDownsync) GetVirtualGridX() int32 {
+	return p.VirtualGridX
+}
+
+func (p *PlayerDownsync) GetVirtualGridY() int32 {
+	return p.VirtualGridY
+}
+
+func (p *PlayerDownsync) GetDirX() int32 {
+	return p.DirX
+}
+
+func (p *PlayerDownsync) GetDirY() int32 {
+	return p.DirY
+}
+
+func (p *PlayerDownsync) GetVelX() int32 {
+	return p.VelX
+}
+
+func (p *PlayerDownsync) GetVelY() int32 {
+	return p.VelY
+}
+
+func (p *PlayerDownsync) GetSpeed() int32 {
+	return p.Speed
+}
+
+func (p *PlayerDownsync) GetHp() int32 {
+	return p.Hp
+}
+
+func (p *PlayerDownsync) GetMaxHp() int32 {
+	return p.MaxHp
+}
+
+func (p *PlayerDownsync) GetCharacterState() int32 {
+	return p.CharacterState
+}
+
+func (p *PlayerDownsync) GetFramesToRecover() int32 {
+	return p.FramesToRecover
+}
+
+func (p *PlayerDownsync) GetFramesInChState() int32 {
+	return p.FramesInChState
+}
+
+func (p *PlayerDownsync) GetInAir() bool {
+	return p.InAir
+}
+
+func (p *PlayerDownsync) GetOnWall() bool {
+	return p.OnWall
+}
+
+func (p *PlayerDownsync) GetOnWallNormX() int32 {
+	return p.OnWallNormX
+}
+
+func (p *PlayerDownsync) GetColliderRadius() int32 {
+	return p.ColliderRadius
+}
+
+// MeleeBullet
+func (b *MeleeBullet) GetBlState() int32 {
+	return b.BlState
+}
+
+func (b *MeleeBullet) GetFramesInBlState() int32 {
+	return b.FramesInBlState
+}
+
+func (b *MeleeBullet) GetBulletLocalId() int32 {
+	return b.BattleAttr.BulletLocalId
+}
+
+func (b *MeleeBullet) GetOffenderJoinIndex() int32 {
+	return b.BattleAttr.OffenderJoinIndex
+}
+
+func (b *MeleeBullet) GetOriginatedRenderFrameId() int32 {
+	return b.BattleAttr.OriginatedRenderFrameId
+}
+
+func (b *MeleeBullet) GetStartupFrames() int32 {
+	return b.Bullet.StartupFrames
+}
+
+func (b *MeleeBullet) GetActiveFrames() int32 {
+	return b.Bullet.ActiveFrames
+}
+
+func (b *MeleeBullet) GetHitboxSizeX() int32 {
+	return b.Bullet.HitboxSizeX
+}
+
+func (b *MeleeBullet) GetHitboxSizeY() int32 {
+	return b.Bullet.HitboxSizeY
+}
+
+func (b *MeleeBullet) GetHitboxOffsetX() int32 {
+	return b.Bullet.HitboxOffsetX
+}
+
+func (b *MeleeBullet) GetHitboxOffsetY() int32 {
+	return b.Bullet.HitboxOffsetY
+}
+
+func (b *MeleeBullet) GetExplosionFrames() int32 {
+	return b.Bullet.ExplosionFrames
+}
+
+func (b *MeleeBullet) GetSpeciesId() int32 {
+	return b.Bullet.SpeciesId
+}
+
+// FireballBullet
+func (p *FireballBullet) GetVirtualGridX() int32 {
+	return p.VirtualGridX
+}
+
+func (p *FireballBullet) GetVirtualGridY() int32 {
+	return p.VirtualGridY
+}
+
+func (p *FireballBullet) GetDirX() int32 {
+	return p.DirX
+}
+
+func (p *FireballBullet) GetDirY() int32 {
+	return p.DirY
+}
+
+func (p *FireballBullet) GetVelX() int32 {
+	return p.VelX
+}
+
+func (p *FireballBullet) GetVelY() int32 {
+	return p.VelY
+}
+
+func (p *FireballBullet) GetSpeed() int32 {
+	return p.Speed
+}
+func (b *FireballBullet) GetBlState() int32 {
+	return b.BlState
+}
+
+func (b *FireballBullet) GetFramesInBlState() int32 {
+	return b.FramesInBlState
+}
+
+func (b *FireballBullet) GetBulletLocalId() int32 {
+	return b.BattleAttr.BulletLocalId
+}
+
+func (b *FireballBullet) GetOffenderJoinIndex() int32 {
+	return b.BattleAttr.OffenderJoinIndex
+}
+
+func (b *FireballBullet) GetOriginatedRenderFrameId() int32 {
+	return b.BattleAttr.OriginatedRenderFrameId
+}
+
+func (b *FireballBullet) GetStartupFrames() int32 {
+	return b.Bullet.StartupFrames
+}
+
+func (b *FireballBullet) GetActiveFrames() int32 {
+	return b.Bullet.ActiveFrames
+}
+
+func (b *FireballBullet) GetHitboxSizeX() int32 {
+	return b.Bullet.HitboxSizeX
+}
+
+func (b *FireballBullet) GetHitboxSizeY() int32 {
+	return b.Bullet.HitboxSizeY
+}
+
+func (b *FireballBullet) GetHitboxOffsetX() int32 {
+	return b.Bullet.HitboxOffsetX
+}
+
+func (b *FireballBullet) GetHitboxOffsetY() int32 {
+	return b.Bullet.HitboxOffsetY
+}
+
+func (b *FireballBullet) GetExplosionFrames() int32 {
+	return b.Bullet.ExplosionFrames
+}
+
+func (b *FireballBullet) GetSpeciesId() int32 {
+	return b.Bullet.SpeciesId
+}
+
+// RoomDownsyncFrame
+func (r *RoomDownsyncFrame) GetId() int32 {
+	return r.Id
+}
+
+func (r *RoomDownsyncFrame) GetCountdownNanos() int64 {
+	return r.CountdownNanos
+}
+
+func (r *RoomDownsyncFrame) GetBackendUnconfirmedMask() uint64 {
+	return r.BackendUnconfirmedMask
+}
+
+func (r *RoomDownsyncFrame) GetBulletLocalIdCounter() int32 {
+	return r.BulletLocalIdCounter
+}
+
+func (r *RoomDownsyncFrame) GetShouldForceResync() bool {
+	return r.ShouldForceResync
+}
+
+func (r *RoomDownsyncFrame) GetPlayersArr() []*PlayerDownsync {
+	return r.PlayersArr
+}
+
+func (r *RoomDownsyncFrame) GetMeleeBullets() []*MeleeBullet {
+	return r.MeleeBullets
+}
+
+func (r *RoomDownsyncFrame) GetFireballBullets() []*FireballBullet {
+	return r.FireballBullets
+}
--- a/jsexport/battle/inplace_ring_buff.go
+++ b/jsexport/battle/inplace_ring_buff.go
@@ -181,3 +181,15 @@ func (rb *InplaceRingBuffer) Clear() {
 	rb.StFrameId = 0
 	rb.EdFrameId = 0
 }
+
+func (rb *InplaceRingBuffer) GetStFrameId() int32 {
+	return rb.StFrameId
+}
+
+func (rb *InplaceRingBuffer) GetEdFrameId() int32 {
+	return rb.EdFrameId
+}
+
+func (rb *InplaceRingBuffer) GetCnt() int32 {
+	return rb.Cnt
+}
--- a/jsexport/main.go
+++ b/jsexport/main.go
@@ -6,8 +6,15 @@ import (
 	"resolv"
 )

+/*
+[WARNING] Should avoid using "MakeFullWrapper" as much as possible, and completely remove its usage in 60fps calls like "update(dt)" on frontend!
+*/
+func NewCollisionHolder() *js.Object {
+	return js.MakeWrapper(resolv.NewCollision())
+}
+
 func NewInputFrameDownsync(inputFrameId int32, inputList []uint64, confirmedList uint64) *js.Object {
-	return js.MakeFullWrapper(&InputFrameDownsync{
+	return js.MakeWrapper(&InputFrameDownsync{
 		InputFrameId:  inputFrameId,
 		InputList:     inputList,
 		ConfirmedList: confirmedList,
@@ -15,7 +22,7 @@ func NewInputFrameDownsync(inputFrameId int32, inputList []uint64, confirmedList
 }

 func NewRingBufferJs(n int32) *js.Object {
-	return js.MakeFullWrapper(resolv.NewRingBuffer(n))
+	return js.MakeWrapper(resolv.NewRingBuffer(n))
 }

 func NewCollisionSpaceJs(spaceW, spaceH, minStepW, minStepH int) *js.Object {
@@ -23,14 +30,14 @@ func NewCollisionSpaceJs(spaceW, spaceH, minStepW, minStepH int) *js.Object {
 }

 func NewVec2DJs(x, y float64) *js.Object {
-	return js.MakeFullWrapper(&Vec2D{
+	return js.MakeWrapper(&Vec2D{
 		X: x,
 		Y: y,
 	})
 }

 func NewPolygon2DJs(anchor *Vec2D, points []*Vec2D) *js.Object {
-	return js.MakeFullWrapper(&Polygon2D{
+	return js.MakeWrapper(&Polygon2D{
 		Anchor: anchor,
 		Points: points,
 	})
@@ -55,7 +62,7 @@ func NewFireballBulletJs(bulletLocalId, originatedRenderFrameId, offenderJoinInd
 }

 func NewNpcPatrolCue(flAct, frAct uint64, x, y float64) *js.Object {
-	return js.MakeFullWrapper(&NpcPatrolCue{
+	return js.MakeWrapper(&NpcPatrolCue{
 		FlAct: flAct,
 		FrAct: frAct,
 		X:     x,
@@ -65,7 +72,7 @@ func NewNpcPatrolCue(flAct, frAct uint64, x, y float64) *js.Object {

 func NewRoomDownsyncFrameJs(id int32, playersArr []*PlayerDownsync, bulletLocalIdCounter int32, meleeBullets []*MeleeBullet, fireballBullets []*FireballBullet) *js.Object {
 	// [WARNING] Avoid using "pb.RoomDownsyncFrame" here, in practive "MakeFullWrapper" doesn't expose the public fields for a "protobuf struct" as expected and requires helper functions like "GetCollisionSpaceObjsJs".
-	return js.MakeFullWrapper(&RoomDownsyncFrame{
+	return js.MakeWrapper(&RoomDownsyncFrame{
 		Id:                   id,
 		BulletLocalIdCounter: bulletLocalIdCounter,
 		PlayersArr:           playersArr,
@@ -77,77 +84,56 @@ func NewRoomDownsyncFrameJs(id int32, playersArr []*PlayerDownsync, bulletLocalI
 func GetCollisionSpaceObjsJs(space *resolv.Space) []*js.Object {
 	// [WARNING] We couldn't just use the existing method "space.Objects()" to access them in JavaScript, there'd a stackoverflow error
 	objs := space.Objects()
-	ret := make([]*js.Object, 0, len(objs))
-	for _, obj := range objs {
-		ret = append(ret, js.MakeFullWrapper(obj))
+	ret := make([]*js.Object, len(objs))
+	for i, obj := range objs {
+		ret[i] = js.MakeWrapper(obj)
 	}
 	return ret
 }

-func GenerateRectColliderJs(wx, wy, w, h, spaceOffsetX, spaceOffsetY float64, data interface{}, tag string) *js.Object {
-	/*
-			   [WARNING] It's important to note that we don't need "js.MakeFullWrapper" for a call sequence as follows.
-			   ```
-			       var space = gopkgs.NewCollisionSpaceJs(2048, 2048, 8, 8);
-			       var a = gopkgs.GenerateRectColliderJs(189, 497, 48, 48, spaceOffsetX, spaceOffsetY, "Player");
-			       space.Add(a);
-			   ```
-			   The "space" variable doesn't need access to the field of "a" in JavaScript level to run "space.Add(...)" method, which is good.
-
-		       However, the full wrapper access here is used for updating "collider.X/collider.Y" at JavaScript runtime.
-	*/
-	topPadding, bottomPadding, leftPadding, rightPadding := SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP, SNAP_INTO_PLATFORM_OVERLAP
-	return js.MakeFullWrapper(GenerateRectCollider(wx, wy, w, h, topPadding, bottomPadding, leftPadding, rightPadding, spaceOffsetX, spaceOffsetY, data, tag))
-
-}
-
 func GenerateConvexPolygonColliderJs(unalignedSrc *Polygon2D, spaceOffsetX, spaceOffsetY float64, data interface{}, tag string) *js.Object {
-	return js.MakeFullWrapper(GenerateConvexPolygonCollider(unalignedSrc, spaceOffsetX, spaceOffsetY, data, tag))
+	return js.MakeWrapper(GenerateConvexPolygonCollider(unalignedSrc, spaceOffsetX, spaceOffsetY, data, tag))
 }

 func GetCharacterConfigsOrderedByJoinIndex(speciesIdList []int) []*js.Object {
 	ret := make([]*js.Object, len(speciesIdList), len(speciesIdList))
 	for i, speciesId := range speciesIdList {
-		ret[i] = js.MakeFullWrapper(Characters[speciesId])
+		ret[i] = js.MakeWrapper(Characters[speciesId])
 	}
 	return ret
 }

 func ApplyInputFrameDownsyncDynamicsOnSingleRenderFrameJs(inputsBuffer *resolv.RingBuffer, currRenderFrame *RoomDownsyncFrame, collisionSys *resolv.Space, collisionSysMap map[int32]*resolv.Object, collisionSpaceOffsetX, collisionSpaceOffsetY float64, chConfigsOrderedByJoinIndex []*CharacterConfig) *js.Object {
 	// We need access to all fields of RoomDownsyncFrame for displaying in frontend
-	return js.MakeFullWrapper(ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer, currRenderFrame, collisionSys, collisionSysMap, collisionSpaceOffsetX, collisionSpaceOffsetY, chConfigsOrderedByJoinIndex))
+	return js.MakeWrapper(ApplyInputFrameDownsyncDynamicsOnSingleRenderFrame(inputsBuffer, currRenderFrame, collisionSys, collisionSysMap, collisionSpaceOffsetX, collisionSpaceOffsetY, chConfigsOrderedByJoinIndex))
 }

 func main() {
 	js.Global.Set("gopkgs", map[string]interface{}{
-		"NewVec2DJs":                                           NewVec2DJs,
-		"NewPolygon2DJs":                                       NewPolygon2DJs,
-		"NewBarrierJs":                                         NewBarrierJs,
-		"NewPlayerDownsyncJs":                                  NewPlayerDownsyncJs,
-		"NewMeleeBulletJs":                                     NewMeleeBulletJs,
-		"NewFireballBulletJs":                                  NewFireballBulletJs,
-		"NewNpcPatrolCue":                                      NewNpcPatrolCue,
-		"NewRoomDownsyncFrameJs":                               NewRoomDownsyncFrameJs,
-		"NewCollisionSpaceJs":                                  NewCollisionSpaceJs,
-		"NewInputFrameDownsync":                                NewInputFrameDownsync,
-		"NewRingBufferJs":                                      NewRingBufferJs,
-		"GenerateRectColliderJs":                               GenerateRectColliderJs,
-		"GenerateConvexPolygonColliderJs":                      GenerateConvexPolygonColliderJs,
-		"GetCollisionSpaceObjsJs":                              GetCollisionSpaceObjsJs,
-		"WorldToPolygonColliderBLPos":                          WorldToPolygonColliderBLPos, // No need to wrap primitive return types
-		"PolygonColliderBLToWorldPos":                          PolygonColliderBLToWorldPos,
-		"WorldToVirtualGridPos":                                WorldToVirtualGridPos,
-		"VirtualGridToWorldPos":                                VirtualGridToWorldPos,
-		"GetCharacterConfigsOrderedByJoinIndex":                GetCharacterConfigsOrderedByJoinIndex,
+		"NewVec2DJs":                            NewVec2DJs,
+		"NewPolygon2DJs":                        NewPolygon2DJs,
+		"NewBarrierJs":                          NewBarrierJs,
+		"NewPlayerDownsyncJs":                   NewPlayerDownsyncJs,
+		"NewMeleeBulletJs":                      NewMeleeBulletJs,
+		"NewFireballBulletJs":                   NewFireballBulletJs,
+		"NewNpcPatrolCue":                       NewNpcPatrolCue,
+		"NewRoomDownsyncFrameJs":                NewRoomDownsyncFrameJs,
+		"NewCollisionSpaceJs":                   NewCollisionSpaceJs,
+		"NewInputFrameDownsync":                 NewInputFrameDownsync,
+		"NewRingBufferJs":                       NewRingBufferJs,
+		"GenerateConvexPolygonColliderJs":       GenerateConvexPolygonColliderJs,
+		"GetCollisionSpaceObjsJs":               GetCollisionSpaceObjsJs,
+		"WorldToPolygonColliderBLPos":           WorldToPolygonColliderBLPos, // No need to wrap primitive return types
+		"PolygonColliderBLToWorldPos":           PolygonColliderBLToWorldPos,
+		"WorldToVirtualGridPos":                 WorldToVirtualGridPos,
+		"VirtualGridToWorldPos":                 VirtualGridToWorldPos,
+		"GetCharacterConfigsOrderedByJoinIndex": GetCharacterConfigsOrderedByJoinIndex,
 		"ApplyInputFrameDownsyncDynamicsOnSingleRenderFrameJs": ApplyInputFrameDownsyncDynamicsOnSingleRenderFrameJs,
 		"ConvertToDelayedInputFrameId":                         ConvertToDelayedInputFrameId,
 		"ConvertToNoDelayInputFrameId":                         ConvertToNoDelayInputFrameId,
 		"ConvertToFirstUsedRenderFrameId":                      ConvertToFirstUsedRenderFrameId,
 		"ConvertToLastUsedRenderFrameId":                       ConvertToLastUsedRenderFrameId,
 		"ShouldGenerateInputFrameUpsync":                       ShouldGenerateInputFrameUpsync,
-		"IsMeleeBulletActive":                                  IsMeleeBulletActive,
-		"IsMeleeBulletAlive":                                   IsMeleeBulletAlive,
-		"IsFireballBulletActive":                               IsFireballBulletActive,
-		"IsFireballBulletAlive":                                IsFireballBulletAlive,
+		"IsGeneralBulletActive":                                IsGeneralBulletActive,
 	})
 }