Commit Graph

133 Commits (88a00f77e9ffb2784c91de0ec2e9f79cb75d5a52)

Author SHA1 Message Date
ocornut 52a74701f5 Updated projects to reference new files ()
Didn't update iOS example ()
ocornut 4842ac3bc6 Fonts: added Cousine-Regular.ttf
ocornut 0224d29a35 Examples: comments.
ocornut fcec337061 Examples: Simplified font examples comments.
ocornut d03b046ef4 AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention ()
ocornut 25882c47a3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	examples/directx9_example/imgui_impl_dx9.cpp
	examples/opengl3_example/imgui_impl_glfw_gl3.cpp
	examples/opengl_example/imgui_impl_glfw.cpp
	imgui.cpp
ocornut 502e360ee5 Removed the majority of size_t from the code. ImVector<> now uses int. ()
May trigger new compilation warnings?
ocornut 6a22835f63 AA branch: ImDrawList: rename commands to cmd_buffer
Not strictly necessary but while we're doing minor breakage let's do
them at all once.
ocornut b2b616be00 AA branch: ImDrawCmd idx_count -> elem_count
ocornut f3303fa84f AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API ( )
ocornut f435e42561 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
	examples/opengl_example/imgui_impl_glfw.cpp
ocornut 7437b43b2d Fixed warnings for more pedantic settings ()
ocornut b69d7d9df3 Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
ocornut 2f03511062 Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
ocornut e9b6e437eb Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
	imgui.h
ocornut 5df542c3c0 ImFontAtlas: doesn't clear input data, left to the application. ()
ocornut f00662a5ad Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
ocornut ad7f600e0d Examples: DirectX9/11: hide os curosr if ImGui is drawing it ()
ocornut 4f1acf0d4a Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	imgui.cpp
Dale Kim ac518a1d3e Set modifier key state by inspecting imgui's io.KeysDown array.
ocornut 43cb4038c6 Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
	examples/directx11_example/imgui_impl_dx11.cpp
	imgui.cpp
ocornut 71429d306e Examples: Simplified GLFW keyboard callbacks
ocornut c735d3066b Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
Dale Kim fe15756129 Simplified glfw keyboard callbacks.
ocornut 1746b04065 Indexed rendering. Not in main branch because breaks rendering code too much. Will merge in trunk along with more major graphics changes lat
ocornut 73e2d56acc Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
Dale Kim 4b7be31197 Fixed modifier key state setting in GLFW callbacks.
ocornut d25578efd8 Examples: initializing float + missing comment.
ocornut 3abfb85613 Comments on font loading, fixed commented out paths and added DroidSans in the list
ocornut ed94edfd8e Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
Adam D. Moss c1766c95ed OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
ocornut cb285c4d35 Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
ocornut 04358c301e Removed extraneous spaces
Adam D. Moss f2ff88b03a opengl3+opengl example: if content window doesn't have focus, tell ImGui we don't have a mouse position. e.g. avoids tooltips popping up in imgui app when you're interacting with a different app window that overlaps it.
ocornut 7c9bd71512 Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
ocornut e2c4ba21bc Examples: Added 64-bit projects for MSVC
ocornut ef957b7878 Examples: Moved GLFW/GL3W to a common libs/ folder
ocornut 834085c90c Examples: Updated to GLFW 3.1
ocornut 0911526424 Added io.KeyAlt + support in examples apps
Currently unused but supported by sample so that more people will have
it set up when menus needs them
ocornut d5b7b8398f Examples: reference implementations honors drawlist user callbacks.
ocornut 5879f3f5ac Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
ocornut 2dd92e3eed Examples: Clang/Linux warning fixes.
ocornut a3f3793cb6 Examples: Tweaks.
ocornut b87ec205a9 Examples: shallow tweaks to match upcoming other examples.
ocornut b227b0f8cd Examples: Rename globals again
ocornut 4f27bd6ed3 Examples: Moved gl3w to opengl3_example directory + fixed msvc project paths
ocornut 99ed567577 Examples: Rename global to be more consistent
ocornut d829852391 Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
ocornut 545a57d253 Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.
Other examples will follow.
ocornut be9fe9489c Examples: DirectX examples uses WM_KEYDOWN/WM_KEYUP
Fixes pressing Enter in IME being caught by application right after
validating an IME input.