Skip to content

Commit 634e28b

Browse files
SpaiRSpaiR
authored
feat(api): bump Dear ImGui from 1.89.0 to 1.90.9
1 parent 718633e commit 634e28b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

61 files changed

+13686
-9785
lines changed

‎buildSrc/src/main/kotlin/tool/generator/api/jni_content.kt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -664,13 +664,21 @@ private fun createFieldSetContent(field: CtField<*>): List<String> {
664664
}
665665
} else {
666666
result += transformMethodToContent(setAccessor, listOf(valueParam)).map {
667+
var valueReplaceTarget = "$1"
668+
field.getAnnotation(A_NAME_BINDING_FIELD)?.let { a ->
669+
val staticCast = a.getValueAsString(A_VALUE_STATIC_CAST)
670+
if (staticCast != null && staticCast.isNotEmpty()) {
671+
valueReplaceTarget = "static_cast<$staticCast>($valueReplaceTarget)"
672+
}
673+
}
674+
667675
val fieldName = "$PTR_JNI_THIS->${field.getCallName()}"
668676
val replaceTarget = "$PTR_JNI_THIS->${setAccessor.simpleName}\\((.+)\\)"
669-
var replaceContent = "$fieldName = $1"
677+
var replaceContent = "$fieldName = $valueReplaceTarget"
670678

671679
// When we set a string to a field we need to manually copy the string itself.
672680
if (field.isType("String") && !field.hasAnnotation(A_NAME_TYPE_STD_STRING)) {
673-
replaceContent = "SET_STRING_FIELD($fieldName, $1)"
681+
replaceContent = "SET_STRING_FIELD($fieldName, $valueReplaceTarget)"
674682
}
675683

676684
it.replace(replaceTarget.toRegex(), replaceContent)

‎buildSrc/src/main/resources/generator/api/ast/ast-ImGuizmo.json‎

Lines changed: 178 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"info" : {
33
"source" : "include/imguizmo/ImGuizmo.h",
4-
"hash" : "86c265f6f4ce4a91b09950758f209579",
4+
"hash" : "330da82032707d5d2f3bd3f474934613",
55
"url" : "https://github.com/CedricGuillemet/ImGuizmo.git",
6-
"revision" : "ba662b119d64f9ab700bb2cd7b2781f9044f5565"
6+
"revision" : "bcdd86bb8a8019b373e46921c52ef7f2fdaa8b16"
77
},
88
"decls" : [ {
99
"@type" : "AstNamespaceDecl",
@@ -672,6 +672,129 @@
672672
"qualType" : "int",
673673
"desugaredQualType" : "int"
674674
} ]
675+
}, {
676+
"@type" : "AstFunctionDecl",
677+
"name" : "PushID",
678+
"resultType" : "void",
679+
"decls" : [ {
680+
"@type" : "AstParmVarDecl",
681+
"name" : "str_id",
682+
"qualType" : "const char *",
683+
"desugaredQualType" : "const char *"
684+
}, {
685+
"@type" : "AstFullComment",
686+
"decls" : [ {
687+
"@type" : "AstParagraphComment",
688+
"decls" : [ {
689+
"@type" : "AstTextComment",
690+
"text" : " ID stack/scopes"
691+
}, {
692+
"@type" : "AstTextComment",
693+
"text" : " Read the FAQ (docs/FAQ.md or http://dearimgui.org/faq) for more details about how ID are handled in dear imgui."
694+
}, {
695+
"@type" : "AstTextComment",
696+
"text" : " - Those questions are answered and impacted by understanding of the ID stack system:"
697+
}, {
698+
"@type" : "AstTextComment",
699+
"text" : " - \"Q: Why is my widget not reacting when I click on it?\""
700+
}, {
701+
"@type" : "AstTextComment",
702+
"text" : " - \"Q: How can I have widgets with an empty label?\""
703+
}, {
704+
"@type" : "AstTextComment",
705+
"text" : " - \"Q: How can I have multiple widgets with the same label?\""
706+
}, {
707+
"@type" : "AstTextComment",
708+
"text" : " - Short version: ID are hashes of the entire ID stack. If you are creating widgets in a loop you most likely"
709+
}, {
710+
"@type" : "AstTextComment",
711+
"text" : " want to push a unique identifier (e.g. object pointer, loop index) to uniquely differentiate them."
712+
}, {
713+
"@type" : "AstTextComment",
714+
"text" : " - You can also use the \"Label##foobar\" syntax within widget label to distinguish them from each others."
715+
}, {
716+
"@type" : "AstTextComment",
717+
"text" : " - In this header file we use the \"label\"/\"name\" terminology to denote a string that will be displayed + used as an ID,"
718+
}, {
719+
"@type" : "AstTextComment",
720+
"text" : " whereas \"str_id\" denote a string that is only used as an ID and not normally displayed."
721+
} ]
722+
} ]
723+
} ]
724+
}, {
725+
"@type" : "AstFunctionDecl",
726+
"name" : "PushID",
727+
"resultType" : "void",
728+
"decls" : [ {
729+
"@type" : "AstParmVarDecl",
730+
"name" : "str_id_begin",
731+
"qualType" : "const char *",
732+
"desugaredQualType" : "const char *"
733+
}, {
734+
"@type" : "AstParmVarDecl",
735+
"name" : "str_id_end",
736+
"qualType" : "const char *",
737+
"desugaredQualType" : "const char *"
738+
} ]
739+
}, {
740+
"@type" : "AstFunctionDecl",
741+
"name" : "PushID",
742+
"resultType" : "void",
743+
"decls" : [ {
744+
"@type" : "AstParmVarDecl",
745+
"name" : "ptr_id",
746+
"qualType" : "const void *",
747+
"desugaredQualType" : "const void *"
748+
} ]
749+
}, {
750+
"@type" : "AstFunctionDecl",
751+
"name" : "PushID",
752+
"resultType" : "void",
753+
"decls" : [ {
754+
"@type" : "AstParmVarDecl",
755+
"name" : "int_id",
756+
"qualType" : "int",
757+
"desugaredQualType" : "int"
758+
} ]
759+
}, {
760+
"@type" : "AstFunctionDecl",
761+
"name" : "PopID",
762+
"resultType" : "void"
763+
}, {
764+
"@type" : "AstFunctionDecl",
765+
"name" : "GetID",
766+
"resultType" : "int",
767+
"decls" : [ {
768+
"@type" : "AstParmVarDecl",
769+
"name" : "str_id",
770+
"qualType" : "const char *",
771+
"desugaredQualType" : "const char *"
772+
} ]
773+
}, {
774+
"@type" : "AstFunctionDecl",
775+
"name" : "GetID",
776+
"resultType" : "int",
777+
"decls" : [ {
778+
"@type" : "AstParmVarDecl",
779+
"name" : "str_id_begin",
780+
"qualType" : "const char *",
781+
"desugaredQualType" : "const char *"
782+
}, {
783+
"@type" : "AstParmVarDecl",
784+
"name" : "str_id_end",
785+
"qualType" : "const char *",
786+
"desugaredQualType" : "const char *"
787+
} ]
788+
}, {
789+
"@type" : "AstFunctionDecl",
790+
"name" : "GetID",
791+
"resultType" : "int",
792+
"decls" : [ {
793+
"@type" : "AstParmVarDecl",
794+
"name" : "ptr_id",
795+
"qualType" : "const void *",
796+
"desugaredQualType" : "const void *"
797+
} ]
675798
}, {
676799
"@type" : "AstFunctionDecl",
677800
"name" : "IsOver",
@@ -745,6 +868,35 @@
745868
} ]
746869
} ]
747870
} ]
871+
}, {
872+
"@type" : "AstFunctionDecl",
873+
"name" : "SetAxisMask",
874+
"resultType" : "void",
875+
"decls" : [ {
876+
"@type" : "AstParmVarDecl",
877+
"name" : "x",
878+
"qualType" : "bool",
879+
"desugaredQualType" : "bool"
880+
}, {
881+
"@type" : "AstParmVarDecl",
882+
"name" : "y",
883+
"qualType" : "bool",
884+
"desugaredQualType" : "bool"
885+
}, {
886+
"@type" : "AstParmVarDecl",
887+
"name" : "z",
888+
"qualType" : "bool",
889+
"desugaredQualType" : "bool"
890+
}, {
891+
"@type" : "AstFullComment",
892+
"decls" : [ {
893+
"@type" : "AstParagraphComment",
894+
"decls" : [ {
895+
"@type" : "AstTextComment",
896+
"text" : " Set an axis mask to permanently hide a given axis (true -> hidden, false -> shown)"
897+
} ]
898+
} ]
899+
} ]
748900
}, {
749901
"@type" : "AstFunctionDecl",
750902
"name" : "SetPlaneLimit",
@@ -764,6 +916,30 @@
764916
} ]
765917
} ]
766918
} ]
919+
}, {
920+
"@type" : "AstFunctionDecl",
921+
"name" : "IsOver",
922+
"resultType" : "bool",
923+
"decls" : [ {
924+
"@type" : "AstParmVarDecl",
925+
"name" : "position",
926+
"qualType" : "float *",
927+
"desugaredQualType" : "float *"
928+
}, {
929+
"@type" : "AstParmVarDecl",
930+
"name" : "pixelRadius",
931+
"qualType" : "float",
932+
"desugaredQualType" : "float"
933+
}, {
934+
"@type" : "AstFullComment",
935+
"decls" : [ {
936+
"@type" : "AstParagraphComment",
937+
"decls" : [ {
938+
"@type" : "AstTextComment",
939+
"text" : " from a x,y,z point in space and using Manipulation view/projection matrix, check if mouse is in pixel radius distance of that projected point"
940+
} ]
941+
} ]
942+
} ]
767943
}, {
768944
"@type" : "AstEnumDecl",
769945
"name" : "COLOR",

0 commit comments

Comments
 (0)