Skip to content

Commit db9193a

Browse files
committed
Renaming ImageMetadata FilterName -> Filter
1 parent 4d28c7f commit db9193a

File tree

3 files changed

+17
-13
lines changed

3 files changed

+17
-13
lines changed

src/editor/content/content_opener/image_opener.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func (o ImageOpener) Open(adi asset_info.AssetDatabaseInfo, ed editor_interface.
6464
console.For(ed.Host()).Write("Opening an image")
6565
host := ed.Host()
6666
meta := adi.Metadata.(*asset_importer.ImageMetadata)
67-
texture, err := host.TextureCache().Texture(adi.Path, meta.Filter())
67+
texture, err := host.TextureCache().Texture(adi.Path, meta.TextureFilter())
6868
if err != nil {
6969
return errors.New("failed to load the texture " + adi.Path)
7070
}
Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,20 @@
11
package asset_importer
22

3+
import (
4+
"kaiju/rendering"
5+
"log/slog"
6+
)
7+
38
type ImageMetadata struct {
4-
FilterName string `options:"textureFilterOptions"`
5-
Mipmaps int32
9+
Filter string `options:"textureFilterOptions"`
10+
Mipmaps int32
11+
}
12+
13+
func (m *ImageMetadata) TextureFilter() rendering.TextureFilter {
14+
if f, ok := textureFilterOptions[m.Filter]; ok {
15+
return f
16+
}
17+
slog.Warn("tried to read image metadata filter but has invalid key",
18+
"key", m.Filter)
19+
return rendering.TextureFilterLinear
620
}

src/engine/assets/asset_importer/png_importer.go

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ import (
4141
"kaiju/editor/editor_config"
4242
"kaiju/engine/assets/asset_info"
4343
"kaiju/rendering"
44-
"log/slog"
4544
"path/filepath"
4645
)
4746

@@ -70,12 +69,3 @@ func (m PngImporter) Import(path string) error {
7069
adi.Type = editor_config.AssetTypeImage
7170
return asset_info.Write(adi)
7271
}
73-
74-
func (m *ImageMetadata) Filter() rendering.TextureFilter {
75-
if f, ok := textureFilterOptions[m.FilterName]; ok {
76-
return f
77-
}
78-
slog.Warn("tried to read image metadata filter but has invalid key",
79-
"key", m.FilterName)
80-
return rendering.TextureFilterLinear
81-
}

0 commit comments

Comments
 (0)