chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

目录结构调整

This commit is contained in:
kercylan98 2023-06-03 16:22:03 +08:00
parent e7607cdff5
commit bec0561d30
5 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
game/builtin/moving2d.go → component/components/moving2d.go
View File

@ -1,7 +1,7 @@
package builtin package components
import ( import (
"github.com/kercylan98/minotaur/game" "github.com/kercylan98/minotaur/component"
"github.com/kercylan98/minotaur/utils/g2d" "github.com/kercylan98/minotaur/utils/g2d"
"sync" "sync"
"time" "time"
@ -35,12 +35,12 @@ type Moving2D struct {
event chan func() event chan func()
close bool close bool
position2DChangeEventHandles []game.Position2DChangeEventHandle position2DChangeEventHandles []component.Position2DChangeEventHandle
position2DDestinationEventHandles []game.Position2DDestinationEventHandle position2DDestinationEventHandles []component.Position2DDestinationEventHandle
} }
// MoveTo 设置对象移动到特定位置 // MoveTo 设置对象移动到特定位置
func (slf *Moving2D) MoveTo(entity game.Moving2DEntity, x float64, y float64) { func (slf *Moving2D) MoveTo(entity component.Moving2DEntity, x float64, y float64) {
guid := entity.GetGuid() guid := entity.GetGuid()
current := time.Now().UnixMilli() current := time.Now().UnixMilli()
slf.rw.Lock() slf.rw.Lock()
@ -72,29 +72,29 @@ func (slf *Moving2D) StopMove(guid int64) {
} }
// RegPosition2DChangeEvent 在对象位置改变时将执行注册的事件处理函数 // RegPosition2DChangeEvent 在对象位置改变时将执行注册的事件处理函数
func (slf *Moving2D) RegPosition2DChangeEvent(handle game.Position2DChangeEventHandle) { func (slf *Moving2D) RegPosition2DChangeEvent(handle component.Position2DChangeEventHandle) {
slf.position2DChangeEventHandles = append(slf.position2DChangeEventHandles, handle) slf.position2DChangeEventHandles = append(slf.position2DChangeEventHandles, handle)
} }
func (slf *Moving2D) OnPosition2DChangeEvent(entity game.Moving2DEntity, oldX, oldY float64) { func (slf *Moving2D) OnPosition2DChangeEvent(entity component.Moving2DEntity, oldX, oldY float64) {
for _, handle := range slf.position2DChangeEventHandles { for _, handle := range slf.position2DChangeEventHandles {
handle(slf, entity, oldX, oldY) handle(slf, entity, oldX, oldY)
} }
} }
// RegPosition2DDestinationEvent 在对象到达终点时将执行被注册的事件处理函数 // RegPosition2DDestinationEvent 在对象到达终点时将执行被注册的事件处理函数
func (slf *Moving2D) RegPosition2DDestinationEvent(handle game.Position2DDestinationEventHandle) { func (slf *Moving2D) RegPosition2DDestinationEvent(handle component.Position2DDestinationEventHandle) {
slf.position2DDestinationEventHandles = append(slf.position2DDestinationEventHandles, handle) slf.position2DDestinationEventHandles = append(slf.position2DDestinationEventHandles, handle)
} }
func (slf *Moving2D) OnPosition2DDestinationEvent(entity game.Moving2DEntity) { func (slf *Moving2D) OnPosition2DDestinationEvent(entity component.Moving2DEntity) {
for _, handle := range slf.position2DDestinationEventHandles { for _, handle := range slf.position2DDestinationEventHandles {
handle(slf, entity) handle(slf, entity)
} }
} }
type moving2DTarget struct { type moving2DTarget struct {
game.Moving2DEntity component.Moving2DEntity
x, y float64 x, y float64
lastMoveTime int64 lastMoveTime int64
} }

2
game/builtin/moving2d_options.go → component/components/moving2d_options.go
View File

@ -1,4 +1,4 @@
package builtin package components
import ( import (
"errors" "errors"

8
game/builtin/moving2d_test.go → component/components/moving2d_test.go
View File

@ -1,8 +1,8 @@
package builtin package components
import ( import (
"fmt" "fmt"
"github.com/kercylan98/minotaur/game" "github.com/kercylan98/minotaur/component"
"sync" "sync"
"testing" "testing"
"time" "time"
@ -43,11 +43,11 @@ func NewEntity(guid int64, speed float64) *MoveEntity {
func TestMoving2D_MoveTo(t *testing.T) { func TestMoving2D_MoveTo(t *testing.T) {
moving := NewMoving2D(WithMoving2DTimeUnit(time.Second)) moving := NewMoving2D(WithMoving2DTimeUnit(time.Second))
var wait sync.WaitGroup var wait sync.WaitGroup
moving.RegPosition2DDestinationEvent(func(moving game.Moving2D, entity game.Moving2DEntity) { moving.RegPosition2DDestinationEvent(func(moving component.Moving2D, entity component.Moving2DEntity) {
wait.Done() wait.Done()
}) })
var res []string var res []string
moving.RegPosition2DChangeEvent(func(moving game.Moving2D, entity game.Moving2DEntity, oldX, oldY float64) { moving.RegPosition2DChangeEvent(func(moving component.Moving2D, entity component.Moving2DEntity, oldX, oldY float64) {
x, y := entity.GetPosition() x, y := entity.GetPosition()
res = append(res, fmt.Sprintf("%d : %d | %f, %f > %f, %f", entity.GetGuid(), time.Now().UnixMilli(), oldX, oldY, x, y)) res = append(res, fmt.Sprintf("%d : %d | %f, %f > %f, %f", entity.GetGuid(), time.Now().UnixMilli(), oldX, oldY, x, y))
}) })

2
game/moving2d.go → component/moving2d.go
View File

@ -1,4 +1,4 @@
package game package component
// Moving2D 2D移动功能接口定义 // Moving2D 2D移动功能接口定义
type Moving2D interface { type Moving2D interface {

10
game/moving2d_entity.go → component/moving2d_entity.go
View File

@ -1,10 +1,12 @@
package game package component
import "github.com/kercylan98/minotaur/game"
// Moving2DEntity 2D移动对象接口定义 // Moving2DEntity 2D移动对象接口定义
type Moving2DEntity interface { type Moving2DEntity interface {
Actor game.Actor
Position2D game.Position2D
Position2DSet game.Position2DSet
// GetSpeed 获取移动速度 // GetSpeed 获取移动速度
GetSpeed() float64 GetSpeed() float64