Merge branch 'master' of https://git.code.tencent.com/jl-framework/rtss_simulation

entities/switch_entity.go

@@ -3,7 +3,6 @@ package entities
 import (
 	"time"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
 	"joylink.club/rtsssimulation/repository"
 	"joylink.club/rtsssimulation/simulation"
@@ -13,6 +12,7 @@ import (
 type Position int
 
 type TurnoutState struct {
+	Id      string
 	Normal  bool
 	Reverse bool
 	Turning bool
@@ -78,18 +78,10 @@ func TurnToReverse(worldId ecs.WorldId, turnoutId string) {
 
 func GetState(worldId ecs.WorldId, turnoutId string) *TurnoutState {
 	sim := simulation.FindSimulation(worldId)
-	query := ecs.NewQuery(filter.Contains(system.EntityIdentityComponent, system.Switch2jZdj9StateComponent))
-	var turnoutState *TurnoutState
-	// 查找道岔位置
-	query.Each(sim.World(), func(e *ecs.Entry) {
-		if turnoutId == system.EntityIdentityComponent.Get(e).Id {
-			state := system.Switch2jZdj9StateComponent.Get(e)
-			turnoutState = &TurnoutState{
-				Normal:  state.IsNormal(),
-				Reverse: state.IsReverse(),
-				Turning: state.IsTurning(),
-			}
-		}
-	})
-	return turnoutState
+	entry := sim.GetEntry(turnoutId)
+	if entry == nil {
+		return nil
+	}
+	state := system.Switch2jZdj9StateComponent.Get(entry)
+	return &TurnoutState{Id: turnoutId, Normal: state.IsNormal(), Reverse: state.IsReverse(), Turning: state.IsTurning()}
 }

repository/repository_manager.go

@@ -3,11 +3,12 @@ package repository
 import (
 	"errors"
 	"fmt"
+	"math"
+	"strconv"
+
 	"go.uber.org/zap"
 	"joylink.club/rtsssimulation/repository/model/proto"
 	"joylink.club/rtsssimulation/util/number"
-	"math"
-	"strconv"
 )
 
 var repositoryMap = make(map[string]*Repository)
@@ -421,7 +422,7 @@ func buildLinksAndRelate(repo *Repository) error {
 func buildLinks(repo *Repository) error {
 	visitedTurnoutPortMap := make(map[string]bool)
 	allTurnouts := repo.TurnoutList()
-	linkIdGenerator := 10000
+	linkIdGenerator := 1
 	for {
 		//找一个未遍历过的道岔端口
 		startTp := getATurnoutPort(allTurnouts, visitedTurnoutPortMap)

simulation/simulation.go

@@ -1,6 +1,8 @@
 package simulation
 
 import (
+	"sync"
+
 	"joylink.club/ecs"
 	"joylink.club/rtsssimulation/repository"
 )
@@ -10,8 +12,9 @@ var (
 )
 
 type Simulation struct {
-	world ecs.World
-	repo  *repository.Repository
+	world     ecs.World
+	repo      *repository.Repository
+	entityMap sync.Map
 }
 
 func (s *Simulation) World() ecs.World {
@@ -22,12 +25,25 @@ func (s *Simulation) Repo() *repository.Repository {
 	return s.repo
 }
 
-func CreateSimulation(repo *repository.Repository, world ecs.World) {
+func (s *Simulation) AddEntry(id string, entity *ecs.Entry) {
+	s.entityMap.Store(id, entity)
+}
+
+func (s *Simulation) GetEntry(id string) *ecs.Entry {
+	e, ok := s.entityMap.Load(id)
+	if ok {
+		return e.(*ecs.Entry)
+	}
+	return nil
+}
+
+func CreateSimulation(repo *repository.Repository, world ecs.World) *Simulation {
 	sim := &Simulation{
 		world: world,
 		repo:  repo,
 	}
 	simulationManager[world.Id()] = sim
+	return sim
 }
 
 func DestroySimulation(id ecs.WorldId) {

simulation/world/init.go

@@ -13,16 +13,15 @@ import (
 
 func CreateSimulation(repo *repository.Repository) ecs.WorldId {
 	wc := &WorldConfig{
-		Systems:  []ecs.ISystem{system.NewTimerSystem(), system.NewPercentageMovableSystem(), system.NewSwitch2jZdj9System(), system.NewRelaySystem()},
+		Systems:  []ecs.ISystem{system.NewSwitch2jZdj9System(), system.NewRelaySystem()},
 		Tick:     200,
 		InitTime: time.Now(),
 	}
 	w := InitializeWorld(wc)
-	simulation.CreateSimulation(repo, w)
+	sim := simulation.CreateSimulation(repo, w)
 	//添加实体
 	entities.CreateSystemTimerEntity(w, wc.InitTime)
-	entities.CreateTurnoutEntries(w, repo.TurnoutList())
-	entities.CreateRelayEntries(w, repo.RelayList())
+	initDeviceEntries(w, sim, repo)
 	//初始化组件
 	InitComponent(w, repo)
 	//添加监听器
@@ -33,6 +32,20 @@ func CreateSimulation(repo *repository.Repository) ecs.WorldId {
 	return w.Id()
 }
 
+func initDeviceEntries(w ecs.World, sim *simulation.Simulation, repo *repository.Repository) {
+	// 初始化道岔
+	for _, turnout := range repo.TurnoutList() {
+		if len(turnout.RelayGroups()) == 0 {
+			continue
+		}
+		sim.AddEntry(turnout.Id(), entities.CreateSwitch2jzdj9Entity(w, turnout.Id()))
+	}
+	// 初始化继电器
+	for _, relay := range repo.RelayList() {
+		sim.AddEntry(relay.Id(), entities.CreateRelayEntity(w, relay.Id()))
+	}
+}
+
 // InitializeWorld 初始化仿真world
 func InitializeWorld(config *WorldConfig) ecs.World {
 	world := ecs.NewWorld(config.Tick)