extended FontAtlas to load fonts from files.

Author: dertseha

Font.go

@@ -0,0 +1,15 @@
+package imgui
+
+// #include "imguiWrapperTypes.h"
+import "C"
+
+// Font describes one loaded font in an atlas.
+type Font uintptr
+
+// DefaultFont can be used to refer to the default font of the current font atlas without
+// having the actual font reference.
+const DefaultFont Font = 0
+
+func (font Font) handle() C.IggFont {
+	return C.IggFont(font)
+}

FontAtlas.go

@@ -18,6 +18,21 @@ func (atlas FontAtlas) handle() C.IggFontAtlas {
 	return C.IggFontAtlas(atlas)
 }
 
+// AddFontDefault adds the default font to the atlas. This is done by default if you do not call any
+// of the AddFont* methods before retrieving the texture data.
+func (atlas FontAtlas) AddFontDefault() Font {
+	fontHandle := C.iggAddFontDefault(atlas.handle())
+	return Font(fontHandle)
+}
+
+// AddFontFromFileTTF attempts to load a font from given TTF file.
+func (atlas FontAtlas) AddFontFromFileTTF(filename string, sizePixels float32) Font {
+	filenameArg, filenameFin := wrapString(filename)
+	defer filenameFin()
+	fontHandle := C.iggAddFontFromFileTTF(atlas.handle(), filenameArg, C.float(sizePixels))
+	return Font(fontHandle)
+}
+
 // TextureDataAlpha8 returns the image in 8-bit alpha values for the font atlas.
 // The returned image is valid as long as the font atlas is.
 func (atlas FontAtlas) TextureDataAlpha8() *Alpha8Image {

FontAtlasWrapper.cpp

@@ -2,6 +2,20 @@
 #include "FontAtlasWrapper.h"
 #include "WrapperConverter.h"
 
+IggFont iggAddFontDefault(IggFontAtlas handle)
+{
+   ImFontAtlas *fontAtlas = reinterpret_cast<ImFontAtlas *>(handle);
+   ImFont *font = fontAtlas->AddFontDefault();
+   return static_cast<IggFont>(font);
+}
+
+IggFont iggAddFontFromFileTTF(IggFontAtlas handle, char const *filename, float sizePixels)
+{
+   ImFontAtlas *fontAtlas = reinterpret_cast<ImFontAtlas *>(handle);
+   ImFont *font = fontAtlas->AddFontFromFileTTF(filename, sizePixels);
+   return static_cast<IggFont>(font);
+}
+
 void iggFontAtlasGetTexDataAsAlpha8(IggFontAtlas handle, unsigned char **pixels,
                                     int *width, int *height, int *bytesPerPixel)
 {

FontAtlasWrapper.h

@@ -7,6 +7,9 @@ extern "C"
 {
 #endif
 
+extern IggFont iggAddFontDefault(IggFontAtlas handle);
+extern IggFont iggAddFontFromFileTTF(IggFontAtlas handle, char const *filename, float sizePixels);
+
 extern void iggFontAtlasGetTexDataAsAlpha8(IggFontAtlas handle, unsigned char **pixels,
       int *width, int *height, int *bytesPerPixel);
 extern void iggFontAtlasSetTextureID(IggFontAtlas handle, IggTextureID id);

imgui.go

@@ -129,25 +129,14 @@ func SetNextWindowFocus() {
 	C.iggSetNextWindowFocus()
 }
 
-// PushStyleVarFloat pushes a float value on the stack to temporarily modify a style variable.
-func PushStyleVarFloat(id StyleVarID, value float32) {
-	C.iggPushStyleVarFloat(C.int(id), C.float(value))
-}
-
-// PushStyleVarVec2 pushes a Vec2 value on the stack to temporarily modify a style variable.
-func PushStyleVarVec2(id StyleVarID, value Vec2) {
-	valueArg, _ := value.wrapped()
-	C.iggPushStyleVarVec2(C.int(id), valueArg)
-}
-
-// PopStyleVarV reverts the given amount of style variable changes.
-func PopStyleVarV(count int) {
-	C.iggPopStyleVar(C.int(count))
+// PushFont adds the given font on the stack. Use DefaultFont to refer to the default font.
+func PushFont(font Font) {
+	C.iggPushFont(font.handle())
 }
 
-// PopStyleVar calls PopStyleVarV(1).
-func PopStyleVar() {
-	PopStyleVarV(1)
+// PopFont removes the previously pushed font from the stack.
+func PopFont() {
+	C.iggPopFont()
 }
 
 // PushStyleColor pushes the current style color for given ID on a stack and sets the given one.
@@ -167,6 +156,27 @@ func PopStyleColor() {
 	PopStyleColorV(1)
 }
 
+// PushStyleVarFloat pushes a float value on the stack to temporarily modify a style variable.
+func PushStyleVarFloat(id StyleVarID, value float32) {
+	C.iggPushStyleVarFloat(C.int(id), C.float(value))
+}
+
+// PushStyleVarVec2 pushes a Vec2 value on the stack to temporarily modify a style variable.
+func PushStyleVarVec2(id StyleVarID, value Vec2) {
+	valueArg, _ := value.wrapped()
+	C.iggPushStyleVarVec2(C.int(id), valueArg)
+}
+
+// PopStyleVarV reverts the given amount of style variable changes.
+func PopStyleVarV(count int) {
+	C.iggPopStyleVar(C.int(count))
+}
+
+// PopStyleVar calls PopStyleVarV(1).
+func PopStyleVar() {
+	PopStyleVarV(1)
+}
+
 // PushItemWidth sets width of items for the common item+label case, in pixels.
 // 0.0f = default to ~2/3 of windows width, >0.0f: width in pixels,
 // <0.0f align xx pixels to the right of window (so -1.0f always align width to the right side).
@@ -205,6 +215,15 @@ func Text(text string) {
 	C.iggTextUnformatted(textArg)
 }
 
+// LabelText adds text+label aligned the same way as value+label widgets.
+func LabelText(label, text string) {
+	labelArg, labelFin := wrapString(label)
+	defer labelFin()
+	textArg, textFin := wrapString(text)
+	defer textFin()
+	C.iggLabelText(labelArg, textArg)
+}
+
 // ButtonV returning true if it is pressed.
 func ButtonV(id string, size Vec2) bool {
 	idArg, idFin := wrapString(id)

imguiWrapper.cpp

@@ -110,20 +110,15 @@ void iggSetNextWindowFocus(void)
    ImGui::SetNextWindowFocus();
 }
 
-void iggPushStyleVarFloat(int index, float value)
+void iggPushFont(IggFont handle)
 {
-   ImGui::PushStyleVar(index, value);
+   ImFont *font = reinterpret_cast<ImFont *>(handle);
+   ImGui::PushFont(font);
 }
 
-void iggPushStyleVarVec2(int index, IggVec2 const *value)
+void iggPopFont(void)
 {
-   Vec2Wrapper valueArg(value);
-   ImGui::PushStyleVar(index, *valueArg);
-}
-
-void iggPopStyleVar(int count)
-{
-   ImGui::PopStyleVar(count);
+   ImGui::PopFont();
 }
 
 void iggPushStyleColor(int index, IggVec4 const *col)
@@ -137,6 +132,22 @@ void iggPopStyleColor(int count)
    ImGui::PopStyleColor(count);
 }
 
+void iggPushStyleVarFloat(int index, float value)
+{
+   ImGui::PushStyleVar(index, value);
+}
+
+void iggPushStyleVarVec2(int index, IggVec2 const *value)
+{
+   Vec2Wrapper valueArg(value);
+   ImGui::PushStyleVar(index, *valueArg);
+}
+
+void iggPopStyleVar(int count)
+{
+   ImGui::PopStyleVar(count);
+}
+
 void iggPushItemWidth(float width)
 {
    ImGui::PushItemWidth(width);
@@ -162,6 +173,11 @@ void iggTextUnformatted(char const *text)
    ImGui::TextUnformatted(text);
 }
 
+void iggLabelText(char const *label, char const *text)
+{
+   ImGui::LabelText(label, "%s", text);
+}
+
 IggBool iggButton(char const *label, IggVec2 const *size)
 {
    Vec2Wrapper sizeArg(size);

imguiWrapper.h

@@ -32,18 +32,21 @@ extern void iggSetNextWindowPos(IggVec2 const *pos, int cond, IggVec2 const *piv
 extern void iggSetNextWindowSize(IggVec2 const *size, int cond);
 extern void iggSetNextWindowFocus(void);
 
+extern void iggPushFont(IggFont handle);
+extern void iggPopFont(void);
+extern void iggPushStyleColor(int index, IggVec4 const *col);
+extern void iggPopStyleColor(int count);
 extern void iggPushStyleVarFloat(int index, float value);
 extern void iggPushStyleVarVec2(int index, IggVec2 const *value);
 extern void iggPopStyleVar(int count);
-extern void iggPushStyleColor(int index, IggVec4 const *col);
-extern void iggPopStyleColor(int count);
 
 extern void iggPushItemWidth(float width);
 extern void iggPopItemWidth(void);
 extern void iggPushTextWrapPos(float wrapPosX);
 extern void iggPopTextWrapPos(void);
 
 extern void iggTextUnformatted(char const *text);
+extern void iggLabelText(char const *label, char const *text);
 
 extern IggBool iggButton(char const *label, IggVec2 const *size);
 extern IggBool iggCheckbox(char const *label, IggBool *selected);

imguiWrapperTypes.h

@@ -13,6 +13,7 @@ typedef void *IggDrawCmd;
 typedef void *IggDrawData;
 typedef void *IggDrawList;
 typedef void *IggFontAtlas;
+typedef void *IggFont;
 typedef void *IggGuiStyle;
 typedef void *IggIO;