From b51f4d5312d46adc4ef417dd8f7241859f368d0e Mon Sep 17 00:00:00 2001 From: Hajime Hoshi Date: Thu, 5 Oct 2017 02:41:18 +0900 Subject: [PATCH] graphics: Refactoring: Use web package --- graphicscontext.go | 8 ++++++++ graphicscontext_js.go | 21 --------------------- graphicscontext_notjs.go | 21 --------------------- 3 files changed, 8 insertions(+), 42 deletions(-) delete mode 100644 graphicscontext_js.go delete mode 100644 graphicscontext_notjs.go diff --git a/graphicscontext.go b/graphicscontext.go index e93af6875..ef7c26de1 100644 --- a/graphicscontext.go +++ b/graphicscontext.go @@ -19,6 +19,7 @@ import ( "github.com/hajimehoshi/ebiten/internal/restorable" "github.com/hajimehoshi/ebiten/internal/ui" + "github.com/hajimehoshi/ebiten/internal/web" ) func newGraphicsContext(f func(*Image) error) *graphicsContext { @@ -119,6 +120,13 @@ func (c *graphicsContext) Update(updateCount int) error { return nil } +func (c *graphicsContext) needsRestoring() (bool, error) { + if web.IsBrowser() { + return c.invalidated, nil + } + return c.offscreen.restorable.IsInvalidated() +} + func (c *graphicsContext) restoreIfNeeded() error { if !restorable.IsRestoringEnabled() { return nil diff --git a/graphicscontext_js.go b/graphicscontext_js.go deleted file mode 100644 index b0b9a204e..000000000 --- a/graphicscontext_js.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2017 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. - -// +build js - -package ebiten - -func (c *graphicsContext) needsRestoring() (bool, error) { - return c.invalidated, nil -} diff --git a/graphicscontext_notjs.go b/graphicscontext_notjs.go deleted file mode 100644 index aa6addd3a..000000000 --- a/graphicscontext_notjs.go +++ /dev/null @@ -1,21 +0,0 @@ -// Copyright 2017 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. - -// +build !js - -package ebiten - -func (c *graphicsContext) needsRestoring() (bool, error) { - return c.offscreen.restorable.IsInvalidated() -}