Examples: Using #include "imgui.h" instead of <imgui.h> appear correct-er as per standard? xcode+clang are very nitpicky there.

This commit is contained in:
omar 2018-01-29 14:38:46 +01:00
parent 91d77be36e
commit 6a25a8720a
19 changed files with 21 additions and 23 deletions

View File

@ -12,7 +12,7 @@
#include <stdint.h> // uint64_t #include <stdint.h> // uint64_t
#include <cstring> // memcpy #include <cstring> // memcpy
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_a5.h" #include "imgui_impl_a5.h"
#include <allegro5/allegro.h> #include <allegro5/allegro.h>
#include <allegro5/allegro_primitives.h> #include <allegro5/allegro_primitives.h>

View File

@ -4,7 +4,7 @@
#include <stdint.h> #include <stdint.h>
#include <allegro5/allegro.h> #include <allegro5/allegro.h>
#include <allegro5/allegro_primitives.h> #include <allegro5/allegro_primitives.h>
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_a5.h" #include "imgui_impl_a5.h"
int main(int, char**) int main(int, char**)

View File

@ -1,7 +1,7 @@
// ImGui - standalone example application for DirectX 10 // ImGui - standalone example application for DirectX 10
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_dx10.h" #include "imgui_impl_dx10.h"
#include <d3d10_1.h> #include <d3d10_1.h>
#include <d3d10.h> #include <d3d10.h>

View File

@ -6,7 +6,7 @@
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// https://github.com/ocornut/imgui // https://github.com/ocornut/imgui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_dx11.h" #include "imgui_impl_dx11.h"
// DirectX // DirectX

View File

@ -1,7 +1,7 @@
// ImGui - standalone example application for DirectX 11 // ImGui - standalone example application for DirectX 11
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_dx11.h" #include "imgui_impl_dx11.h"
#include <d3d11.h> #include <d3d11.h>
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800

View File

@ -6,7 +6,7 @@
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// https://github.com/ocornut/imgui // https://github.com/ocornut/imgui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_dx9.h" #include "imgui_impl_dx9.h"
// DirectX // DirectX

View File

@ -1,7 +1,7 @@
// ImGui - standalone example application for DirectX 9 // ImGui - standalone example application for DirectX 9
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_dx9.h" #include "imgui_impl_dx9.h"
#include <d3d9.h> #include <d3d9.h>
#define DIRECTINPUT_VERSION 0x0800 #define DIRECTINPUT_VERSION 0x0800

View File

@ -9,7 +9,7 @@
// Copyright (C) 2015 by Giovanni Zito // Copyright (C) 2015 by Giovanni Zito
// This file is part of ImGui // This file is part of ImGui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_marmalade.h" #include "imgui_impl_marmalade.h"
#include <s3eClipboard.h> #include <s3eClipboard.h>

View File

@ -4,7 +4,7 @@
// Copyright (C) 2015 by Giovanni Zito // Copyright (C) 2015 by Giovanni Zito
// This file is part of ImGui // This file is part of ImGui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_marmalade.h" #include "imgui_impl_marmalade.h"
#include <stdio.h> #include <stdio.h>

View File

@ -1,5 +1,5 @@
// ImGui - null/dummy example application (compile and link imgui with no inputs, no outputs) // ImGui - null/dummy example application (compile and link imgui with no inputs, no outputs)
#include <imgui.h> #include "imgui.h"
#include <stdio.h> #include <stdio.h>
int main(int, char**) int main(int, char**)

View File

@ -15,7 +15,7 @@
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// https://github.com/ocornut/imgui // https://github.com/ocornut/imgui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_glfw_gl2.h" #include "imgui_impl_glfw_gl2.h"
// GLFW // GLFW

View File

@ -6,7 +6,7 @@
// **Prefer using the code in the opengl3_example/ folder** // **Prefer using the code in the opengl3_example/ folder**
// See imgui_impl_glfw.cpp for details. // See imgui_impl_glfw.cpp for details.
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_glfw_gl2.h" #include "imgui_impl_glfw_gl2.h"
#include <stdio.h> #include <stdio.h>
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>

