LoweBowe/LumixEngine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

imgui moved to external

Browse source
This commit is contained in:
Mikulas Florek 2016-05-07 13:10:29 +02:00
parent 6a7a944aaf
commit de2d2dacb5
20 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/editor/imgui/LICENSE → external/imgui/LICENSE vendored
View file

0
src/editor/imgui/README.md → external/imgui/README.md vendored
View file

0
src/editor/imgui/imconfig.h → external/imgui/imconfig.h vendored
View file

0
src/editor/imgui/imgui.cpp → external/imgui/imgui.cpp vendored
View file

0
src/editor/imgui/imgui.h → external/imgui/imgui.h vendored
View file

0
src/editor/imgui/imgui_demo.cpp → external/imgui/imgui_demo.cpp vendored
View file

0
src/editor/imgui/imgui_dock.h → external/imgui/imgui_dock.h vendored
View file

0
src/editor/imgui/imgui_dock.inl → external/imgui/imgui_dock.inl vendored
View file

0
src/editor/imgui/imgui_draw.cpp → external/imgui/imgui_draw.cpp vendored
View file

0
src/editor/imgui/imgui_internal.h → external/imgui/imgui_internal.h vendored
View file

0
src/editor/imgui/imgui_user.h → external/imgui/imgui_user.h vendored
View file

0
src/editor/imgui/imgui_user.inl → external/imgui/imgui_user.inl vendored
View file

0
src/editor/imgui/stb_rect_pack.h → external/imgui/stb_rect_pack.h vendored
View file

0
src/editor/imgui/stb_textedit.h → external/imgui/stb_textedit.h vendored
View file

0
src/editor/imgui/stb_truetype.h → external/imgui/stb_truetype.h vendored
View file

11
projects/genie.lua
View file

@ -266,7 +266,7 @@ solution "LumixEngine"
configurations { "Debug", "Release", "RelWithDebInfo" }
platforms { "x32", "x64" }
flags { "FatalWarnings", "NoPCH" }
includedirs {"../src"}
includedirs {"../src", "../external"}
location(LOCATION)
language "C++"
startproject "studio"
@ -494,7 +494,13 @@ if build_studio then
project "editor"
libType()
files { "../src/editor/**.h", "../src/editor/**.cpp", "../src/editor/**.inl" }
files {
"../src/editor/**.h",
"../src/editor/**.cpp",
"../external/imgui/**.h",
"../external/imgui/**.cpp",
"../external/imgui/**.inl"
}
defines { "BUILDING_EDITOR" }
links { "engine" }
includedirs {
@ -502,6 +508,7 @@ if build_studio then
"../src/editor",
"../external/lua/include",
"../external/bgfx/include",
"../external"
}
configuration { "windows", "not asmjs" }

2
src/animation/animation_system.cpp
View file

@ -7,13 +7,13 @@
#include "engine/core/profiler.h"
#include "engine/core/resource_manager.h"
#include "editor/asset_browser.h"
#include "editor/imgui/imgui.h"
#include "editor/property_grid.h"
#include "editor/studio_app.h"
#include "editor/world_editor.h"
#include "engine/engine.h"
#include "engine/property_descriptor.h"
#include "engine/property_register.h"
#include "imgui/imgui.h"
#include "renderer/model.h"
#include "renderer/pose.h"
#include "renderer/render_scene.h"

2
src/audio/audio_system.cpp
View file

@ -6,7 +6,6 @@
#include "engine/core/path.h"
#include "engine/core/resource_manager.h"
#include "editor/asset_browser.h"
#include "editor/imgui/imgui.h"
#include "editor/studio_app.h"
#include "editor/utils.h"
#include "editor/world_editor.h"
@ -15,6 +14,7 @@
#include "engine/plugin_manager.h"
#include "engine/property_register.h"
#include "engine/property_descriptor.h"
#include "imgui/imgui.h"
#include "renderer/render_scene.h"

2
src/lua_script/lua_script_system.cpp
View file

@ -14,7 +14,6 @@
#include "engine/debug/debug.h"
#include "editor/asset_browser.h"
#include "editor/ieditor_command.h"
#include "editor/imgui/imgui.h"
#include "editor/property_grid.h"
#include "editor/studio_app.h"
#include "editor/utils.h"
@ -23,6 +22,7 @@
#include "engine/property_register.h"
#include "engine/property_descriptor.h"
#include "engine/iplugin.h"
#include "imgui/imgui.h"
#include "lua_script/lua_script_manager.h"
#include "engine/plugin_manager.h"
#include "engine/universe/universe.h"

4
src/renderer/editor/game_view.cpp
View file

@ -1,17 +1,17 @@
#include "game_view.h"
#include "editor/platform_interface.h"
#include "engine/core/crc32.h"
#include "engine/core/input_system.h"
#include "engine/core/profiler.h"
#include "engine/core/resource_manager.h"
#include "engine/engine.h"
#include "engine/plugin_manager.h"
#include "imgui/imgui.h"
#include "renderer/frame_buffer.h"
#include "renderer/pipeline.h"
#include "renderer/render_scene.h"
#include "renderer/renderer.h"
#include "renderer/texture.h"
#include "editor/imgui/imgui.h"
#include "editor/platform_interface.h"
GameView::GameView()