Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Master160 #50

Merged
merged 6 commits into from Apr 25, 2018
Merged

Master160 #50

merged 6 commits into from Apr 25, 2018

Conversation

sonoro1234
Copy link
Contributor

This is my branch preparing for imgui 1.60 release

@extrawurst extrawurst merged commit 7f688bf into cimgui:master Apr 25, 2018
@extrawurst
Copy link
Collaborator

Thanks @sonoro1234 so much. I will check it out after work and set the final tag then!

@ocornut
Copy link

ocornut commented Apr 25, 2018

Super cool, thanks @sonoro1234 !

Correct me if I'm wrong, but that PR is meant to be the fixes necessary to update the underlying imgui core, but doesn't expose the new 1.60 functions.

I had a look, here's what I listed from diffing imgui.h between 1.53 and 1.60

  • flags ImGuiBackendFlags, ImGuiConfigFlags
  • flags ImFontAtlasFlags
  • enum ImGuiDir
  • SetNextWindowBgAlpha()
  • ArrowButton()
  • InputDouble()
  • IsItemFocused(), IsAnyItemFocused()
  • IsAnyMouseDown()
  • SetAllocatorFunctions()
  • ImFontConfig layout/size has changed > need to add asserts to compare all C/C++ sizes to catch those
  • need to expose Flags in ImFontAtlas functions

Minor: the new lines are using tabs instead of spaces. Not super important as few people would wander there but it still shows depending on your IDE configuration and it shows on github:
image

You are right @sonoro1234 it would be sane to consider looking at a way to convert structure automatically. It could probably be done with script. I think in the future if this was fully automated we could consider making this part of the imgui repo?
EDIT Another incentive for doing that, if we had sane parsing scripts that can emit C, then people could take advantage of those scripts to emit things in their languages directly?

Any specific reason for not using typedef the structs, e.g. typedef struct ImVec2 ImVec2 ? My standard C is rusty but would that cause problems?

@sonoro1234
Copy link
Contributor Author

This PR was not ready. Your last question was the same I did to Extrawurst.
#49

sonoro1234 added a commit to sonoro1234/cimgui that referenced this pull request Oct 3, 2018
extrawurst pushed a commit that referenced this pull request Oct 3, 2018
* update imgui submodule
* correct definitions in 1.60
* struct ImGuiIO changes
* more changes
* more enum changes
* update imgui to tag 1.60
* automatically generate imgui_structs.h from imgui.h with lua
* generator using tabs in structs
* respect original spaces
* start branch master_auto
* some work
* even some more work
* adapt Makefile to cimgui_auto
* generator in folder
* simplify file generation
* some function renaming
* gen with comments
* cimgui.h with comments
* comments to 10 multiples in structs and typedefs to begining
* comments between lines of code and preserving empty lines
* without gcc parsing
* some more additions
* overload names for Selectable and BeginChild according to cimgui standard
* having GCC and NOGCC in same script
* update to imgui 1.62wip
* cimgui with glfw and opengl3 implementations
* some cosmetics and PushStyleColor overload name
* update README.md and imgui
* generate structs_and_enums.lua file to help in bindings.
* update README.md
* pull imgui submodule
* generator dont wont IMGUI_IMPL_API and generated from imgui1.60WIP
* add opengl2 implementation
* add sdl implementation
* update README.md
* add json saving
* apply ocornut suggested cimgui structure
* correct error without preprocess
* delete menus-api.gif
* all output to generated folder and test HAVE_GCC.
cimgui and cimgui_auto versions
* really add generated folder
* add generated files
* use cimgui_auto instead of cimgui
* prepare 1.62.0-beta
* update README.md
* avoid excesive typedefs
* bad replacement string
* check Lua version
* post issues in https://github.com/Extrawurst/cimgui
* add + to default definition characters
* add typedefs_dict
* add typedef struct any any;
* add argsT to definitions
* add size to struct members and calc_value to enums
* take care of return in vararg functions
* add CMake
* adapt Makefile
* add support for UDT returning functions
* some more explanations in README.md
* README.md correction
* update imguics link
* update to v1.63 imgui
* update readme for 1.63
* take care of space before brackets in function
* move to imgui 1.64
* use include from root
* add xxxx_nonUDT2 functions returning UDT_Simple

* move the ToSimple conversion functions out of CIMGUI_DEFINE_ENUMS_AND_STRUCTS

* move to imgui 1.65

* let post issues in sonoro1234/cimgui

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* Update .travis.yml

* try to make travis happy

* show travis in README.md

* change no args to void arg in prototypes

* calc enum value acording to previous enum value

* Revert "Master160 (#50)"

This reverts commit 7f688bf.

* Revert "Update README.md"

This reverts commit 1a5e261.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants