19 Commits

Author SHA1 Message Date
0e509ad752 Try gooner animation 2025-01-20 14:30:34 +01:00
bcd63efd7b .gitignore 2025-01-20 14:29:10 +01:00
944c33ce3b Update License 2025-01-20 01:17:13 +01:00
d5bb464d9f Add system messages to chat 2025-01-20 00:03:50 +01:00
4549ee7517 Fix cgo bullshit in build 2025-01-19 23:28:04 +01:00
31ae9c525f mod 2025-01-19 23:22:09 +01:00
06913a5217 Update buildscript and readme 2025-01-19 22:50:50 +01:00
49663c9094 rm build artefacts from git tracking 2025-01-19 22:25:48 +01:00
a843680b09 Prepare v1.1.0 release with auth and db functionality 2025-01-19 22:20:17 +01:00
7183df4a8b Merge pull request 'feature/db' (#4) from feature/db into master
Reviewed-on: #4
2025-01-19 21:07:43 +00:00
33e355200d Update goonserver 2025-01-19 22:07:04 +01:00
e45066b2a8 Based db and accounts and log in where you logged out 2025-01-19 21:52:56 +01:00
bb01dccf2b Getting somewhere lol 2025-01-19 21:23:47 +01:00
0f56916295 Add build instructions 2025-01-19 01:33:01 +01:00
a1ddbadea0 Build system + release win64 + linux64 2025-01-19 01:31:05 +01:00
e4d0b98945 actually close instead of continuing with uninitialized GLFW crap 2025-01-19 00:56:17 +01:00
509bc8b20b fix racism condition / deadlock 2025-01-19 00:51:49 +01:00
c40e4ae7ac Merge branch 'feature/menu' 2025-01-18 23:37:21 +01:00
cd68581429 Merge pull request 'feature/menu' (#3) from feature/menu into master
Reviewed-on: #3
2025-01-18 22:26:19 +00:00
24 changed files with 3233 additions and 95 deletions

15
.gitignore vendored Normal file
View File

@ -0,0 +1,15 @@
# Build artifacts
build/
goonscape
goonscape.exe
# IDE files
.vscode/
.idea/
*.swp
# OS files
.DS_Store
Thumbs.db
resources/models/old_and_test/

25
.woodpecker.yml Normal file
View File

@ -0,0 +1,25 @@
pipeline:
build:
image: golang:1.23
commands:
# Install build dependencies
- apt-get update && apt-get install -y gcc-mingw-w64 cmake zip libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev libwayland-dev wayland-protocols libxkbcommon-dev
# Build for all platforms
- make all
when:
event: tag
tag: v*
# Optional: Create Gitea release with built artifacts
release:
image: plugins/gitea-release
settings:
api_key:
from_secret: gitea_token
base_url: https://gitea.boner.be
files: build/*.zip
when:
event: tag
tag: v*

30
Dockerfile.build Normal file
View File

@ -0,0 +1,30 @@
FROM golang:1.23
# Install build dependencies
RUN apt-get update && apt-get install -y \
gcc-mingw-w64 \
cmake \
zip \
libasound2-dev \
mesa-common-dev \
libx11-dev \
libxrandr-dev \
libxi-dev \
xorg-dev \
libgl1-mesa-dev \
libglu1-mesa-dev \
libwayland-dev \
wayland-protocols \
libxkbcommon-dev \
&& rm -rf /var/lib/apt/lists/*
WORKDIR /build
# Copy build scripts
COPY . /build/
# Set execute permissions
RUN chmod +x /build/scripts/build.sh
# Build command
CMD ["make", "all"]

24
LICENSE
View File

@ -1,11 +1,21 @@
“Commons Clause” License Condition v1.0
MIT License
The Software is provided to you by the Licensor under the License, as defined below, subject to the following condition.
Copyright (c) 2025 bdnugget
Without limiting other conditions in the License, the grant of rights under the License will not include, and the License does not grant to you, right to Sell the Software.
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
For purposes of the foregoing, “Sell” means practicing any or all of the rights granted to you under the License to provide to third parties, for a fee or other consideration (including without limitation fees for hosting or consulting/ support services related to the Software), a product or service whose value derives, entirely or substantially, from the functionality of the Software. Any license notice or attribution required by the License must also include this Commons Cause License Condition notice.
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
Software: GoonScape
License: Commons Clause v1.0
Licensor: bdnugget
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.

30
Makefile Normal file
View File

@ -0,0 +1,30 @@
.PHONY: all clean windows linux darwin
include scripts/platforms.mk
BINARY_NAME=goonscape
VERSION=1.1.0
BUILD_DIR=build
ASSETS_DIR=resources
all: clean $(PLATFORMS)
$(PLATFORMS):
@echo "Building for $@..."
@mkdir -p $(BUILD_DIR)/$@
@scripts/build.sh $(word 1,$(subst /, ,$@)) $(word 2,$(subst /, ,$@)) \
$(BUILD_DIR)/$@/$(BINARY_NAME)$(if $(findstring windows,$@),.exe,)
@cp -r $(ASSETS_DIR) $(BUILD_DIR)/$@/
@cd $(BUILD_DIR) && zip -r $(BINARY_NAME)-$(word 1,$(subst /, ,$@))-$(word 2,$(subst /, ,$@))-v$(VERSION).zip $@
@echo "Done building for $@"
clean:
rm -rf $(BUILD_DIR)
# Development build for current platform
dev:
go build -o $(BINARY_NAME)
# Run tests
test:
go test ./...

View File

@ -16,24 +16,57 @@ A multiplayer isometric game inspired by Oldschool RuneScape, built with Go and
## Prerequisites
- Go 1.23 or higher
- GCC (for CGO/SQLite support)
- OpenGL development libraries
- Raylib dependencies (see [raylib-go](https://github.com/gen2brain/raylib-go#requirements))
## Installation
1. Clone the repository:
### Pre-built Binaries
The easiest way to get started is to download the latest release from:
```
https://gitea.boner.be/bdnugget/goonscape/releases
```
Choose the appropriate zip file for your platform:
- Windows: `goonscape-windows-amd64-v1.1.0.zip`
- Linux: `goonscape-linux-amd64-v1.1.0.zip`
Extract the zip and run the executable.
### Quick Start
For development:
```bash
# Run directly (recommended for development)
go run main.go
# Run with local server
go run main.go -local
```
### Server Setup
The server requires CGO for SQLite support:
```bash
# Enable CGO
go env -w CGO_ENABLED=1
# Clone and build server
git clone https://gitea.boner.be/bdnugget/goonserver.git
cd goonserver
go build
```
### Client Installation
Then install or build:
```bash
# Install the client
go install gitea.boner.be/bdnugget/goonscape@latest
```
Or build from source:
```bash
git clone https://gitea.boner.be/bdnugget/goonscape.git
cd goonscape
```
2. Install dependencies:
```bash
go mod tidy
```
3. Build and run:
```bash
go run main.go
go build
```
## Controls
@ -63,6 +96,26 @@ go run main.go -addr somehost:6970 # Uses somehost:6970
Note: The `-local` flag is a shorthand for `-addr localhost:6969` and cannot be used together with `-addr`.
## Building Release Binaries
The project uses Docker to create consistent builds across platforms. To build release binaries:
1. Build the Docker image (only needed once):
```bash
sudo docker build -t goonscape-builder -f Dockerfile.build .
```
2. Create release builds:
```bash
sudo docker run -v $(pwd):/build goonscape-builder
```
This will create zip files in the `build` directory for:
- Windows (64-bit): `goonscape-windows-amd64-v1.0.0.zip`
- Linux (64-bit): `goonscape-linux-amd64-v1.0.0.zip`
Each zip contains the binary and all required assets.
## Development
The project uses Protocol Buffers for network communication. If you modify the `.proto` files, regenerate the Go code with:

View File

@ -5,21 +5,74 @@ import (
rl "github.com/gen2brain/raylib-go/raylib"
)
func LoadModels() ([]types.ModelAsset, error) {
goonerModel := rl.LoadModel("resources/models/goonion.obj")
goonerTexture := rl.LoadTexture("resources/models/goonion.png")
rl.SetMaterialTexture(goonerModel.Materials, rl.MapDiffuse, goonerTexture)
// Helper function to load animations for a model
func loadModelAnimations(animPaths map[string]string) (types.AnimationSet, error) {
var animSet types.AnimationSet
// Load idle animations if specified
if idlePath, ok := animPaths["idle"]; ok {
idleAnims := rl.LoadModelAnimations(idlePath)
if len(idleAnims) > 0 {
animSet.Idle = idleAnims
rl.TraceLog(rl.LogInfo, "Loaded idle animation: %s (%d frames, %f seconds)",
idlePath, idleAnims[0].FrameCount, float32(idleAnims[0].FrameCount)/60.0)
}
}
// Load walk animations if specified
if walkPath, ok := animPaths["walk"]; ok {
walkAnims := rl.LoadModelAnimations(walkPath)
if len(walkAnims) > 0 {
animSet.Walk = walkAnims
rl.TraceLog(rl.LogInfo, "Loaded walk animation: %s (%d frames, %f seconds)",
walkPath, walkAnims[0].FrameCount, float32(walkAnims[0].FrameCount)/60.0)
}
}
return animSet, nil
}
func LoadModels() ([]types.ModelAsset, error) {
// Goonion model and animations
goonerModel := rl.LoadModel("resources/models/biped/Animation_Unsteady_Walk_withSkin.glb")
goonerAnims, _ := loadModelAnimations(map[string]string{"idle": "resources/models/biped/Animation_Idle_withSkin.glb", "walk": "resources/models/biped/Animation_Unsteady_Walk_withSkin.glb"})
// Apply transformations
transform := rl.MatrixIdentity()
transform = rl.MatrixMultiply(transform, rl.MatrixRotateY(180*rl.Deg2rad))
transform = rl.MatrixMultiply(transform, rl.MatrixRotateX(-90*rl.Deg2rad))
transform = rl.MatrixMultiply(transform, rl.MatrixScale(1.0, 1.0, 1.0))
goonerModel.Transform = transform
// Coomer model (ready for animations)
coomerModel := rl.LoadModel("resources/models/coomer.obj")
coomerTexture := rl.LoadTexture("resources/models/coomer.png")
rl.SetMaterialTexture(coomerModel.Materials, rl.MapDiffuse, coomerTexture)
// When you have animations, add them like:
// coomerAnims, _ := loadModelAnimations("resources/models/coomer.glb",
// map[string]string{
// "idle": "resources/models/coomer_idle.glb",
// "walk": "resources/models/coomer_walk.glb",
// })
// Shreke model (ready for animations)
shrekeModel := rl.LoadModel("resources/models/shreke.obj")
shrekeTexture := rl.LoadTexture("resources/models/shreke.png")
rl.SetMaterialTexture(shrekeModel.Materials, rl.MapDiffuse, shrekeTexture)
// When you have animations, add them like:
// shrekeAnims, _ := loadModelAnimations("resources/models/shreke.glb",
// map[string]string{
// "idle": "resources/models/shreke_idle.glb",
// "walk": "resources/models/shreke_walk.glb",
// })
return []types.ModelAsset{
{Model: goonerModel, Texture: goonerTexture},
{
Model: goonerModel,
Animation: append(goonerAnims.Idle, goonerAnims.Walk...), // For compatibility
AnimFrames: int32(len(goonerAnims.Idle) + len(goonerAnims.Walk)),
Animations: goonerAnims,
},
{Model: coomerModel, Texture: coomerTexture},
{Model: shrekeModel, Texture: shrekeTexture},
}, nil
@ -31,6 +84,11 @@ func LoadMusic(filename string) (rl.Music, error) {
func UnloadModels(models []types.ModelAsset) {
for _, model := range models {
if model.Animation != nil {
for i := int32(0); i < model.AnimFrames; i++ {
rl.UnloadModelAnimation(model.Animation[i])
}
}
rl.UnloadModel(model.Model)
rl.UnloadTexture(model.Texture)
}

2287
frames.txt Normal file

File diff suppressed because it is too large Load Diff

View File

@ -53,6 +53,7 @@ func (c *Chat) HandleServerMessages(messages []*pb.ChatMessage) {
for _, msg := range messages {
localMsg := types.ChatMessage{
PlayerID: msg.PlayerId,
Username: msg.Username,
Content: msg.Content,
Time: time.Unix(0, msg.Timestamp),
}
@ -117,8 +118,14 @@ func (c *Chat) Draw(screenWidth, screenHeight int32) {
for i := startIdx; i < endIdx; i++ {
msg := c.messages[i]
text := fmt.Sprintf("[%d]: %s", msg.PlayerID, msg.Content)
rl.DrawText(text, int32(chatX)+5, int32(messageY), 20, rl.White)
var color rl.Color
if msg.PlayerID == 0 { // System message
color = rl.Gold
} else {
color = rl.White
}
text := fmt.Sprintf("%s: %s", msg.Username, msg.Content)
rl.DrawText(text, int32(chatX)+5, int32(messageY), 20, color)
messageY += messageHeight
}

View File

@ -1,9 +1,11 @@
package game
import (
"os"
"time"
"gitea.boner.be/bdnugget/goonscape/assets"
"gitea.boner.be/bdnugget/goonscape/network"
"gitea.boner.be/bdnugget/goonscape/types"
pb "gitea.boner.be/bdnugget/goonserver/actions"
rl "github.com/gen2brain/raylib-go/raylib"
@ -18,20 +20,13 @@ type Game struct {
Chat *Chat
MenuOpen bool
QuitChan chan struct{} // Channel to signal shutdown
QuitDone chan struct{} // New channel to signal when cleanup is complete
loginScreen *LoginScreen
isLoggedIn bool
}
func New() *Game {
InitWorld()
game := &Game{
Player: &types.Player{
PosActual: rl.NewVector3(5*types.TileSize, 0, 5*types.TileSize),
PosTile: GetTile(5, 5),
Speed: 50.0,
TargetPath: []types.Tile{},
UserData: nil,
QuitDone: make(chan struct{}),
},
OtherPlayers: make(map[int32]*types.Player),
Camera: rl.Camera3D{
Position: rl.NewVector3(0, 10, 10),
@ -40,11 +35,10 @@ func New() *Game {
Fovy: 45.0,
Projection: rl.CameraPerspective,
},
Chat: NewChat(),
QuitChan: make(chan struct{}),
QuitDone: make(chan struct{}),
Chat: NewChat(),
QuitChan: make(chan struct{}),
loginScreen: NewLoginScreen(),
}
game.Player.UserData = game
game.Chat.userData = game
return game
}
@ -65,6 +59,32 @@ func (g *Game) LoadAssets() error {
}
func (g *Game) Update(deltaTime float32) {
if !g.isLoggedIn {
username, password, isRegistering, submitted := g.loginScreen.Update()
if submitted {
conn, playerID, err := network.ConnectToServer(username, password, isRegistering)
if err != nil {
g.loginScreen.SetError(err.Error())
return
}
g.Player = &types.Player{
Speed: 50.0,
TargetPath: []types.Tile{},
UserData: g,
QuitDone: make(chan struct{}),
ID: playerID,
}
g.AssignModelToPlayer(g.Player)
go network.HandleServerCommunication(conn, playerID, g.Player, g.OtherPlayers, g.QuitChan)
g.isLoggedIn = true
return
}
g.loginScreen.Draw()
return
}
// Handle ESC for menu
if rl.IsKeyPressed(rl.KeyEscape) {
g.MenuOpen = !g.MenuOpen
@ -140,9 +160,27 @@ func (g *Game) DrawPlayer(player *types.Player, model rl.Model) {
Z: player.PosActual.Z,
}
if player.ID%int32(len(g.Models)) == 0 {
modelAsset := g.Models[0]
// Check if model has animations
if modelAsset.Animations.Idle != nil || modelAsset.Animations.Walk != nil {
if player.IsMoving && len(modelAsset.Animations.Walk) > 0 {
anim := modelAsset.Animations.Walk[0] // Use first walk animation
player.AnimationFrame = player.AnimationFrame % anim.FrameCount
rl.UpdateModelAnimation(model, anim, player.AnimationFrame)
} else if len(modelAsset.Animations.Idle) > 0 {
anim := modelAsset.Animations.Idle[0] // Use first idle animation
player.AnimationFrame = player.AnimationFrame % anim.FrameCount
rl.UpdateModelAnimation(model, anim, player.AnimationFrame)
}
}
}
rl.DrawModel(model, playerPos, 16, rl.White)
if player.FloatingMessage != nil && time.Now().Before(player.FloatingMessage.ExpireTime) {
// Draw floating messages and path indicators
if player.FloatingMessage != nil {
screenPos := rl.GetWorldToScreen(rl.Vector3{
X: playerPos.X,
Y: playerPos.Y + 24.0,
@ -150,8 +188,6 @@ func (g *Game) DrawPlayer(player *types.Player, model rl.Model) {
}, g.Camera)
player.FloatingMessage.ScreenPos = screenPos
} else if player.FloatingMessage != nil {
player.FloatingMessage = nil
}
if len(player.TargetPath) > 0 {
@ -177,11 +213,20 @@ func (g *Game) Render() {
rl.BeginDrawing()
rl.ClearBackground(rl.RayWhite)
if !g.isLoggedIn {
g.loginScreen.Draw()
rl.EndDrawing()
return
}
rl.BeginMode3D(g.Camera)
g.DrawMap()
g.DrawPlayer(g.Player, g.Player.Model)
for id, other := range g.OtherPlayers {
g.DrawPlayer(other, g.Models[int(id)%len(g.Models)].Model)
for _, other := range g.OtherPlayers {
if other.Model.Meshes == nil {
g.AssignModelToPlayer(other)
}
g.DrawPlayer(other, other.Model)
}
rl.EndMode3D()
@ -293,9 +338,7 @@ func (g *Game) DrawMenu() {
case "Settings":
// TODO: Implement settings
case "Exit Game":
close(g.QuitChan)
<-g.QuitDone
rl.CloseWindow()
g.Shutdown()
}
}
}
@ -310,3 +353,23 @@ func (g *Game) DrawMenu() {
buttonY += buttonSpacing
}
}
func (g *Game) Shutdown() {
close(g.QuitChan)
<-g.Player.QuitDone
rl.CloseWindow()
os.Exit(0)
}
func (g *Game) HandleServerMessages(messages []*pb.ChatMessage) {
g.Chat.HandleServerMessages(messages)
}
func (g *Game) AssignModelToPlayer(player *types.Player) {
modelIndex := int(player.ID) % len(g.Models)
modelAsset := g.Models[modelIndex]
// Just use the original model - don't try to copy it
player.Model = modelAsset.Model
player.Texture = modelAsset.Texture
}

185
game/login.go Normal file
View File

@ -0,0 +1,185 @@
package game
import (
rl "github.com/gen2brain/raylib-go/raylib"
)
type LoginScreen struct {
username string
password string
errorMessage string
isRegistering bool
focusedField int // 0 = username, 1 = password
}
func NewLoginScreen() *LoginScreen {
return &LoginScreen{}
}
func (l *LoginScreen) Draw() {
screenWidth := float32(rl.GetScreenWidth())
screenHeight := float32(rl.GetScreenHeight())
// Draw background
rl.DrawRectangle(0, 0, int32(screenWidth), int32(screenHeight), rl.RayWhite)
// Draw title
title := "GoonScape"
if l.isRegistering {
title += " - Register"
} else {
title += " - Login"
}
titleSize := int32(40)
titleWidth := rl.MeasureText(title, titleSize)
rl.DrawText(title, int32(screenWidth/2)-titleWidth/2, 100, titleSize, rl.Black)
// Draw input fields
inputWidth := float32(200)
inputHeight := float32(30)
inputX := screenWidth/2 - inputWidth/2
// Username field
rl.DrawRectangleRec(rl.Rectangle{
X: inputX, Y: 200,
Width: inputWidth, Height: inputHeight,
}, rl.LightGray)
rl.DrawText(l.username, int32(inputX)+5, 205, 20, rl.Black)
if l.focusedField == 0 {
rl.DrawRectangleLinesEx(rl.Rectangle{
X: inputX - 2, Y: 198,
Width: inputWidth + 4, Height: inputHeight + 4,
}, 2, rl.Blue)
}
// Password field
rl.DrawRectangleRec(rl.Rectangle{
X: inputX, Y: 250,
Width: inputWidth, Height: inputHeight,
}, rl.LightGray)
masked := ""
for range l.password {
masked += "*"
}
rl.DrawText(masked, int32(inputX)+5, 255, 20, rl.Black)
if l.focusedField == 1 {
rl.DrawRectangleLinesEx(rl.Rectangle{
X: inputX - 2, Y: 248,
Width: inputWidth + 4, Height: inputHeight + 4,
}, 2, rl.Blue)
}
// Draw error message
if l.errorMessage != "" {
msgWidth := rl.MeasureText(l.errorMessage, 20)
rl.DrawText(l.errorMessage, int32(screenWidth/2)-msgWidth/2, 300, 20, rl.Red)
}
// Draw buttons
buttonWidth := float32(100)
buttonHeight := float32(30)
buttonY := float32(350)
// Login/Register button
actionBtn := rl.Rectangle{
X: screenWidth/2 - buttonWidth - 10,
Y: buttonY,
Width: buttonWidth,
Height: buttonHeight,
}
rl.DrawRectangleRec(actionBtn, rl.Blue)
actionText := "Login"
if l.isRegistering {
actionText = "Register"
}
actionWidth := rl.MeasureText(actionText, 20)
rl.DrawText(actionText,
int32(actionBtn.X+actionBtn.Width/2)-actionWidth/2,
int32(actionBtn.Y+5),
20, rl.White)
// Switch mode button
switchBtn := rl.Rectangle{
X: screenWidth/2 + 10,
Y: buttonY,
Width: buttonWidth,
Height: buttonHeight,
}
rl.DrawRectangleRec(switchBtn, rl.DarkGray)
switchText := "Register"
if l.isRegistering {
switchText = "Login"
}
switchWidth := rl.MeasureText(switchText, 20)
rl.DrawText(switchText,
int32(switchBtn.X+switchBtn.Width/2)-switchWidth/2,
int32(switchBtn.Y+5),
20, rl.White)
}
func (l *LoginScreen) Update() (string, string, bool, bool) {
// Handle input field focus
if rl.IsMouseButtonPressed(rl.MouseLeftButton) {
mousePos := rl.GetMousePosition()
screenWidth := float32(rl.GetScreenWidth())
inputWidth := float32(200)
inputX := screenWidth/2 - inputWidth/2
// Check username field
if mousePos.X >= inputX && mousePos.X <= inputX+inputWidth &&
mousePos.Y >= 200 && mousePos.Y <= 230 {
l.focusedField = 0
}
// Check password field
if mousePos.X >= inputX && mousePos.X <= inputX+inputWidth &&
mousePos.Y >= 250 && mousePos.Y <= 280 {
l.focusedField = 1
}
// Check buttons
buttonWidth := float32(100)
if mousePos.Y >= 350 && mousePos.Y <= 380 {
// Action button
if mousePos.X >= screenWidth/2-buttonWidth-10 &&
mousePos.X <= screenWidth/2-10 {
return l.username, l.password, l.isRegistering, true
}
// Switch mode button
if mousePos.X >= screenWidth/2+10 &&
mousePos.X <= screenWidth/2+buttonWidth+10 {
l.isRegistering = !l.isRegistering
}
}
}
// Handle text input
key := rl.GetCharPressed()
for key > 0 {
if l.focusedField == 0 && len(l.username) < 12 {
l.username += string(key)
} else if l.focusedField == 1 && len(l.password) < 20 {
l.password += string(key)
}
key = rl.GetCharPressed()
}
// Handle backspace
if rl.IsKeyPressed(rl.KeyBackspace) {
if l.focusedField == 0 && len(l.username) > 0 {
l.username = l.username[:len(l.username)-1]
} else if l.focusedField == 1 && len(l.password) > 0 {
l.password = l.password[:len(l.password)-1]
}
}
// Handle tab to switch fields
if rl.IsKeyPressed(rl.KeyTab) {
l.focusedField = (l.focusedField + 1) % 2
}
return "", "", false, false
}
func (l *LoginScreen) SetError(msg string) {
l.errorMessage = msg
}

2
go.mod
View File

@ -3,7 +3,7 @@ module gitea.boner.be/bdnugget/goonscape
go 1.23.0
require (
gitea.boner.be/bdnugget/goonserver v0.0.0-20250113131525-49e23114973c
gitea.boner.be/bdnugget/goonserver v1.1.0
github.com/gen2brain/raylib-go/raylib v0.0.0-20250109172833-6dbba4f81a9b
google.golang.org/protobuf v1.36.3
)

37
main.go
View File

@ -11,20 +11,21 @@ import (
)
func main() {
local := flag.Bool("local", false, "Use local server instead of remote")
addr := flag.String("addr", "boner.be:6969", "Server address (hostname:port or hostname)")
// Parse command line flags
local := flag.Bool("local", false, "Connect to local server")
addr := flag.String("addr", "", "Server address (host or host:port)")
flag.Parse()
if *local && *addr != "boner.be:6969" {
log.Fatal("Cannot use both -local and -addr flags")
}
// Set server address based on flags
if *local {
if *addr != "" {
log.Fatal("Cannot use -local and -addr together")
}
network.SetServerAddr("localhost:6969")
} else if *addr != "" {
// If only hostname is provided, append default port
// If port is not specified, append default port
if !strings.Contains(*addr, ":") {
*addr = *addr + ":6969"
*addr += ":6969"
}
network.SetServerAddr(*addr)
}
@ -32,36 +33,24 @@ func main() {
rl.InitWindow(1024, 768, "GoonScape")
rl.SetExitKey(0)
defer rl.CloseWindow()
rl.InitAudioDevice()
defer rl.CloseAudioDevice()
rl.SetTargetFPS(60)
game := game.New()
if err := game.LoadAssets(); err != nil {
log.Fatalf("Failed to load assets: %v", err)
}
defer game.Cleanup()
conn, playerID, err := network.ConnectToServer()
if err != nil {
log.Fatalf("Failed to connect to server: %v", err)
}
defer conn.Close()
game.Player.ID = playerID
modelIndex := int(playerID) % len(game.Models)
game.Player.Model = game.Models[modelIndex].Model
game.Player.Texture = game.Models[modelIndex].Texture
go network.HandleServerCommunication(conn, playerID, game.Player, game.OtherPlayers, game.QuitChan)
rl.PlayMusicStream(game.Music)
rl.SetMusicVolume(game.Music, 0.5)
rl.SetTargetFPS(60)
for !rl.WindowShouldClose() {
rl.UpdateMusicStream(game.Music)
deltaTime := rl.GetFrameTime()
rl.UpdateMusicStream(game.Music)
game.Update(deltaTime)
game.Render()
}

View File

@ -3,56 +3,89 @@ package network
import (
"bufio"
"encoding/binary"
"fmt"
"io"
"log"
"net"
"time"
"gitea.boner.be/bdnugget/goonscape/game"
"gitea.boner.be/bdnugget/goonscape/types"
pb "gitea.boner.be/bdnugget/goonserver/actions"
rl "github.com/gen2brain/raylib-go/raylib"
"google.golang.org/protobuf/proto"
)
const protoVersion = 1
var serverAddr = "boner.be:6969"
func SetServerAddr(addr string) {
serverAddr = addr
}
func ConnectToServer() (net.Conn, int32, error) {
func ConnectToServer(username, password string, isRegistering bool) (net.Conn, int32, error) {
conn, err := net.Dial("tcp", serverAddr)
if err != nil {
log.Printf("Failed to dial server: %v", err)
return nil, 0, err
}
log.Println("Connected to server. Waiting for player ID...")
reader := bufio.NewReader(conn)
log.Println("Connected to server. Authenticating...")
// Read message length (4 bytes)
// Send auth message
authAction := &pb.Action{
Type: pb.Action_LOGIN,
Username: username,
Password: password,
}
if isRegistering {
authAction.Type = pb.Action_REGISTER
}
authBatch := &pb.ActionBatch{
Actions: []*pb.Action{authAction},
ProtocolVersion: protoVersion,
}
if err := writeMessage(conn, authBatch); err != nil {
conn.Close()
return nil, 0, fmt.Errorf("failed to send auth: %v", err)
}
// Read server response
reader := bufio.NewReader(conn)
lengthBuf := make([]byte, 4)
if _, err := io.ReadFull(reader, lengthBuf); err != nil {
log.Printf("Failed to read message length: %v", err)
return nil, 0, err
conn.Close()
return nil, 0, fmt.Errorf("failed to read auth response: %v", err)
}
messageLength := binary.BigEndian.Uint32(lengthBuf)
// Read the full message
messageBuf := make([]byte, messageLength)
if _, err := io.ReadFull(reader, messageBuf); err != nil {
log.Printf("Failed to read message body: %v", err)
return nil, 0, err
conn.Close()
return nil, 0, fmt.Errorf("failed to read auth response body: %v", err)
}
var response pb.ServerMessage
if err := proto.Unmarshal(messageBuf, &response); err != nil {
log.Printf("Failed to unmarshal server response: %v", err)
return nil, 0, err
conn.Close()
return nil, 0, fmt.Errorf("failed to unmarshal auth response: %v", err)
}
if response.ProtocolVersion > protoVersion {
conn.Close()
return nil, 0, fmt.Errorf("server requires newer protocol version (server: %d, client: %d)",
response.ProtocolVersion, protoVersion)
}
if !response.AuthSuccess {
conn.Close()
return nil, 0, fmt.Errorf(response.ErrorMessage)
}
playerID := response.GetPlayerId()
log.Printf("Successfully connected with player ID: %d", playerID)
log.Printf("Successfully authenticated with player ID: %d", playerID)
return conn, playerID, nil
}
@ -67,6 +100,9 @@ func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Play
// Create a channel to signal when goroutines are done
done := make(chan struct{})
// Create a set of current players to track disconnects
currentPlayers := make(map[int32]bool)
go func() {
for {
select {
@ -111,9 +147,18 @@ func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Play
for {
select {
case <-quitChan:
<-done // Wait for action goroutine to finish
close(done)
time.Sleep(100 * time.Millisecond) // Give time for disconnect message to be sent
done := make(chan struct{})
go func() {
<-done
close(player.QuitDone)
}()
select {
case <-done:
time.Sleep(100 * time.Millisecond)
case <-time.After(1 * time.Second):
log.Println("Shutdown timed out")
}
return
default:
// Read message length (4 bytes)
@ -152,7 +197,19 @@ func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Play
player.Unlock()
for _, state := range serverMessage.Players {
currentPlayers[state.PlayerId] = true
if state.PlayerId == playerID {
player.Lock()
// Update initial position if not set
if player.PosActual.X == 0 && player.PosActual.Z == 0 {
player.PosActual = rl.Vector3{
X: float32(state.X * types.TileSize),
Y: 0,
Z: float32(state.Y * types.TileSize),
}
player.PosTile = types.Tile{X: int(state.X), Y: int(state.Y)}
}
player.Unlock()
continue
}
@ -163,8 +220,15 @@ func HandleServerCommunication(conn net.Conn, playerID int32, player *types.Play
}
}
if g, ok := player.UserData.(*game.Game); ok && len(serverMessage.ChatMessages) > 0 {
g.Chat.HandleServerMessages(serverMessage.ChatMessages)
// Remove players that are no longer in the server state
for id := range otherPlayers {
if !currentPlayers[id] {
delete(otherPlayers, id)
}
}
if handler, ok := player.UserData.(types.ChatMessageHandler); ok && len(serverMessage.ChatMessages) > 0 {
handler.HandleServerMessages(serverMessage.ChatMessages)
}
}
}

Binary file not shown.

Binary file not shown.

Binary file not shown.

27
scripts/build.sh Executable file
View File

@ -0,0 +1,27 @@
#!/bin/bash
# Main build process
build() {
local os=$1
local arch=$2
local output=$3
# Set GOOS and GOARCH for cross-compilation
export GOOS=$os
export GOARCH=$arch
# Disable CGO only for cross-compilation
if [ "$os" != "$(go env GOOS)" ] || [ "$arch" != "$(go env GOARCH)" ]; then
export CGO_ENABLED=0
fi
if [ "$os" = "windows" ]; then
export CC=x86_64-w64-mingw32-gcc
export CXX=x86_64-w64-mingw32-g++
fi
go build -buildvcs=false -ldflags="-s -w" -o $output
}
# Call build with provided arguments
build "$1" "$2" "$3"

1
scripts/platforms.mk Normal file
View File

@ -0,0 +1 @@
PLATFORMS=windows/amd64 linux/amd64

245
segfault.txt Normal file
View File

@ -0,0 +1,245 @@
INFO: Initializing raylib 5.5
INFO: Platform backend: DESKTOP (GLFW)
INFO: Supported raylib modules:
INFO: > rcore:..... loaded (mandatory)
INFO: > rlgl:...... loaded (mandatory)
INFO: > rshapes:... loaded (optional)
INFO: > rtextures:. loaded (optional)
INFO: > rtext:..... loaded (optional)
INFO: > rmodels:... loaded (optional)
INFO: > raudio:.... loaded (optional)
INFO: DISPLAY: Device initialized successfully
INFO: > Display size: 1920 x 1080
INFO: > Screen size: 1024 x 768
INFO: > Render size: 1024 x 768
INFO: > Viewport offsets: 0, 0
INFO: GLAD: OpenGL extensions loaded successfully
INFO: GL: Supported extensions count: 390
INFO: GL: OpenGL device information:
INFO: > Vendor: NVIDIA Corporation
INFO: > Renderer: NVIDIA GeForce GTX 1070/PCIe/SSE2
INFO: > Version: 3.3.0 NVIDIA 565.77
INFO: > GLSL: 3.30 NVIDIA via Cg compiler
INFO: GL: VAO extension detected, VAO functions loaded successfully
INFO: GL: NPOT textures extension detected, full NPOT textures supported
INFO: GL: DXT compressed textures supported
INFO: GL: ETC2/EAC compressed textures supported
INFO: PLATFORM: DESKTOP (GLFW - X11): Initialized successfully
INFO: TEXTURE: [ID 1] Texture loaded successfully (1x1 | R8G8B8A8 | 1 mipmaps)
INFO: TEXTURE: [ID 1] Default texture loaded successfully
INFO: SHADER: [ID 1] Vertex shader compiled successfully
INFO: SHADER: [ID 2] Fragment shader compiled successfully
INFO: SHADER: [ID 3] Program shader loaded successfully
INFO: SHADER: [ID 3] Default shader loaded successfully
INFO: RLGL: Render batch vertex buffers loaded successfully in RAM (CPU)
INFO: RLGL: Render batch vertex buffers loaded successfully in VRAM (GPU)
INFO: RLGL: Default OpenGL state initialized successfully
INFO: TEXTURE: [ID 2] Texture loaded successfully (128x128 | GRAY_ALPHA | 1 mipmaps)
INFO: FONT: Default font loaded successfully (224 glyphs)
INFO: SYSTEM: Working Directory: /home/bd/Projects/go/goonscape
INFO: AUDIO: Device initialized successfully
INFO: > Backend: miniaudio | PulseAudio
INFO: > Format: 32-bit IEEE Floating Point -> 32-bit Signed Integer
INFO: > Channels: 2 -> 2
INFO: > Sample rate: 48000 -> 48000
INFO: > Periods size: 3600
INFO: TIMER: Target time per frame: 16.667 milliseconds
INFO: FILEIO: [resources/models/goonion.obj] Text file loaded successfully
INFO: FILEIO: [goonion.png] File loaded successfully
INFO: IMAGE: Data loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: TEXTURE: [ID 3] Texture loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: VAO: [ID 2] Mesh uploaded successfully to VRAM (GPU)
WARNING: VAO: [ID 2] Trying to re-load an already loaded mesh
INFO: FILEIO: [resources/models/goonion.png] File loaded successfully
INFO: IMAGE: Data loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: TEXTURE: [ID 4] Texture loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: FILEIO: [resources/models/biped/Animation_Unsteady_Walk_withSkin.glb] File loaded successfully
INFO: MODEL: [resources/models/biped/Animation_Unsteady_Walk_withSkin.glb] Loaded animation: Armature|Unsteady_Walk|baselayer (177 frames, 3.000000s)
INFO: FILEIO: [resources/models/coomer.obj] Text file loaded successfully
INFO: FILEIO: [coomer.png] File loaded successfully
INFO: IMAGE: Data loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: TEXTURE: [ID 5] Texture loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: VAO: [ID 3] Mesh uploaded successfully to VRAM (GPU)
WARNING: VAO: [ID 3] Trying to re-load an already loaded mesh
INFO: FILEIO: [resources/models/coomer.png] File loaded successfully
INFO: IMAGE: Data loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: TEXTURE: [ID 6] Texture loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: FILEIO: [resources/models/shreke.obj] Text file loaded successfully
INFO: FILEIO: [shreke.png] File loaded successfully
INFO: IMAGE: Data loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: TEXTURE: [ID 7] Texture loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: VAO: [ID 4] Mesh uploaded successfully to VRAM (GPU)
WARNING: VAO: [ID 4] Trying to re-load an already loaded mesh
INFO: FILEIO: [resources/models/shreke.png] File loaded successfully
INFO: IMAGE: Data loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: TEXTURE: [ID 8] Texture loaded successfully (2048x2048 | R8G8B8 | 1 mipmaps)
INFO: STREAM: Initialized successfully (48000 Hz, 32 bit, Stereo)
INFO: FILEIO: [resources/audio/GoonScape2.mp3] Music file loaded successfully
INFO: > Sample rate: 48000 Hz
INFO: > Sample size: 32 bits
INFO: > Channels: 2 (Stereo)
INFO: > Total frames: 3487104
2025/01/20 12:28:12 Connected to server. Authenticating...
2025/01/20 12:28:12 Successfully authenticated with player ID: 6
Clicked: 2, 1
Path found: [{5 1 1 true} {4 1 5 true} {3 1 4 true} {2 1 3 true}]
SIGSEGV: segmentation violation
PC=0x69da90 m=0 sigcode=1 addr=0x0
signal arrived during cgo execution
goroutine 1 gp=0xc0000061c0 m=0 mp=0x991ca0 [syscall, locked to thread]:
runtime.cgocall(0x5ef7f0, 0xc00002b858)
/usr/lib/go/src/runtime/cgocall.go:167 +0x4b fp=0xc00002b830 sp=0xc00002b7f8 pc=0x46a0ab
github.com/gen2brain/raylib-go/raylib._Cfunc_UpdateModelAnimation({{0x3f800000, 0x0, 0x0, 0x0, 0x0, 0x3f800000, 0x0, 0x0, 0x0, 0x0, ...}, ...}, ...)
_cgo_gotypes.go:7298 +0x45 fp=0xc00002b858 sp=0xc00002b830 pc=0x4db8c5
github.com/gen2brain/raylib-go/raylib.UpdateModelAnimation.func1(0x47731a?, 0x1000000?, 0x0)
/home/bd/.cache/go/mod/github.com/gen2brain/raylib-go/raylib@v0.0.0-20250109172833-6dbba4f81a9b/rmodels.go:613 +0x1a5 fp=0xc00002ba80 sp=0xc00002b858 pc=0x4dd265
github.com/gen2brain/raylib-go/raylib.UpdateModelAnimation({{0x3f800000, 0x0, 0x0, 0x0, 0x0, 0x3f800000, 0x0, 0x0, 0x0, 0x0, ...}, ...}, ...)
/home/bd/.cache/go/mod/github.com/gen2brain/raylib-go/raylib@v0.0.0-20250109172833-6dbba4f81a9b/rmodels.go:613 +0x25 fp=0xc00002baa8 sp=0xc00002ba80 pc=0x4dd085
gitea.boner.be/bdnugget/goonscape/game.(*Game).DrawPlayer(0xc0001a4000, 0xc0001de160, {{0x3f800000, 0x0, 0x0, 0x0, 0x0, 0x3f800000, 0x0, 0x0, ...}, ...})
/home/bd/Projects/go/goonscape/game/game.go:172 +0x2d5 fp=0xc00002bc58 sp=0xc00002baa8 pc=0x5c5c95
gitea.boner.be/bdnugget/goonscape/game.(*Game).Render(0xc0001a4000)
/home/bd/Projects/go/goonscape/game/game.go:221 +0x147 fp=0xc00002be00 sp=0xc00002bc58 pc=0x5c61e7
main.main()
/home/bd/Projects/go/goonscape/main.go:55 +0x4ac fp=0xc00002bf50 sp=0xc00002be00 pc=0x5c924c
runtime.main()
/usr/lib/go/src/runtime/proc.go:272 +0x28b fp=0xc00002bfe0 sp=0xc00002bf50 pc=0x43c42b
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc00002bfe8 sp=0xc00002bfe0 pc=0x4776c1
goroutine 2 gp=0xc000006c40 m=nil [force gc (idle)]:
runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000054fa8 sp=0xc000054f88 pc=0x46ff0e
runtime.goparkunlock(...)
/usr/lib/go/src/runtime/proc.go:430
runtime.forcegchelper()
/usr/lib/go/src/runtime/proc.go:337 +0xb3 fp=0xc000054fe0 sp=0xc000054fa8 pc=0x43c773
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000054fe8 sp=0xc000054fe0 pc=0x4776c1
created by runtime.init.7 in goroutine 1
/usr/lib/go/src/runtime/proc.go:325 +0x1a
goroutine 3 gp=0xc000007180 m=nil [GC sweep wait]:
runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000055780 sp=0xc000055760 pc=0x46ff0e
runtime.goparkunlock(...)
/usr/lib/go/src/runtime/proc.go:430
runtime.bgsweep(0xc00007e000)
/usr/lib/go/src/runtime/mgcsweep.go:277 +0x94 fp=0xc0000557c8 sp=0xc000055780 pc=0x427394
runtime.gcenable.gowrap1()
/usr/lib/go/src/runtime/mgc.go:204 +0x25 fp=0xc0000557e0 sp=0xc0000557c8 pc=0x41baa5
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc0000557e8 sp=0xc0000557e0 pc=0x4776c1
created by runtime.gcenable in goroutine 1
/usr/lib/go/src/runtime/mgc.go:204 +0x66
goroutine 4 gp=0xc000007340 m=nil [GC scavenge wait]:
runtime.gopark(0xc00007e000?, 0x7b0098?, 0x1?, 0x0?, 0xc000007340?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000055f78 sp=0xc000055f58 pc=0x46ff0e
runtime.goparkunlock(...)
/usr/lib/go/src/runtime/proc.go:430
runtime.(*scavengerState).park(0x990ee0)
/usr/lib/go/src/runtime/mgcscavenge.go:425 +0x49 fp=0xc000055fa8 sp=0xc000055f78 pc=0x424dc9
runtime.bgscavenge(0xc00007e000)
/usr/lib/go/src/runtime/mgcscavenge.go:653 +0x3c fp=0xc000055fc8 sp=0xc000055fa8 pc=0x42533c
runtime.gcenable.gowrap2()
/usr/lib/go/src/runtime/mgc.go:205 +0x25 fp=0xc000055fe0 sp=0xc000055fc8 pc=0x41ba45
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000055fe8 sp=0xc000055fe0 pc=0x4776c1
created by runtime.gcenable in goroutine 1
/usr/lib/go/src/runtime/mgc.go:205 +0xa5
goroutine 5 gp=0xc000007c00 m=nil [finalizer wait]:
runtime.gopark(0x0?, 0x0?, 0x0?, 0x0?, 0x0?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000056620 sp=0xc000056600 pc=0x46ff0e
runtime.runfinq()
/usr/lib/go/src/runtime/mfinal.go:193 +0x107 fp=0xc0000567e0 sp=0xc000056620 pc=0x41ab27
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc0000567e8 sp=0xc0000567e0 pc=0x4776c1
created by runtime.createfing in goroutine 1
/usr/lib/go/src/runtime/mfinal.go:163 +0x3d
goroutine 6 gp=0xc000007dc0 m=nil [chan receive]:
runtime.gopark(0x6f63a0?, 0x0?, 0x48?, 0x69?, 0x986948?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000054718 sp=0xc0000546f8 pc=0x46ff0e
runtime.chanrecv(0xc00008a0e0, 0x0, 0x1)
/usr/lib/go/src/runtime/chan.go:639 +0x41c fp=0xc000054790 sp=0xc000054718 pc=0x40bb1c
runtime.chanrecv1(0x43c5c0?, 0xc000054776?)
/usr/lib/go/src/runtime/chan.go:489 +0x12 fp=0xc0000547b8 sp=0xc000054790 pc=0x40b6f2
runtime.unique_runtime_registerUniqueMapCleanup.func1(...)
/usr/lib/go/src/runtime/mgc.go:1781
runtime.unique_runtime_registerUniqueMapCleanup.gowrap1()
/usr/lib/go/src/runtime/mgc.go:1784 +0x2f fp=0xc0000547e0 sp=0xc0000547b8 pc=0x41eacf
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc0000547e8 sp=0xc0000547e0 pc=0x4776c1
created by unique.runtime_registerUniqueMapCleanup in goroutine 1
/usr/lib/go/src/runtime/mgc.go:1779 +0x96
goroutine 20 gp=0xc0001b8000 m=nil [IO wait]:
runtime.gopark(0xc0000bdad0?, 0x55fcb8?, 0x8?, 0xaa?, 0xb?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc0000bda68 sp=0xc0000bda48 pc=0x46ff0e
runtime.netpollblock(0x4b0778?, 0x408f46?, 0x0?)
/usr/lib/go/src/runtime/netpoll.go:575 +0xf7 fp=0xc0000bdaa0 sp=0xc0000bda68 pc=0x434fd7
internal/poll.runtime_pollWait(0x7094ad4a5680, 0x72)
/usr/lib/go/src/runtime/netpoll.go:351 +0x85 fp=0xc0000bdac0 sp=0xc0000bdaa0 pc=0x46f205
internal/poll.(*pollDesc).wait(0xc0001e2080?, 0xc0000d2000?, 0x0)
/usr/lib/go/src/internal/poll/fd_poll_runtime.go:84 +0x27 fp=0xc0000bdae8 sp=0xc0000bdac0 pc=0x4bf127
internal/poll.(*pollDesc).waitRead(...)
/usr/lib/go/src/internal/poll/fd_poll_runtime.go:89
internal/poll.(*FD).Read(0xc0001e2080, {0xc0000d2000, 0x1000, 0x1000})
/usr/lib/go/src/internal/poll/fd_unix.go:165 +0x27a fp=0xc0000bdb80 sp=0xc0000bdae8 pc=0x4bfa5a
net.(*netFD).Read(0xc0001e2080, {0xc0000d2000?, 0xc0000961e0?, 0x2710?})
/usr/lib/go/src/net/fd_posix.go:55 +0x25 fp=0xc0000bdbc8 sp=0xc0000bdb80 pc=0x5ae0c5
net.(*conn).Read(0xc0001b4030, {0xc0000d2000?, 0x10000000006?, 0xc0001a7b00?})
/usr/lib/go/src/net/net.go:189 +0x45 fp=0xc0000bdc10 sp=0xc0000bdbc8 pc=0x5b6345
net.(*TCPConn).Read(0x7094f4718a68?, {0xc0000d2000?, 0xedf202a1b?, 0x990e60?})
<autogenerated>:1 +0x25 fp=0xc0000bdc40 sp=0xc0000bdc10 pc=0x5c0c05
bufio.(*Reader).Read(0xc0000802a0, {0xc0001a7b0c, 0x4, 0x471809?})
/usr/lib/go/src/bufio/bufio.go:241 +0x197 fp=0xc0000bdc78 sp=0xc0000bdc40 pc=0x4d93b7
io.ReadAtLeast({0x7b2640, 0xc0000802a0}, {0xc0001a7b0c, 0x4, 0x4}, 0x4)
/usr/lib/go/src/io/io.go:335 +0x90 fp=0xc0000bdcc0 sp=0xc0000bdc78 pc=0x4aaa10
io.ReadFull(...)
/usr/lib/go/src/io/io.go:354
gitea.boner.be/bdnugget/goonscape/network.HandleServerCommunication({0x7b4bb8, 0xc0001b4030}, 0x6, 0xc0001de160, 0xc000194000, 0xc0001a0000)
/home/bd/Projects/go/goonscape/network/network.go:166 +0x412 fp=0xc0000bdfa0 sp=0xc0000bdcc0 pc=0x5c27b2
gitea.boner.be/bdnugget/goonscape/game.(*Game).Update.gowrap1()
/home/bd/Projects/go/goonscape/game/game.go:80 +0x33 fp=0xc0000bdfe0 sp=0xc0000bdfa0 pc=0x5c57d3
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc0000bdfe8 sp=0xc0000bdfe0 pc=0x4776c1
created by gitea.boner.be/bdnugget/goonscape/game.(*Game).Update in goroutine 1
/home/bd/Projects/go/goonscape/game/game.go:80 +0x45e
goroutine 7 gp=0xc0000c6380 m=nil [select]:
runtime.gopark(0xc000050f80?, 0x2?, 0x0?, 0x0?, 0xc000050f10?)
/usr/lib/go/src/runtime/proc.go:424 +0xce fp=0xc000050db0 sp=0xc000050d90 pc=0x46ff0e
runtime.selectgo(0xc000050f80, 0xc000050f0c, 0x0?, 0x0, 0x0?, 0x1)
/usr/lib/go/src/runtime/select.go:335 +0x7a5 fp=0xc000050ed8 sp=0xc000050db0 pc=0x44e2a5
gitea.boner.be/bdnugget/goonscape/network.HandleServerCommunication.func1()
/home/bd/Projects/go/goonscape/network/network.go:108 +0xb2 fp=0xc000050fe0 sp=0xc000050ed8 pc=0x5c3492
runtime.goexit({})
/usr/lib/go/src/runtime/asm_amd64.s:1700 +0x1 fp=0xc000050fe8 sp=0xc000050fe0 pc=0x4776c1
created by gitea.boner.be/bdnugget/goonscape/network.HandleServerCommunication in goroutine 20
/home/bd/Projects/go/goonscape/network/network.go:106 +0x3bd
rax 0x0
rbx 0x0
rcx 0x0
rdx 0x0
rdi 0x13ee9800
rsi 0xb1
rbp 0x13bd6580
rsp 0x7ffc9d661890
r8 0x140baba0
r9 0x0
r10 0x0
r11 0x0
r12 0x13bd1f20
r13 0x744e4
r14 0x4d898
r15 0x26c4c
rip 0x69da90
rflags 0x10246
cs 0x33
fs 0x0
gs 0x0
exit status 2

View File

@ -19,6 +19,33 @@ func (p *Player) MoveTowards(target Tile, deltaTime float32, mapGrid [][]Tile) {
direction := rl.Vector3Subtract(targetPos, p.PosActual)
distance := rl.Vector3Length(direction)
if distance > 1.0 {
wasMoving := p.IsMoving
p.IsMoving = true
if !wasMoving {
p.AnimationFrame = 0
}
oldFrame := p.AnimationFrame
p.AnimationFrame += int32(deltaTime * 60)
rl.TraceLog(rl.LogInfo, "Walk frame update: %d -> %d (delta: %f)",
oldFrame, p.AnimationFrame, deltaTime)
} else {
wasMoving := p.IsMoving
p.IsMoving = false
if wasMoving {
p.AnimationFrame = 0
}
oldFrame := p.AnimationFrame
p.AnimationFrame += int32(deltaTime * 60)
rl.TraceLog(rl.LogInfo, "Idle frame update: %d -> %d (delta: %f)",
oldFrame, p.AnimationFrame, deltaTime)
}
if distance > 0 {
direction = rl.Vector3Scale(direction, p.Speed*deltaTime/distance)
}
@ -41,9 +68,12 @@ func NewPlayer(state *pb.PlayerState) *Player {
Y: float32(state.Y * TileHeight),
Z: float32(state.Y * TileSize),
},
PosTile: Tile{X: int(state.X), Y: int(state.Y)},
Speed: 50.0,
ID: state.PlayerId,
PosTile: Tile{X: int(state.X), Y: int(state.Y)},
Speed: 50.0,
ID: state.PlayerId,
IsMoving: false,
AnimationFrame: 0,
LastAnimUpdate: time.Now(),
}
}

View File

@ -26,19 +26,34 @@ type Player struct {
ID int32
CurrentTick int64
LastUpdateTime time.Time
LastAnimUpdate time.Time
InterpolationProgress float32
UserData interface{}
FloatingMessage *FloatingMessage
QuitDone chan struct{}
AnimationFrame int32
IsMoving bool
}
type AnimationSet struct {
Idle []rl.ModelAnimation
Walk []rl.ModelAnimation
// Can add more animation types later like:
// Attack []ModelAnimation
// Jump []ModelAnimation
}
type ModelAsset struct {
Model rl.Model
Texture rl.Texture2D
Model rl.Model
Texture rl.Texture2D
Animation []rl.ModelAnimation // Keep this for compatibility
AnimFrames int32 // Keep this for compatibility
Animations AnimationSet // New field for organized animations
}
type ChatMessage struct {
PlayerID int32
Username string
Content string
Time time.Time
}
@ -49,6 +64,10 @@ type FloatingMessage struct {
ScreenPos rl.Vector2 // Store the screen position for 2D rendering
}
type ChatMessageHandler interface {
HandleServerMessages([]*pb.ChatMessage)
}
const (
MapWidth = 50
MapHeight = 50