examples/ folder added

go4orward · May 2, 2021 · 0ec5125 · 0ec5125
1 parent 871c83a
commit 0ec5125
Show file tree

Hide file tree

Showing 30 changed files with 31 additions and 31 deletions.
diff --git a/Makefile b/Makefile
@@ -1,21 +1,21 @@
 all: 
-	GOOS=js GOARCH=wasm go build -o wasm_test.wasm webgl1st_example.go
+	GOOS=js GOARCH=wasm go build -o wasm_test.wasm examples/webgl1st_example.go
 	go build -o wasm_test_server wasm_test_server.go
 
 2d:
-	GOOS=js GOARCH=wasm go build -o wasm_test.wasm webgl2d_example.go
+	GOOS=js GOARCH=wasm go build -o wasm_test.wasm examples/webgl2d_example.go
 	go build -o wasm_test_server wasm_test_server.go
 
 2dui:
-	GOOS=js GOARCH=wasm go build -o wasm_test.wasm webgl2dui_example.go
+	GOOS=js GOARCH=wasm go build -o wasm_test.wasm examples/webgl2dui_example.go
 	go build -o wasm_test_server wasm_test_server.go
 
 3d:
-	GOOS=js GOARCH=wasm go build -o wasm_test.wasm webgl3d_example.go
+	GOOS=js GOARCH=wasm go build -o wasm_test.wasm examples/webgl3d_example.go
 	go build -o wasm_test_server wasm_test_server.go
 
 globe:
-	GOOS=js GOARCH=wasm go build -o wasm_test.wasm webglglobe_example.go
+	GOOS=js GOARCH=wasm go build -o wasm_test.wasm examples/webglglobe_example.go
 	go build -o wasm_test_server wasm_test_server.go
 
 clean:

diff --git a/webgl1st_example.go → examples/webgl1st_example.go b/webgl1st_example.go → examples/webgl1st_example.go
@@ -1,5 +1,5 @@
 // +build js,wasm
