Change package name to edgaru089.ink/go/gl01 & Update dependencies

This commit is contained in:
Edgaru089 2024-08-02 18:38:33 +08:00
parent e4fc6f4d96
commit c954c502ba
34 changed files with 90 additions and 82 deletions

View File

@ -5,10 +5,10 @@ import (
"runtime" "runtime"
"time" "time"
"edgaru089.ml/go/gl01/internal/game" "edgaru089.ink/go/gl01/internal/game"
gio "edgaru089.ml/go/gl01/internal/io" gio "edgaru089.ink/go/gl01/internal/io"
_ "edgaru089.ml/go/gl01/internal/render/gpu_preference" _ "edgaru089.ink/go/gl01/internal/render/gpu_preference"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
) )

10
go.mod
View File

@ -1,13 +1,13 @@
module edgaru089.ml/go/gl01 module edgaru089.ink/go/gl01
go 1.17 go 1.17
require ( require (
github.com/aquilax/go-perlin v1.1.0 github.com/aquilax/go-perlin v1.1.0
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a
github.com/go-gl/mathgl v1.0.0 github.com/go-gl/mathgl v1.1.0
github.com/inkyblackness/imgui-go/v4 v4.4.0 github.com/inkyblackness/imgui-go/v4 v4.7.0
) )
require golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f // indirect require golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f // indirect

8
go.sum
View File

@ -4,12 +4,20 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk=
github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 h1:5BVwOaUSBTlVZowGO6VZGw2H/zl9nrd3eCZfYV+NfQA=
github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec h1:3FLiRYO6PlQFDpUU7OEFlWgjGD1jnBIVSJ5SYRWk+9c= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec h1:3FLiRYO6PlQFDpUU7OEFlWgjGD1jnBIVSJ5SYRWk+9c=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a h1:vxnBhFDDT+xzxf1jTJKMKZw3H0swfWk9RpWbBbDK5+0=
github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
github.com/go-gl/mathgl v1.0.0 h1:t9DznWJlXxxjeeKLIdovCOVJQk/GzDEL7h/h+Ro2B68= github.com/go-gl/mathgl v1.0.0 h1:t9DznWJlXxxjeeKLIdovCOVJQk/GzDEL7h/h+Ro2B68=
github.com/go-gl/mathgl v1.0.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ= github.com/go-gl/mathgl v1.0.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ=
github.com/go-gl/mathgl v1.1.0 h1:0lzZ+rntPX3/oGrDzYGdowSLC2ky8Osirvf5uAwfIEA=
github.com/go-gl/mathgl v1.1.0/go.mod h1:yhpkQzEiH9yPyxDUGzkmgScbaBVlhC06qodikEM0ZwQ=
github.com/inkyblackness/imgui-go/v4 v4.4.0 h1:jY32Xl18aRwTBXaDfyefCmPDxJOtGM8kGfu/kMNJpbE= github.com/inkyblackness/imgui-go/v4 v4.4.0 h1:jY32Xl18aRwTBXaDfyefCmPDxJOtGM8kGfu/kMNJpbE=
github.com/inkyblackness/imgui-go/v4 v4.4.0/go.mod h1:g8SAGtOYUP7rYaOB2AsVKCEHmPMDmJKgt4z6d+flhb0= github.com/inkyblackness/imgui-go/v4 v4.4.0/go.mod h1:g8SAGtOYUP7rYaOB2AsVKCEHmPMDmJKgt4z6d+flhb0=
github.com/inkyblackness/imgui-go/v4 v4.7.0 h1:Gc169uXvSydsr/gjw3p1cmHCI1XIpqX7I3KBmfeMMOo=
github.com/inkyblackness/imgui-go/v4 v4.7.0/go.mod h1:g8SAGtOYUP7rYaOB2AsVKCEHmPMDmJKgt4z6d+flhb0=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=

View File

@ -5,7 +5,7 @@ import (
"log" "log"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
) )
// WorldTextureAtlas holds all the world block textures. // WorldTextureAtlas holds all the world block textures.

View File

@ -3,9 +3,9 @@ package entities
import ( import (
"time" "time"
"edgaru089.ml/go/gl01/internal/entity" "edgaru089.ink/go/gl01/internal/entity"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
) )
type PlayerBehaviour struct{} type PlayerBehaviour struct{}

View File

@ -3,8 +3,8 @@ package entity
import ( import (
"time" "time"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
) )
// EntityBehaviour describes the behaviour of a type of entity with the same Name. // EntityBehaviour describes the behaviour of a type of entity with the same Name.

View File

@ -4,9 +4,9 @@ import (
"math" "math"
"time" "time"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
) )
// WorldHitbox returns the hitboxes of the entity, in world coordinates. // WorldHitbox returns the hitboxes of the entity, in world coordinates.

View File

