ecs filter

component/common.go

@@ -2,6 +2,7 @@ package component
 
 import (
 	"joylink.club/ecs"
+	"joylink.club/rtsssimulation/component/component_proto"
 	"joylink.club/rtsssimulation/consts"
 )
 
@@ -13,9 +14,13 @@ type Uid struct {
 var UidType = ecs.NewComponentType[Uid]()
 
 // 两个稳态位置转换组件
+// type TwoPositionTransform struct {
+// 	Pos   int // 当前位置百分比,[0, 10000],两位小数
+// 	Speed int
+// }
+
 type TwoPositionTransform struct {
-	Pos   int // 当前位置百分比,[0, 10000],两位小数
-	Speed int
+	component_proto.TwoPositionTransform
 }
 
 // 当前位置百分比值
@@ -27,8 +32,8 @@ var TwoPositionTransformType = ecs.NewComponentType[TwoPositionTransform]()
 
 // 计算两位置动作的平均速度
 // 总时间t和tick的单位都应该是ms
-func CalculateTwoPositionAvgSpeed(t int, tick int) int {
-	return consts.TwoPosMax / (t / tick)
+func CalculateTwoPositionAvgSpeed(t int, tick int) int32 {
+	return int32(consts.TwoPosMax / (t / tick))
 }
 
 // 仅有两状态的组件

component/component_proto/common.pb.go

@@ -0,0 +1,361 @@
+// Code generated by protoc-gen-go. DO NOT EDIT.
+// versions:
+// 	protoc-gen-go v1.31.0
+// 	protoc        v4.23.1
+// source: component/common.proto
+
+package component_proto
+
+import (
+	protoreflect "google.golang.org/protobuf/reflect/protoreflect"
+	protoimpl "google.golang.org/protobuf/runtime/protoimpl"
+	reflect "reflect"
+	sync "sync"
+)
+
+const (
+	// Verify that this generated code is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion)
+	// Verify that runtime/protoimpl is sufficiently up-to-date.
+	_ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20)
+)
+
+// 两个稳态位置转换组件
+type TwoPositionTransform struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Pos   int32 `protobuf:"varint,1,opt,name=Pos,proto3" json:"Pos,omitempty"` // 当前位置百分比,[0, 10000],两位小数
+	Speed int32 `protobuf:"varint,2,opt,name=Speed,proto3" json:"Speed,omitempty"`
+}
+
+func (x *TwoPositionTransform) Reset() {
+	*x = TwoPositionTransform{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_component_common_proto_msgTypes[0]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *TwoPositionTransform) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*TwoPositionTransform) ProtoMessage() {}
+
+func (x *TwoPositionTransform) ProtoReflect() protoreflect.Message {
+	mi := &file_component_common_proto_msgTypes[0]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use TwoPositionTransform.ProtoReflect.Descriptor instead.
+func (*TwoPositionTransform) Descriptor() ([]byte, []int) {
+	return file_component_common_proto_rawDescGZIP(), []int{0}
+}
+
+func (x *TwoPositionTransform) GetPos() int32 {
+	if x != nil {
+		return x.Pos
+	}
+	return 0
+}
+
+func (x *TwoPositionTransform) GetSpeed() int32 {
+	if x != nil {
+		return x.Speed
+	}
+	return 0
+}
+
+// 仅有两状态的组件
+type BitState struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Val bool `protobuf:"varint,1,opt,name=Val,proto3" json:"Val,omitempty"`
+}
+
+func (x *BitState) Reset() {
+	*x = BitState{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_component_common_proto_msgTypes[1]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *BitState) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*BitState) ProtoMessage() {}
+
+func (x *BitState) ProtoReflect() protoreflect.Message {
+	mi := &file_component_common_proto_msgTypes[1]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use BitState.ProtoReflect.Descriptor instead.
+func (*BitState) Descriptor() ([]byte, []int) {
+	return file_component_common_proto_rawDescGZIP(), []int{1}
+}
+
+func (x *BitState) GetVal() bool {
+	if x != nil {
+		return x.Val
+	}
+	return false
+}
+
+// 计数/计时组件
+type Counter struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Val  int32 `protobuf:"varint,1,opt,name=Val,proto3" json:"Val,omitempty"`
+	Step int32 `protobuf:"varint,2,opt,name=Step,proto3" json:"Step,omitempty"`
+}
+
+func (x *Counter) Reset() {
+	*x = Counter{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_component_common_proto_msgTypes[2]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *Counter) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*Counter) ProtoMessage() {}
+
+func (x *Counter) ProtoReflect() protoreflect.Message {
+	mi := &file_component_common_proto_msgTypes[2]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use Counter.ProtoReflect.Descriptor instead.
+func (*Counter) Descriptor() ([]byte, []int) {
+	return file_component_common_proto_rawDescGZIP(), []int{2}
+}
+
+func (x *Counter) GetVal() int32 {
+	if x != nil {
+		return x.Val
+	}
+	return 0
+}
+
+func (x *Counter) GetStep() int32 {
+	if x != nil {
+		return x.Step
+	}
+	return 0
+}
+
+// 倒数/倒计时组件
+type CounterDown struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	Val  int32 `protobuf:"varint,1,opt,name=Val,proto3" json:"Val,omitempty"`
+	Step int32 `protobuf:"varint,2,opt,name=Step,proto3" json:"Step,omitempty"`
+}
+
+func (x *CounterDown) Reset() {
+	*x = CounterDown{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_component_common_proto_msgTypes[3]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
+	}
+}
+
+func (x *CounterDown) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*CounterDown) ProtoMessage() {}
+
+func (x *CounterDown) ProtoReflect() protoreflect.Message {
+	mi := &file_component_common_proto_msgTypes[3]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use CounterDown.ProtoReflect.Descriptor instead.
+func (*CounterDown) Descriptor() ([]byte, []int) {
+	return file_component_common_proto_rawDescGZIP(), []int{3}
+}
+
+func (x *CounterDown) GetVal() int32 {
+	if x != nil {
+		return x.Val
+	}
+	return 0
+}
+
+func (x *CounterDown) GetStep() int32 {
+	if x != nil {
+		return x.Step
+	}
+	return 0
+}
+
+var File_component_common_proto protoreflect.FileDescriptor
+
+var file_component_common_proto_rawDesc = []byte{
+	0x0a, 0x16, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x6d,
+	0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x09, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e,
+	0x65, 0x6e, 0x74, 0x22, 0x3e, 0x0a, 0x14, 0x54, 0x77, 0x6f, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69,
+	0x6f, 0x6e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x6f, 0x72, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x50,
+	0x6f, 0x73, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x50, 0x6f, 0x73, 0x12, 0x14, 0x0a,
+	0x05, 0x53, 0x70, 0x65, 0x65, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x53, 0x70,
+	0x65, 0x65, 0x64, 0x22, 0x1c, 0x0a, 0x08, 0x42, 0x69, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12,
+	0x10, 0x0a, 0x03, 0x56, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x56, 0x61,
+	0x6c, 0x22, 0x2f, 0x0a, 0x07, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x10, 0x0a, 0x03,
+	0x56, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x56, 0x61, 0x6c, 0x12, 0x12,
+	0x0a, 0x04, 0x53, 0x74, 0x65, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x53, 0x74,
+	0x65, 0x70, 0x22, 0x33, 0x0a, 0x0b, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x44, 0x6f, 0x77,
+	0x6e, 0x12, 0x10, 0x0a, 0x03, 0x56, 0x61, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
+	0x56, 0x61, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x53, 0x74, 0x65, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28,
+	0x05, 0x52, 0x04, 0x53, 0x74, 0x65, 0x70, 0x42, 0x1d, 0x5a, 0x1b, 0x2e, 0x2f, 0x63, 0x6f, 0x6d,
+	0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74, 0x2f, 0x63, 0x6f, 0x6d, 0x70, 0x6f, 0x6e, 0x65, 0x6e, 0x74,
+	0x5f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+}
+
+var (
+	file_component_common_proto_rawDescOnce sync.Once
+	file_component_common_proto_rawDescData = file_component_common_proto_rawDesc
+)
+
+func file_component_common_proto_rawDescGZIP() []byte {
+	file_component_common_proto_rawDescOnce.Do(func() {
+		file_component_common_proto_rawDescData = protoimpl.X.CompressGZIP(file_component_common_proto_rawDescData)
+	})
+	return file_component_common_proto_rawDescData
+}
+
+var file_component_common_proto_msgTypes = make([]protoimpl.MessageInfo, 4)
+var file_component_common_proto_goTypes = []interface{}{
+	(*TwoPositionTransform)(nil), // 0: component.TwoPositionTransform
+	(*BitState)(nil),             // 1: component.BitState
+	(*Counter)(nil),              // 2: component.Counter
+	(*CounterDown)(nil),          // 3: component.CounterDown
+}
+var file_component_common_proto_depIdxs = []int32{
+	0, // [0:0] is the sub-list for method output_type
+	0, // [0:0] is the sub-list for method input_type
+	0, // [0:0] is the sub-list for extension type_name
+	0, // [0:0] is the sub-list for extension extendee
+	0, // [0:0] is the sub-list for field type_name
+}
+
+func init() { file_component_common_proto_init() }
+func file_component_common_proto_init() {
+	if File_component_common_proto != nil {
+		return
+	}
+	if !protoimpl.UnsafeEnabled {
+		file_component_common_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*TwoPositionTransform); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_component_common_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*BitState); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_component_common_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*Counter); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+		file_component_common_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*CounterDown); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
+	}
+	type x struct{}
+	out := protoimpl.TypeBuilder{
+		File: protoimpl.DescBuilder{
+			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
+			RawDescriptor: file_component_common_proto_rawDesc,
+			NumEnums:      0,
+			NumMessages:   4,
+			NumExtensions: 0,
+			NumServices:   0,
+		},
+		GoTypes:           file_component_common_proto_goTypes,
+		DependencyIndexes: file_component_common_proto_depIdxs,
+		MessageInfos:      file_component_common_proto_msgTypes,
+	}.Build()
+	File_component_common_proto = out.File
+	file_component_common_proto_rawDesc = nil
+	file_component_common_proto_goTypes = nil
+	file_component_common_proto_depIdxs = nil
+}

