mirror of
https://github.com/bloeys/nmage.git
synced 2025-12-29 13:28:20 +00:00
Start transition to github.com/AllenDang/cimgui-go for imgui because the old wrapper is now depcreated. This is auto generated so has much better chance of being supported, and we get latest imgui always (including docking!)
This commit is contained in:
bloeys
@ -1,17 +1,16 @@
|
||||
package nmageimgui
|
||||
|
||||
import (
|
||||
newimgui "github.com/AllenDang/cimgui-go"
|
||||
"github.com/bloeys/gglm/gglm"
|
||||
"github.com/bloeys/nmage/assert"
|
||||
"github.com/bloeys/nmage/materials"
|
||||
"github.com/bloeys/nmage/timing"
|
||||
"github.com/go-gl/gl/v4.1-core/gl"
|
||||
"github.com/inkyblackness/imgui-go/v4"
|
||||
"github.com/veandco/go-sdl2/sdl"
|
||||
)
|
||||
|
||||
type ImguiInfo struct {
|
||||
ImCtx *imgui.Context
|
||||
ImCtx newimgui.Context
|
||||
// ImCtx2 *imgui.Context
|
||||
|
||||
Mat *materials.Material
|
||||
VaoID uint32
|
||||
@ -22,32 +21,32 @@ type ImguiInfo struct {
|
||||
|
||||
func (i *ImguiInfo) FrameStart(winWidth, winHeight float32) {
|
||||
|
||||
if err := i.ImCtx.SetCurrent(); err != nil {
|
||||
assert.T(false, "Setting imgui ctx as current failed. Err: "+err.Error())
|
||||
}
|
||||
// if err := i.ImCtx.SetCurrent(); err != nil {
|
||||
// assert.T(false, "Setting imgui ctx as current failed. Err: "+err.Error())
|
||||
// }
|
||||
|
||||
imIO := imgui.CurrentIO()
|
||||
imIO.SetDisplaySize(imgui.Vec2{X: float32(winWidth), Y: float32(winHeight)})
|
||||
imIO := newimgui.CurrentIO()
|
||||
imIO.SetDisplaySize(newimgui.Vec2{X: float32(winWidth), Y: float32(winHeight)})
|
||||
imIO.SetDeltaTime(timing.DT())
|
||||
|
||||
imgui.NewFrame()
|
||||
newimgui.NewFrame()
|
||||
}
|
||||
|
||||
func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32) {
|
||||
|
||||
if err := i.ImCtx.SetCurrent(); err != nil {
|
||||
assert.T(false, "Setting imgui ctx as current failed. Err: "+err.Error())
|
||||
}
|
||||
// if err := i.ImCtx.SetCurrent(); err != nil {
|
||||
// assert.T(false, "Setting imgui ctx as current failed. Err: "+err.Error())
|
||||
// }
|
||||
|
||||
imgui.Render()
|
||||
newimgui.Render()
|
||||
|
||||
// Avoid rendering when minimized, scale coordinates for retina displays (screen coordinates != framebuffer coordinates)
|
||||
if fbWidth <= 0 || fbHeight <= 0 {
|
||||
return
|
||||
}
|
||||
|
||||
drawData := imgui.RenderedDrawData()
|
||||
drawData.ScaleClipRects(imgui.Vec2{
|
||||
drawData := newimgui.CurrentDrawData()
|
||||
drawData.ScaleClipRects(newimgui.Vec2{
|
||||
X: float32(fbWidth) / float32(winWidth),
|
||||
Y: float32(fbHeight) / float32(winHeight),
|
||||
})
|
||||
@ -79,7 +78,7 @@ func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32)
|
||||
gl.BindVertexArray(i.VaoID)
|
||||
gl.BindBuffer(gl.ARRAY_BUFFER, i.VboID)
|
||||
|
||||
vertexSize, vertexOffsetPos, vertexOffsetUv, vertexOffsetCol := imgui.VertexBufferLayout()
|
||||
vertexSize, vertexOffsetPos, vertexOffsetUv, vertexOffsetCol := newimgui.VertexBufferLayout()
|
||||
i.Mat.EnableAttribute("Position")
|
||||
i.Mat.EnableAttribute("UV")
|
||||
i.Mat.EnableAttribute("Color")
|
||||
@ -87,7 +86,7 @@ func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32)
|
||||
gl.VertexAttribPointerWithOffset(uint32(i.Mat.GetAttribLoc("UV")), 2, gl.FLOAT, false, int32(vertexSize), uintptr(vertexOffsetUv))
|
||||
gl.VertexAttribPointerWithOffset(uint32(i.Mat.GetAttribLoc("Color")), 4, gl.UNSIGNED_BYTE, true, int32(vertexSize), uintptr(vertexOffsetCol))
|
||||
|
||||
indexSize := imgui.IndexBufferLayout()
|
||||
indexSize := newimgui.IndexBufferLayout()
|
||||
drawType := gl.UNSIGNED_SHORT
|
||||
if indexSize == 4 {
|
||||
drawType = gl.UNSIGNED_INT
|
||||
@ -96,11 +95,11 @@ func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32)
|
||||
// Draw
|
||||
for _, list := range drawData.CommandLists() {
|
||||
|
||||
vertexBuffer, vertexBufferSize := list.VertexBuffer()
|
||||
vertexBuffer, vertexBufferSize := list.GetVertexBuffer()
|
||||
gl.BindBuffer(gl.ARRAY_BUFFER, i.VboID)
|
||||
gl.BufferData(gl.ARRAY_BUFFER, vertexBufferSize, vertexBuffer, gl.STREAM_DRAW)
|
||||
|
||||
indexBuffer, indexBufferSize := list.IndexBuffer()
|
||||
indexBuffer, indexBufferSize := list.GetIndexBuffer()
|
||||
gl.BindBuffer(gl.ELEMENT_ARRAY_BUFFER, i.IndexBufID)
|
||||
gl.BufferData(gl.ELEMENT_ARRAY_BUFFER, indexBufferSize, indexBuffer, gl.STREAM_DRAW)
|
||||
|
||||
@ -113,7 +112,7 @@ func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32)
|
||||
clipRect := cmd.ClipRect()
|
||||
gl.Scissor(int32(clipRect.X), int32(fbHeight)-int32(clipRect.W), int32(clipRect.Z-clipRect.X), int32(clipRect.W-clipRect.Y))
|
||||
|
||||
gl.DrawElementsBaseVertex(gl.TRIANGLES, int32(cmd.ElementCount()), uint32(drawType), gl.PtrOffset(cmd.IndexOffset()*indexSize), int32(cmd.VertexOffset()))
|
||||
gl.DrawElementsBaseVertex(gl.TRIANGLES, int32(cmd.ElemCount()), uint32(drawType), gl.PtrOffset(int(cmd.IdxOffset())*indexSize), int32(cmd.VtxOffset()))
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -124,26 +123,26 @@ func (i *ImguiInfo) Render(winWidth, winHeight float32, fbWidth, fbHeight int32)
|
||||
gl.Enable(gl.DEPTH_TEST)
|
||||
}
|
||||
|
||||
func (i *ImguiInfo) AddFontTTF(fontPath string, fontSize float32, fontConfig *imgui.FontConfig, glyphRanges *imgui.GlyphRanges) imgui.Font {
|
||||
func (i *ImguiInfo) AddFontTTF(fontPath string, fontSize float32, fontConfig *newimgui.FontConfig, glyphRanges *newimgui.GlyphRange) newimgui.Font {
|
||||
|
||||
fontConfigToUse := imgui.DefaultFontConfig
|
||||
fontConfigToUse := newimgui.NewFontConfig()
|
||||
if fontConfig != nil {
|
||||
fontConfigToUse = *fontConfig
|
||||
}
|
||||
|
||||
glyphRangesToUse := imgui.EmptyGlyphRanges
|
||||
glyphRangesToUse := newimgui.NewGlyphRange()
|
||||
if glyphRanges != nil {
|
||||
glyphRangesToUse = *glyphRanges
|
||||
}
|
||||
|
||||
imIO := imgui.CurrentIO()
|
||||
imIO := newimgui.CurrentIO()
|
||||
|
||||
a := imIO.Fonts()
|
||||
f := a.AddFontFromFileTTFV(fontPath, fontSize, fontConfigToUse, glyphRangesToUse)
|
||||
image := a.TextureDataAlpha8()
|
||||
f := a.AddFontFromFileTTFV(fontPath, fontSize, fontConfigToUse, glyphRangesToUse.Data())
|
||||
pixels, width, height, _ := a.GetTextureDataAsAlpha8()
|
||||
|
||||
gl.BindTexture(gl.TEXTURE_2D, i.TexID)
|
||||
gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RED, int32(image.Width), int32(image.Height), 0, gl.RED, gl.UNSIGNED_BYTE, image.Pixels)
|
||||
gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RED, int32(width), int32(height), 0, gl.RED, gl.UNSIGNED_BYTE, pixels)
|
||||
|
||||
return f
|
||||
}
|
||||
@ -184,15 +183,17 @@ void main()
|
||||
}
|
||||
`
|
||||
|
||||
func NewImGUI() ImguiInfo {
|
||||
func NewImGui() ImguiInfo {
|
||||
|
||||
imguiInfo := ImguiInfo{
|
||||
ImCtx: imgui.CreateContext(nil),
|
||||
Mat: materials.NewMaterialSrc("ImGUI Mat", []byte(imguiShdrSrc)),
|
||||
// ImCtx2: imgui.CreateContext(nil),
|
||||
ImCtx: newimgui.CreateContext(),
|
||||
|
||||
Mat: materials.NewMaterialSrc("ImGUI Mat", []byte(imguiShdrSrc)),
|
||||
}
|
||||
|
||||
imIO := imgui.CurrentIO()
|
||||
imIO.SetBackendFlags(imIO.GetBackendFlags() | imgui.BackendFlagsRendererHasVtxOffset)
|
||||
imIO := newimgui.CurrentIO()
|
||||
imIO.SetBackendFlags(imIO.BackendFlags() | newimgui.BackendFlagsRendererHasVtxOffset)
|
||||
|
||||
gl.GenVertexArrays(1, &imguiInfo.VaoID)
|
||||
gl.GenBuffers(1, &imguiInfo.VboID)
|
||||
@ -205,11 +206,11 @@ func NewImGUI() ImguiInfo {
|
||||
gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
|
||||
gl.PixelStorei(gl.UNPACK_ROW_LENGTH, 0)
|
||||
|
||||
image := imIO.Fonts().TextureDataAlpha8()
|
||||
gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RED, int32(image.Width), int32(image.Height), 0, gl.RED, gl.UNSIGNED_BYTE, image.Pixels)
|
||||
pixels, width, height, _ := imIO.Fonts().GetTextureDataAsAlpha8()
|
||||
gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RED, int32(width), int32(height), 0, gl.RED, gl.UNSIGNED_BYTE, pixels)
|
||||
|
||||
// Store our identifier
|
||||
imIO.Fonts().SetTextureID(imgui.TextureID(imguiInfo.TexID))
|
||||
imIO.Fonts().SetTexID(newimgui.TextureID(uintptr(imguiInfo.TexID)))
|
||||
|
||||
//Shader attributes
|
||||
imguiInfo.Mat.Bind()
|
||||
@ -218,35 +219,97 @@ func NewImGUI() ImguiInfo {
|
||||
imguiInfo.Mat.EnableAttribute("Color")
|
||||
imguiInfo.Mat.UnBind()
|
||||
|
||||
//Init imgui input mapping
|
||||
keys := map[int]int{
|
||||
imgui.KeyTab: sdl.SCANCODE_TAB,
|
||||
imgui.KeyLeftArrow: sdl.SCANCODE_LEFT,
|
||||
imgui.KeyRightArrow: sdl.SCANCODE_RIGHT,
|
||||
imgui.KeyUpArrow: sdl.SCANCODE_UP,
|
||||
imgui.KeyDownArrow: sdl.SCANCODE_DOWN,
|
||||
imgui.KeyPageUp: sdl.SCANCODE_PAGEUP,
|
||||
imgui.KeyPageDown: sdl.SCANCODE_PAGEDOWN,
|
||||
imgui.KeyHome: sdl.SCANCODE_HOME,
|
||||
imgui.KeyEnd: sdl.SCANCODE_END,
|
||||
imgui.KeyInsert: sdl.SCANCODE_INSERT,
|
||||
imgui.KeyDelete: sdl.SCANCODE_DELETE,
|
||||
imgui.KeyBackspace: sdl.SCANCODE_BACKSPACE,
|
||||
imgui.KeySpace: sdl.SCANCODE_BACKSPACE,
|
||||
imgui.KeyEnter: sdl.SCANCODE_RETURN,
|
||||
imgui.KeyEscape: sdl.SCANCODE_ESCAPE,
|
||||
imgui.KeyA: sdl.SCANCODE_A,
|
||||
imgui.KeyC: sdl.SCANCODE_C,
|
||||
imgui.KeyV: sdl.SCANCODE_V,
|
||||
imgui.KeyX: sdl.SCANCODE_X,
|
||||
imgui.KeyY: sdl.SCANCODE_Y,
|
||||
imgui.KeyZ: sdl.SCANCODE_Z,
|
||||
}
|
||||
|
||||
// Keyboard mapping. ImGui will use those indices to peek into the io.KeysDown[] array.
|
||||
for imguiKey, nativeKey := range keys {
|
||||
imIO.KeyMap(imguiKey, nativeKey)
|
||||
}
|
||||
// //Init imgui input mapping
|
||||
// keys := map[int]int{
|
||||
// newimgui.KeyTab: sdl.SCANCODE_TAB,
|
||||
// newimgui.KeyLeftArrow: sdl.SCANCODE_LEFT,
|
||||
// newimgui.KeyRightArrow: sdl.SCANCODE_RIGHT,
|
||||
// newimgui.KeyUpArrow: sdl.SCANCODE_UP,
|
||||
// newimgui.KeyDownArrow: sdl.SCANCODE_DOWN,
|
||||
// newimgui.KeyPageUp: sdl.SCANCODE_PAGEUP,
|
||||
// newimgui.KeyPageDown: sdl.SCANCODE_PAGEDOWN,
|
||||
// newimgui.KeyHome: sdl.SCANCODE_HOME,
|
||||
// newimgui.KeyEnd: sdl.SCANCODE_END,
|
||||
// newimgui.KeyInsert: sdl.SCANCODE_INSERT,
|
||||
// newimgui.KeyDelete: sdl.SCANCODE_DELETE,
|
||||
// newimgui.KeyBackspace: sdl.SCANCODE_BACKSPACE,
|
||||
// newimgui.KeySpace: sdl.SCANCODE_BACKSPACE,
|
||||
// newimgui.KeyEnter: sdl.SCANCODE_RETURN,
|
||||
// newimgui.KeyEscape: sdl.SCANCODE_ESCAPE,
|
||||
// newimgui.KeyA: sdl.SCANCODE_A,
|
||||
// newimgui.KeyC: sdl.SCANCODE_C,
|
||||
// newimgui.KeyV: sdl.SCANCODE_V,
|
||||
// newimgui.KeyX: sdl.SCANCODE_X,
|
||||
// newimgui.KeyY: sdl.SCANCODE_Y,
|
||||
// newimgui.KeyZ: sdl.SCANCODE_Z,
|
||||
// }
|
||||
|
||||
return imguiInfo
|
||||
}
|
||||
|
||||
// func newImGUI() ImguiInfo {
|
||||
|
||||
// imguiInfo := ImguiInfo{
|
||||
// ImCtx: imgui.CreateContext(nil),
|
||||
// Mat: materials.NewMaterialSrc("ImGUI Mat", []byte(imguiShdrSrc)),
|
||||
// }
|
||||
|
||||
// imIO := imgui.CurrentIO()
|
||||
// imIO.SetBackendFlags(imIO.GetBackendFlags() | imgui.BackendFlagsRendererHasVtxOffset)
|
||||
|
||||
// gl.GenVertexArrays(1, &imguiInfo.VaoID)
|
||||
// gl.GenBuffers(1, &imguiInfo.VboID)
|
||||
// gl.GenBuffers(1, &imguiInfo.IndexBufID)
|
||||
// gl.GenTextures(1, &imguiInfo.TexID)
|
||||
|
||||
// // Upload font to gpu
|
||||
// gl.BindTexture(gl.TEXTURE_2D, imguiInfo.TexID)
|
||||
// gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MIN_FILTER, gl.LINEAR)
|
||||
// gl.TexParameteri(gl.TEXTURE_2D, gl.TEXTURE_MAG_FILTER, gl.LINEAR)
|
||||
// gl.PixelStorei(gl.UNPACK_ROW_LENGTH, 0)
|
||||
|
||||
// image := imIO.Fonts().TextureDataAlpha8()
|
||||
// gl.TexImage2D(gl.TEXTURE_2D, 0, gl.RED, int32(image.Width), int32(image.Height), 0, gl.RED, gl.UNSIGNED_BYTE, image.Pixels)
|
||||
|
||||
// // Store our identifier
|
||||
// imIO.Fonts().SetTextureID(imgui.TextureID(imguiInfo.TexID))
|
||||
|
||||
// //Shader attributes
|
||||
// imguiInfo.Mat.Bind()
|
||||
// imguiInfo.Mat.EnableAttribute("Position")
|
||||
// imguiInfo.Mat.EnableAttribute("UV")
|
||||
// imguiInfo.Mat.EnableAttribute("Color")
|
||||
// imguiInfo.Mat.UnBind()
|
||||
|
||||
// //Init imgui input mapping
|
||||
// keys := map[int]int{
|
||||
// imgui.KeyTab: sdl.SCANCODE_TAB,
|
||||
// imgui.KeyLeftArrow: sdl.SCANCODE_LEFT,
|
||||
// imgui.KeyRightArrow: sdl.SCANCODE_RIGHT,
|
||||
// imgui.KeyUpArrow: sdl.SCANCODE_UP,
|
||||
// imgui.KeyDownArrow: sdl.SCANCODE_DOWN,
|
||||
// imgui.KeyPageUp: sdl.SCANCODE_PAGEUP,
|
||||
// imgui.KeyPageDown: sdl.SCANCODE_PAGEDOWN,
|
||||
// imgui.KeyHome: sdl.SCANCODE_HOME,
|
||||
// imgui.KeyEnd: sdl.SCANCODE_END,
|
||||
// imgui.KeyInsert: sdl.SCANCODE_INSERT,
|
||||
// imgui.KeyDelete: sdl.SCANCODE_DELETE,
|
||||
// imgui.KeyBackspace: sdl.SCANCODE_BACKSPACE,
|
||||
// imgui.KeySpace: sdl.SCANCODE_BACKSPACE,
|
||||
// imgui.KeyEnter: sdl.SCANCODE_RETURN,
|
||||
// imgui.KeyEscape: sdl.SCANCODE_ESCAPE,
|
||||
// imgui.KeyA: sdl.SCANCODE_A,
|
||||
// imgui.KeyC: sdl.SCANCODE_C,
|
||||
// imgui.KeyV: sdl.SCANCODE_V,
|
||||
// imgui.KeyX: sdl.SCANCODE_X,
|
||||
// imgui.KeyY: sdl.SCANCODE_Y,
|
||||
// imgui.KeyZ: sdl.SCANCODE_Z,
|
||||
// }
|
||||
|
||||
// // Keyboard mapping. ImGui will use those indices to peek into the io.KeysDown[] array.
|
||||
// for imguiKey, nativeKey := range keys {
|
||||
// imIO.KeyMap(imguiKey, nativeKey)
|
||||
// }
|
||||
|
||||
// return imguiInfo
|
||||
// }
|
||||
|
||||
Reference in New Issue
Block a user