@ -3,13 +3,13 @@ package game
import ( import (
"time" "time"
"edgaru089.ml/go/gl01/internal/entity" "edgaru089.ink/go/gl01/internal/entity"
"edgaru089.ml/go/gl01/internal/render" "edgaru089.ink/go/gl01/internal/render"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
"github.com/inkyblackness/imgui-go/v4" "github.com/inkyblackness/imgui-go/v4"
_ "edgaru089.ml/go/gl01/internal/entity/entities" _ "edgaru089.ink/go/gl01/internal/entity/entities"
) )
// Game holds a game scene. // Game holds a game scene.

View File

@ -7,13 +7,13 @@ import (
"os" "os"
"runtime" "runtime"
"edgaru089.ml/go/gl01/internal/asset" "edgaru089.ink/go/gl01/internal/asset"
"edgaru089.ml/go/gl01/internal/igwrap" "edgaru089.ink/go/gl01/internal/igwrap"
"edgaru089.ml/go/gl01/internal/igwrap/backend" "edgaru089.ink/go/gl01/internal/igwrap/backend"
"edgaru089.ml/go/gl01/internal/io" "edgaru089.ink/go/gl01/internal/io"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
"github.com/inkyblackness/imgui-go/v4" "github.com/inkyblackness/imgui-go/v4"
) )

View File

@ -6,14 +6,14 @@ import (
"os" "os"
"time" "time"
"edgaru089.ml/go/gl01/internal/igwrap/backend" "edgaru089.ink/go/gl01/internal/igwrap/backend"
"edgaru089.ml/go/gl01/internal/io" "edgaru089.ink/go/gl01/internal/io"
"edgaru089.ml/go/gl01/internal/render" "edgaru089.ink/go/gl01/internal/render"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
"edgaru089.ml/go/gl01/internal/world/blocks" "edgaru089.ink/go/gl01/internal/world/blocks"
"edgaru089.ml/go/gl01/internal/world/worldgen" "edgaru089.ink/go/gl01/internal/world/worldgen"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
"github.com/go-gl/mathgl/mgl64" "github.com/go-gl/mathgl/mgl64"
) )

View File

@ -6,13 +6,13 @@ import (
"time" "time"
"unsafe" "unsafe"
"edgaru089.ml/go/gl01/internal/asset" "edgaru089.ink/go/gl01/internal/asset"
"edgaru089.ml/go/gl01/internal/igwrap" "edgaru089.ink/go/gl01/internal/igwrap"
"edgaru089.ml/go/gl01/internal/igwrap/backend" "edgaru089.ink/go/gl01/internal/igwrap/backend"
"edgaru089.ml/go/gl01/internal/io" "edgaru089.ink/go/gl01/internal/io"
"edgaru089.ml/go/gl01/internal/render" "edgaru089.ink/go/gl01/internal/render"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
"github.com/go-gl/mathgl/mgl32" "github.com/go-gl/mathgl/mgl32"

View File

@ -4,11 +4,11 @@ import (
"math" "math"
"time" "time"
"edgaru089.ml/go/gl01/internal/asset" "edgaru089.ink/go/gl01/internal/asset"
"edgaru089.ml/go/gl01/internal/igwrap" "edgaru089.ink/go/gl01/internal/igwrap"
"edgaru089.ml/go/gl01/internal/io" "edgaru089.ink/go/gl01/internal/io"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/inkyblackness/imgui-go/v4" "github.com/inkyblackness/imgui-go/v4"
) )

View File

