mirror of
https://github.com/Fluffy-Bean/ColouringApp.git
synced 2025-02-17 23:50:05 +00:00
Draw only when in canvas
This commit is contained in:
parent
65ec70dd4a
commit
832fcdc7c4
|
@ -2,10 +2,16 @@ package scenes
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"ColouringApp/application"
|
"ColouringApp/application"
|
||||||
|
"fmt"
|
||||||
gui "github.com/gen2brain/raylib-go/raygui"
|
gui "github.com/gen2brain/raylib-go/raygui"
|
||||||
raylib "github.com/gen2brain/raylib-go/raylib"
|
raylib "github.com/gen2brain/raylib-go/raylib"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
ModeDrawing = iota
|
||||||
|
ModeLine
|
||||||
|
)
|
||||||
|
|
||||||
type stroke struct {
|
type stroke struct {
|
||||||
Color raylib.Color
|
Color raylib.Color
|
||||||
Size float32
|
Size float32
|
||||||
|
@ -14,16 +20,23 @@ type stroke struct {
|
||||||
|
|
||||||
func Drawing() {
|
func Drawing() {
|
||||||
var (
|
var (
|
||||||
canvasSize = raylib.NewVector2(500, 430)
|
canvasSize = raylib.NewVector2(500, 430)
|
||||||
canvas = raylib.LoadRenderTexture(int32(canvasSize.X), int32(canvasSize.Y))
|
canvas = raylib.LoadRenderTexture(int32(canvasSize.X), int32(canvasSize.Y))
|
||||||
|
|
||||||
|
sidePanelWidth float32 = 300
|
||||||
|
sidePanelRelativeX = application.WindowWidth - int32(sidePanelWidth)
|
||||||
|
|
||||||
|
drawing = false
|
||||||
|
//drawingMode = ModeDrawing
|
||||||
|
|
||||||
currentStroke = stroke{}
|
currentStroke = stroke{}
|
||||||
strokes = []stroke{currentStroke}
|
strokes = []stroke{currentStroke}
|
||||||
undoneStrokes = []stroke{}
|
undoneStrokes = []stroke{}
|
||||||
|
|
||||||
brushSize float32 = 10
|
|
||||||
|
|
||||||
colourPickerVal = raylib.Orange
|
colourPickerVal = raylib.Orange
|
||||||
colourPickerHeight float32 = 200
|
colourPickerHeight float32 = 200
|
||||||
|
|
||||||
|
brushSize float32 = 10
|
||||||
)
|
)
|
||||||
|
|
||||||
refreshCanvas := func() {
|
refreshCanvas := func() {
|
||||||
|
@ -46,63 +59,86 @@ func Drawing() {
|
||||||
refreshCanvas()
|
refreshCanvas()
|
||||||
|
|
||||||
for !application.ShouldQuit {
|
for !application.ShouldQuit {
|
||||||
application.ShouldQuit = raylib.WindowShouldClose()
|
// DEFAULT
|
||||||
if application.CurrentScene != application.SceneDrawing {
|
{
|
||||||
break
|
application.ShouldQuit = raylib.WindowShouldClose()
|
||||||
}
|
if application.CurrentScene != application.SceneDrawing {
|
||||||
if raylib.IsWindowResized() {
|
break
|
||||||
application.WindowWidth = int32(raylib.GetScreenWidth())
|
}
|
||||||
application.WindowHeight = int32(raylib.GetScreenHeight())
|
if raylib.IsWindowResized() {
|
||||||
|
application.WindowWidth = int32(raylib.GetScreenWidth())
|
||||||
|
application.WindowHeight = int32(raylib.GetScreenHeight())
|
||||||
|
|
||||||
|
sidePanelRelativeX = application.WindowWidth - int32(sidePanelWidth)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// INPUT
|
// INPUT
|
||||||
{
|
{
|
||||||
if raylib.IsMouseButtonPressed(raylib.MouseLeftButton) {
|
if raylib.IsMouseButtonPressed(raylib.MouseLeftButton) {
|
||||||
currentStroke = stroke{
|
drawing = false
|
||||||
Color: colourPickerVal,
|
|
||||||
Size: brushSize,
|
if raylib.CheckCollisionPointRec(raylib.GetMousePosition(), raylib.NewRectangle(10, 10, canvasSize.X, canvasSize.Y)) {
|
||||||
|
drawing = true
|
||||||
|
currentStroke = stroke{
|
||||||
|
Color: colourPickerVal,
|
||||||
|
Size: brushSize,
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if raylib.IsMouseButtonDown(raylib.MouseLeftButton) {
|
if raylib.IsMouseButtonDown(raylib.MouseLeftButton) && drawing {
|
||||||
// if mouse is further than 5 pixels from last point, add it
|
var safeZone float32 = 5
|
||||||
var safeZone float32 = 1
|
|
||||||
if len(currentStroke.Points) <= 1 {
|
if len(currentStroke.Points) <= 1 {
|
||||||
currentStroke.Points = append(currentStroke.Points, raylib.GetMousePosition())
|
currentStroke.Points = append(currentStroke.Points, raylib.GetMousePosition())
|
||||||
} else if raylib.Vector2Distance(currentStroke.Points[len(currentStroke.Points)-1], raylib.GetMousePosition()) > safeZone {
|
} else if raylib.Vector2Distance(currentStroke.Points[len(currentStroke.Points)-1], raylib.GetMousePosition()) > safeZone {
|
||||||
currentStroke.Points = append(currentStroke.Points, raylib.GetMousePosition())
|
currentStroke.Points = append(currentStroke.Points, raylib.GetMousePosition())
|
||||||
}
|
}
|
||||||
//currentStroke.Points = append(currentStroke.Points, raylib.GetMousePosition())
|
|
||||||
}
|
}
|
||||||
if raylib.IsMouseButtonReleased(raylib.MouseLeftButton) && currentStroke.Points != nil {
|
if raylib.IsMouseButtonReleased(raylib.MouseLeftButton) && currentStroke.Points != nil {
|
||||||
|
drawing = false
|
||||||
|
|
||||||
strokes = append(strokes, currentStroke)
|
strokes = append(strokes, currentStroke)
|
||||||
currentStroke = stroke{}
|
currentStroke = stroke{}
|
||||||
undoneStrokes = []stroke{}
|
undoneStrokes = []stroke{}
|
||||||
|
|
||||||
refreshCanvas()
|
refreshCanvas()
|
||||||
}
|
}
|
||||||
|
|
||||||
if raylib.IsKeyDown(raylib.KeyLeftControl) && raylib.IsKeyDown(raylib.KeyLeftShift) && raylib.IsKeyPressed(raylib.KeyZ) {
|
if raylib.IsKeyDown(raylib.KeyLeftControl) && raylib.IsKeyDown(raylib.KeyLeftShift) && raylib.IsKeyPressed(raylib.KeyZ) {
|
||||||
if len(undoneStrokes) > 0 {
|
if len(undoneStrokes) > 1 {
|
||||||
strokes = append(strokes, undoneStrokes[len(undoneStrokes)-1])
|
strokes = append(strokes, undoneStrokes[len(undoneStrokes)-1])
|
||||||
undoneStrokes = undoneStrokes[:len(undoneStrokes)-1]
|
undoneStrokes = undoneStrokes[:len(undoneStrokes)-1]
|
||||||
}
|
}
|
||||||
|
|
||||||
refreshCanvas()
|
refreshCanvas()
|
||||||
} else if raylib.IsKeyDown(raylib.KeyLeftControl) && raylib.IsKeyPressed(raylib.KeyZ) {
|
} else if raylib.IsKeyDown(raylib.KeyLeftControl) && raylib.IsKeyPressed(raylib.KeyZ) {
|
||||||
if len(strokes) > 0 {
|
if len(strokes) > 1 {
|
||||||
undoneStrokes = append(undoneStrokes, strokes[len(strokes)-1])
|
undoneStrokes = append(undoneStrokes, strokes[len(strokes)-1])
|
||||||
strokes = strokes[:len(strokes)-1]
|
strokes = strokes[:len(strokes)-1]
|
||||||
}
|
}
|
||||||
|
|
||||||
refreshCanvas()
|
refreshCanvas()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// UPDATE
|
// UPDATE
|
||||||
|
{
|
||||||
|
if drawing {
|
||||||
|
gui.SetState(gui.STATE_DISABLED)
|
||||||
|
} else {
|
||||||
|
gui.SetState(gui.STATE_NORMAL)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// DRAW
|
// DRAW
|
||||||
raylib.BeginDrawing()
|
raylib.BeginDrawing()
|
||||||
{
|
{
|
||||||
raylib.ClearBackground(raylib.White)
|
raylib.ClearBackground(raylib.White)
|
||||||
|
gui.Grid(raylib.NewRectangle(0, 0, float32(application.WindowWidth), float32(application.WindowHeight)), "", 30, 1, &raylib.Vector2{})
|
||||||
|
|
||||||
// Canvas stuff
|
// Canvas stuff
|
||||||
|
raylib.DrawRectangle(20, 20, int32(canvasSize.X), int32(canvasSize.Y), raylib.Fade(raylib.Black, 0.3))
|
||||||
raylib.BeginScissorMode(10, 10, int32(canvasSize.X), int32(canvasSize.Y))
|
raylib.BeginScissorMode(10, 10, int32(canvasSize.X), int32(canvasSize.Y))
|
||||||
{
|
{
|
||||||
raylib.DrawTexturePro(canvas.Texture, raylib.NewRectangle(0, 0, float32(canvas.Texture.Width), float32(-canvas.Texture.Height)), raylib.NewRectangle(10, 10, canvasSize.X, canvasSize.Y), raylib.Vector2{}, 0, raylib.White)
|
raylib.DrawTexturePro(canvas.Texture, raylib.NewRectangle(0, 0, float32(canvas.Texture.Width), float32(-canvas.Texture.Height)), raylib.NewRectangle(10, 10, canvasSize.X, canvasSize.Y), raylib.Vector2{}, 0, raylib.White)
|
||||||
|
@ -116,17 +152,32 @@ func Drawing() {
|
||||||
raylib.DrawRectangleLines(10, 10, int32(canvasSize.X), int32(canvasSize.Y), raylib.Gray)
|
raylib.DrawRectangleLines(10, 10, int32(canvasSize.X), int32(canvasSize.Y), raylib.Gray)
|
||||||
|
|
||||||
// UI stuff
|
// UI stuff
|
||||||
if gui.Button(raylib.NewRectangle(float32(30+int32(canvasSize.X)), 10, 25, 25), gui.IconText(gui.ICON_CROSS, "")) {
|
raylib.BeginScissorMode(sidePanelRelativeX, 0, int32(sidePanelWidth), application.WindowHeight)
|
||||||
application.CurrentScene = application.SceneTitle
|
{
|
||||||
}
|
raylib.DrawRectangle(sidePanelRelativeX, 0, int32(sidePanelWidth), application.WindowHeight, raylib.Fade(raylib.White, 0.7))
|
||||||
if gui.Button(raylib.NewRectangle(float32(65+int32(canvasSize.X)), 10, 25, 25), gui.IconText(gui.ICON_FOLDER_SAVE, "")) {
|
|
||||||
}
|
|
||||||
|
|
||||||
colourPickerVal = gui.ColorPicker(raylib.NewRectangle(float32(30+int32(canvasSize.X)), 45, float32(application.WindowWidth)-float32(65+int32(canvasSize.X)), colourPickerHeight), "Color", colourPickerVal)
|
if gui.Button(raylib.NewRectangle(float32(sidePanelRelativeX+10), 10, 25, 25), gui.IconText(gui.ICON_CROSS, "")) {
|
||||||
brushSize = gui.Slider(raylib.NewRectangle(float32(90+int32(canvasSize.X)), 65+colourPickerHeight, 200, 20), "Brush Size", "", brushSize, 1, 100)
|
application.CurrentScene = application.SceneTitle
|
||||||
|
}
|
||||||
|
if gui.Button(raylib.NewRectangle(float32(sidePanelRelativeX+20+25), 10, 25, 25), gui.IconText(gui.ICON_FOLDER_SAVE, "")) {
|
||||||
|
}
|
||||||
|
|
||||||
raylib.DrawLine(20+int32(canvasSize.X), 10, 20+int32(canvasSize.X), 10+int32(canvasSize.Y), raylib.Gray)
|
colourPickerVal = gui.ColorPicker(raylib.NewRectangle(float32(sidePanelRelativeX+10), 45, sidePanelWidth-40, colourPickerHeight), "Color", colourPickerVal)
|
||||||
raylib.DrawLine(30+int32(canvasSize.X), int32(55+colourPickerHeight), application.WindowWidth-10, int32(55+colourPickerHeight), raylib.Gray)
|
brushSize = gui.Slider(raylib.NewRectangle(float32(sidePanelRelativeX+80), 65+colourPickerHeight, 200, 20), "Brush Size", "", brushSize, 1, 100)
|
||||||
|
}
|
||||||
|
raylib.EndScissorMode()
|
||||||
|
raylib.DrawRectangleLines(sidePanelRelativeX, 0, int32(sidePanelWidth), application.WindowHeight, raylib.Gray)
|
||||||
|
|
||||||
|
// Info
|
||||||
|
{
|
||||||
|
var text string
|
||||||
|
|
||||||
|
text = fmt.Sprintf("Strokes: %d | Stroke Points: %d", len(strokes), len(currentStroke.Points))
|
||||||
|
gui.StatusBar(raylib.NewRectangle(0, float32(application.WindowHeight-20), 200, 20), text)
|
||||||
|
|
||||||
|
text = fmt.Sprintf("Canvas Size: %dx%d", int32(canvasSize.X), int32(canvasSize.Y))
|
||||||
|
gui.StatusBar(raylib.NewRectangle(199, float32(application.WindowHeight-20), 200, 20), text)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
raylib.EndDrawing()
|
raylib.EndDrawing()
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue