Move private packages to /internal

lord-server · Apr 23, 2023 · 8483073 · 8483073
1 parent b9d2f5b
commit 8483073
Show file tree

Hide file tree

Showing 30 changed files with 52 additions and 52 deletions.
diff --git a/cmd/panorama/main.go b/cmd/panorama/main.go
@@ -5,13 +5,13 @@ import (
 	"log"
 	"path"
 
-	"github.com/lord-server/panorama/pkg/config"
-	"github.com/lord-server/panorama/pkg/game"
-	"github.com/lord-server/panorama/pkg/render"
-	"github.com/lord-server/panorama/pkg/render/isometric"
-	"github.com/lord-server/panorama/pkg/tile"
-	"github.com/lord-server/panorama/pkg/web"
-	"github.com/lord-server/panorama/pkg/world"
+	"github.com/lord-server/panorama/internal/config"
+	"github.com/lord-server/panorama/internal/game"
+	"github.com/lord-server/panorama/internal/render"
+	"github.com/lord-server/panorama/internal/render/isometric"
+	"github.com/lord-server/panorama/internal/tile"
+	"github.com/lord-server/panorama/internal/web"
+	"github.com/lord-server/panorama/internal/world"
 )
 
 type Args struct {

diff --git a/pkg/config/config.go → internal/config/config.go b/pkg/config/config.go → internal/config/config.go
@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/BurntSushi/toml"
-	"github.com/lord-server/panorama/pkg/spatial"
+	"github.com/lord-server/panorama/internal/spatial"
 )
 
 type Web struct {

diff --git a/pkg/game/game.go → internal/game/game.go b/pkg/game/game.go → internal/game/game.go
@@ -5,7 +5,7 @@ import (
 	"image"
 	"os"
 
-	"github.com/lord-server/panorama/pkg/mesh"
+	"github.com/lord-server/panorama/internal/mesh"
 )
 
 type gameDescriptor struct {

diff --git a/pkg/game/media.go → internal/game/media.go b/pkg/game/media.go → internal/game/media.go
@@ -8,8 +8,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/lord-server/panorama/pkg/mesh"
-	"github.com/lord-server/panorama/pkg/raster"
+	"github.com/lord-server/panorama/internal/mesh"
+	"github.com/lord-server/panorama/internal/raster"
 )
 
 type MediaCache struct {

diff --git a/pkg/game/node.go → internal/game/node.go b/pkg/game/node.go → internal/game/node.go
diff --git a/pkg/lm/matrix3.go → internal/lm/matrix3.go b/pkg/lm/matrix3.go → internal/lm/matrix3.go
diff --git a/pkg/lm/projection.go → internal/lm/projection.go b/pkg/lm/projection.go → internal/lm/projection.go
diff --git a/pkg/lm/round.go → internal/lm/round.go b/pkg/lm/round.go → internal/lm/round.go
diff --git a/pkg/lm/scalar.go → internal/lm/scalar.go b/pkg/lm/scalar.go → internal/lm/scalar.go
diff --git a/pkg/lm/vector2.go → internal/lm/vector2.go b/pkg/lm/vector2.go → internal/lm/vector2.go
diff --git a/pkg/lm/vector3.go → internal/lm/vector3.go b/pkg/lm/vector3.go → internal/lm/vector3.go
diff --git a/pkg/lm/vector4.go → internal/lm/vector4.go b/pkg/lm/vector4.go → internal/lm/vector4.go
diff --git a/pkg/mesh/mesh.go → internal/mesh/mesh.go b/pkg/mesh/mesh.go → internal/mesh/mesh.go
@@ -1,7 +1,7 @@
 package mesh
 
 import (
-	"github.com/lord-server/panorama/pkg/lm"
+	"github.com/lord-server/panorama/internal/lm"
 )
 
 type Vertex struct {

diff --git a/pkg/mesh/obj.go → internal/mesh/obj.go b/pkg/mesh/obj.go → internal/mesh/obj.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/lord-server/panorama/pkg/lm"
+	"github.com/lord-server/panorama/internal/lm"
 )
 
 func parseVector3(fields []string) (lm.Vector3, error) {

diff --git a/pkg/raster/depth.go → internal/raster/depth.go b/pkg/raster/depth.go → internal/raster/depth.go
diff --git a/pkg/raster/png.go → internal/raster/png.go b/pkg/raster/png.go → internal/raster/png.go
diff --git a/pkg/raster/renderbuffer.go → internal/raster/renderbuffer.go b/pkg/raster/renderbuffer.go → internal/raster/renderbuffer.go
diff --git a/pkg/render/isometric/renderer.go → internal/render/isometric/renderer.go b/pkg/render/isometric/renderer.go → internal/render/isometric/renderer.go
@@ -4,13 +4,13 @@ import (
 	"image"
 	"math"
 
-	"github.com/lord-server/panorama/pkg/game"
-	"github.com/lord-server/panorama/pkg/lm"
-	"github.com/lord-server/panorama/pkg/mesh"
-	"github.com/lord-server/panorama/pkg/raster"
-	"github.com/lord-server/panorama/pkg/render"
-	"github.com/lord-server/panorama/pkg/spatial"
-	"github.com/lord-server/panorama/pkg/world"
+	"github.com/lord-server/panorama/internal/game"
+	"github.com/lord-server/panorama/internal/lm"
+	"github.com/lord-server/panorama/internal/mesh"
+	"github.com/lord-server/panorama/internal/raster"
+	"github.com/lord-server/panorama/internal/render"
+	"github.com/lord-server/panorama/internal/spatial"
+	"github.com/lord-server/panorama/internal/world"
 )
 
 var (

diff --git a/pkg/render/light.go → internal/render/light.go b/pkg/render/light.go → internal/render/light.go
diff --git a/pkg/render/neighborhood.go → internal/render/neighborhood.go b/pkg/render/neighborhood.go → internal/render/neighborhood.go
@@ -1,8 +1,8 @@
 package render
 
 import (
-	"github.com/lord-server/panorama/pkg/spatial"
-	"github.com/lord-server/panorama/pkg/world"
+	"github.com/lord-server/panorama/internal/spatial"
+	"github.com/lord-server/panorama/internal/world"
 )
 
 type BlockNeighborhood struct {

diff --git a/pkg/render/rasterizer.go → internal/render/rasterizer.go b/pkg/render/rasterizer.go → internal/render/rasterizer.go
@@ -5,10 +5,10 @@ import (
 	"image/color"
 	"math"
 
-	"github.com/lord-server/panorama/pkg/game"
-	"github.com/lord-server/panorama/pkg/lm"
-	"github.com/lord-server/panorama/pkg/mesh"
-	"github.com/lord-server/panorama/pkg/raster"
+	"github.com/lord-server/panorama/internal/game"
+	"github.com/lord-server/panorama/internal/lm"
+	"github.com/lord-server/panorama/internal/mesh"
+	"github.com/lord-server/panorama/internal/raster"
 )
 
 const Gamma = 2.2

diff --git a/pkg/render/renderer.go → internal/render/renderer.go b/pkg/render/renderer.go → internal/render/renderer.go
@@ -1,10 +1,10 @@
 package render
 
 import (
-	"github.com/lord-server/panorama/pkg/game"
-	"github.com/lord-server/panorama/pkg/raster"
-	"github.com/lord-server/panorama/pkg/spatial"
-	"github.com/lord-server/panorama/pkg/world"
+	"github.com/lord-server/panorama/internal/game"
+	"github.com/lord-server/panorama/internal/raster"
+	"github.com/lord-server/panorama/internal/spatial"
+	"github.com/lord-server/panorama/internal/world"
 )
 
 type TilePosition struct {

diff --git a/pkg/spatial/position.go → internal/spatial/position.go b/pkg/spatial/position.go → internal/spatial/position.go
diff --git a/pkg/spatial/region.go → internal/spatial/region.go b/pkg/spatial/region.go → internal/spatial/region.go
diff --git a/pkg/tile/downscale.go → internal/tile/downscale.go b/pkg/tile/downscale.go → internal/tile/downscale.go
@@ -7,9 +7,9 @@ import (
 
 	"github.com/nfnt/resize"
 
-	"github.com/lord-server/panorama/pkg/lm"
-	"github.com/lord-server/panorama/pkg/raster"
-	"github.com/lord-server/panorama/pkg/render"
+	"github.com/lord-server/panorama/internal/lm"
+	"github.com/lord-server/panorama/internal/raster"
+	"github.com/lord-server/panorama/internal/render"
 )
 
 func uniquePositions(input []render.TilePosition) []render.TilePosition {

diff --git a/pkg/tile/tiler.go → internal/tile/tiler.go b/pkg/tile/tiler.go → internal/tile/tiler.go
@@ -11,12 +11,12 @@ import (
 	"strings"
 	"sync"
 
-	"github.com/lord-server/panorama/pkg/game"
-	"github.com/lord-server/panorama/pkg/lm"
-	"github.com/lord-server/panorama/pkg/raster"
-	"github.com/lord-server/panorama/pkg/render"
-	"github.com/lord-server/panorama/pkg/spatial"
-	"github.com/lord-server/panorama/pkg/world"
+	"github.com/lord-server/panorama/internal/game"
+	"github.com/lord-server/panorama/internal/lm"
+	"github.com/lord-server/panorama/internal/raster"
+	"github.com/lord-server/panorama/internal/render"
+	"github.com/lord-server/panorama/internal/spatial"
+	"github.com/lord-server/panorama/internal/world"
 )
 
 type Tiler struct {

diff --git a/pkg/web/handlers/metadata.go → internal/web/handlers/metadata.go b/pkg/web/handlers/metadata.go → internal/web/handlers/metadata.go
@@ -3,7 +3,7 @@ package handlers
 import (
 	"github.com/gofiber/fiber/v2"
 
-	"github.com/lord-server/panorama/pkg/config"
+	"github.com/lord-server/panorama/internal/config"
 )
 
 func Metadata(config *config.Config) func(c *fiber.Ctx) error {

diff --git a/pkg/web/server.go → internal/web/server.go b/pkg/web/server.go → internal/web/server.go
@@ -5,8 +5,8 @@ import (
 
 	"github.com/gofiber/fiber/v2"
 
-	"github.com/lord-server/panorama/pkg/config"
-	"github.com/lord-server/panorama/pkg/web/handlers"
+	"github.com/lord-server/panorama/internal/config"
+	"github.com/lord-server/panorama/internal/web/handlers"
 )
 
 func Serve(config *config.Config) {

diff --git a/pkg/world/block.go → internal/world/block.go b/pkg/world/block.go → internal/world/block.go
@@ -7,7 +7,7 @@ import (
 	"io"
 
 	"github.com/klauspost/compress/zstd"
-	"github.com/lord-server/panorama/pkg/spatial"
+	"github.com/lord-server/panorama/internal/spatial"
 )
 
 const NodeSizeInBytes = 4

diff --git a/pkg/world/world.go → internal/world/world.go b/pkg/world/world.go → internal/world/world.go
@@ -7,7 +7,7 @@ import (
 	lru "github.com/hashicorp/golang-lru/v2"
 	"github.com/jackc/pgx/v5"
 	"github.com/jackc/pgx/v5/pgxpool"
-	"github.com/lord-server/panorama/pkg/spatial"
+	"github.com/lord-server/panorama/internal/spatial"
 )
 
 type Backend interface {
@@ -49,23 +49,23 @@ func (p *PostgresBackend) GetBlockData(pos spatial.BlockPosition) ([]byte, error
 }
 
 type World struct {
-	backend    Backend
-	blockCache *lru.Cache[spatial.BlockPosition, *MapBlock]
+	backend           Backend
+	decodedBlockCache *lru.Cache[spatial.BlockPosition, *MapBlock]
 }
 
 func NewWorldWithBackend(backend Backend) World {
-	blockCache, err := lru.New[spatial.BlockPosition, *MapBlock](1024 * 16)
+	decodedBlockCache, err := lru.New[spatial.BlockPosition, *MapBlock](1024 * 16)
 	if err != nil {
 		panic(err)
 	}
 	return World{
-		backend:    backend,
-		blockCache: blockCache,
+		backend:           backend,
+		decodedBlockCache: decodedBlockCache,
 	}
 }
 
 func (w *World) GetBlock(pos spatial.BlockPosition) (*MapBlock, error) {
-	cachedBlock, ok := w.blockCache.Get(pos)
+	cachedBlock, ok := w.decodedBlockCache.Get(pos)
 
 	if ok {
 		if cachedBlock == nil {
@@ -80,7 +80,7 @@ func (w *World) GetBlock(pos spatial.BlockPosition) (*MapBlock, error) {
 	}
 
 	if data == nil {
-		w.blockCache.Add(pos, nil)
+		w.decodedBlockCache.Add(pos, nil)
 		return nil, nil
 	}
 
@@ -89,7 +89,7 @@ func (w *World) GetBlock(pos spatial.BlockPosition) (*MapBlock, error) {
 		return nil, err
 	}
 
-	w.blockCache.Add(pos, block)
+	w.decodedBlockCache.Add(pos, block)
 
 	return block, nil
 }