Skip to content

Commit

Permalink
Upgrade math lib (goplus#466)
Browse files Browse the repository at this point in the history
  • Loading branch information
JiepengTan authored Dec 6, 2024
1 parent 28cdf09 commit 39b8d3c
Show file tree
Hide file tree
Showing 34 changed files with 176 additions and 900 deletions.
13 changes: 7 additions & 6 deletions audio.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ package spx

import (
"github.com/goplus/spx/internal/engine"
"github.com/realdream-ai/mathf"
)

type PlayAction int
Expand Down Expand Up @@ -104,12 +105,12 @@ func (p *soundMgr) getVolume() float64 {
}

func (p *soundMgr) setVolume(volume float64) {
engine.SyncAudioSetMasterVolume(float32(volume))
engine.SyncAudioSetMasterVolume(volume)
}

func (p *soundMgr) changeVolume(delta float64) {
volume := p.getVolume() + delta
volume = engine.Clamp01d(volume)
volume = mathf.Clamp01f(volume)
p.setVolume(volume)
}

Expand All @@ -119,12 +120,12 @@ func (p *soundMgr) getSfxVolume() float64 {
}

func (p *soundMgr) setSfxVolume(volume float64) {
engine.SyncAudioSetSfxVolume(float32(volume))
engine.SyncAudioSetSfxVolume(volume)
}

func (p *soundMgr) changeSfxVolume(delta float64) {
volume := p.getSfxVolume() + delta
volume = engine.Clamp01d(volume)
volume = mathf.Clamp01f(volume)
p.setSfxVolume(volume)
}

Expand All @@ -134,12 +135,12 @@ func (p *soundMgr) getMusicVolume() float64 {
}

func (p *soundMgr) setMusicVolume(volume float64) {
engine.SyncAudioSetMusicVolume(float32(volume))
engine.SyncAudioSetMusicVolume(volume)
}

func (p *soundMgr) changeMusicVolume(delta float64) {
volume := p.getMusicVolume() + delta
volume = engine.Clamp01d(volume)
volume = mathf.Clamp01f(volume)
p.setMusicVolume(volume)
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/ispx/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require (
github.com/goplus/igop v0.27.1
github.com/goplus/reflectx v1.2.2
github.com/goplus/spx v0.0.0
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57
)

require (
Expand All @@ -16,6 +16,7 @@ require (
github.com/goplus/mod v0.13.10 // indirect
github.com/pkg/errors v0.9.1 // indirect
github.com/qiniu/x v1.13.10 // indirect
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d // indirect
github.com/timandy/routine v1.1.1 // indirect
github.com/visualfc/funcval v0.1.4 // indirect
github.com/visualfc/gid v0.1.0 // indirect
Expand Down
10 changes: 6 additions & 4 deletions cmd/ispx/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,19 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/qiniu/x v1.13.10 h1:J4Z3XugYzAq85SlyAfqlKVrbf05glMbAOh+QncsDQpE=
github.com/qiniu/x v1.13.10/go.mod h1:INZ2TSWSJVWO/RuELQROERcslBwVgFG7MkTfEdaQz9E=
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29 h1:uWNI/G9ZOwsageL7cBivO9XYo00fnVAzXZ+6b2pr/yg=
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29/go.mod h1:IoJp7Z/RciFWJeURRncLxtoHhJbVQfqGOm4hrtTrtas=
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57 h1:iF9BObP4FNyjdyxJD8ng0mCf+dJTaVExco+QWChoukc=
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57/go.mod h1:UCzetvoQdU+yfesI6xAL33acsuEbYICGQUcYpGiAW00=
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d h1:hEIUl272UkUUd2F77nONdEDR1tHLpe1MAgaYAGoVnEk=
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d/go.mod h1:oAFczOO99bG05kC9tKp5deLqrvZSjtBDIpNH36ZWwnY=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
github.com/timandy/routine v1.1.1 h1:6/Z7qLFZj3GrzuRksBFzIG8YGUh8CLhjnnMePBQTrEI=
github.com/timandy/routine v1.1.1/go.mod h1:OZHPOKSvqL/ZvqXFkNZyit0xIVelERptYXdAHH00adQ=
github.com/visualfc/funcval v0.1.4 h1:lAI88zQYfRzmC7mKF4+swXeCZvb8wb1f3lMSDRAY2mQ=
Expand Down
6 changes: 4 additions & 2 deletions cmd/spx/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ go 1.21.3

require (
github.com/goplus/spx v0.0.0-00010101000000-000000000000
github.com/realdream-ai/gdspx/cmd/gdspx v0.0.0-20241203104608-fbf5ae1aac29
github.com/realdream-ai/gdspx/cmd/gdspx v0.0.0-20241204130734-35c372f84f57
)

require github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d // indirect

require (
github.com/pkg/errors v0.9.1 // indirect
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29 // indirect
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57 // indirect
golang.org/x/image v0.18.0 // indirect
golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd // indirect
)
Expand Down
10 changes: 6 additions & 4 deletions cmd/spx/go.sum
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29 h1:uWNI/G9ZOwsageL7cBivO9XYo00fnVAzXZ+6b2pr/yg=
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29/go.mod h1:IoJp7Z/RciFWJeURRncLxtoHhJbVQfqGOm4hrtTrtas=
github.com/realdream-ai/gdspx/cmd/gdspx v0.0.0-20241203104608-fbf5ae1aac29 h1:h2El72S4H9dIy/el65H5LSjGeXKN3Cq1iAPa7+JKJTo=
github.com/realdream-ai/gdspx/cmd/gdspx v0.0.0-20241203104608-fbf5ae1aac29/go.mod h1:13E+n0eYg6BgtOYJ7asaMnyfXW+MsM75ZImE7jb/bQ8=
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57 h1:iF9BObP4FNyjdyxJD8ng0mCf+dJTaVExco+QWChoukc=
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57/go.mod h1:UCzetvoQdU+yfesI6xAL33acsuEbYICGQUcYpGiAW00=
github.com/realdream-ai/gdspx/cmd/gdspx v0.0.0-20241204130734-35c372f84f57 h1:mfEmEOPTNIR+4kLiov5jltwKjRq12obp2+v0txCQIs8=
github.com/realdream-ai/gdspx/cmd/gdspx v0.0.0-20241204130734-35c372f84f57/go.mod h1:13E+n0eYg6BgtOYJ7asaMnyfXW+MsM75ZImE7jb/bQ8=
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d h1:hEIUl272UkUUd2F77nONdEDR1tHLpe1MAgaYAGoVnEk=
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d/go.mod h1:oAFczOO99bG05kC9tKp5deLqrvZSjtBDIpNH36ZWwnY=
github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down
2 changes: 1 addition & 1 deletion cmd/spx/template/project/go.mod.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ require github.com/goplus/spx v0.0.0-00010101000000-000000000000

require (
github.com/pkg/errors v0.9.1 // indirect
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57
golang.org/x/image v0.18.0 // indirect
golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd // indirect
)
Expand Down
12 changes: 6 additions & 6 deletions config.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (

spxfs "github.com/goplus/spx/fs"
"github.com/goplus/spx/internal/engine"
"github.com/goplus/spx/internal/math32"
"github.com/realdream-ai/mathf"
)

func resourceDir(resource interface{}) (fs spxfs.Dir, err error) {
Expand Down Expand Up @@ -256,20 +256,20 @@ type spriteConfig struct {
TAnimations map[string]*aniConfig `json:"tAnimations"`
Visible bool `json:"visible"`
IsDraggable bool `json:"isDraggable"`
Pivot math32.Vector2 `json:"pivot"`
Pivot mathf.Vec2 `json:"pivot"`
DefaultAnimation string `json:"defaultAnimation"`
AnimBindings map[string]string `json:"animBindings"`
CollisionMask *int64 `json:"collisionMask"`
CollisionLayer *int64 `json:"collisionLayer"`
TriggerMask *int64 `json:"triggerMask"`
TriggerLayer *int64 `json:"triggerLayer"`
ColliderType string `json:"colliderType"`
ColliderCenter math32.Vector2 `json:"colliderCenter"`
ColliderSize math32.Vector2 `json:"colliderSize"`
ColliderCenter mathf.Vec2 `json:"colliderCenter"`
ColliderSize mathf.Vec2 `json:"colliderSize"`
ColliderRadius float64 `json:"colliderRadius"`
TriggerType string `json:"triggerType"`
TriggerCenter math32.Vector2 `json:"triggerCenter"`
TriggerSize math32.Vector2 `json:"triggerSize"`
TriggerCenter mathf.Vec2 `json:"triggerCenter"`
TriggerSize mathf.Vec2 `json:"triggerSize"`
TriggerRadius float64 `json:"triggerRadius"`
}

Expand Down
5 changes: 3 additions & 2 deletions game.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ import (
"github.com/goplus/spx/internal/coroutine"
"github.com/goplus/spx/internal/engine"
gtime "github.com/goplus/spx/internal/time"
"github.com/realdream-ai/mathf"

spxfs "github.com/goplus/spx/fs"
_ "github.com/goplus/spx/fs/asset"
Expand Down Expand Up @@ -519,7 +520,7 @@ func (p *Game) setupBackdrop() {
scaleY := dstH / imgH
p.scale = 1
checkUpdateCostume(&p.baseObj, true)
engine.SyncSpriteSetScale(p.proxy.GetId(), engine.NewVec2(scaleX, scaleY))
engine.SyncSpriteSetScale(p.proxy.GetId(), mathf.NewVec2(scaleX, scaleY))
}

func (p *Game) endLoad(g reflect.Value, proj *projConfig) (err error) {
Expand Down Expand Up @@ -683,7 +684,7 @@ type clicker interface {
}

func (p *Game) doWhenLeftButtonDown(ev *eventLeftButtonDown) {
point := engine.NewVec2(float64(ev.X), float64(ev.Y))
point := mathf.NewVec2(float64(ev.X), float64(ev.Y))
tempItems := p.getTempShapes()
for _, item := range tempItems {
if o, ok := item.(clicker); ok {
Expand Down
38 changes: 19 additions & 19 deletions gdspx.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,24 @@ import (
"sync/atomic"

"github.com/goplus/spx/internal/engine"
"github.com/goplus/spx/internal/math32"

gdspx "github.com/realdream-ai/gdspx/pkg/engine"
"github.com/realdream-ai/mathf"
)

var (
cachedBounds map[string]gdspx.Rect2
cachedBounds map[string]mathf.Rect2
)

func (p *Game) OnEngineStart() {
cachedBounds = make(map[string]gdspx.Rect2)
cachedBounds = make(map[string]mathf.Rect2)
go p.onStartAsync()
}

func (p *Game) OnEngineDestroy() {
}

func (p *Game) OnEngineUpdate(delta float32) {
func (p *Game) OnEngineUpdate(delta float64) {
if !p.isRunned {
return
}
Expand All @@ -50,7 +50,7 @@ func (p *Game) OnEngineUpdate(delta float32) {
p.updateCamera()
p.updateLogic()
}
func (p *Game) OnEngineRender(delta float32) {
func (p *Game) OnEngineRender(delta float64) {
if !p.isRunned {
return
}
Expand Down Expand Up @@ -82,7 +82,7 @@ func (p *Game) updateLogic() error {
func (p *Game) updateCamera() {
isOn, x, y := p.Camera.getFollowPos()
if isOn {
gdspx.CameraMgr.SetCameraPosition(engine.NewVec2(x, -y))
gdspx.CameraMgr.SetCameraPosition(mathf.NewVec2(x, -y))
}
}

Expand Down Expand Up @@ -162,7 +162,7 @@ func doCheckUpdateCostume(p *baseObj) {
p.isCostumeDirty = false
path := p.getCostumePath()
renderScale := p.getCostumeRenderScale()
rect := p.getCostumeAltasRegion().ToRect2()
rect := p.getCostumeAltasRegion()
isAltas := p.isCostumeAltas()
pself := p.proxy
if isAltas {
Expand Down Expand Up @@ -203,41 +203,41 @@ func initSpritePhysicInfo(sprite *SpriteImpl, proxy *engine.ProxySprite) {
switch sprite.colliderType {
case physicColliderCircle:
proxy.SetCollisionEnabled(true)
proxy.SetColliderCircle(sprite.colliderCenter.ToVec2(), float32(math.Max(sprite.colliderRadius, 0.01)))
proxy.SetColliderCircle(sprite.colliderCenter, math.Max(sprite.colliderRadius, 0.01))
case physicColliderRect:
proxy.SetCollisionEnabled(true)
proxy.SetColliderRect(sprite.colliderCenter.ToVec2(), sprite.colliderSize.ToVec2())
proxy.SetColliderRect(sprite.colliderCenter, sprite.colliderSize)
case physicColliderAuto:
center, size := getCostumeBoundByAlpha(sprite, sprite.scale)
proxy.SetCollisionEnabled(true)
proxy.SetColliderRect(center.ToVec2(), size.ToVec2())
proxy.SetColliderRect(center, size)
case physicColliderNone:
proxy.SetCollisionEnabled(false)
}

switch sprite.triggerType {
case physicColliderCircle:
proxy.SetTriggerEnabled(true)
proxy.SetTriggerCircle(sprite.triggerCenter.ToVec2(), float32(math.Max(sprite.triggerRadius, 0.01)))
sprite.triggerSize = *math32.NewVector2(sprite.triggerRadius, sprite.triggerRadius)
proxy.SetTriggerCircle(sprite.triggerCenter, math.Max(sprite.triggerRadius, 0.01))
sprite.triggerSize = mathf.NewVec2(sprite.triggerRadius, sprite.triggerRadius)
case physicColliderRect:
proxy.SetTriggerEnabled(true)
proxy.SetTriggerRect(sprite.triggerCenter.ToVec2(), sprite.triggerSize.ToVec2())
proxy.SetTriggerRect(sprite.triggerCenter, sprite.triggerSize)
case physicColliderAuto:
sprite.triggerCenter, sprite.triggerSize = getCostumeBoundByAlpha(sprite, sprite.scale)
proxy.SetTriggerEnabled(true)
proxy.SetTriggerRect(sprite.triggerCenter.ToVec2(), sprite.triggerSize.ToVec2())
proxy.SetTriggerRect(sprite.triggerCenter, sprite.triggerSize)
case physicColliderNone:
proxy.SetTriggerEnabled(false)
}
}

func getCostumeBoundByAlpha(p *SpriteImpl, pscale float64) (math32.Vector2, math32.Vector2) {
func getCostumeBoundByAlpha(p *SpriteImpl, pscale float64) (mathf.Vec2, mathf.Vec2) {
cs := p.costumes[p.costumeIndex_]
var rect gdspx.Rect2
var rect mathf.Rect2
// GetBoundFromAlpha is very slow, so we should cache the result
if cs.isAltas() {
rect = p.getCostumeAltasRegion().ToRect2()
rect = p.getCostumeAltasRegion()
rect.Position.X = 0
rect.Position.Y = 0
} else {
Expand All @@ -261,8 +261,8 @@ func getCostumeBoundByAlpha(p *SpriteImpl, pscale float64) (math32.Vector2, math
offsetX := float64(posX + sizeX/2 - w/2)
offsetY := -float64(posY + sizeY/2 - h/2)

center := *math32.NewVector2(offsetX, offsetY)
size := *math32.NewVector2(sizeX, sizeY)
center := mathf.NewVec2(offsetX, offsetY)
size := mathf.NewVec2(sizeX, sizeY)
return center, size
}

Expand Down
3 changes: 2 additions & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@ go 1.21.3

require (
github.com/pkg/errors v0.9.1
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d
golang.org/x/image v0.18.0
golang.org/x/mobile v0.0.0-20220518205345-8578da9835fd
)
Expand Down
6 changes: 4 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29 h1:uWNI/G9ZOwsageL7cBivO9XYo00fnVAzXZ+6b2pr/yg=
github.com/realdream-ai/gdspx v0.0.0-20241203104608-fbf5ae1aac29/go.mod h1:IoJp7Z/RciFWJeURRncLxtoHhJbVQfqGOm4hrtTrtas=
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57 h1:iF9BObP4FNyjdyxJD8ng0mCf+dJTaVExco+QWChoukc=
github.com/realdream-ai/gdspx v0.0.0-20241204130734-35c372f84f57/go.mod h1:UCzetvoQdU+yfesI6xAL33acsuEbYICGQUcYpGiAW00=
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d h1:hEIUl272UkUUd2F77nONdEDR1tHLpe1MAgaYAGoVnEk=
github.com/realdream-ai/mathf v0.0.0-20241204125103-284ee6a3722d/go.mod h1:oAFczOO99bG05kC9tKp5deLqrvZSjtBDIpNH36ZWwnY=
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
Expand Down
6 changes: 3 additions & 3 deletions internal/engine/coordinate_adapter.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package engine

import (
. "github.com/realdream-ai/gdspx/pkg/engine"
. "github.com/realdream-ai/mathf"
)

// --------------------------------------------------------------------------
Expand All @@ -18,7 +18,7 @@ func (pself *ProxySprite) SetTriggerCapsule(center Vec2, size Vec2) {
pself.Sprite.SetTriggerCapsule(center, size)
}

func (pself *ProxySprite) SetTriggerCircle(center Vec2, radius float32) {
func (pself *ProxySprite) SetTriggerCircle(center Vec2, radius float64) {
center.Y = -center.Y
pself.Sprite.SetTriggerCircle(center, radius)
}
Expand All @@ -33,7 +33,7 @@ func (pself *ProxySprite) SetColliderCapsule(center Vec2, size Vec2) {
pself.Sprite.SetColliderCapsule(center, size)
}

func (pself *ProxySprite) SetColliderCircle(center Vec2, radius float32) {
func (pself *ProxySprite) SetColliderCircle(center Vec2, radius float64) {
center.Y = -center.Y
pself.Sprite.SetColliderCircle(center, radius)
}
8 changes: 4 additions & 4 deletions internal/engine/engine.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ var (

type Gamer interface {
OnEngineStart()
OnEngineUpdate(delta float32)
OnEngineRender(delta float32)
OnEngineUpdate(delta float64)
OnEngineRender(delta float64)
OnEngineDestroy()
}

Expand Down Expand Up @@ -77,7 +77,7 @@ func onStart() {
game.OnEngineStart()
}

func onUpdate(delta float32) {
func onUpdate(delta float64) {
updateTime(float64(delta))
cacheTriggerEvents()
cacheKeyEvents()
Expand All @@ -97,7 +97,7 @@ func calcfps() {
}
}
func onSetTimeScale(scale float64) {
SyncPlatformSetTimeScale(float32(scale))
SyncPlatformSetTimeScale(scale)
}

func updateTime(delta float64) {
Expand Down
Loading

0 comments on commit 39b8d3c

Please sign in to comment.