From 1da3f327153306599b6c60a080e949e197bb44d3 Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Sun, 31 Jul 2016 22:00:45 +0900 Subject: [PATCH] examples: Embed arcadefont.png --- examples/_resources/images/license.md | 22 -- examples/common/font.go | 20 +- .../internal/assets}/arcadefont.png | Bin examples/common/internal/assets/assets.go | 36 ++++ examples/common/internal/assets/bindata.go | 193 ++++++++++++++++++ examples/common/internal/assets/license.md | 23 +++ 6 files changed, 259 insertions(+), 35 deletions(-) rename examples/{_resources/images => common/internal/assets}/arcadefont.png (100%) create mode 100644 examples/common/internal/assets/assets.go create mode 100644 examples/common/internal/assets/bindata.go create mode 100644 examples/common/internal/assets/license.md diff --git a/examples/_resources/images/license.md b/examples/_resources/images/license.md index a5366241e..0cd416aae 100644 --- a/examples/_resources/images/license.md +++ b/examples/_resources/images/license.md @@ -1,27 +1,5 @@ # License -## arcadefont.png - -``` -9031 Font ReadMe - -Terms of Use and Disclaimer - -All 9031 fonts are free of charge to use for personal or commercial purposes, e.g. printed papers, t-shirts, logos, images for website, merchandise or anything featuring these fonts. - -OpenType font files are licensed for your personal desktop use only. No part of these files may be re-distributed, sold, renamed, converted, or made available for download on any web site without permission of author. - -Author give no warranty in relation to these fonts, and you use them at your own risk. By using or installing these fonts, you agree to be bound by the terms of this agreement. Author will not be liable for any damage to your system, any loss or corruption of any data or font, or any other loss or damage that you may suffer as a result of downloading or using these fonts, whether it results from Author's negligence or in any other way. - - -Author - -Yuji Adachi, 9031 -Website: http://9031.com/ -Email: info@9031.com -©1997-2011 9031 -``` - ## ebiten.png ``` diff --git a/examples/common/font.go b/examples/common/font.go index adde74a32..3d7e3e6fe 100644 --- a/examples/common/font.go +++ b/examples/common/font.go @@ -19,12 +19,10 @@ import ( "image/color" "image/draw" "math" - "path/filepath" - "runtime" "strings" "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/ebitenutil" + "github.com/hajimehoshi/ebiten/examples/common/internal/assets" ) var ( @@ -51,19 +49,15 @@ func (f *Font) TextHeight(str string) int { } func init() { - dir := "" - if runtime.GOARCH != "js" { - // Get the path of this file (font.go). - _, path, _, _ := runtime.Caller(0) - path = filepath.Dir(path) - dir = filepath.Join(path, "..") - } - arcadeFontPath := filepath.Join(dir, "_resources", "images", "arcadefont.png") - arcadeFontImage, img, err := ebitenutil.NewImageFromFile(arcadeFontPath, ebiten.FilterNearest) + img, err := assets.ArcadeFontImage() if err != nil { panic(err) } - ArcadeFont = &Font{arcadeFontImage, img, 32, 16, 8, 8} + eimg, err := ebiten.NewImageFromImage(img, ebiten.FilterNearest) + if err != nil { + panic(err) + } + ArcadeFont = &Font{eimg, img, 32, 16, 8, 8} } type fontImageParts struct { diff --git a/examples/_resources/images/arcadefont.png b/examples/common/internal/assets/arcadefont.png similarity index 100% rename from examples/_resources/images/arcadefont.png rename to examples/common/internal/assets/arcadefont.png diff --git a/examples/common/internal/assets/assets.go b/examples/common/internal/assets/assets.go new file mode 100644 index 000000000..2cf30b67d --- /dev/null +++ b/examples/common/internal/assets/assets.go @@ -0,0 +1,36 @@ +// Copyright 2016 The Ebiten Authors +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +//go:generate go-bindata -nocompress -pkg=assets arcadefont.png +//go:generate gofmt -s -w . + +package assets + +import ( + "bytes" + "image" + _ "image/png" +) + +func ArcadeFontImage() (image.Image, error) { + b, err := Asset("arcadefont.png") + if err != nil { + return nil, err + } + img, _, err := image.Decode(bytes.NewBuffer(b)) + if err != nil { + return nil, err + } + return img, nil +} diff --git a/examples/common/internal/assets/bindata.go b/examples/common/internal/assets/bindata.go new file mode 100644 index 000000000..44bed97c7 --- /dev/null +++ b/examples/common/internal/assets/bindata.go @@ -0,0 +1,193 @@ +package assets + +import ( + "fmt" + "io/ioutil" + "os" + "path" + "path/filepath" + "strings" + "time" +) + +type asset struct { + bytes []byte + info os.FileInfo +} + +type bindata_file_info struct { + name string + size int64 + mode os.FileMode + modTime time.Time +} + +func (fi bindata_file_info) Name() string { + return fi.name +} +func (fi bindata_file_info) Size() int64 { + return fi.size +} +func (fi bindata_file_info) Mode() os.FileMode { + return fi.mode +} +func (fi bindata_file_info) ModTime() time.Time { + return fi.modTime +} +func (fi bindata_file_info) IsDir() bool { + return false +} +func (fi bindata_file_info) Sys() interface{} { + return nil +} + +var _arcadefont_png = []byte("\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x80\x00\x00\x000\b\x03\x00\x00\x00\xee*\x82\x8c\x00\x00\x00\x06PLTE\x00\x00\x00\xff\xff\xff\xa5ٟ\xdd\x00\x00\x00\x01tRNS\x00@\xe6\xd8f\x00\x00\x03\x98IDATx\x9c\xc4X\x89\x96\xac(\f\xe5\xd6\xf3\xff\u007f9\xd3B\x96\x9b\x18ѩ\xe99/ݥ\x82\x81\xec\v~F\x00\xa0\xd7\xf5\x10\xf3t=\xdf#\xe1\xdbCY\xf4\x0e0>\xbb\x97F\xf9\xdc{\x8e\xe6\xbf\b*\xa2\xfc\\%X,\xf7\r\ti\x18\x90\xf9\xbf(bm#sNN|\xdeW\x98\xbes\x80W\xa4\x8d~B];\xc1\t\x89\x13\x14ǧ\xa1\x8e\x9d\x01{P\x04\x10\x8f\xa3\x19\xfbz\x9a@\x1e\x99\xb5\xf5\x0e\xffG\xc2,>\x01\xb2]\xb7o\xe6(\x99@\x12G2\xff\xd6rӌ\x8b!\t\xd1\xe8\x89\tYE\xeb\x04\xbd\xc8\u007f\xef\xc7H\x174a\xf2\x10\x05\xd5i\xff\x85\x9b\xfc\nli\x81\x9d,9\xcfZ\xa63\x92\x87\x11s\xa2\xc3\xceɈ\x884\x83\xb5\xf0ϴm(y\xbd\a*G\x8d\xaf\x8b\xe5\x05\xba[*\x1b\xe9^\x9c?6\xfcy<&\x1f8=B\xc02\x12}\x01q\x1cQOq\xbb\x85\x88N\xf5\xd0I\xcd\xe5Q\t$cJ\"\xc8҇)HA\xc1u\xe3\xda\xd79\x90͏f\xc1\xf0x\x82\xe5*\x962\xe6]A\xb0\x90\xbd\xec\xef\x02\x93\x8f\xa4\xf7\x87\xaa\x9f\xe9',SM#Hp\xd4\x1b\xdb^'\x95\x13\x96\xf1\x85\xa4\xc2\xe4\xdd\xccj\x8a\x8eb1\x9b/\xf4!\rc1\xd8\xc8\xf4;\xf0*׀\x95~\t\u007fR\x84i\xc65\xa4o܉\xd9\t\x91\xe69l\v\xfe\xe9\x84ӟ\xf4\xa5\x19\vP\xf7_\xfe\x91\x8d\xd8\xe9u\x8c\xceM\xf2\x04,\x9c\x89!\xc8g\xe6!wd\xe4Œ*\xfdf\xf3\x16*Jۨ\x1c\xc1\x19\xe3u\x9b\xe7\xfc\xa03ro\xea{\x16\x91\x198ŧ\xfc\xe7q^\xa1\x98`P\xee\xbc+\xa3\xb9\xbe\xab\xa4Y\xde\xcf\xe9\x15K\xd3\"\x97*\x0f\xdc\xcaҙe\xe2rdž\a\tƩ\x01A\xed\x94\x16\x8e\x00T\fǥ\xdcI\xd3;ώ5R)\xa9\xb6\xe8\u0096\xffω\xe0\r\x1c\x1e\xbe*`\x1a\xa7\f\x99㸉k\x89b\x15\x1b \xf2^nn\x15>\xcb\xf63\fE\xbb\v\x1f\xeb\xb0v\x8b\x05\x90L-\xe4J\"\xe4r\"-\xfe\xe6`\xf2@7U\x81\xeaD\\\xc6(=\xe2(%\x83\x9e\x904\xb5\xf0y\xd9y\x8f<`\x89P3 \xf8>bl\x89\x11\x1e\xcd\"\xa5\xdc\\m\xa2\xb3\x9eZi\xffc\xa7\xa9\xbe\xa1y\v\xef\x9aރ\xd1+\x89\x8b\b:\x13\x88m\xf4`|\x17\xb6\x86\x83U\xc9.\x85\xcb\xf0/\x06\xc6@\x0e\xb7`\xa3\x8f\x11o|\xac#BtP\x89\xfe\x068\x80\x81Z\xd9\xea'\x9d\xd4s\xc8`\r'\u007f\x18\xe3\xe2\x03\x86\xd9Z䖁o\xe1\xcb\xf8\xff'\x00\x00\xff\xff\"\xd9\xedҰ\xcb\xea\x95\x00\x00\x00\x00IEND\xaeB`\x82") + +func arcadefont_png_bytes() ([]byte, error) { + return _arcadefont_png, nil +} + +func arcadefont_png() (*asset, error) { + bytes, err := arcadefont_png_bytes() + if err != nil { + return nil, err + } + + info := bindata_file_info{name: "arcadefont.png", size: 1008, mode: os.FileMode(420), modTime: time.Unix(1463226773, 0)} + a := &asset{bytes: bytes, info: info} + return a, nil +} + +// Asset loads and returns the asset for the given name. +// It returns an error if the asset could not be found or +// could not be loaded. +func Asset(name string) ([]byte, error) { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { + a, err := f() + if err != nil { + return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err) + } + return a.bytes, nil + } + return nil, fmt.Errorf("Asset %s not found", name) +} + +// AssetInfo loads and returns the asset info for the given name. +// It returns an error if the asset could not be found or +// could not be loaded. +func AssetInfo(name string) (os.FileInfo, error) { + cannonicalName := strings.Replace(name, "\\", "/", -1) + if f, ok := _bindata[cannonicalName]; ok { + a, err := f() + if err != nil { + return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err) + } + return a.info, nil + } + return nil, fmt.Errorf("AssetInfo %s not found", name) +} + +// AssetNames returns the names of the assets. +func AssetNames() []string { + names := make([]string, 0, len(_bindata)) + for name := range _bindata { + names = append(names, name) + } + return names +} + +// _bindata is a table, holding each asset generator, mapped to its name. +var _bindata = map[string]func() (*asset, error){ + "arcadefont.png": arcadefont_png, +} + +// AssetDir returns the file names below a certain +// directory embedded in the file by go-bindata. +// For example if you run go-bindata on data/... and data contains the +// following hierarchy: +// data/ +// foo.txt +// img/ +// a.png +// b.png +// then AssetDir("data") would return []string{"foo.txt", "img"} +// AssetDir("data/img") would return []string{"a.png", "b.png"} +// AssetDir("foo.txt") and AssetDir("notexist") would return an error +// AssetDir("") will return []string{"data"}. +func AssetDir(name string) ([]string, error) { + node := _bintree + if len(name) != 0 { + cannonicalName := strings.Replace(name, "\\", "/", -1) + pathList := strings.Split(cannonicalName, "/") + for _, p := range pathList { + node = node.Children[p] + if node == nil { + return nil, fmt.Errorf("Asset %s not found", name) + } + } + } + if node.Func != nil { + return nil, fmt.Errorf("Asset %s not found", name) + } + rv := make([]string, 0, len(node.Children)) + for name := range node.Children { + rv = append(rv, name) + } + return rv, nil +} + +type _bintree_t struct { + Func func() (*asset, error) + Children map[string]*_bintree_t +} + +var _bintree = &_bintree_t{nil, map[string]*_bintree_t{ + "arcadefont.png": {arcadefont_png, map[string]*_bintree_t{}}, +}} + +// Restore an asset under the given directory +func RestoreAsset(dir, name string) error { + data, err := Asset(name) + if err != nil { + return err + } + info, err := AssetInfo(name) + if err != nil { + return err + } + err = os.MkdirAll(_filePath(dir, path.Dir(name)), os.FileMode(0755)) + if err != nil { + return err + } + err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode()) + if err != nil { + return err + } + err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime()) + if err != nil { + return err + } + return nil +} + +// Restore assets under the given directory recursively +func RestoreAssets(dir, name string) error { + children, err := AssetDir(name) + if err != nil { // File + return RestoreAsset(dir, name) + } else { // Dir + for _, child := range children { + err = RestoreAssets(dir, path.Join(name, child)) + if err != nil { + return err + } + } + } + return nil +} + +func _filePath(dir, name string) string { + cannonicalName := strings.Replace(name, "\\", "/", -1) + return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...) +} diff --git a/examples/common/internal/assets/license.md b/examples/common/internal/assets/license.md new file mode 100644 index 000000000..f3245d2f7 --- /dev/null +++ b/examples/common/internal/assets/license.md @@ -0,0 +1,23 @@ +# License + +## arcadefont.png + +``` +9031 Font ReadMe + +Terms of Use and Disclaimer + +All 9031 fonts are free of charge to use for personal or commercial purposes, e.g. printed papers, t-shirts, logos, images for website, merchandise or anything featuring these fonts. + +OpenType font files are licensed for your personal desktop use only. No part of these files may be re-distributed, sold, renamed, converted, or made available for download on any web site without permission of author. + +Author give no warranty in relation to these fonts, and you use them at your own risk. By using or installing these fonts, you agree to be bound by the terms of this agreement. Author will not be liable for any damage to your system, any loss or corruption of any data or font, or any other loss or damage that you may suffer as a result of downloading or using these fonts, whether it results from Author's negligence or in any other way. + + +Author + +Yuji Adachi, 9031 +Website: http://9031.com/ +Email: info@9031.com +©1997-2011 9031 +```