Add multi monitor multiplayer

2024-08-29 18:48:27 +02:00
parent 352c7af7ce
commit 696b827a7d
10 changed files with 1210 additions and 515 deletions
@@ -2,28 +2,29 @@ package main

 import "github.com/veandco/go-sdl2/sdl"

-const (
-	openingWidth = 7
-)
-
 type Base struct {
-	rect  sdl.Rect
-	owner *Player
+	owner        *Player
+	openingWidth int32
+	gameObject   *GameObject
 }

 func (base *Base) tick(players *[]*Player) {
 	for _, player := range *players {
-		if player.cullingRect.HasIntersection(&base.rect) {
+		if player.gameObject.baseRect.HasIntersection(&base.gameObject.baseRect) {
 			if player.rechargeCooldown == 0 && player.energy < MaxEnergy {
-				player.energy++
+				if MaxEnergy-player.energy < 4 {
+					player.energy++
+				} else {
+					player.energy += 4
+				}
 				if player == base.owner {
 					player.rechargeCooldown = RechargeCooldownOwn
 				} else {
 					player.rechargeCooldown = RechargeCooldownOpponent
 				}
 			}
-			if player == base.owner && player.repairCooldown == 0 && player.health < MaxHealth {
-				player.health++
+			if player == base.owner && player.repairCooldown == 0 && player.shields < MaxShields {
+				player.shields++
 				player.repairCooldown = RepairCooldown
 			}
 		}
@@ -31,112 +32,79 @@ func (base *Base) tick(players *[]*Player) {
 }

 func (base *Base) render(camera *sdl.Rect, surface *sdl.Surface) {
-	borderWidth := base.rect.W - openingWidth
-	borderWidthA := borderWidth / 2
-	borderWidthB := borderWidth - borderWidthA + 1
-	if borderWidth < 0 {
-		panic("Bad border width")
-	}
-	rects := []sdl.Rect{
-		{
-			X: base.rect.X,
-			Y: base.rect.Y,
-			W: 1,
-			H: base.rect.H,
-		},
-		{
-			X: base.rect.X + base.rect.W,
-			Y: base.rect.Y,
-			W: 1,
-			H: base.rect.H,
-		},
-		{
-			X: base.rect.X,
-			Y: base.rect.Y,
-			W: borderWidthA,
-			H: 1,
-		},
-		{
-			X: base.rect.X + borderWidthA + openingWidth,
-			Y: base.rect.Y,
-			W: borderWidthB,
-			H: 1,
-		},
-		{
-			X: base.rect.X,
-			Y: base.rect.Y + base.rect.H,
-			W: borderWidthA,
-			H: 1,
-		},
-		{
-			X: base.rect.X + borderWidthA + openingWidth,
-			Y: base.rect.Y + base.rect.H,
-			W: borderWidthB,
-			H: 1,
-		},
-	}
-
-	for _, rect := range rects {
-		if camera.HasIntersection(&rect) {
-			cameraCompensatedRect := sdl.Rect{
-				X: rect.X - camera.X,
-				Y: rect.Y - camera.Y,
-				W: rect.W,
-				H: rect.H,
-			}
-			surface.FillRect(&cameraCompensatedRect, (*base.owner).color2)
-		}
-	}
+	base.gameObject.render(camera, surface)
 }

 func (base *Base) build(gameMap *GameMap) {
-	borderWidth := base.rect.W - openingWidth
+	borderWidth := base.gameObject.baseRect.W - base.openingWidth
 	borderWidthA := borderWidth / 2
 	if borderWidth < 0 {
 		panic("Bad border width")
 	}
-	if base.rect.H < 9 {
+	if base.gameObject.baseRect.H < 9 {
 		panic("Bad border height")
 	}
-	if gameMap.width-base.rect.X-base.rect.W <= 0 {
+	if gameMap.width-base.gameObject.baseRect.X-base.gameObject.baseRect.W <= 0 {
 		panic("Bad base x location")
 	}
-	if gameMap.height-base.rect.Y-base.rect.H <= 0 {
+	if gameMap.height-base.gameObject.baseRect.Y-base.gameObject.baseRect.H <= 0 {
 		panic("Bad base y location")
 	}
-	if base.rect.X < 0 || base.rect.Y < 0 {
+	if base.gameObject.baseRect.X < 0 || base.gameObject.baseRect.Y < 0 {
 		panic("Bad base negative location")
 	}
-	for x := base.rect.X; x < base.rect.X+base.rect.W+1; x++ {
-		for y := base.rect.Y; y < base.rect.Y+base.rect.H+1; y++ {
+	for x := base.gameObject.baseRect.X; x < base.gameObject.baseRect.X+base.gameObject.baseRect.W+1; x++ {
+		for y := base.gameObject.baseRect.Y; y < base.gameObject.baseRect.Y+base.gameObject.baseRect.H+1; y++ {
 			gameMap.tiles[x][y] = 0
 		}
 	}
-	for y := base.rect.Y; y < base.rect.Y+base.rect.H; y++ {
-		gameMap.tiles[base.rect.X][y] = 4
-		gameMap.tiles[base.rect.X+base.rect.W][y] = 4
+	for y := base.gameObject.baseRect.Y; y < base.gameObject.baseRect.Y+base.gameObject.baseRect.H; y++ {
+		gameMap.tiles[base.gameObject.baseRect.X][y] = 4
+		gameMap.tiles[base.gameObject.baseRect.X+base.gameObject.baseRect.W][y] = 4
 	}
-	for x := base.rect.X; x < base.rect.X+borderWidthA; x++ {
-		gameMap.tiles[x][base.rect.Y] = 4
-		gameMap.tiles[x][base.rect.Y+base.rect.H] = 4
+	for x := base.gameObject.baseRect.X; x < base.gameObject.baseRect.X+borderWidthA; x++ {
+		gameMap.tiles[x][base.gameObject.baseRect.Y] = 4
+		gameMap.tiles[x][base.gameObject.baseRect.Y+base.gameObject.baseRect.H] = 4
 	}
-	for x := base.rect.X + borderWidthA + openingWidth; x < base.rect.X+base.rect.W+1; x++ {
-		gameMap.tiles[x][base.rect.Y] = 4
-		gameMap.tiles[x][base.rect.Y+base.rect.H] = 4
+	for x := base.gameObject.baseRect.X + borderWidthA + base.openingWidth; x < base.gameObject.baseRect.X+base.gameObject.baseRect.W+1; x++ {
+		gameMap.tiles[x][base.gameObject.baseRect.Y] = 4
+		gameMap.tiles[x][base.gameObject.baseRect.Y+base.gameObject.baseRect.H] = 4
 	}
 }

 func createBases(players *[]*Player, gameMap *GameMap) *[]*Base {
 	bases := &[]*Base{}
+
 	for ownerID, player := range *players {
+		gameObject := &GameObject{}
+		gameObject.baseRect = sdl.Rect{
+			X: player.gameObject.baseRect.X - 14,
+			Y: player.gameObject.baseRect.Y - 14,
+			W: 35,
+			H: 35,
+		}
+		openingWidth := int32(float64(player.gameObject.baseRect.W) * 1.5)
+		if openingWidth%2 == 0 {
+			openingWidth++
+		}
+
+		borderWidth := gameObject.baseRect.W - openingWidth
+		borderWidthA := borderWidth / 2
+		borderWidthB := borderWidth - borderWidthA + 1
+		if borderWidth < 0 {
+			panic("Bad border width")
+		}
+		gameObject.addColor((*player).playerColors.body)
+		gameObject.addColoredRect(0, 0, 1, gameObject.baseRect.H, 0)
+		gameObject.addColoredRect(gameObject.baseRect.W, 0, 1, gameObject.baseRect.H, 0)
+		gameObject.addColoredRect(0, 0, borderWidthA, 1, 0)
+		gameObject.addColoredRect(borderWidthA+openingWidth, 0, borderWidthB, 1, 0)
+		gameObject.addColoredRect(0, gameObject.baseRect.H, borderWidthA, 1, 0)
+		gameObject.addColoredRect(borderWidthA+openingWidth, gameObject.baseRect.H, borderWidthB, 1, 0)
 		*bases = append(*bases, &Base{
-			rect: sdl.Rect{
-				X: player.posX - 14,
-				Y: player.posY - 14,
-				W: 35,
-				H: 35,
-			},
-			owner: (*players)[ownerID],
+			gameObject:   gameObject,
+			owner:        (*players)[ownerID],
+			openingWidth: openingWidth,
 		})
 		(*bases)[ownerID].build(gameMap)
 	}