deprecated/entities/button_entity.go

@@ -2,7 +2,7 @@ package entities
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // CreateSelfResetButtonEntity 创建自复位按钮实体

deprecated/entities/common_entity.go

@@ -4,7 +4,7 @@ import (
 	"time"
 
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // CreateModelStorageEntity 创建模型仓库实体

deprecated/entities/dcb_entity.go

@@ -2,7 +2,7 @@ package entities
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // CreateDcbCircuitEntity 创建门控箱电路实体

deprecated/entities/emps_entity.go

@@ -2,7 +2,7 @@ package entities
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 func CreateEmpsCircuitEntity(w ecs.World, empsCircuitId string) *ecs.Entry {

deprecated/entities/psd_entity.go

@@ -2,7 +2,7 @@ package entities
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // CreatePsdCircuitEntity 创建车站屏蔽门电路实体

deprecated/entities/relay_entity.go

@@ -2,9 +2,9 @@ package entities
 
 import (
 	"joylink.club/ecs"
+	"joylink.club/rtsssimulation/deprecated/simulation"
+	"joylink.club/rtsssimulation/deprecated/system"
 	"joylink.club/rtsssimulation/repository"
-	"joylink.club/rtsssimulation/simulation"
-	"joylink.club/rtsssimulation/system"
 )
 
 type RelayState struct {

deprecated/entities/signal_entity.go

@@ -2,7 +2,7 @@ package entities
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 func CreateSignal3XH1Entity(w ecs.World, signalId string) *ecs.Entry {

deprecated/entities/spks_entity.go

@@ -2,7 +2,7 @@ package entities
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // CreateSpksCircuitEntity 创建人员防护按钮电路实体

deprecated/entities/switch_entity.go

@@ -4,9 +4,9 @@ import (
 	"time"
 
 	"joylink.club/ecs"
+	"joylink.club/rtsssimulation/deprecated/simulation"
+	"joylink.club/rtsssimulation/deprecated/system"
 	"joylink.club/rtsssimulation/repository"
-	"joylink.club/rtsssimulation/simulation"
-	"joylink.club/rtsssimulation/system"
 )
 
 type Position int

deprecated/simulation/world/config.go

@@ -1,9 +1,10 @@
 package world
 
 import (
-	"joylink.club/rtsssimulation/system"
 	"time"
 
+	"joylink.club/rtsssimulation/deprecated/system"
+
 	"joylink.club/ecs"
 )
 

deprecated/simulation/world/init.go

@@ -3,12 +3,12 @@ package world
 import (
 	"time"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/entities"
+	"joylink.club/ecs/filter"
+	"joylink.club/rtsssimulation/deprecated/entities"
+	"joylink.club/rtsssimulation/deprecated/simulation"
+	"joylink.club/rtsssimulation/deprecated/system"
 	"joylink.club/rtsssimulation/repository"
-	"joylink.club/rtsssimulation/simulation"
-	"joylink.club/rtsssimulation/system"
 )
 
 func CreateSimulation(repo *repository.Repository) ecs.WorldId {

deprecated/system/button_system.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 )
 
 // ButtonState 广义按钮开关状态，开关有三个接点，分别为公共接点、常开点和常闭点

deprecated/system/dcb_system.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 )
 
 // DcbCircuitState 门控箱电路   A---按钮  J---继电器

deprecated/system/emp_system.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 )
 
 //站台紧急停车按钮

deprecated/system/percentage_system.go

@@ -2,8 +2,9 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 )
 
 // PercentageDeviceState 百分比设备

deprecated/system/psd_system.go

@@ -1,9 +1,9 @@
 package system
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // PsdDriveXGMJ 联锁驱动XGMJ

deprecated/system/relay_system.go

@@ -1,9 +1,9 @@
 package system
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // RelayState 继电器有两个线圈1-2,3-4

deprecated/system/signal_2xh1_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // Signal2XH1State 电路状态：**信号机2XH-1(红-绿) 出段(场)信号机 或 **出站区间阻挡信号机

deprecated/system/signal_3xh1_system.go

@@ -3,9 +3,9 @@ package system
 import (
 	"fmt"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // 信号机电路继电器组合类型和功能名称常量

deprecated/system/signal_3xh2_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // Signal3XH2State 电路状态：信号机3XH-2(红-绿-黄) 道岔防护信号机(三显示不封灯、无单黄显示、带引导)

deprecated/system/signal_3xh3_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // Signal3XH3State 电路状态：信号机3XH-3(红-绿-黄) 道岔防护信号机(三显示封绿灯、有单黄显示、带引导)

deprecated/system/signal_3xh4_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // Signal3XH4State 电路状态：信号机3XH-4(红-绿-黄) 出站兼道岔防护信号机(三显示不封灯、有单黄显示、无引导)

deprecated/system/signal_dcxh_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // SignalDCXHState 电路状态：信号机DCXH(蓝-白) 调车信号机

deprecated/system/signal_jckxh_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // SignalJCKXHState 电路状态：信号机JCKXH(红-白-黄) 进/出库列车兼调车信号机(三显示不封灯、有单黄显示、无引导)

deprecated/system/signal_jdxh_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // SignalJDXHState 电路状态：信号机JDXH(红-绿-黄) 进段信号机(三显示不封灯、无单黄显示、带引导)

deprecated/system/spks_system.go

@@ -1,8 +1,8 @@
 package system
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 )
 
 // SpksCircuitState 车站人员防护开关电路

deprecated/system/switch_2jzdj9_system.go

@@ -2,9 +2,10 @@ package system
 
 import (
 	"fmt"
-	"github.com/yohamta/donburi/filter"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // --------联锁驱动-----------------

deprecated/system/system.go

@@ -2,12 +2,12 @@ package system
 
 import (
 	"fmt"
-	"joylink.club/rtsssimulation/simulation"
 
-	"github.com/yohamta/donburi/component"
-	"github.com/yohamta/donburi/filter"
+	"joylink.club/rtsssimulation/deprecated/simulation"
+
 	"joylink.club/ecs"
-	sysEvent "joylink.club/rtsssimulation/system/event"
+	"joylink.club/ecs/filter"
+	sysEvent "joylink.club/rtsssimulation/deprecated/system/event"
 )
 
 // EntityIdentity 实体身份定义
@@ -60,7 +60,7 @@ func simpleRecover() {
 /////////////////////////////////////////////////////////
 
 // EntityTag 实体标签
-type EntityTag = component.IComponentType
+type EntityTag = ecs.IComponentType
 
 type EntityTagHandler struct {
 	Tag EntityTag

deprecated/system/timer_system.go

@@ -3,8 +3,8 @@ package system
 import (
 	"time"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 )
 
 var SystemTimerComponent = ecs.NewComponentType[SystemTimer]()

deprecated/test1/sjzdj9/main.go

@@ -2,16 +2,17 @@ package sjzdj9
 
 import (
 	"fmt"
-	"joylink.club/rtsssimulation/examples/test1/tinit"
-	"joylink.club/rtsssimulation/repository/model/proto"
 	"time"
 
-	"github.com/yohamta/donburi/filter"
+	"joylink.club/rtsssimulation/deprecated/test1/tinit"
+	"joylink.club/rtsssimulation/repository/model/proto"
+
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/entities"
-	"joylink.club/rtsssimulation/examples/test1/tmodel"
-	"joylink.club/rtsssimulation/examples/test1/tstorages"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/ecs/filter"
+	"joylink.club/rtsssimulation/deprecated/entities"
+	"joylink.club/rtsssimulation/deprecated/system"
+	"joylink.club/rtsssimulation/deprecated/test1/tmodel"
+	"joylink.club/rtsssimulation/deprecated/test1/tstorages"
 )
 
 // Test 测试双机ZDJ9道岔

deprecated/test1/tinit/config.go

@@ -1,9 +1,10 @@
 package tinit
 
 import (
-	"joylink.club/rtsssimulation/system"
 	"time"
 
+	"joylink.club/rtsssimulation/deprecated/system"
+
 	"joylink.club/ecs"
 )
 

deprecated/test1/tinit/init.go

@@ -2,8 +2,8 @@ package tinit
 
 import (
 	"joylink.club/ecs"
-	"joylink.club/rtsssimulation/entities"
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/entities"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // InitializeWorld 初始化仿真world

deprecated/test1/tmodel/device_model.go

@@ -1,7 +1,7 @@
 package tmodel
 
 import (
-	"joylink.club/rtsssimulation/system"
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // 设备模型基础信息

deprecated/test1/tmodel/switch_model.go

@@ -1,8 +1,8 @@
 package tmodel
 
 import (
+	"joylink.club/rtsssimulation/deprecated/system"
 	"joylink.club/rtsssimulation/repository/model/proto"
-	"joylink.club/rtsssimulation/system"
 )
 
 // 道岔电路系统中的继电器

deprecated/test1/tstorages/model_storage.go

@@ -2,7 +2,8 @@ package tstorages
 
 import (
 	"fmt"
-	"joylink.club/rtsssimulation/system"
+
+	"joylink.club/rtsssimulation/deprecated/system"
 )
 
 // 仿真模型数据定义

deprecated/test1/tstorages/storage_manager.go

@@ -2,8 +2,9 @@ package tstorages
 
 import (
 	"fmt"
+
+	"joylink.club/rtsssimulation/deprecated/system"
 	"joylink.club/rtsssimulation/repository/model/proto"
-	"joylink.club/rtsssimulation/system"
 )
 
 // 共享仓库映射

entity/singleton.go

@@ -3,8 +3,8 @@ package entity
 import (
 	"time"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/repository"
 )

proto/src/component/common.proto

@@ -0,0 +1,28 @@
+syntax = "proto3";
+
+package component;
+
+option go_package = "./component/component_proto";
+
+// 两个稳态位置转换组件
+message TwoPositionTransform {
+    int32 Pos = 1; // 当前位置百分比,[0, 10000],两位小数
+    int32 Speed = 2;
+}
+
+// 仅有两状态的组件
+message BitState {
+    bool Val = 1;
+}
+
+// 计数/计时组件
+message Counter {
+    int32 Val = 1;
+    int32 Step = 2;
+}
+
+// 倒数/倒计时组件
+message CounterDown {
+    int32 Val = 1;
+    int32 Step = 2;
+}

sys/circuit_sys/signal_2xh1.go

@@ -1,8 +1,8 @@
 package circuit_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 )
 

sys/circuit_sys/turnout_zdj9_2.go

@@ -3,8 +3,8 @@ package circuit_sys
 import (
 	"fmt"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/consts"
 )

sys/common_sys/counter.go

@@ -1,8 +1,8 @@
 package common_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 )
 

sys/common_sys/counterdown.go

@@ -1,8 +1,8 @@
 package common_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 )
 

sys/common_sys/two_position_movement.go

@@ -1,8 +1,8 @@
 package common_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/consts"
 )

sys/device_sys/dbq.go

@@ -1,8 +1,8 @@
 package device_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/consts"
 )

sys/device_sys/relay.go

@@ -3,8 +3,8 @@ package device_sys
 import (
 	"unsafe"
 
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/consts"
 )

sys/device_sys/turnout.go

@@ -1,8 +1,8 @@
 package device_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 )
 

sys/device_sys/zzj.go

@@ -1,8 +1,8 @@
 package device_sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 	"joylink.club/rtsssimulation/consts"
 )

sys/world_time.go

@@ -1,8 +1,8 @@
 package sys
 
 import (
-	"github.com/yohamta/donburi/filter"
 	"joylink.club/ecs"
+	"joylink.club/ecs/filter"
 	"joylink.club/rtsssimulation/component"
 )