Joel Davis
|
eee6dab226
|
iOS example working based on modified OpenGL3 example + Synergy
|
10 years ago |
ocornut
|
d03b046ef4
|
AA branch: Agressively renamed all fields of ImDrawList, ImDrawCmd, ImDrawData to match the rest of our coding convention (#133)
|
10 years ago |
|
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
|
10 years ago |
|
ocornut
|
502e360ee5
|
Removed the majority of size_t from the code. ImVector<> now uses int. (#262)
May trigger new compilation warnings?
|
10 years ago |
|
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.
|
10 years ago |
|
ocornut
|
b2b616be00
|
AA branch: ImDrawCmd idx_count -> elem_count
|
10 years ago |
|
ocornut
|
f3303fa84f
|
AA branch: io.RenderDrawListsFn signature changed to take ImDrawData, neater and future proof breaking of the render API (#133 #254)
|
10 years ago |
|
ocornut
|
8b4a470e1d
|
Examples: DirectX9: fixed size passed to vertex and index buffer Lock() + readjust default buffer sizes.
|
10 years ago |
|
ocornut
|
61e551e0ee
|
AA branch: fixed warning
|
10 years ago |
|
ocornut
|
f435e42561
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
Conflicts:
examples/opengl_example/imgui_impl_glfw.cpp
|
10 years ago |
|
ocornut
|
7437b43b2d
|
Fixed warnings for more pedantic settings (#258)
|
10 years ago |
|
ocornut
|
b69d7d9df3
|
Merge remote-tracking branch 'origin' into 2015-03-antialiased-primitives
|
10 years ago |
|
ocornut
|
2f03511062
|
Added ImGuiKey_PageUp, ImGuiKey_PageDown for user.
|
10 years ago |
|
ocornut
|
71e9f2a3dd
|
Fixed warnings for 64-bits builds
|
10 years ago |
Cedric Guillemet
|
2acdafe4f2
|
imgui_impl_sdl and main sample
|
10 years ago |
|
ocornut
|
e3f2ad728a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
|
10 years ago |
Gordon McShane
|
6ee65fc5af
|
Add conditional compilation of forward compat. glfw window hint to fix crash on later versions of OSX
|
10 years ago |
|
ocornut
|
b6f3c97e3b
|
Examples: DirectX11: explicitly set rasterizer state.
|
10 years ago |
|
ocornut
|
e9b6e437eb
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
imgui.h
|
10 years ago |
|
ocornut
|
5df542c3c0
|
ImFontAtlas: doesn't clear input data, left to the application. (#224)
|
10 years ago |
|
ocornut
|
f00662a5ad
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
|
10 years ago |
|
ocornut
|
ad7f600e0d
|
Examples: DirectX9/11: hide os curosr if ImGui is drawing it (#155)
|
10 years ago |
|
ocornut
|
18a00c7060
|
Examples: DirectX9/11: Fixed key mapping for down arrow.
|
10 years ago |
|
ocornut
|
4f1acf0d4a
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
imgui.cpp
|
10 years ago |
|
ocornut
|
f400ea4ec8
|
Examples: OpenGL3: backup/restore current program and texture #195
|
10 years ago |
Dale Kim
|
ac518a1d3e
|
Set modifier key state by inspecting imgui's io.KeysDown array.
|
10 years ago |
|
ocornut
|
43cb4038c6
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
imgui.cpp
|
10 years ago |
|
ocornut
|
71429d306e
|
Examples: Simplified GLFW keyboard callbacks
|
10 years ago |
|
ocornut
|
c735d3066b
|
Merge branch 'master' of https://github.com/Roflraging/imgui into Roflraging-master
|
10 years ago |
|
Dale Kim
|
fe15756129
|
Simplified glfw keyboard callbacks.
|
10 years ago |
|
ocornut
|
d809abbe1c
|
Examples: DirectX11: tidying up.
|
10 years ago |
|
ocornut
|
7ab49f80ca
|
Merge remote-tracking branch 'origin' into 2015-04-indexed-rendering
Conflicts:
examples/directx11_example/imgui_impl_dx11.cpp
examples/opengl3_example/imgui_impl_glfw_gl3.cpp
|
10 years ago |
|
ocornut
|
4f51b77937
|
Examples: OpenGL3: Tweaks (argh, github ui)
|
10 years ago |
|
ocornut
|
90766141b3
|
Examples: OpenGL3: Tweaks.
|
10 years ago |
|
ocornut
|
37f1715bfa
|
Examples: DirectX11: Removed unnecessary vertices conversion and CUSTOMVERTEX types.
|
10 years ago |
|
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
|
10 years ago |
|
ocornut
|
d9ff617ff8
|
Examples: Formatting #187
|
10 years ago |
heroboy
|
e09e2cbd28
|
set pixel shader and vertex shader to NULL
Previous graphic render may use shaders,so set pixel shader and vertex shader to NULL to force use fixed pipeline.
|
10 years ago |
omar
|
46769406dc
|
Update README.txt
|
10 years ago |
|
ocornut
|
73e2d56acc
|
Examples: OpenGL fixed-pipeline: added glBindTexture(0), via Anton M
|
10 years ago |
|
Dale Kim
|
4b7be31197
|
Fixed modifier key state setting in GLFW callbacks.
|
10 years ago |
|
ocornut
|
d25578efd8
|
Examples: initializing float + missing comment.
|
10 years ago |
|
ocornut
|
3abfb85613
|
Comments on font loading, fixed commented out paths and added DroidSans in the list
|
10 years ago |
|
ocornut
|
ed94edfd8e
|
Examples: Terser code + added commented out glUseProgram(0( suggestion in OpenGL2 sample.
|
10 years ago |
Adam D. Moss
|
c1766c95ed
|
OpenGL/GLFW: hide system cursor if imgui is soft-rendering cursor
|
10 years ago |
biller23
|
2f4271a2b3
|
typo ImGui_ImplGlfwGL3_KeyCallback()
|
10 years ago |
|
ocornut
|
cb285c4d35
|
Examples: uses SetNextWindowPos/SetNextWindowSize when applicable
|
10 years ago |
|
ocornut
|
04358c301e
|
Removed extraneous spaces
|
10 years ago |
|
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.
|
10 years ago |
|
ocornut
|
d3e444dfd9
|
Examples: DirectX9: fixed duplicate creation of vertex buffer. Size of static vertex buffer at top of the code.
|
10 years ago |
|
ocornut
|
06fbeed41a
|
Examples: Fixed Makefile
|
10 years ago |
|
ocornut
|
55edd522c2
|
Examples: Fixed Makefile
|
10 years ago |
|
ocornut
|
e97d02a294
|
Examples: Fixed Clang warnings in DirectX examples
|
10 years ago |
|
ocornut
|
7c9bd71512
|
Examples: MSVC: increase warning level from /W3 to /W4 for OpenGL examples
|
10 years ago |
|
ocornut
|
2b0acc128c
|
Examples: MSVC: increase warning level from /W3 to /W4 for DirectX examples
|
10 years ago |
|
ocornut
|
8e0f04638d
|
Examples: Fix includes order to avoid conflicts between DXSDK_DIR and Windows SDK
|
10 years ago |
|
ocornut
|
e2c4ba21bc
|
Examples: Added 64-bit projects for MSVC
|
10 years ago |
|
ocornut
|
ef957b7878
|
Examples: Moved GLFW/GL3W to a common libs/ folder
|
10 years ago |
|
ocornut
|
834085c90c
|
Examples: Updated to GLFW 3.1
|
10 years ago |
|
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
|
10 years ago |
|
ocornut
|
d5b7b8398f
|
Examples: reference implementations honors drawlist user callbacks.
|
10 years ago |
|
ocornut
|
db5fc8a265
|
Examples: README direct the user to the opengl_example
|
10 years ago |
|
ocornut
|
5879f3f5ac
|
Examples: OpenGL 2/3 examples cleanup to match DirectX9/11 structure.
|
10 years ago |
|
ocornut
|
f9c833b4a5
|
Examples: DirectX9 example cleanup to match DirectX11 structure.
|
10 years ago |
|
ocornut
|
66a5837ba8
|
Examples: DirectX11 example application handles window resizing.
|
10 years ago |
|
ocornut
|
866fa95aaa
|
Examples: DirectX9 example application handle window resizing.
|
10 years ago |
|
ocornut
|
25765e4bfc
|
Examples: Fixed readme file.
|
10 years ago |
|
ocornut
|
b4165c43ff
|
Examples: Refactored directx11_example to be easier to copy & paste into user application.
|
10 years ago |
|
ocornut
|
567184dc9f
|
Examples: Clang warning fix.
|
10 years ago |
|
ocornut
|
3f86554457
|
Examples: Makefile fixes.
|
10 years ago |
|
ocornut
|
2dd92e3eed
|
Examples: Clang/Linux warning fixes.
|
10 years ago |
|
ocornut
|
a3f3793cb6
|
Examples: Tweaks.
|
10 years ago |
|
ocornut
|
7397425097
|
Examples: Refactored directx9_example to be eaasier to copy & paste into user application.
|
10 years ago |
|
ocornut
|
b87ec205a9
|
Examples: shallow tweaks to match upcoming other examples.
|
10 years ago |
|
ocornut
|
b227b0f8cd
|
Examples: Rename globals again
|
10 years ago |
|
ocornut
|
4f27bd6ed3
|
Examples: Moved gl3w to opengl3_example directory + fixed msvc project paths
|
10 years ago |
|
ocornut
|
4da432bd7b
|
Examples: Makefile
|
10 years ago |
|
ocornut
|
99ed567577
|
Examples: Rename global to be more consistent
|
10 years ago |
|
ocornut
|
d829852391
|
Examples: Refactored opengl3_exapmle into a glfw specific file that can be copied and pasted
|
10 years ago |
|
ocornut
|
545a57d253
|
Examples: Refactored opengl_example into a glfw specific file that can be copied and pasted.
Other examples will follow.
|
10 years ago |
|
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.
|
10 years ago |
|
ocornut
|
e269125c3a
|
Windows: setup a default handler for ImeSetInputScreenPosFn so IME (Japanese/Chinese) inputs are positioned correctly.
User need to set io.ImeWindowHandle
|
10 years ago |
|
ocornut
|
386cfada83
|
Examples: Windows examples don't link with imm32.lib by default.
|
10 years ago |
|
ocornut
|
b911f96a56
|
Examples: Speculative Makefile fix. I should get a Linux box instead on relying on Jenkins, this is pretty embarrassing.
|
10 years ago |
|
ocornut
|
dc7cdb3025
|
Examples: Fix Makefile
|
10 years ago |
|
ocornut
|
5aaf0cd2dc
|
Examples: Fix OpenGL3 example Makefile
|
10 years ago |
|
ocornut
|
3ed38f3313
|
Replaced dependency on glew (inc. prebuilt one for Windows) by gl3w in source form
Expecting something to break now.
|
10 years ago |
|
ocornut
|
00270b837f
|
Examples: Desperate attempts removing link warnings under Windows. Screw standard librairies.
|
10 years ago |
|
ocornut
|
37d8d5c5be
|
Examples: OpenGL2 example doesn't need Glew
|
10 years ago |
|
ocornut
|
40b04a3701
|
Renamed ImGuiSetCondition_*** to ImGuiSetCond_*** and ImGuiCondition_FirstUseThisSession to ImGuiCond_Once
|
10 years ago |
|
ocornut
|
9c4972ee9d
|
Examples: msvc: output .exe in project directory (not in solution directory).
|
10 years ago |
|
ocornut
|
fc322fde0f
|
Examples: added README file
|
10 years ago |
|
ocornut
|
546460cd26
|
Examples: Removed unused file
|
10 years ago |
|
ocornut
|
0d63e0ce60
|
Examples: DirectX examples applications all have a Console for debugging.
|
10 years ago |
|
ocornut
|
cb0a4db048
|
Calculate frame-rate for the user, as a purely luxurious feature
..and to reduce sample code size a little.
|
10 years ago |
|
ocornut
|
d65e051a07
|
Minor formatting tweaks, comments
|
10 years ago |
|
ocornut
|
b623f97d9f
|
Examples: DirectX11: fixed build setting of Release mode.
|
10 years ago |
|
ocornut
|
35c0842bcf
|
Examples: DirectX11: fixed handling of unicode character inputs.
|
10 years ago |
|
ocornut
|
5834297928
|
Examples: DirectX11: increasing vertex buffer size (would really need a dynamic buffer size)
+ Delete unused code
|
10 years ago |
|
ocornut
|
381c7428c1
|
Examples: changed default background color.
|
10 years ago |
|
ocornut
|
b24d4d0538
|
Ignore lists
|
10 years ago |
|
ocornut
|
b0eac255ca
|
Warning fixes for 64-bit architectures
|
10 years ago |
|
ocornut
|
edcf2d3bf6
|
Examples: more comments on loading fonts.
|
10 years ago |
|
ocornut
|
1916a0c78c
|
Renamed FontAtlas to Fonts. Further cleanup/comments.
|
10 years ago |
|
ocornut
|
2c31599bcc
|
ImFontAtlas allows loading multiple fonts into same texture. Revamped new init API for 1.30
|
10 years ago |
|
ocornut
|
cb9a3235be
|
Removed PixelCenterOffset, uncesssary
|
10 years ago |
|
ocornut
|
43c8b5e0d2
|
Examples: DirectX11: use linear sampler to be in sync with other examples.
|
10 years ago |
|
ocornut
|
ab8d2782c6
|
Merge remote-tracking branch 'upstream/master' into 2015-01-truetype
Conflicts:
imgui.cpp
imgui.h
|
10 years ago |
|
ocornut
|
62ecdd21a5
|
Examples: Added a color slider for the background color + tweak first example use of button.s
|
10 years ago |
|
ocornut
|
0f4d74d614
|
ImFont::GetTextureData API allow to retrieve 8/32 bits data + lazily load defaults font
Examples: OpenGL3 and DirectX11 back to using 32-bits texture solely for
ease of integration.
|
10 years ago |
|
ocornut
|
241e8086fa
|
Mde it optional to new() io.Font - however it stills needs to be loaded.
|
10 years ago |
|
ocornut
|
51df5874a6
|
Examples' Says "OpenGL2" vs "OpenGL3" in title bar.
|
10 years ago |
|
ocornut
|
a09f426b89
|
TAB to spaces
|
10 years ago |
|
ocornut
|
5ca563b5a5
|
Speculative fix for warnings for GCC/Clang
|
10 years ago |
|
ocornut
|
20bb6270bc
|
Examples: all supports TextureID in renderer, added LoadFontTexture() function.
|
10 years ago |
|
ocornut
|
f77490cb2d
|
Cleanup extra_fonts/ folder
|
10 years ago |
|
ocornut
|
b3a208901a
|
Loading TTF file with stb_truetype. Broke setup API slightly. Font baked, packed with space for custom data. Embeds compressed ProggyClean.
|
10 years ago |
|
ocornut
|
dd8a7655f5
|
Fixed DirectX11 example.
|
10 years ago |
|
ocornut
|
c1251d2994
|
Examples: Fixed warnings for Clang
|
10 years ago |
|
ocornut
|
1c657564ac
|
Examples: Added STB_IMAGE_STATIC in examples to avoid conflicting implementation. Relate to #109
|
10 years ago |
|
ocornut
|
b3febabc30
|
OpenGL3 example: fix growing of VBO
|
10 years ago |
|
omar
|
e9e0e36f98
|
New and better Set[Next]Window(Pos|Size|Collapsed) API.
Removed rarely useful SetNewWindowDefaultPos() in favor of new API.
|
10 years ago |
|
omar
|
09bacfbe18
|
OpenGL example: allow resizing window.
|
10 years ago |
|
omar
|
6523fb263d
|
OpenGL3 example: fixed mouse handling.
|
10 years ago |
|
ocornut
|
987188d437
|
Fix Clang warning with offsetof() macro? Added -Wall in OpenGL 3 example.
|
10 years ago |
|
ocornut
|
71e20680db
|
Setup Travis CI integration with Clang + -Wall in Makefiles
|
10 years ago |
|
ocornut
|
036ed3ea93
|
OpenGL3 example: unregistered mouse callback for mouse click-release faster than frame interval.
|
10 years ago |
|
omar
|
2e5b81627f
|
Examples: DirectX11: moved shader to be close to its usage location,
|
10 years ago |
|
omar
|
52b5376d9b
|
Examples: OpenGL3: cleaned up to match features of OpenGL2 example
|
10 years ago |
|
omar
|
b02eed3e49
|
Examples: adding title to the top of each examples. Cleaning up file headers.
|
10 years ago |
|
omar
|
6c9edb6db0
|
Examples: removed LICENSE file from MSVC project.
|
10 years ago |
Olivier Chatry
|
2f176033c6
|
fixed indentation mix, removed some unused code, updated different callback using the example_opengl code.
|
10 years ago |
|
Olivier Chatry
|
a8d2bc69ed
|
added opengl3 sample, mix from @ocornut and @thelinked
|
10 years ago |
|
omar
|
63ff0ad0ff
|
Examples: OpenGL: fix accessing libraries via ProjectDir instead of SolutionDir
|
10 years ago |
|
ocornut
|
bd762b559c
|
DirectX11 example: fixed projection matrix offset.
|
10 years ago |
|
ocornut
|
b4fd216bd2
|
DirectX9/DirectX11 example: fixed window initially showing an hourglass cursor.
|
10 years ago |
|
ocornut
|
0730ec7577
|
Example apps: accumulate mouse wheel to accodomate for slow framerate.
|
10 years ago |
|
ocornut
|
0e6f288a2f
|
DirectX11 example: further tweaks/massaging (-15 lines). Syncing example.
|
10 years ago |
|
ocornut
|
7f804d3d64
|
Tab->Spaces :( visual studio can't even be trusted for that, oh thanks.
|
10 years ago |
|
ocornut
|
de44af5227
|
DirectX11 example: closing all handler/resources in Cleanup.
|
10 years ago |
|
ocornut
|
0f29cd7a14
|
Removed Microsoft IME handler in examples, too confusing. Moved to imgui.cpp instruction block.
|
10 years ago |
|
ocornut
|
a5a84a9b69
|
Tab->Spaces :(
|
10 years ago |
|
ocornut
|
197b2763fc
|
Fixed DirectX11 example Release build include
|
10 years ago |
|
ocornut
|
df00fa8113
|
Fixed DirectX11 example to compile with whatever Visual Studio version user has
|
10 years ago |
|
ocornut
|
9e16317382
|
Added DirectX11 example application (code is too long!)
|
10 years ago |
|
ocornut
|
b5acb16378
|
Examples: created single .sln solution for all example projects.
|
10 years ago |
|
ocornut
|
214c967df8
|
Example code: warning fix + comments.
|
10 years ago |
Mikko Mononen
|
54ea495207
|
Updated example code.
|
10 years ago |
|
ocornut
|
e4a79e9fc8
|
Moved IO.Font*** options to inside the IO.Font-> structure.. Added IO.FontGlobalScale setting (vs Font->Scale)
|
10 years ago |
|
ocornut
|
df2ad5e899
|
Renamed ImBitmapFont -> ImFont, removed abstraction-pretend typedef
|
10 years ago |