View File

@ -8,7 +8,7 @@
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// https://github.com/ocornut/imgui // https://github.com/ocornut/imgui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_glfw_gl3.h" #include "imgui_impl_glfw_gl3.h"
// GL3W/GLFW // GL3W/GLFW

View File

@ -3,7 +3,7 @@
// (GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.) // (GLFW is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.)
// (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.) // (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.)
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_glfw_gl3.h" #include "imgui_impl_glfw_gl3.h"
#include <stdio.h> #include <stdio.h>
#include <GL/gl3w.h> // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you. #include <GL/gl3w.h> // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.

View File

@ -18,7 +18,7 @@
#include <SDL.h> #include <SDL.h>
#include <SDL_syswm.h> #include <SDL_syswm.h>
#include <SDL_opengl.h> #include <SDL_opengl.h>
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_sdl_gl2.h" #include "imgui_impl_sdl_gl2.h"
// Data // Data

View File

@ -6,7 +6,7 @@
// **Prefer using the code in the sdl_opengl3_example/ folder** // **Prefer using the code in the sdl_opengl3_example/ folder**
// See imgui_impl_sdl.cpp for details. // See imgui_impl_sdl.cpp for details.
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_sdl_gl2.h" #include "imgui_impl_sdl_gl2.h"
#include <stdio.h> #include <stdio.h>
#include <SDL.h> #include <SDL.h>

View File

@ -3,7 +3,7 @@
// (SDL is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.) // (SDL is a cross-platform general purpose library for handling windows, inputs, OpenGL/Vulkan graphics context creation, etc.)
// (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.) // (GL3W is a helper library to access OpenGL functions since there is no standard header to access modern OpenGL functions easily. Alternatives are GLEW, Glad, etc.)
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_sdl_gl3.h" #include "imgui_impl_sdl_gl3.h"
#include <stdio.h> #include <stdio.h>
#include <GL/gl3w.h> // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you. #include <GL/gl3w.h> // This example is using gl3w to access OpenGL functions (because it is small). You may use glew/glad/glLoadGen/etc. whatever already works for you.

View File

@ -6,7 +6,8 @@
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
// https://github.com/ocornut/imgui // https://github.com/ocornut/imgui
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_glfw_vulkan.h"
// GLFW // GLFW
#define GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE
@ -19,8 +20,6 @@
#include <GLFW/glfw3native.h> #include <GLFW/glfw3native.h>
#endif #endif
#include "imgui_impl_glfw_vulkan.h"
// GLFW Data // GLFW Data
static GLFWwindow* g_Window = NULL; static GLFWwindow* g_Window = NULL;
static double g_Time = 0.0f; static double g_Time = 0.0f;

View File

@ -1,7 +1,8 @@
// ImGui - standalone example application for Glfw + Vulkan, using programmable pipeline // ImGui - standalone example application for Glfw + Vulkan, using programmable pipeline
// If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp. // If you are new to ImGui, see examples/README.txt and documentation at the top of imgui.cpp.
#include <imgui.h> #include "imgui.h"
#include "imgui_impl_glfw_vulkan.h"
#include <stdio.h> // printf, fprintf #include <stdio.h> // printf, fprintf
#include <stdlib.h> // abort #include <stdlib.h> // abort
@ -9,8 +10,6 @@
#define GLFW_INCLUDE_VULKAN #define GLFW_INCLUDE_VULKAN
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
#include "imgui_impl_glfw_vulkan.h"
#define IMGUI_MAX_POSSIBLE_BACK_BUFFERS 16 #define IMGUI_MAX_POSSIBLE_BACK_BUFFERS 16
#define IMGUI_UNLIMITED_FRAME_RATE #define IMGUI_UNLIMITED_FRAME_RATE
//#ifdef _DEBUG //#ifdef _DEBUG