diff --git a/cmd/main.go b/cmd/main.go index 7a7f0ad..dc3e106 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -5,10 +5,10 @@ import ( "runtime" "time" - "edgaru089.ml/go/gl01/internal/game" - gio "edgaru089.ml/go/gl01/internal/io" - _ "edgaru089.ml/go/gl01/internal/render/gpu_preference" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/game" + gio "edgaru089.ink/go/gl01/internal/io" + _ "edgaru089.ink/go/gl01/internal/render/gpu_preference" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/go-gl/gl/all-core/gl" "github.com/go-gl/glfw/v3.3/glfw" ) diff --git a/go.mod b/go.mod index 1618c4c..bc08d84 100644 --- a/go.mod +++ b/go.mod @@ -1,13 +1,13 @@ -module edgaru089.ml/go/gl01 +module edgaru089.ink/go/gl01 go 1.17 require ( github.com/aquilax/go-perlin v1.1.0 - github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 - github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec - github.com/go-gl/mathgl v1.0.0 - github.com/inkyblackness/imgui-go/v4 v4.4.0 + github.com/go-gl/gl v0.0.0-20231021071112-07e5d0ea2e71 + github.com/go-gl/glfw/v3.3/glfw v0.0.0-20240506104042-037f3cc74f2a + github.com/go-gl/mathgl v1.1.0 + github.com/inkyblackness/imgui-go/v4 v4.7.0 ) require golang.org/x/image v0.0.0-20190321063152-3fc05d484e9f // indirect diff --git a/go.sum b/go.sum index 961495b..9381dcd 100644 --- a/go.sum +++ b/go.sum @@ -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/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-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/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/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/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/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/internal/asset/texture.go b/internal/asset/texture.go index 8a00317..5f801db 100644 --- a/internal/asset/texture.go +++ b/internal/asset/texture.go @@ -5,7 +5,7 @@ import ( "log" - "edgaru089.ml/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util" ) // WorldTextureAtlas holds all the world block textures. diff --git a/internal/entity/entities/player.go b/internal/entity/entities/player.go index 8624796..07640a2 100644 --- a/internal/entity/entities/player.go +++ b/internal/entity/entities/player.go @@ -3,9 +3,9 @@ package entities import ( "time" - "edgaru089.ml/go/gl01/internal/entity" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/entity" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" ) type PlayerBehaviour struct{} diff --git a/internal/entity/entity.go b/internal/entity/entity.go index d6821bf..bb5bba4 100644 --- a/internal/entity/entity.go +++ b/internal/entity/entity.go @@ -3,8 +3,8 @@ package entity import ( "time" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" ) // EntityBehaviour describes the behaviour of a type of entity with the same Name. diff --git a/internal/entity/physics.go b/internal/entity/physics.go index 98fa6d9..b8ddb88 100644 --- a/internal/entity/physics.go +++ b/internal/entity/physics.go @@ -4,9 +4,9 @@ import ( "math" "time" - "edgaru089.ml/go/gl01/internal/util" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" ) // WorldHitbox returns the hitboxes of the entity, in world coordinates. diff --git a/internal/game/game.go b/internal/game/game.go index 38194d3..b062f87 100644 --- a/internal/game/game.go +++ b/internal/game/game.go @@ -3,13 +3,13 @@ package game import ( "time" - "edgaru089.ml/go/gl01/internal/entity" - "edgaru089.ml/go/gl01/internal/render" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/entity" + "edgaru089.ink/go/gl01/internal/render" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" "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. diff --git a/internal/game/imgui.go b/internal/game/imgui.go index ea9cdc0..5629219 100644 --- a/internal/game/imgui.go +++ b/internal/game/imgui.go @@ -7,13 +7,13 @@ import ( "os" "runtime" - "edgaru089.ml/go/gl01/internal/asset" - "edgaru089.ml/go/gl01/internal/igwrap" - "edgaru089.ml/go/gl01/internal/igwrap/backend" - "edgaru089.ml/go/gl01/internal/io" - "edgaru089.ml/go/gl01/internal/util" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/asset" + "edgaru089.ink/go/gl01/internal/igwrap" + "edgaru089.ink/go/gl01/internal/igwrap/backend" + "edgaru089.ink/go/gl01/internal/io" + "edgaru089.ink/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" "github.com/go-gl/glfw/v3.3/glfw" "github.com/inkyblackness/imgui-go/v4" ) diff --git a/internal/game/logic.go b/internal/game/logic.go index 3cba0bc..ccc639f 100644 --- a/internal/game/logic.go +++ b/internal/game/logic.go @@ -6,14 +6,14 @@ import ( "os" "time" - "edgaru089.ml/go/gl01/internal/igwrap/backend" - "edgaru089.ml/go/gl01/internal/io" - "edgaru089.ml/go/gl01/internal/render" - "edgaru089.ml/go/gl01/internal/util" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" - "edgaru089.ml/go/gl01/internal/world/blocks" - "edgaru089.ml/go/gl01/internal/world/worldgen" + "edgaru089.ink/go/gl01/internal/igwrap/backend" + "edgaru089.ink/go/gl01/internal/io" + "edgaru089.ink/go/gl01/internal/render" + "edgaru089.ink/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/world/blocks" + "edgaru089.ink/go/gl01/internal/world/worldgen" "github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/mathgl/mgl64" ) diff --git a/internal/game/render.go b/internal/game/render.go index 298777a..309d7ac 100644 --- a/internal/game/render.go +++ b/internal/game/render.go @@ -6,13 +6,13 @@ import ( "time" "unsafe" - "edgaru089.ml/go/gl01/internal/asset" - "edgaru089.ml/go/gl01/internal/igwrap" - "edgaru089.ml/go/gl01/internal/igwrap/backend" - "edgaru089.ml/go/gl01/internal/io" - "edgaru089.ml/go/gl01/internal/render" - "edgaru089.ml/go/gl01/internal/util" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/asset" + "edgaru089.ink/go/gl01/internal/igwrap" + "edgaru089.ink/go/gl01/internal/igwrap/backend" + "edgaru089.ink/go/gl01/internal/io" + "edgaru089.ink/go/gl01/internal/render" + "edgaru089.ink/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/go-gl/gl/all-core/gl" "github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/mathgl/mgl32" diff --git a/internal/game/render_debuginfo.go b/internal/game/render_debuginfo.go index f452f92..a100893 100644 --- a/internal/game/render_debuginfo.go +++ b/internal/game/render_debuginfo.go @@ -4,11 +4,11 @@ import ( "math" "time" - "edgaru089.ml/go/gl01/internal/asset" - "edgaru089.ml/go/gl01/internal/igwrap" - "edgaru089.ml/go/gl01/internal/io" - "edgaru089.ml/go/gl01/internal/util" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/asset" + "edgaru089.ink/go/gl01/internal/igwrap" + "edgaru089.ink/go/gl01/internal/io" + "edgaru089.ink/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/inkyblackness/imgui-go/v4" ) diff --git a/internal/igwrap/backend/render.go b/internal/igwrap/backend/render.go index ad7f522..359e98a 100644 --- a/internal/igwrap/backend/render.go +++ b/internal/igwrap/backend/render.go @@ -3,8 +3,8 @@ package backend import ( _ "embed" - "edgaru089.ml/go/gl01/internal/igwrap" - "edgaru089.ml/go/gl01/internal/render" + "edgaru089.ink/go/gl01/internal/igwrap" + "edgaru089.ink/go/gl01/internal/render" "github.com/go-gl/gl/all-core/gl" "github.com/go-gl/glfw/v3.3/glfw" "github.com/go-gl/mathgl/mgl32" diff --git a/internal/igwrap/convert.go b/internal/igwrap/convert.go index 30a4300..4aea61b 100644 --- a/internal/igwrap/convert.go +++ b/internal/igwrap/convert.go @@ -3,7 +3,7 @@ package igwrap import ( "math" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/inkyblackness/imgui-go/v4" ) diff --git a/internal/igwrap/imagewrap.go b/internal/igwrap/imagewrap.go index 4bf43f2..35cabf4 100644 --- a/internal/igwrap/imagewrap.go +++ b/internal/igwrap/imagewrap.go @@ -3,7 +3,7 @@ package igwrap import ( "sync" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/inkyblackness/imgui-go/v4" ) diff --git a/internal/igwrap/wrap.go b/internal/igwrap/wrap.go index 8363c81..c3fb95a 100644 --- a/internal/igwrap/wrap.go +++ b/internal/igwrap/wrap.go @@ -3,7 +3,7 @@ package igwrap import ( "fmt" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/inkyblackness/imgui-go/v4" ) diff --git a/internal/io/config.go b/internal/io/config.go index df84c26..772a4e9 100644 --- a/internal/io/config.go +++ b/internal/io/config.go @@ -1,6 +1,6 @@ package io -import "edgaru089.ml/go/gl01/internal/util" +import "edgaru089.ink/go/gl01/internal/util" var ( MainConfig struct { diff --git a/internal/io/io.go b/internal/io/io.go index 7a3ba8e..32bfe83 100644 --- a/internal/io/io.go +++ b/internal/io/io.go @@ -3,7 +3,7 @@ package io import ( "time" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" ) var ( diff --git a/internal/render/render_framewire.go b/internal/render/render_framewire.go index c86e4a6..201e58b 100644 --- a/internal/render/render_framewire.go +++ b/internal/render/render_framewire.go @@ -4,8 +4,8 @@ import ( "image/color" "unsafe" - "edgaru089.ml/go/gl01/internal/asset" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/asset" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/go-gl/gl/all-core/gl" "github.com/go-gl/mathgl/mgl32" ) diff --git a/internal/render/screenquad.go b/internal/render/screenquad.go index bfe494c..b0f0403 100644 --- a/internal/render/screenquad.go +++ b/internal/render/screenquad.go @@ -4,7 +4,7 @@ import ( _ "embed" "unsafe" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/go-gl/gl/all-core/gl" ) diff --git a/internal/render/shader.go b/internal/render/shader.go index e57ca87..306d4d4 100644 --- a/internal/render/shader.go +++ b/internal/render/shader.go @@ -5,7 +5,7 @@ import ( "log" "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/mathgl/mgl32" ) diff --git a/internal/render/view.go b/internal/render/view.go index 00fde07..ece2939 100644 --- a/internal/render/view.go +++ b/internal/render/view.go @@ -1,7 +1,7 @@ package render import ( - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/go-gl/mathgl/mgl32" ) diff --git a/internal/util/atlas.go b/internal/util/atlas.go index e70f3d4..228098a 100644 --- a/internal/util/atlas.go +++ b/internal/util/atlas.go @@ -8,7 +8,7 @@ import ( "log" "sort" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" ) // The largest width a texture atlas can grow to. diff --git a/internal/util/bunnyhop.go b/internal/util/bunnyhop.go index 8e6ab67..360b9a6 100644 --- a/internal/util/bunnyhop.go +++ b/internal/util/bunnyhop.go @@ -1,6 +1,6 @@ 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) { if accelVel < 1e-4 { diff --git a/internal/world/block.go b/internal/world/block.go index f464205..e84b31d 100644 --- a/internal/world/block.go +++ b/internal/world/block.go @@ -3,7 +3,7 @@ package world import ( "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 diff --git a/internal/world/blocks/default.go b/internal/world/blocks/default.go index b9ca615..85e36df 100644 --- a/internal/world/blocks/default.go +++ b/internal/world/blocks/default.go @@ -1,6 +1,6 @@ package blocks -import "edgaru089.ml/go/gl01/internal/world" +import "edgaru089.ink/go/gl01/internal/world" const ( Nil = iota diff --git a/internal/world/blocks/helper_appendface.go b/internal/world/blocks/helper_appendface.go index 1886d3e..9510624 100644 --- a/internal/world/blocks/helper_appendface.go +++ b/internal/world/blocks/helper_appendface.go @@ -1,9 +1,9 @@ package blocks import ( - "edgaru089.ml/go/gl01/internal/asset" - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/asset" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" ) // texname is the full filename of the texture file (with .png) diff --git a/internal/world/blocks/slab.go b/internal/world/blocks/slab.go index e6ed193..d497ebd 100644 --- a/internal/world/blocks/slab.go +++ b/internal/world/blocks/slab.go @@ -1,8 +1,8 @@ package blocks import ( - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" ) type SlabBehaviour struct{} diff --git a/internal/world/blocks/water.go b/internal/world/blocks/water.go index 02226a6..263f53e 100644 --- a/internal/world/blocks/water.go +++ b/internal/world/blocks/water.go @@ -1,8 +1,8 @@ package blocks import ( - "edgaru089.ml/go/gl01/internal/util/itype" - "edgaru089.ml/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/world" ) type WaterBehaviour struct{} diff --git a/internal/world/chunk.go b/internal/world/chunk.go index 714fd15..96f57cf 100644 --- a/internal/world/chunk.go +++ b/internal/world/chunk.go @@ -5,7 +5,7 @@ import ( "io" "log" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" ) const ( diff --git a/internal/world/render.go b/internal/world/render.go index 1eabb66..60a83af 100644 --- a/internal/world/render.go +++ b/internal/world/render.go @@ -5,10 +5,10 @@ import ( "time" "unsafe" - "edgaru089.ml/go/gl01/internal/asset" - "edgaru089.ml/go/gl01/internal/io" - "edgaru089.ml/go/gl01/internal/util" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/asset" + "edgaru089.ink/go/gl01/internal/io" + "edgaru089.ink/go/gl01/internal/util" + "edgaru089.ink/go/gl01/internal/util/itype" "github.com/go-gl/gl/all-core/gl" ) diff --git a/internal/world/viewray.go b/internal/world/viewray.go index 423fd84..bb55747 100644 --- a/internal/world/viewray.go +++ b/internal/world/viewray.go @@ -1,7 +1,7 @@ package world 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) { diff --git a/internal/world/world.go b/internal/world/world.go index 8fb12e1..0778866 100644 --- a/internal/world/world.go +++ b/internal/world/world.go @@ -4,7 +4,7 @@ import ( "fmt" "io" - "edgaru089.ml/go/gl01/internal/util/itype" + "edgaru089.ink/go/gl01/internal/util/itype" ) // World holds a number of Chunks and Entities. diff --git a/internal/world/worldgen/worldgen.go b/internal/world/worldgen/worldgen.go index 20780ec..e214890 100644 --- a/internal/world/worldgen/worldgen.go +++ b/internal/world/worldgen/worldgen.go @@ -3,8 +3,8 @@ package worldgen import ( "sync" - packworld "edgaru089.ml/go/gl01/internal/world" - "edgaru089.ml/go/gl01/internal/world/blocks" + packworld "edgaru089.ink/go/gl01/internal/world" + "edgaru089.ink/go/gl01/internal/world/blocks" "github.com/aquilax/go-perlin" )