From f3d7d84178578a2420824cad6837dde4c7f48bb1 Mon Sep 17 00:00:00 2001 From: JupiterRider <60042618+JupiterRider@users.noreply.github.com> Date: Sat, 11 Feb 2023 16:34:47 +0100 Subject: [PATCH] gofmt -s -w -l . --- examples/core/2d_camera_mouse_zoom/main.go | 4 +- examples/core/core_split_screen/main.go | 6 +- examples/core/world_screen/main.go | 2 +- examples/games/arkanoid/main.go | 554 +++++++++--------- examples/gui/button/main.go | 4 +- .../controls_test_suite.go | 4 +- .../gui/portable_window/portable_window.go | 4 +- examples/gui/scroll_panel/scroll_panel.go | 16 +- rres/cmd/rrem/main.go | 2 +- 9 files changed, 298 insertions(+), 298 deletions(-) diff --git a/examples/core/2d_camera_mouse_zoom/main.go b/examples/core/2d_camera_mouse_zoom/main.go index 2e25279..c32c025 100644 --- a/examples/core/2d_camera_mouse_zoom/main.go +++ b/examples/core/2d_camera_mouse_zoom/main.go @@ -17,9 +17,9 @@ import ( * ********************************************************************************************/ -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ // Program main entry point -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ func main() { // Initialization //-------------------------------------------------------------------------------------- diff --git a/examples/core/core_split_screen/main.go b/examples/core/core_split_screen/main.go index 3901c6e..8e6a3d4 100644 --- a/examples/core/core_split_screen/main.go +++ b/examples/core/core_split_screen/main.go @@ -31,7 +31,7 @@ func DrawScene() { rl.DrawPlane(rl.Vector3{0, 0, 0}, rl.Vector2{50, 50}, rl.Beige) // Simple world plane for x := -float32(count * spacing); x <= count*spacing; x += spacing { - for z :=-float32(count * spacing); z <= count*spacing; z += spacing { + for z := -float32(count * spacing); z <= count*spacing; z += spacing { rl.DrawCube(rl.Vector3{x, 1.5, z}, 1, 1, 1, rl.Lime) rl.DrawCube(rl.Vector3{x, 0.5, z}, 0.25, 1, 0.25, rl.Brown) } @@ -42,9 +42,9 @@ func DrawScene() { rl.DrawCube(cameraPlayer2.Position, 1, 1, 1, rl.Blue) } -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ // Program main entry point -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ func main() { // Initialization //-------------------------------------------------------------------------------------- diff --git a/examples/core/world_screen/main.go b/examples/core/world_screen/main.go index 2b900d1..e7aa921 100644 --- a/examples/core/world_screen/main.go +++ b/examples/core/world_screen/main.go @@ -14,7 +14,7 @@ func main() { camera.Position = rl.NewVector3(10.0, 10.0, 10.0) // Camera position camera.Target = rl.NewVector3(0.0, 0.0, 0.0) // Camera looking at point camera.Up = rl.NewVector3(0.0, 1.0, 0.0) // Camera up vector (rotation towards target) - camera.Fovy = 45.0 // Camera field-of-view Y + camera.Fovy = 45.0 // Camera field-of-view Y cubePosition := rl.NewVector3(0.0, 0.0, 0.0) cubeScreenPosition := rl.Vector2{} diff --git a/examples/games/arkanoid/main.go b/examples/games/arkanoid/main.go index 14d5735..b60398a 100644 --- a/examples/games/arkanoid/main.go +++ b/examples/games/arkanoid/main.go @@ -1,277 +1,277 @@ -package main - -/******************************************************************************************* -* -* raylib - sample game: arkanoid -* -* Sample game Marc Palau and Ramon Santamaria -* -* This game has been created using raylib v1.3 (www.raylib.com) -* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) -* -* Copyright (c) 2015 Ramon Santamaria (@raysan5) -* -* Ported to raylib-go by Nehpe (@nehpe), July 2019 -* -********************************************************************************************/ - -import ( - "math" - - rl "github.com/gen2brain/raylib-go/raylib" -) - -const ( - PLAYER_MAX_LIFE = 5 - LINES_OF_BRICKS = 5 - BRICKS_PER_LINE = 20 -) - -type Player struct { - position rl.Vector2 - size rl.Vector2 - life int -} - -type Ball struct { - position rl.Vector2 - speed rl.Vector2 - radius float32 - active bool -} - -type Brick struct { - position rl.Vector2 - active bool -} - -const ( - screenWidth = 800 - screenHeight = 450 -) - -type Game struct { - gameOver bool - pause bool - player Player - ball Ball - brick [LINES_OF_BRICKS][BRICKS_PER_LINE]Brick - brickSize rl.Vector2 -} - -func main() { - rl.InitWindow(screenWidth, screenHeight, "sample game: arkanoid") - - // Init game - game := NewGame() - game.gameOver = true - - rl.SetTargetFPS(60) - - for !rl.WindowShouldClose() { - game.Update() - - game.Draw() - - } - - rl.CloseWindow() - -} - -// For android -func init() { - rl.SetCallbackFunc(main) -} - -// NewGame - Create a new game instance -func NewGame() (g Game) { - g.Init() - return -} - -// Init - initialize game -func (g *Game) Init() { - g.brickSize = rl.Vector2{float32(rl.GetScreenWidth() / BRICKS_PER_LINE), 40} - - // Initialize player - g.player.position = rl.Vector2{float32(screenWidth / 2), float32(screenHeight * 7 / 8)} - g.player.size = rl.Vector2{float32(screenWidth / 10), 20} - g.player.life = PLAYER_MAX_LIFE - - // Initialize ball - g.ball.position = rl.Vector2{float32(screenWidth / 2), float32(screenHeight*7/8 - 30)} - g.ball.speed = rl.Vector2{0, 0} - g.ball.radius = 7 - g.ball.active = false - - initialDownPosition := int(50) - - for i := 0; i < LINES_OF_BRICKS; i++ { - for j := 0; j < BRICKS_PER_LINE; j++ { - g.brick[i][j].position = rl.Vector2{float32(j)*g.brickSize.X + g.brickSize.X/2, float32(i)*g.brickSize.Y + float32(initialDownPosition)} - g.brick[i][j].active = true - } - } -} - -// Update - update game state -func (g *Game) Update() { - if !g.gameOver { - - if rl.IsKeyPressed(rl.KeyP) { - g.pause = !g.pause - } - - if !g.pause { - - if rl.IsKeyDown(rl.KeyLeft) || rl.IsKeyDown(rl.KeyA) { - g.player.position.X -= 5 - } - if (g.player.position.X - g.player.size.X/2) <= 0 { - g.player.position.X = g.player.size.X / 2 - } - if rl.IsKeyDown(rl.KeyRight) || rl.IsKeyDown(rl.KeyD) { - g.player.position.X += 5 - } - if (g.player.position.X + g.player.size.X/2) >= screenWidth { - g.player.position.X = screenWidth - g.player.size.X/2 - } - - if !g.ball.active { - if rl.IsKeyPressed(rl.KeySpace) { - g.ball.active = true - g.ball.speed = rl.Vector2{0, -5} - } - } - - if g.ball.active { - g.ball.position.X += g.ball.speed.X - g.ball.position.Y += g.ball.speed.Y - } else { - g.ball.position = rl.Vector2{g.player.position.X, screenHeight*7/8 - 30} - } - - // Collision logic: ball vs walls - if ((g.ball.position.X + g.ball.radius) >= screenWidth) || ((g.ball.position.X - g.ball.radius) <= 0) { - g.ball.speed.X *= -1 - } - if (g.ball.position.Y - g.ball.radius) <= 0 { - g.ball.speed.Y *= -1 - } - if (g.ball.position.Y + g.ball.radius) >= screenHeight { - g.ball.speed = rl.Vector2{0, 0} - g.ball.active = false - - g.player.life-- - } - if (rl.CheckCollisionCircleRec(g.ball.position, g.ball.radius, - rl.Rectangle{g.player.position.X - g.player.size.X/2, g.player.position.Y - g.player.size.Y/2, g.player.size.X, g.player.size.Y})) { - if g.ball.speed.Y > 0 { - g.ball.speed.Y *= -1 - g.ball.speed.X = (g.ball.position.X - g.player.position.X) / (g.player.size.X / 2) * 5 - } - } - // Collision logic: ball vs bricks - for i := 0; i < LINES_OF_BRICKS; i++ { - for j := 0; j < BRICKS_PER_LINE; j++ { - if g.brick[i][j].active { - if ((g.ball.position.Y - g.ball.radius) <= (g.brick[i][j].position.Y + g.brickSize.Y/2)) && - ((g.ball.position.Y - g.ball.radius) > (g.brick[i][j].position.Y + g.brickSize.Y/2 + g.ball.speed.Y)) && - ((float32(math.Abs(float64(g.ball.position.X - g.brick[i][j].position.X)))) < (g.brickSize.X/2 + g.ball.radius*2/3)) && - (g.ball.speed.Y < 0) { - // Hit below - g.brick[i][j].active = false - g.ball.speed.Y *= -1 - } else if ((g.ball.position.Y + g.ball.radius) >= (g.brick[i][j].position.Y - g.brickSize.Y/2)) && - ((g.ball.position.Y + g.ball.radius) < (g.brick[i][j].position.Y - g.brickSize.Y/2 + g.ball.speed.Y)) && - ((float32(math.Abs(float64(g.ball.position.X - g.brick[i][j].position.X)))) < (g.brickSize.X/2 + g.ball.radius*2/3)) && - (g.ball.speed.Y > 0) { - // Hit above - g.brick[i][j].active = false - g.ball.speed.Y *= -1 - } else if ((g.ball.position.X + g.ball.radius) >= (g.brick[i][j].position.X - g.brickSize.X/2)) && - ((g.ball.position.X + g.ball.radius) < (g.brick[i][j].position.X - g.brickSize.X/2 + g.ball.speed.X)) && - ((float32(math.Abs(float64(g.ball.position.Y - g.brick[i][j].position.Y)))) < (g.brickSize.Y/2 + g.ball.radius*2/3)) && - (g.ball.speed.X > 0) { - // Hit left - g.brick[i][j].active = false - g.ball.speed.X *= -1 - } else if ((g.ball.position.X - g.ball.radius) <= (g.brick[i][j].position.X + g.brickSize.X/2)) && - ((g.ball.position.X - g.ball.radius) > (g.brick[i][j].position.X + g.brickSize.X/2 + g.ball.speed.X)) && - ((float32(math.Abs(float64(g.ball.position.Y - g.brick[i][j].position.Y)))) < (g.brickSize.Y/2 + g.ball.radius*2/3)) && - (g.ball.speed.X < 0) { - // Hit right - g.brick[i][j].active = false - g.ball.speed.X *= -1 - } - } - } - } - } - - // Game over logic - if g.player.life <= 0 { - g.gameOver = true - } else { - g.gameOver = true - - for i := 0; i < LINES_OF_BRICKS; i++ { - for j := 0; j < BRICKS_PER_LINE; j++ { - if g.brick[i][j].active { - g.gameOver = false - } - } - } - } - - } else { - if rl.IsKeyPressed(rl.KeyEnter) { - g.Init() - g.gameOver = false - } - } -} - -// Draw - draw game -func (g *Game) Draw() { - rl.BeginDrawing() - rl.ClearBackground(rl.White) - - if !g.gameOver { - // Draw player bar - rl.DrawRectangle(int32(g.player.position.X-g.player.size.X/2), int32(g.player.position.Y-g.player.size.Y/2), int32(g.player.size.X), int32(g.player.size.Y), rl.Black) - - // Draw player lives - for i := 0; i < g.player.life; i++ { - rl.DrawRectangle(int32(20+40*i), screenHeight-30, 35, 10, rl.LightGray) - } - - // Draw Ball - rl.DrawCircleV(g.ball.position, g.ball.radius, rl.Maroon) - - for i := 0; i < LINES_OF_BRICKS; i++ { - for j := 0; j < BRICKS_PER_LINE; j++ { - if g.brick[i][j].active { - if (i+j)%2 == 0 { - rl.DrawRectangle(int32(g.brick[i][j].position.X-g.brickSize.X/2), int32(g.brick[i][j].position.Y-g.brickSize.Y/2), int32(g.brickSize.X), int32(g.brickSize.Y), rl.Gray) - } else { - rl.DrawRectangle(int32(g.brick[i][j].position.X-g.brickSize.X/2), int32(g.brick[i][j].position.Y-g.brickSize.Y/2), int32(g.brickSize.X), int32(g.brickSize.Y), rl.DarkGray) - } - } - } - } - - if g.pause { - rl.DrawText("GAME PAUSED", screenWidth/2-rl.MeasureText("GAME PAUSED", 40)/2, screenHeight/2+screenHeight/4-40, 40, rl.Gray) - } - - } else { - str := "PRESS [ENTER] TO PLAY AGAIN" - x := int(rl.GetScreenWidth()/2) - int(rl.MeasureText(str, 20)/2) - y := rl.GetScreenHeight()/2 - 50 - rl.DrawText(str, int32(x), int32(y), 20, rl.Gray) - } - - rl.EndDrawing() -} +package main + +/******************************************************************************************* +* +* raylib - sample game: arkanoid +* +* Sample game Marc Palau and Ramon Santamaria +* +* This game has been created using raylib v1.3 (www.raylib.com) +* raylib is licensed under an unmodified zlib/libpng license (View raylib.h for details) +* +* Copyright (c) 2015 Ramon Santamaria (@raysan5) +* +* Ported to raylib-go by Nehpe (@nehpe), July 2019 +* +********************************************************************************************/ + +import ( + "math" + + rl "github.com/gen2brain/raylib-go/raylib" +) + +const ( + PLAYER_MAX_LIFE = 5 + LINES_OF_BRICKS = 5 + BRICKS_PER_LINE = 20 +) + +type Player struct { + position rl.Vector2 + size rl.Vector2 + life int +} + +type Ball struct { + position rl.Vector2 + speed rl.Vector2 + radius float32 + active bool +} + +type Brick struct { + position rl.Vector2 + active bool +} + +const ( + screenWidth = 800 + screenHeight = 450 +) + +type Game struct { + gameOver bool + pause bool + player Player + ball Ball + brick [LINES_OF_BRICKS][BRICKS_PER_LINE]Brick + brickSize rl.Vector2 +} + +func main() { + rl.InitWindow(screenWidth, screenHeight, "sample game: arkanoid") + + // Init game + game := NewGame() + game.gameOver = true + + rl.SetTargetFPS(60) + + for !rl.WindowShouldClose() { + game.Update() + + game.Draw() + + } + + rl.CloseWindow() + +} + +// For android +func init() { + rl.SetCallbackFunc(main) +} + +// NewGame - Create a new game instance +func NewGame() (g Game) { + g.Init() + return +} + +// Init - initialize game +func (g *Game) Init() { + g.brickSize = rl.Vector2{float32(rl.GetScreenWidth() / BRICKS_PER_LINE), 40} + + // Initialize player + g.player.position = rl.Vector2{float32(screenWidth / 2), float32(screenHeight * 7 / 8)} + g.player.size = rl.Vector2{float32(screenWidth / 10), 20} + g.player.life = PLAYER_MAX_LIFE + + // Initialize ball + g.ball.position = rl.Vector2{float32(screenWidth / 2), float32(screenHeight*7/8 - 30)} + g.ball.speed = rl.Vector2{0, 0} + g.ball.radius = 7 + g.ball.active = false + + initialDownPosition := int(50) + + for i := 0; i < LINES_OF_BRICKS; i++ { + for j := 0; j < BRICKS_PER_LINE; j++ { + g.brick[i][j].position = rl.Vector2{float32(j)*g.brickSize.X + g.brickSize.X/2, float32(i)*g.brickSize.Y + float32(initialDownPosition)} + g.brick[i][j].active = true + } + } +} + +// Update - update game state +func (g *Game) Update() { + if !g.gameOver { + + if rl.IsKeyPressed(rl.KeyP) { + g.pause = !g.pause + } + + if !g.pause { + + if rl.IsKeyDown(rl.KeyLeft) || rl.IsKeyDown(rl.KeyA) { + g.player.position.X -= 5 + } + if (g.player.position.X - g.player.size.X/2) <= 0 { + g.player.position.X = g.player.size.X / 2 + } + if rl.IsKeyDown(rl.KeyRight) || rl.IsKeyDown(rl.KeyD) { + g.player.position.X += 5 + } + if (g.player.position.X + g.player.size.X/2) >= screenWidth { + g.player.position.X = screenWidth - g.player.size.X/2 + } + + if !g.ball.active { + if rl.IsKeyPressed(rl.KeySpace) { + g.ball.active = true + g.ball.speed = rl.Vector2{0, -5} + } + } + + if g.ball.active { + g.ball.position.X += g.ball.speed.X + g.ball.position.Y += g.ball.speed.Y + } else { + g.ball.position = rl.Vector2{g.player.position.X, screenHeight*7/8 - 30} + } + + // Collision logic: ball vs walls + if ((g.ball.position.X + g.ball.radius) >= screenWidth) || ((g.ball.position.X - g.ball.radius) <= 0) { + g.ball.speed.X *= -1 + } + if (g.ball.position.Y - g.ball.radius) <= 0 { + g.ball.speed.Y *= -1 + } + if (g.ball.position.Y + g.ball.radius) >= screenHeight { + g.ball.speed = rl.Vector2{0, 0} + g.ball.active = false + + g.player.life-- + } + if (rl.CheckCollisionCircleRec(g.ball.position, g.ball.radius, + rl.Rectangle{g.player.position.X - g.player.size.X/2, g.player.position.Y - g.player.size.Y/2, g.player.size.X, g.player.size.Y})) { + if g.ball.speed.Y > 0 { + g.ball.speed.Y *= -1 + g.ball.speed.X = (g.ball.position.X - g.player.position.X) / (g.player.size.X / 2) * 5 + } + } + // Collision logic: ball vs bricks + for i := 0; i < LINES_OF_BRICKS; i++ { + for j := 0; j < BRICKS_PER_LINE; j++ { + if g.brick[i][j].active { + if ((g.ball.position.Y - g.ball.radius) <= (g.brick[i][j].position.Y + g.brickSize.Y/2)) && + ((g.ball.position.Y - g.ball.radius) > (g.brick[i][j].position.Y + g.brickSize.Y/2 + g.ball.speed.Y)) && + ((float32(math.Abs(float64(g.ball.position.X - g.brick[i][j].position.X)))) < (g.brickSize.X/2 + g.ball.radius*2/3)) && + (g.ball.speed.Y < 0) { + // Hit below + g.brick[i][j].active = false + g.ball.speed.Y *= -1 + } else if ((g.ball.position.Y + g.ball.radius) >= (g.brick[i][j].position.Y - g.brickSize.Y/2)) && + ((g.ball.position.Y + g.ball.radius) < (g.brick[i][j].position.Y - g.brickSize.Y/2 + g.ball.speed.Y)) && + ((float32(math.Abs(float64(g.ball.position.X - g.brick[i][j].position.X)))) < (g.brickSize.X/2 + g.ball.radius*2/3)) && + (g.ball.speed.Y > 0) { + // Hit above + g.brick[i][j].active = false + g.ball.speed.Y *= -1 + } else if ((g.ball.position.X + g.ball.radius) >= (g.brick[i][j].position.X - g.brickSize.X/2)) && + ((g.ball.position.X + g.ball.radius) < (g.brick[i][j].position.X - g.brickSize.X/2 + g.ball.speed.X)) && + ((float32(math.Abs(float64(g.ball.position.Y - g.brick[i][j].position.Y)))) < (g.brickSize.Y/2 + g.ball.radius*2/3)) && + (g.ball.speed.X > 0) { + // Hit left + g.brick[i][j].active = false + g.ball.speed.X *= -1 + } else if ((g.ball.position.X - g.ball.radius) <= (g.brick[i][j].position.X + g.brickSize.X/2)) && + ((g.ball.position.X - g.ball.radius) > (g.brick[i][j].position.X + g.brickSize.X/2 + g.ball.speed.X)) && + ((float32(math.Abs(float64(g.ball.position.Y - g.brick[i][j].position.Y)))) < (g.brickSize.Y/2 + g.ball.radius*2/3)) && + (g.ball.speed.X < 0) { + // Hit right + g.brick[i][j].active = false + g.ball.speed.X *= -1 + } + } + } + } + } + + // Game over logic + if g.player.life <= 0 { + g.gameOver = true + } else { + g.gameOver = true + + for i := 0; i < LINES_OF_BRICKS; i++ { + for j := 0; j < BRICKS_PER_LINE; j++ { + if g.brick[i][j].active { + g.gameOver = false + } + } + } + } + + } else { + if rl.IsKeyPressed(rl.KeyEnter) { + g.Init() + g.gameOver = false + } + } +} + +// Draw - draw game +func (g *Game) Draw() { + rl.BeginDrawing() + rl.ClearBackground(rl.White) + + if !g.gameOver { + // Draw player bar + rl.DrawRectangle(int32(g.player.position.X-g.player.size.X/2), int32(g.player.position.Y-g.player.size.Y/2), int32(g.player.size.X), int32(g.player.size.Y), rl.Black) + + // Draw player lives + for i := 0; i < g.player.life; i++ { + rl.DrawRectangle(int32(20+40*i), screenHeight-30, 35, 10, rl.LightGray) + } + + // Draw Ball + rl.DrawCircleV(g.ball.position, g.ball.radius, rl.Maroon) + + for i := 0; i < LINES_OF_BRICKS; i++ { + for j := 0; j < BRICKS_PER_LINE; j++ { + if g.brick[i][j].active { + if (i+j)%2 == 0 { + rl.DrawRectangle(int32(g.brick[i][j].position.X-g.brickSize.X/2), int32(g.brick[i][j].position.Y-g.brickSize.Y/2), int32(g.brickSize.X), int32(g.brickSize.Y), rl.Gray) + } else { + rl.DrawRectangle(int32(g.brick[i][j].position.X-g.brickSize.X/2), int32(g.brick[i][j].position.Y-g.brickSize.Y/2), int32(g.brickSize.X), int32(g.brickSize.Y), rl.DarkGray) + } + } + } + } + + if g.pause { + rl.DrawText("GAME PAUSED", screenWidth/2-rl.MeasureText("GAME PAUSED", 40)/2, screenHeight/2+screenHeight/4-40, 40, rl.Gray) + } + + } else { + str := "PRESS [ENTER] TO PLAY AGAIN" + x := int(rl.GetScreenWidth()/2) - int(rl.MeasureText(str, 20)/2) + y := rl.GetScreenHeight()/2 - 50 + rl.DrawText(str, int32(x), int32(y), 20, rl.Gray) + } + + rl.EndDrawing() +} diff --git a/examples/gui/button/main.go b/examples/gui/button/main.go index c7b3a12..0671a28 100644 --- a/examples/gui/button/main.go +++ b/examples/gui/button/main.go @@ -3,8 +3,8 @@ package main import ( "fmt" - rl "github.com/gen2brain/raylib-go/raylib" - gui "github.com/gen2brain/raylib-go/raygui" + gui "github.com/gen2brain/raylib-go/raygui" + rl "github.com/gen2brain/raylib-go/raylib" ) func main() { diff --git a/examples/gui/controls_test_suite/controls_test_suite.go b/examples/gui/controls_test_suite/controls_test_suite.go index 1cad647..2f7c6f4 100644 --- a/examples/gui/controls_test_suite/controls_test_suite.go +++ b/examples/gui/controls_test_suite/controls_test_suite.go @@ -46,9 +46,9 @@ import ( //#define RAYGUI_CUSTOM_ICONS // It requires providing gui_icons.h in the same directory //#include "gui_icons.h" // External icons data provided, it can be generated with rGuiIcons tool -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ // Program main entry point -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ func main() { // Initialization //--------------------------------------------------------------------------------------- diff --git a/examples/gui/portable_window/portable_window.go b/examples/gui/portable_window/portable_window.go index 2e4754b..2485641 100644 --- a/examples/gui/portable_window/portable_window.go +++ b/examples/gui/portable_window/portable_window.go @@ -24,9 +24,9 @@ import ( * **********************************************************************************************/ -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ // Program main entry point -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ func main() { // Initialization //--------------------------------------------------------------------------------------- diff --git a/examples/gui/scroll_panel/scroll_panel.go b/examples/gui/scroll_panel/scroll_panel.go index dc6e207..d033bf8 100644 --- a/examples/gui/scroll_panel/scroll_panel.go +++ b/examples/gui/scroll_panel/scroll_panel.go @@ -30,9 +30,9 @@ import ( * **********************************************************************************************/ -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ // Program main entry point -//------------------------------------------------------------------------------------ +// ------------------------------------------------------------------------------------ func main() { // Initialization @@ -85,10 +85,10 @@ func main() { if showContentArea { rl.DrawRectangle( - int32(panelRec.X+panelScroll.X), - int32(panelRec.Y+panelScroll.Y), - int32(panelContentRec.Width), - int32(panelContentRec.Height), + int32(panelRec.X+panelScroll.X), + int32(panelRec.Y+panelScroll.Y), + int32(panelContentRec.Width), + int32(panelContentRec.Height), rl.Fade(rl.Red, 0.1), ) } @@ -140,7 +140,7 @@ func DrawStyleEditControls() { gui.Spinner(rl.Rectangle{670, 240, 90, 20}, "", &style, 0, 14, false) gui.SetStyle(gui.SCROLLBAR, gui.SLIDER_PADDING, style) - style = boolToint32( gui.CheckBox(rl.Rectangle{565, 280, 20, 20}, "ARROWS_VISIBLE", int32Tobool(gui.GetStyle(gui.SCROLLBAR, gui.ARROWS_VISIBLE)))) + style = boolToint32(gui.CheckBox(rl.Rectangle{565, 280, 20, 20}, "ARROWS_VISIBLE", int32Tobool(gui.GetStyle(gui.SCROLLBAR, gui.ARROWS_VISIBLE)))) gui.SetStyle(gui.SCROLLBAR, gui.ARROWS_VISIBLE, style) style = gui.GetStyle(gui.SCROLLBAR, gui.SLIDER_PADDING) @@ -159,7 +159,7 @@ func DrawStyleEditControls() { } else { text = "SCROLLBAR: RIGHT" } - style = boolToint32( gui.Toggle(rl.Rectangle{560, 110, 200, 35}, text, int32Tobool(gui.GetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE)))) + style = boolToint32(gui.Toggle(rl.Rectangle{560, 110, 200, 35}, text, int32Tobool(gui.GetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE)))) gui.SetStyle(gui.LISTVIEW, gui.SCROLLBAR_SIDE, style) //---------------------------------------------------------- diff --git a/rres/cmd/rrem/main.go b/rres/cmd/rrem/main.go index 5938f27..49055cc 100644 --- a/rres/cmd/rrem/main.go +++ b/rres/cmd/rrem/main.go @@ -422,7 +422,7 @@ func genSource(w io.Writer, data []byte) error { return nil } -//genBin generates go-bindata file +// genBin generates go-bindata file func genBin(base string) error { cfg := bindata.NewConfig() cfg.NoCompress = true