diff --git a/examples/mobile/main.go b/examples/mobile/main.go index 62ba07c97..22deec4b1 100644 --- a/examples/mobile/main.go +++ b/examples/mobile/main.go @@ -12,51 +12,19 @@ // See the License for the specific language governing permissions and // limitations under the License. -// Package mobile is an example of Ebiten for mobiles (Android). -// You can `gomobile bind` this package but not `gomobile build`. -package mobile +// +build !android + +package main import ( - "math" + "log" "github.com/hajimehoshi/ebiten" - "github.com/hajimehoshi/ebiten/examples/common" - "github.com/hajimehoshi/ebiten/mobile" + "github.com/hajimehoshi/ebiten/examples/mobile/mobile" ) -const ( - screenWidth = 320 - screenHeight = 240 -) - -var ( - count int - gophersImage *ebiten.Image -) - -func update(screen *ebiten.Image) error { - count++ - w, h := gophersImage.Size() - op := &ebiten.DrawImageOptions{} - op.GeoM.Translate(-float64(w)/2, -float64(h)/2) - op.GeoM.Rotate(float64(count%360) * 2 * math.Pi / 360) - op.GeoM.Translate(screenWidth/2, screenHeight/2) - if err := screen.DrawImage(gophersImage, op); err != nil { - return err +func main() { + if err := ebiten.Run(mobile.Update, mobile.ScreenWidth, mobile.ScreenHeight, 2, "Mobile (Ebiten Demo)"); err != nil { + log.Fatal(err) } - return nil -} - -func Start() error { - var err error - gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest) - if err != nil { - return err - } - mobile.Start(update, screenWidth, screenHeight, 2, "Mobile (Ebiten Demo)") - return nil -} - -func Render() error { - return mobile.Render() } diff --git a/examples/mobile/main_mobile.go b/examples/mobile/main_mobile.go new file mode 100644 index 000000000..dc6ed1b6f --- /dev/null +++ b/examples/mobile/main_mobile.go @@ -0,0 +1,39 @@ +// Copyright 2016 Hajime Hoshi +// +// 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. + +// +build android + +// Package mobile is an example of Ebiten for mobiles (Android). +// You can `gomobile bind` this package but not `gomobile build`. +// Please run `gomobile bind` like: +// +// Android: +// gomobile bind -javapkg [Your package path] -o [AAR file path] github.com/hajimehoshi/ebiten/examples/mobile +// iOS: +// (TBD) +package mobile + +import ( + example "github.com/hajimehoshi/ebiten/examples/mobile/mobile" + "github.com/hajimehoshi/ebiten/mobile" +) + +func Start() error { + mobile.Start(example.Update, example.ScreenWidth, example.ScreenHeight, 2, "Mobile (Ebiten Demo)") + return nil +} + +func Render() error { + return mobile.Render() +} diff --git a/examples/mobile/mobile/update.go b/examples/mobile/mobile/update.go new file mode 100644 index 000000000..eb14d969c --- /dev/null +++ b/examples/mobile/mobile/update.go @@ -0,0 +1,54 @@ +// Copyright 2016 Hajime Hoshi +// +// 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. + +package mobile + +import ( + "log" + "math" + + "github.com/hajimehoshi/ebiten" + "github.com/hajimehoshi/ebiten/examples/common" +) + +const ( + ScreenWidth = 320 + ScreenHeight = 240 +) + +var ( + count int + gophersImage *ebiten.Image +) + +func init() { + var err error + gophersImage, _, err = common.AssetImage("gophers.jpg", ebiten.FilterNearest) + if err != nil { + log.Fatal(err) + } +} + +func Update(screen *ebiten.Image) error { + count++ + w, h := gophersImage.Size() + op := &ebiten.DrawImageOptions{} + op.GeoM.Translate(-float64(w)/2, -float64(h)/2) + op.GeoM.Rotate(float64(count%360) * 2 * math.Pi / 360) + op.GeoM.Translate(ScreenWidth/2, ScreenHeight/2) + if err := screen.DrawImage(gophersImage, op); err != nil { + return err + } + return nil +}