Moved core ecs and asset code to their own sub module.

Author: ClickerMonkey

pkg/asset-mtl.go

@@ -3,33 +3,34 @@ package axe
 import (
 	"regexp"
 
+	"github.com/axe/axe-go/pkg/asset"
 	"github.com/udhos/gwob"
 )
 
-var _ AssetFormat = &MtlFormat{}
+var _ asset.Format = &MtlFormat{}
 var mtlFormatRegex, _ = regexp.Compile(`\.mtl$`)
 
 type MtlFormat struct {
 }
 
-func (format *MtlFormat) Handles(ref AssetRef) bool {
+func (format *MtlFormat) Handles(ref asset.Ref) bool {
 	return mtlFormatRegex.MatchString(ref.URI)
 }
 
-func (format *MtlFormat) Types() []AssetType {
-	return []AssetType{AssetTypeModel}
+func (format *MtlFormat) Types() []asset.Type {
+	return []asset.Type{asset.TypeModel}
 }
 
-func (format *MtlFormat) Load(asset *Asset) error {
-	lib, err := gwob.ReadMaterialLibFromReader(asset.SourceReader, &gwob.ObjParserOptions{})
+func (format *MtlFormat) Load(a *asset.Asset) error {
+	lib, err := gwob.ReadMaterialLibFromReader(a.SourceReader, &gwob.ObjParserOptions{})
 
 	if err != nil {
-		asset.LoadStatus.Fail(err)
+		a.LoadStatus.Fail(err)
 		return err
 	}
 
 	materials := Materials{}
-	asset.Dependent = make([]AssetRef, 0)
+	a.Dependent = make([]asset.Ref, 0)
 
 	for materialName, material := range lib.Lib {
 		mat := Material{
@@ -57,39 +58,39 @@ func (format *MtlFormat) Load(asset *Asset) error {
 		}
 
 		if mat.Ambient.Texture != "" {
-			asset.AddNext(mat.Ambient.Texture, true)
+			a.AddNext(mat.Ambient.Texture, true)
 		}
 		if mat.Specular.Texture != "" {
-			asset.AddNext(mat.Specular.Texture, true)
+			a.AddNext(mat.Specular.Texture, true)
 		}
 		if mat.Diffuse.Texture != "" {
-			asset.AddNext(mat.Diffuse.Texture, true)
+			a.AddNext(mat.Diffuse.Texture, true)
 		}
 		if mat.Emissive.Texture != "" {
-			asset.AddNext(mat.Emissive.Texture, true)
+			a.AddNext(mat.Emissive.Texture, true)
 		}
 		if mat.TextureBump != "" {
-			asset.AddNext(mat.TextureBump, true)
+			a.AddNext(mat.TextureBump, true)
 		}
 
 		materials[materialName] = mat
 	}
 
-	asset.Data = materials
-	asset.LoadStatus.Success()
+	a.Data = materials
+	a.LoadStatus.Success()
 
 	return nil
 }
 
-func (format *MtlFormat) Unload(asset *Asset) error {
+func (format *MtlFormat) Unload(asset *asset.Asset) error {
 	asset.LoadStatus.Reset()
 	return nil
 }
-func (format *MtlFormat) Activate(asset *Asset) error {
+func (format *MtlFormat) Activate(asset *asset.Asset) error {
 	asset.ActivateStatus.Success()
 	return nil
 }
-func (format *MtlFormat) Deactivate(asset *Asset) error {
+func (format *MtlFormat) Deactivate(asset *asset.Asset) error {
 	asset.ActivateStatus.Reset()
 	return nil
 }

pkg/asset-obj.go

@@ -3,24 +3,25 @@ package axe
 import (
 	"regexp"
 
+	"github.com/axe/axe-go/pkg/asset"
 	"github.com/udhos/gwob"
 )
 
-var _ AssetFormat = &ObjFormat{}
+var _ asset.Format = &ObjFormat{}
 var objFormatRegex, _ = regexp.Compile(`\.obj$`)
 
 type ObjFormat struct {
 }
 
-func (format *ObjFormat) Handles(ref AssetRef) bool {
+func (format *ObjFormat) Handles(ref asset.Ref) bool {
 	return objFormatRegex.MatchString(ref.URI)
 }
 
-func (format *ObjFormat) Types() []AssetType {
-	return []AssetType{AssetTypeModel}
+func (format *ObjFormat) Types() []asset.Type {
+	return []asset.Type{asset.TypeModel}
 }
 
-func (format *ObjFormat) Load(asset *Asset) error {
+func (format *ObjFormat) Load(asset *asset.Asset) error {
 	obj, err := gwob.NewObjFromReader(asset.Ref.Name, asset.SourceReader, nil)
 	if err != nil {
 		asset.LoadStatus.Fail(err)
@@ -116,15 +117,15 @@ func (format *ObjFormat) Load(asset *Asset) error {
 	return nil
 }
 
-func (format *ObjFormat) Unload(asset *Asset) error {
+func (format *ObjFormat) Unload(asset *asset.Asset) error {
 	asset.LoadStatus.Reset()
 	return nil
 }
-func (format *ObjFormat) Activate(asset *Asset) error {
+func (format *ObjFormat) Activate(asset *asset.Asset) error {
 	asset.ActivateStatus.Success()
 	return nil
 }
-func (format *ObjFormat) Deactivate(asset *Asset) error {
+func (format *ObjFormat) Deactivate(asset *asset.Asset) error {
 	asset.ActivateStatus.Reset()
 	return nil
 }