From 4a5420d6f23e8d5cc53556c7416cfdc0e55cac79 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sat, 2 Dec 2017 16:46:55 +0900
Subject: [PATCH] opengl: Remove Node.js support (#141)

---
 internal/opengl/context_js.go | 35 ++++++++++++++---------------------
 internal/web/js.go            |  6 +++++-
 internal/web/notjs.go         |  4 ++++
 3 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/internal/opengl/context_js.go b/internal/opengl/context_js.go
index d20573db2..599e01f8a 100644
--- a/internal/opengl/context_js.go
+++ b/internal/opengl/context_js.go
@@ -22,6 +22,8 @@ import (
 
 	"github.com/gopherjs/gopherjs/js"
 	"github.com/gopherjs/webgl"
+
+	"github.com/hajimehoshi/ebiten/internal/web"
 )
 
 // Note that `type Texture *js.Object` doesn't work.
@@ -103,31 +105,22 @@ type context struct {
 }
 
 func Init() error {
-	var gl *webgl.Context
+	if web.IsNodeJS() {
+		return fmt.Errorf("opengl: Node.js is not supported")
+	}
 
-	if js.Global.Get("require") == js.Undefined {
-		// TODO: Define id?
-		canvas := js.Global.Get("document").Call("querySelector", "canvas")
-		var err error
-		gl, err = webgl.NewContext(canvas, &webgl.ContextAttributes{
-			Alpha:              true,
-			PremultipliedAlpha: true,
-		})
-		if err != nil {
-			return err
-		}
-	} else {
-		// TODO: Now Ebiten with headless-gl doesn't work well (#141).
-		// Use headless-gl for testing.
-		options := map[string]bool{
-			"alpha":              true,
-			"premultipliedAlpha": true,
-		}
-		webglContext := js.Global.Call("require", "gl").Invoke(16, 16, options)
-		gl = &webgl.Context{Object: webglContext}
+	// TODO: Define id?
+	canvas := js.Global.Get("document").Call("querySelector", "canvas")
+	gl, err := webgl.NewContext(canvas, &webgl.ContextAttributes{
+		Alpha:              true,
+		PremultipliedAlpha: true,
+	})
+	if err != nil {
+		return err
 	}
 	c := &Context{}
 	c.gl = gl
+
 	// Getting an extension might fail after the context is lost, so
 	// it is required to get the extension here.
 	c.loseContext = gl.GetExtension("WEBGL_lose_context")
diff --git a/internal/web/js.go b/internal/web/js.go
index ad4218d8a..9a70af33a 100644
--- a/internal/web/js.go
+++ b/internal/web/js.go
@@ -22,8 +22,12 @@ import (
 	"github.com/gopherjs/gopherjs/js"
 )
 
+func IsNodeJS() bool {
+	return js.Global.Get("require") != js.Undefined
+}
+
 func IsBrowser() bool {
-	return true
+	return !IsNodeJS()
 }
 
 func IsIOSSafari() bool {
diff --git a/internal/web/notjs.go b/internal/web/notjs.go
index 805c9b7d8..6970e8eb7 100644
--- a/internal/web/notjs.go
+++ b/internal/web/notjs.go
@@ -16,6 +16,10 @@
 
 package web
 
+func IsNodeJS() bool {
+	return false
+}
+
 func IsBrowser() bool {
 	return false
 }