@ -3,8 +3,8 @@ package backend
import ( import (
_ "embed" _ "embed"
"edgaru089.ml/go/gl01/internal/igwrap" "edgaru089.ink/go/gl01/internal/igwrap"
"edgaru089.ml/go/gl01/internal/render" "edgaru089.ink/go/gl01/internal/render"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/glfw/v3.3/glfw"
"github.com/go-gl/mathgl/mgl32" "github.com/go-gl/mathgl/mgl32"

View File

@ -3,7 +3,7 @@ package igwrap
import ( import (
"math" "math"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/inkyblackness/imgui-go/v4" "github.com/inkyblackness/imgui-go/v4"
) )

View File

@ -3,7 +3,7 @@ package igwrap
import ( import (
"sync" "sync"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/inkyblackness/imgui-go/v4" "github.com/inkyblackness/imgui-go/v4"
) )

View File

@ -3,7 +3,7 @@ package igwrap
import ( import (
"fmt" "fmt"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/inkyblackness/imgui-go/v4" "github.com/inkyblackness/imgui-go/v4"
) )

View File

@ -1,6 +1,6 @@
package io package io
import "edgaru089.ml/go/gl01/internal/util" import "edgaru089.ink/go/gl01/internal/util"
var ( var (
MainConfig struct { MainConfig struct {

View File

@ -3,7 +3,7 @@ package io
import ( import (
"time" "time"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
) )
var ( var (

View File

@ -4,8 +4,8 @@ import (
"image/color" "image/color"
"unsafe" "unsafe"
"edgaru089.ml/go/gl01/internal/asset" "edgaru089.ink/go/gl01/internal/asset"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/go-gl/mathgl/mgl32" "github.com/go-gl/mathgl/mgl32"
) )

View File

@ -4,7 +4,7 @@ import (
_ "embed" _ "embed"
"unsafe" "unsafe"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
) )

View File

@ -5,7 +5,7 @@ import (
"log" "log"
"strings" "strings"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
"github.com/go-gl/mathgl/mgl32" "github.com/go-gl/mathgl/mgl32"
) )

View File

@ -1,7 +1,7 @@
package render package render
import ( import (
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/mathgl/mgl32" "github.com/go-gl/mathgl/mgl32"
) )

View File

@ -8,7 +8,7 @@ import (
"log" "log"
"sort" "sort"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
) )
// The largest width a texture atlas can grow to. // The largest width a texture atlas can grow to.

View File

@ -1,6 +1,6 @@
package util package util
import "edgaru089.ml/go/gl01/internal/util/itype" import "edgaru089.ink/go/gl01/internal/util/itype"
func BunnyhopAccelerate(accelDir, prevVel itype.Vec3d, accelVel, maxVel float64) (resultVel itype.Vec3d) { func BunnyhopAccelerate(accelDir, prevVel itype.Vec3d, accelVel, maxVel float64) (resultVel itype.Vec3d) {
if accelVel < 1e-4 { if accelVel < 1e-4 {

View File

@ -3,7 +3,7 @@ package world
import ( import (
"fmt" "fmt"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
) )
// BlockRenderType is an enum describing the rendering process of a block // BlockRenderType is an enum describing the rendering process of a block

View File

@ -1,6 +1,6 @@
package blocks package blocks
import "edgaru089.ml/go/gl01/internal/world" import "edgaru089.ink/go/gl01/internal/world"
const ( const (
Nil = iota Nil = iota

View File

@ -1,9 +1,9 @@
package blocks package blocks
import ( import (
"edgaru089.ml/go/gl01/internal/asset" "edgaru089.ink/go/gl01/internal/asset"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
) )
// texname is the full filename of the texture file (with .png) // texname is the full filename of the texture file (with .png)

View File

@ -1,8 +1,8 @@
package blocks package blocks
import ( import (
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
) )
type SlabBehaviour struct{} type SlabBehaviour struct{}

View File

@ -1,8 +1,8 @@
package blocks package blocks
import ( import (
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"edgaru089.ml/go/gl01/internal/world" "edgaru089.ink/go/gl01/internal/world"
) )
type WaterBehaviour struct{} type WaterBehaviour struct{}

View File

@ -5,7 +5,7 @@ import (
"io" "io"
"log" "log"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
) )
const ( const (

View File

@ -5,10 +5,10 @@ import (
"time" "time"
"unsafe" "unsafe"
"edgaru089.ml/go/gl01/internal/asset" "edgaru089.ink/go/gl01/internal/asset"
"edgaru089.ml/go/gl01/internal/io" "edgaru089.ink/go/gl01/internal/io"
"edgaru089.ml/go/gl01/internal/util" "edgaru089.ink/go/gl01/internal/util"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
"github.com/go-gl/gl/all-core/gl" "github.com/go-gl/gl/all-core/gl"
) )

View File

@ -1,7 +1,7 @@
package world package world
import ( import (
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
) )
func (w *World) castworker(from, dir itype.Vec3d, maxlen float64, current itype.Vec3i, skipdir itype.Direction) (ok bool, blockcoord itype.Vec3i, face itype.Direction, where itype.Vec3d, dist float64) { func (w *World) castworker(from, dir itype.Vec3d, maxlen float64, current itype.Vec3i, skipdir itype.Direction) (ok bool, blockcoord itype.Vec3i, face itype.Direction, where itype.Vec3d, dist float64) {

View File

@ -4,7 +4,7 @@ import (
"fmt" "fmt"
"io" "io"
"edgaru089.ml/go/gl01/internal/util/itype" "edgaru089.ink/go/gl01/internal/util/itype"
) )
// World holds a number of Chunks and Entities. // World holds a number of Chunks and Entities.

View File

@ -3,8 +3,8 @@ package worldgen
import ( import (
"sync" "sync"
packworld "edgaru089.ml/go/gl01/internal/world" packworld "edgaru089.ink/go/gl01/internal/world"
"edgaru089.ml/go/gl01/internal/world/blocks" "edgaru089.ink/go/gl01/internal/world/blocks"
"github.com/aquilax/go-perlin" "github.com/aquilax/go-perlin"
) )