Merge pull request #9 from inkyblackness/update/to-3.0.0

dertseha · web-flow · commit b01e28d070a7 · 2020-12-28T12:08:24.000+01:00
update to imgui-go/v3
diff --git a/assets/screenshot.png b/assets/screenshot.png
diff --git a/cmd/example_glfw_opengl2/main.go b/cmd/example_glfw_opengl2/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 
 	"github.com/inkyblackness/imgui-go-examples/internal/example"
 	"github.com/inkyblackness/imgui-go-examples/internal/platforms"
diff --git a/cmd/example_glfw_opengl3/main.go b/cmd/example_glfw_opengl3/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 
 	"github.com/inkyblackness/imgui-go-examples/internal/example"
 	"github.com/inkyblackness/imgui-go-examples/internal/platforms"
diff --git a/cmd/example_sdl_opengl2/main.go b/cmd/example_sdl_opengl2/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 
 	"github.com/inkyblackness/imgui-go-examples/internal/example"
 	"github.com/inkyblackness/imgui-go-examples/internal/platforms"
diff --git a/cmd/example_sdl_opengl3/main.go b/cmd/example_sdl_opengl3/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 
 	"github.com/inkyblackness/imgui-go-examples/internal/example"
 	"github.com/inkyblackness/imgui-go-examples/internal/platforms"
diff --git a/go.mod b/go.mod
@@ -4,7 +4,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7
 	github.com/go-gl/glfw v0.0.0-20191125211704-12ad95a8df72
-	github.com/inkyblackness/imgui-go/v2 v2.4.0
+	github.com/inkyblackness/imgui-go/v3 v3.0.0
 	github.com/veandco/go-sdl2 v0.4.0
 )
 
diff --git a/go.sum b/go.sum
@@ -5,8 +5,8 @@ github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7 h1:SCYMcCJ89LjRGwEa0tRluN
 github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk=
 github.com/go-gl/glfw v0.0.0-20191125211704-12ad95a8df72 h1:LgLYrxDRSVv3kStk6louYTP1ekZ6t7HZY/X05KUyaeM=
 github.com/go-gl/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
-github.com/inkyblackness/imgui-go/v2 v2.4.0 h1:Trb694GPM+ImDgJaOoEXNWk0ofvI1R05JFGTB6PLFH4=
-github.com/inkyblackness/imgui-go/v2 v2.4.0/go.mod h1:cwQKd6U2onyuT5qwSC3DKCRsUE1SQ58TSVVpLoW/pDs=
+github.com/inkyblackness/imgui-go/v3 v3.0.0 h1:+gOBA/xlr528SOGDteKQS+q7QkyBcOi+znhn18BMs/8=
+github.com/inkyblackness/imgui-go/v3 v3.0.0/go.mod h1:WdM5LZHuTrjd1d+yd2fA19t3mG538kJ6zOLB2sAXF6U=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/internal/demo/Window.go b/internal/demo/Window.go
@@ -3,7 +3,7 @@ package demo
 import (
 	"fmt"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 )
 
 type windowFlags struct {
diff --git a/internal/example/Run.go b/internal/example/Run.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 
 	"github.com/inkyblackness/imgui-go-examples/internal/demo"
 )
diff --git a/internal/platforms/glfw.go b/internal/platforms/glfw.go
@@ -8,7 +8,7 @@ import (
 	"runtime"
 
 	"github.com/go-gl/glfw/v3.2/glfw"
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 )
 
 // GLFWClientAPI identifies the render system that shall be initialized.
diff --git a/internal/platforms/sdl.go b/internal/platforms/sdl.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"runtime"
 
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 	"github.com/veandco/go-sdl2/sdl"
 )
 
diff --git a/internal/renderers/OpenGL2.go b/internal/renderers/OpenGL2.go
@@ -5,7 +5,7 @@ import (
 	"unsafe"
 
 	"github.com/go-gl/gl/v2.1/gl"
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 )
 
 // OpenGL2 implements a renderer based on github.com/go-gl/gl (v2.1).
diff --git a/internal/renderers/OpenGL3.go b/internal/renderers/OpenGL3.go
@@ -5,7 +5,7 @@ import (
 	"unsafe"
 
 	"github.com/go-gl/gl/v3.2-core/gl"
-	"github.com/inkyblackness/imgui-go/v2"
+	"github.com/inkyblackness/imgui-go/v3"
 )
 
 // OpenGL3 implements a renderer based on github.com/go-gl/gl (v3.2-core).

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ require (`
`4`	`4`	`github.com/davecgh/go-spew v1.1.1 // indirect`
`5`	`5`	`github.com/go-gl/gl v0.0.0-20190320180904-bf2b1f2f34d7`
`6`	`6`	`github.com/go-gl/glfw v0.0.0-20191125211704-12ad95a8df72`
`7`		`- github.com/inkyblackness/imgui-go/v2 v2.4.0`
	`7`	`+ github.com/inkyblackness/imgui-go/v3 v3.0.0`
`8`	`8`	`github.com/veandco/go-sdl2 v0.4.0`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package demo`
`3`	`3`	`import (`
`4`	`4`	`"fmt"`
`5`	`5`
`6`		`- "github.com/inkyblackness/imgui-go/v2"`
	`6`	`+ "github.com/inkyblackness/imgui-go/v3"`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type windowFlags struct {`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"fmt"`
`5`	`5`	`"time"`
`6`	`6`
`7`		`- "github.com/inkyblackness/imgui-go/v2"`
	`7`	`+ "github.com/inkyblackness/imgui-go/v3"`
`8`	`8`
`9`	`9`	`"github.com/inkyblackness/imgui-go-examples/internal/demo"`
`10`	`10`	`)`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"runtime"`
`9`	`9`
`10`	`10`	`"github.com/go-gl/glfw/v3.2/glfw"`
`11`		`- "github.com/inkyblackness/imgui-go/v2"`
	`11`	`+ "github.com/inkyblackness/imgui-go/v3"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// GLFWClientAPI identifies the render system that shall be initialized.`