-package main
+package examples
 
 import (
 	"fmt"

diff --git a/webgl2d_example.go → examples/webgl2d_example.go b/webgl2d_example.go → examples/webgl2d_example.go
@@ -1,5 +1,5 @@
 // +build js,wasm
-package main
+package examples
 
 import (
 	"fmt"

diff --git a/webgl2dui_example.go → examples/webgl2dui_example.go b/webgl2dui_example.go → examples/webgl2dui_example.go
@@ -1,5 +1,5 @@
 // +build js,wasm
-package main
+package examples
 
 import (
 	"fmt"

diff --git a/webgl3d_example.go → examples/webgl3d_example.go b/webgl3d_example.go → examples/webgl3d_example.go
@@ -1,5 +1,5 @@
 // +build js,wasm
-package main
+package examples
 
 import (
 	"fmt"

diff --git a/webglglobe_example.go → examples/webglglobe_example.go b/webglglobe_example.go → examples/webglglobe_example.go
@@ -1,4 +1,4 @@
-package main
+package examples
 
 import (
 	"fmt"

diff --git a/wcommon/geom2d/geom2d.go → geom2d/geom2d.go b/wcommon/geom2d/geom2d.go → geom2d/geom2d.go
diff --git a/wcommon/geom2d/matrix3.go → geom2d/matrix3.go b/wcommon/geom2d/matrix3.go → geom2d/matrix3.go
diff --git a/wcommon/geom3d/geom3d.go → geom3d/geom3d.go b/wcommon/geom3d/geom3d.go → geom3d/geom3d.go
diff --git a/wcommon/geom3d/matrix4.go → geom3d/matrix4.go b/wcommon/geom3d/matrix4.go → geom3d/matrix4.go
diff --git a/webgl2d/camera.go b/webgl2d/camera.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
+	"github.com/go4orward/gowebgl/geom2d"
 )
 
 type Camera struct {

diff --git a/webgl2d/geometry.go b/webgl2d/geometry.go
@@ -5,8 +5,8 @@ import (
 	"math"
 	"syscall/js"
 
+	"github.com/go4orward/gowebgl/geom2d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/webgl2d/overlay.go b/webgl2d/overlay.go
@@ -1,7 +1,7 @@
 package webgl2d
 
 import (
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
+	"github.com/go4orward/gowebgl/geom2d"
 )
 
 type Overlay interface {

diff --git a/webgl2d/overlay_label_layer.go b/webgl2d/overlay_label_layer.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/go4orward/gowebgl/geom2d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
 )
 
 type OverlayLabel struct {

diff --git a/webgl2d/overlay_marker_layer.go b/webgl2d/overlay_marker_layer.go
@@ -1,8 +1,8 @@
 package webgl2d
 
 import (
+	"github.com/go4orward/gowebgl/geom2d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
 )
 
 type OverlayMarkerLayer struct {

diff --git a/webgl2d/renderer.go b/webgl2d/renderer.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"syscall/js"
 
+	"github.com/go4orward/gowebgl/geom2d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
 )
 
 type Renderer struct {

diff --git a/webgl2d/scene.go b/webgl2d/scene.go
@@ -1,8 +1,8 @@
 package webgl2d
 
 import (
+	"github.com/go4orward/gowebgl/geom2d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
 )
 
 type Scene struct {

diff --git a/webgl2d/scene_object.go b/webgl2d/scene_object.go
@@ -3,8 +3,8 @@ package webgl2d
 import (
 	"fmt"
 
+	"github.com/go4orward/gowebgl/geom2d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
 )
 
 type SceneObject struct {

diff --git a/webgl3d/camera.go b/webgl3d/camera.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
+	"github.com/go4orward/gowebgl/geom3d"
 )
 
 type CameraProjection interface {

diff --git a/webgl3d/camera_orthographic_projection.go b/webgl3d/camera_orthographic_projection.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
+	"github.com/go4orward/gowebgl/geom3d"
 )
 
 type OrthographicProjection struct {

diff --git a/webgl3d/camera_perspective_projection.go b/webgl3d/camera_perspective_projection.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"math"
 
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
+	"github.com/go4orward/gowebgl/geom3d"
 )
 
 type PerspectiveProjection struct {

diff --git a/webgl3d/geometry.go b/webgl3d/geometry.go
@@ -5,8 +5,8 @@ import (
 	"math"
 	"syscall/js"
 
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 )
 
 // ----------------------------------------------------------------------------

diff --git a/webgl3d/overlay.go b/webgl3d/overlay.go
@@ -1,6 +1,6 @@
 package webgl3d
 
-import "github.com/go4orward/gowebgl/wcommon/geom3d"
+import "github.com/go4orward/gowebgl/geom3d"
 
 type Overlay interface {
 	Render(proj *geom3d.Matrix4, view *geom3d.Matrix4)

diff --git a/webgl3d/overlay_label_layer.go b/webgl3d/overlay_label_layer.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 	"github.com/go4orward/gowebgl/webgl2d"
 )
 

diff --git a/webgl3d/overlay_marker_layer.go b/webgl3d/overlay_marker_layer.go
@@ -1,8 +1,8 @@
 package webgl3d
 
 import (
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 	"github.com/go4orward/gowebgl/webgl2d"
 )
 

diff --git a/webgl3d/renderer.go b/webgl3d/renderer.go
@@ -7,9 +7,9 @@ import (
 	"strings"
 	"syscall/js"
 
+	"github.com/go4orward/gowebgl/geom2d"
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom2d"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 )
 
 type Renderer struct {

diff --git a/webgl3d/scene_object.go b/webgl3d/scene_object.go
@@ -3,8 +3,8 @@ package webgl3d
 import (
 	"fmt"
 
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 )
 
 type SceneObject struct {

diff --git a/webglglobe/globe.go b/webglglobe/globe.go
@@ -3,8 +3,8 @@ package webglglobe
 import (
 	"math"
 
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 	"github.com/go4orward/gowebgl/webgl3d"
 )
 

diff --git a/webglglobe/world_camera.go b/webglglobe/world_camera.go
@@ -3,7 +3,7 @@ package webglglobe
 import (
 	"math"
 
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/webgl3d"
 )
 

diff --git a/webglglobe/world_renderer.go b/webglglobe/world_renderer.go
@@ -1,8 +1,8 @@
 package webglglobe
 
 import (
+	"github.com/go4orward/gowebgl/geom3d"
 	"github.com/go4orward/gowebgl/wcommon"
-	"github.com/go4orward/gowebgl/wcommon/geom3d"
 	"github.com/go4orward/gowebgl/webgl3d"
 )
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"math"
-    	"github.com/go4orward/gowebgl/wcommon/geom2d"
+    	"github.com/go4orward/gowebgl/geom2d"
     )
     type Camera struct {
@@ Expand Down @@