feat: various fixes

config/config.go

@@ -14,35 +14,35 @@ import (
 )
 
 type ConfigS struct {
-	FPSCounter         bool
+	FPSCounter                bool
-	ShowMPRIS          bool
+	ShowMPRIS                 bool
-	TargetFPS          int32
+	TargetFPS                 int32
-	WindowWidth        int32
+	WindowWidth               int32
-	WindowHeight       int32
+	WindowHeight              int32
-	WindowOpacity      float32
+	CaptureDeviceIndex        int
-	CaptureDeviceIndex int
+	SampleRate                uint32
-	SampleRate         uint32
+	RingBufferSize            uint32
-	RingBufferSize     uint32
+	ReadBufferSize            uint32
-	ReadBufferSize     uint32
+	Gain                      float32
-	Gain               float32
+	LineOpacity               uint8
-	LineOpacity        uint8
+	LineThickness             float32
-	LineThickness      float32
+	LineInvSqrtOpacityControl bool
 }
 
 var DefaultConfig = ConfigS{
-	FPSCounter:         false,
+	FPSCounter:                false,
-	ShowMPRIS:          true,
+	ShowMPRIS:                 true,
-	TargetFPS:          60,
+	TargetFPS:                 240,
-	WindowWidth:        1080,
+	WindowWidth:               1300,
-	WindowHeight:       1080,
+	WindowHeight:              1300,
-	WindowOpacity:      0.8,
+	CaptureDeviceIndex:        0,
-	CaptureDeviceIndex: 0,
+	SampleRate:                96000,
-	SampleRate:         48000,
+	RingBufferSize:            9600,
-	RingBufferSize:     4800,
+	ReadBufferSize:            9600,
-	ReadBufferSize:     4800,
+	Gain:                      1,
-	Gain:               1,
+	LineOpacity:               100,
-	LineOpacity:        50,
+	LineThickness:             3,
-	LineThickness:      2,
+	LineInvSqrtOpacityControl: false,
 }
 
 var Config ConfigS

icons/icons.go

@@ -0,0 +1,35 @@
+package icons
+
+import (
+	"embed"
+	"image"
+	_ "image/png"
+	"xyosc/utils"
+)
+
+//go:embed assets/icon-48.png
+//go:embed assets/icon-16.png
+//go:embed assets/icon-32.png
+var fs embed.FS
+
+var WindowIcon48 image.Image
+var WindowIcon32 image.Image
+var WindowIcon16 image.Image
+
+func Init() {
+	f48, err := fs.Open("assets/icon-48.png")
+	utils.CheckError(err)
+	defer f48.Close()
+	WindowIcon48, _, err = image.Decode(f48)
+	utils.CheckError(err)
+	f32, err := fs.Open("assets/icon-32.png")
+	utils.CheckError(err)
+	defer f32.Close()
+	WindowIcon32, _, err = image.Decode(f32)
+	utils.CheckError(err)
+	f16, err := fs.Open("assets/icon-16.png")
+	utils.CheckError(err)
+	defer f16.Close()
+	WindowIcon16, _, err = image.Decode(f16)
+	utils.CheckError(err)
+}

main.go

@@ -2,10 +2,14 @@ package main
 
 import (
 	"encoding/binary"
+	"image"
+	"image/color"
 	"log"
 	"xyosc/audio"
 	"xyosc/config"
+	"xyosc/fastsqrt"
 	"xyosc/fonts"
+	"xyosc/icons"
 	"xyosc/media"
 
 	"fmt"
@@ -38,9 +42,15 @@ func (g *Game) Draw(screen *ebiten.Image) {
 		fAY := -float32(AY) * config.Config.Gain * float32(scale)
 		fBX := float32(BX) * config.Config.Gain * float32(scale)
 		fBY := -float32(BY) * config.Config.Gain * float32(scale)
-		//inv := fastsqrt.FastInvSqrt32((fBX-fAX)*(fBX-fAX) + (fBY-fBY)*(fBY-fBY))
+		if config.Config.LineInvSqrtOpacityControl {
-		//colorAdjusted := color.RGBA{config.AccentColor.R, config.AccentColor.G, config.AccentColor.B, uint8(255 * inv * config.Config.LineOpacity)}
+
-		vector.StrokeLine(screen, float32(config.Config.WindowWidth/2)+fAX, float32(config.Config.WindowWidth/2)+fAY, float32(config.Config.WindowWidth/2)+fBX, float32(config.Config.WindowWidth/2)+fBY, config.Config.LineThickness, config.AccentColor, true)
+			inv := fastsqrt.FastInvSqrt32((fBX-fAX)*(fBX-fAX) + (fBY-fBY)*(fBY-fBY))
+			colorAdjusted := color.RGBA{config.AccentColor.R, config.AccentColor.G, config.AccentColor.B, uint8(float32(config.Config.LineOpacity) * inv)}
+			vector.StrokeLine(screen, float32(config.Config.WindowWidth/2)+fAX, float32(config.Config.WindowWidth/2)+fAY, float32(config.Config.WindowWidth/2)+fBX, float32(config.Config.WindowWidth/2)+fBY, config.Config.LineThickness, colorAdjusted, true)
+		} else {
+			vector.StrokeLine(screen, float32(config.Config.WindowWidth/2)+fAX, float32(config.Config.WindowWidth/2)+fAY, float32(config.Config.WindowWidth/2)+fBX, float32(config.Config.WindowWidth/2)+fBY, config.Config.LineThickness, config.AccentColor, true)
+
+		}
 		AX = BX
 		AY = BY
 	}
@@ -84,10 +94,13 @@ func main() {
 	config.Init()
 	audio.Init()
 	fonts.Init()
+	icons.Init()
 	go audio.Start()
 	go media.Start()
+	ebiten.SetWindowIcon([]image.Image{icons.WindowIcon48, icons.WindowIcon32, icons.WindowIcon16})
 	ebiten.SetWindowSize(int(config.Config.WindowWidth), int(config.Config.WindowHeight))
 	ebiten.SetWindowTitle("xyosc")
+	ebiten.SetWindowMousePassthrough(true)
 	ebiten.SetTPS(int(config.Config.TargetFPS))
 	ebiten.SetWindowDecorated(false)
 	screenW, screenH := ebiten.Monitor().Size()