bericyb/sshpong
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 5 Releases Wiki Activity

start game logic and pong physics

Browse Source
This commit is contained in:
Beric Bearnson
2024-08-26 10:02:05 -06:00
parent b3df666196
commit e31dbef6ef
11 changed files with 591 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/netwrk/game.go
-35
View File
@@ -1,35 +0,0 @@
package netwrk
import (
"log"
"net"
)
func handleGameConnection(conn net.Conn) {
defer conn.Close()
messageBytes := make([]byte, 126)
n, err := conn.Read(messageBytes)
if err != nil {
log.Printf("Error reading game ID on connection", err)
}
_ = string(messageBytes[:n])
if err != nil {
log.Printf("Game id was not a string?", err)
}
_ = make(chan GameMessage)
n, err = conn.Read(messageBytes)
if err != nil {
log.Printf("Error reading message %v", err)
return
}
}
func handleGameMessage(conn net.Conn, message *GameMessage) error {
return nil
}
internal/netwrk/game_messages.pb.go
-152
View File
@@ -1,152 +0,0 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.34.2
// protoc v5.27.1
// source: proto/game_messages.proto
package netwrk
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 GameMessage struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Action string `protobuf:"bytes,1,opt,name=action,proto3" json:"action,omitempty"`
Value int32 `protobuf:"varint,2,opt,name=value,proto3" json:"value,omitempty"`
}
func (x *GameMessage) Reset() {
*x = GameMessage{}
if protoimpl.UnsafeEnabled {
mi := &file_proto_game_messages_proto_msgTypes[0]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *GameMessage) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*GameMessage) ProtoMessage() {}
func (x *GameMessage) ProtoReflect() protoreflect.Message {
mi := &file_proto_game_messages_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 GameMessage.ProtoReflect.Descriptor instead.
func (*GameMessage) Descriptor() ([]byte, []int) {
return file_proto_game_messages_proto_rawDescGZIP(), []int{0}
}
func (x *GameMessage) GetAction() string {
if x != nil {
return x.Action
}
return ""
}
func (x *GameMessage) GetValue() int32 {
if x != nil {
return x.Value
}
return 0
}
var File_proto_game_messages_proto protoreflect.FileDescriptor
var file_proto_game_messages_proto_rawDesc = []byte{
0x0a, 0x19, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x5f, 0x6d, 0x65, 0x73,
0x73, 0x61, 0x67, 0x65, 0x73, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x12, 0x06, 0x6e, 0x65, 0x74,
0x77, 0x72, 0x6b, 0x22, 0x3b, 0x0a, 0x0b, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61,
0x67, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01,
0x28, 0x09, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65,
0x42, 0x0a, 0x5a, 0x08, 0x2e, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x72, 0x6b, 0x62, 0x06, 0x70, 0x72,
0x6f, 0x74, 0x6f, 0x33,
}
var (
file_proto_game_messages_proto_rawDescOnce sync.Once
file_proto_game_messages_proto_rawDescData = file_proto_game_messages_proto_rawDesc
)
func file_proto_game_messages_proto_rawDescGZIP() []byte {
file_proto_game_messages_proto_rawDescOnce.Do(func() {
file_proto_game_messages_proto_rawDescData = protoimpl.X.CompressGZIP(file_proto_game_messages_proto_rawDescData)
})
return file_proto_game_messages_proto_rawDescData
}
var file_proto_game_messages_proto_msgTypes = make([]protoimpl.MessageInfo, 1)
var file_proto_game_messages_proto_goTypes = []any{
(*GameMessage)(nil), // 0: netwrk.GameMessage
}
var file_proto_game_messages_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_proto_game_messages_proto_init() }
func file_proto_game_messages_proto_init() {
if File_proto_game_messages_proto != nil {
return
}
if !protoimpl.UnsafeEnabled {
file_proto_game_messages_proto_msgTypes[0].Exporter = func(v any, i int) any {
switch v := v.(*GameMessage); 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_proto_game_messages_proto_rawDesc,
NumEnums: 0,
NumMessages: 1,
NumExtensions: 0,
NumServices: 0,
},
GoTypes: file_proto_game_messages_proto_goTypes,
DependencyIndexes: file_proto_game_messages_proto_depIdxs,
MessageInfos: file_proto_game_messages_proto_msgTypes,
}.Build()
File_proto_game_messages_proto = out.File
file_proto_game_messages_proto_rawDesc = nil
file_proto_game_messages_proto_goTypes = nil
file_proto_game_messages_proto_depIdxs = nil
}
internal/netwrk/lobby_messages.pb.go
+1 -1
View File
@@ -1,7 +1,7 @@
// Code generated by protoc-gen-go. DO NOT EDIT.
// versions:
// protoc-gen-go v1.34.2
// protoc v5.27.1
// protoc v5.27.3
// source: proto/lobby_messages.proto
package netwrk
internal/netwrk/netwrk.go
+43 -10
View File
@@ -3,6 +3,8 @@ package netwrk
import (
"log"
"net"
"sshpong/internal/pong"
"strings"
sync "sync"
"google.golang.org/protobuf/proto"
@@ -13,27 +15,26 @@ type Client struct {
Conn net.Conn
}
type LobbyPlayersMessage struct {
Type string
Username string
IsAvailable chan bool
}
type ExternalMessage struct {
Target string
Message *LobbyMessage
}
var lobbyListener chan LobbyPlayersMessage
type GameClients struct {
Client1 Client
Client2 Client
}
var externalMessageChan chan ExternalMessage
var lobbyMembers sync.Map
var games sync.Map
func init() {
lobbyListener = make(chan LobbyPlayersMessage)
externalMessageChan = make(chan ExternalMessage)
lobbyMembers = sync.Map{}
games = sync.Map{}
go func() {
for {
@@ -76,7 +77,6 @@ func LobbyListen() {
}
func GamesListen() {
gameListener, err := net.Listen("tcp", "127.0.0.1:42069")
if err != nil {
log.Fatal(err)
@@ -89,6 +89,39 @@ func GamesListen() {
log.Println(err)
continue
}
handleGameConnection(conn)
go func(conn net.Conn) {
messageBytes := make([]byte, 126)
n, err := conn.Read(messageBytes)
if err != nil {
log.Printf("Error reading game ID on connection %s", err)
}
gInfo := strings.SplitAfter(string(messageBytes[:n]), ":")
if err != nil {
log.Printf("Game id was not a string? %s", err)
}
game, ok := games.Load(gInfo[0])
if !ok {
games.Store(gInfo[0], GameClients{Client1: Client{
Username: gInfo[1],
Conn: conn,
}, Client2: Client{}})
} else {
gameclients, _ := game.(GameClients)
client2 := Client{
Username: gInfo[1],
Conn: conn,
}
games.Store(gInfo[0], GameClients{
Client1: gameclients.Client1,
Client2: client2})
go pong.StartGame(gameclients.Client1.Conn, client2.Conn, gameclients.Client1.Username, client2.Username)
}
}(conn)
}
}