Initial Commit

zcube · zcube · commit 2ef357202264 · 2017-05-14T08:04:41.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+**/build/*
+**/bin/*
+**/lib/*
+build/*
+bin/*
+lib/*
+*.user**
+*.aps
+*.pdb
+*.user
+dist/*
+*.7z
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,10 @@
+[submodule "external/jsoncpp"]
+	path = external/jsoncpp
+	url = https://github.com/open-source-parsers/jsoncpp.git
+	ignore = dirty
+[submodule "external/imgui"]
+	path = external/imgui
+	url = https://github.com/ocornut/imgui.git
+[submodule "external/beast"]
+	path = external/beast
+	url = https://github.com/vinniefalco/Beast.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,46 @@
+cmake_minimum_required(VERSION 3.0.0)
+
+project(ActWebSocketOverlay C CXX)
+
+ADD_DEFINITIONS(
+  -DBOOST_ALL_NO_LIB
+  -D_CRT_SECURE_NO_WARNINGS
+  -D_WIN32_WINNT=0x0601
+  -DWIN32_LEAN_AND_MEAN
+  -DUNICODE
+  -D_UNICODE
+  -DNOMINMAX
+)
+set(Boost_ADDITIONAL_VERSIONS
+	"1.63" "1.63.0" 
+	"1.64" "1.64.0" 
+	${BOOST_ADDITIONAL_VERSION}
+)
+set(Boost_USE_STATIC_LIBS        ON)
+set(Boost_USE_MULTITHREADED      ON)
+set(Boost_USE_STATIC_RUNTIME    OFF)
+##########################################################################################
+# boost build step
+##########################################################################################
+#
+# 1. download https://dl.bintray.com/boostorg/release/1.64.0/source/:boost_1_64_0.7z
+# 2. unzip
+# 3. bootstrap.bat
+# 4. b2 --stagedir=stage   variant=debug,release address-model=32 threading=multi link=static runtime-link=shared --prefix=c:/boost32 install
+# 5. b2 --stagedir=stage64 variant=debug,release address-model=64 threading=multi link=static runtime-link=shared --prefix=c:/boost64 install
+
+if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+	set(address_model "64")
+elseif(CMAKE_SIZEOF_VOID_P EQUAL 4)
+	set(address_model "32")
+endif()
+
+set(BOOST_ROOT "c:/boost${address_model}")
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib/${address_model})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/lib/${address_model})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_HOME_DIRECTORY}/bin/${address_model})
+
+find_package(Boost REQUIRED COMPONENTS system filesystem )
+
+ADD_SUBDIRECTORY(external)
+ADD_SUBDIRECTORY(src)
diff --git a/LICENSE b/LICENSE
diff --git a/build.bat b/build.bat
@@ -0,0 +1,12 @@
+@echo off
+set _ROOT=%CD%
+if not exist build\64 mkdir build\64
+pushd build\64
+cmake --build . --config Release
+popd
+
+if not exist build\32 mkdir build\32
+pushd build\32
+cmake --build . --config Release
+popd
+
diff --git a/configure.bat b/configure.bat
@@ -0,0 +1,12 @@
+@echo off
+set _ROOT=%CD%
+if not exist build\64 mkdir build\64
+pushd build\64
+cmake -G "Visual Studio 14 2015 Win64" %_ROOT%
+popd
+
+if not exist build\32 mkdir build\32
+pushd build\32
+cmake -G "Visual Studio 14 2015" %_ROOT%
+popd
+
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
@@ -0,0 +1,7 @@
+SET(JSONCPP_WITH_TESTS OFF CACHE BOOL "" FORCE)
+SET(JSONCPP_WITH_POST_BUILD_UNITTEST OFF CACHE BOOL "" FORCE)
+SET(JSONCPP_WITH_WARNING_AS_ERROR OFF CACHE BOOL "" FORCE)
+SET(JSONCPP_WITH_STRICT_ISO OFF CACHE BOOL "" FORCE)
+SET(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" OFF CACHE BOOL "" FORCE)
+
+ADD_SUBDIRECTORY(jsoncpp)
diff --git a/external/beast b/external/beast
@@ -0,0 +1 @@
+Subproject commit f2d825594ee34ccc1ebc0b231899a1735245778d
diff --git a/external/imgui b/external/imgui
@@ -0,0 +1 @@
+Subproject commit 43e6c46c8d10dac9441e341ed3b2fde1be947c96
diff --git a/external/jsoncpp b/external/jsoncpp
@@ -0,0 +1 @@
+Subproject commit d7347a2623707d71f8b21b18a46a1281ab79d45c
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -0,0 +1,13 @@
+INCLUDE_DIRECTORIES(
+	../external/jsoncpp/include
+	${Boost_INCLUDE_DIRS}
+	../external/beast/include
+	../external
+)
+
+LINK_DIRECTORIES(
+	${Boost_LIBRARY_DIRS}
+)
+
+ADD_SUBDIRECTORY(awio)
+
diff --git a/src/awio/CMakeLists.txt b/src/awio/CMakeLists.txt
@@ -0,0 +1,50 @@
+INCLUDE_DIRECTORIES(
+	${CMAKE_HOME_DIRECTORY}/external/imgui
+)
+
+ADD_LIBRARY(ActWebSocketImguiOverlay
+	SHARED
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imconfig.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui_draw.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui_internal.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/stb_rect_pack.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/stb_textedit.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/stb_truetype.h
+	overlay.cpp
+	overlay.def
+)
+
+TARGET_LINK_LIBRARIES(ActWebSocketImguiOverlay
+	jsoncpp_lib_static
+	${Boost_LIBRARIES}
+)
+
+include_directories(
+	${CMAKE_HOME_DIRECTORY}/external/imgui/examples/directx11_example
+)
+
+ADD_EXECUTABLE(test_main
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imconfig.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui_demo.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui_draw.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/examples/directx11_example/imgui_impl_dx11.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/examples/directx11_example/imgui_impl_dx11.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/imgui_internal.h
+	main.cpp
+	${CMAKE_HOME_DIRECTORY}/external/imgui/stb_rect_pack.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/stb_textedit.h
+	${CMAKE_HOME_DIRECTORY}/external/imgui/stb_truetype.h
+)
+
+TARGET_LINK_LIBRARIES(test_main
+	jsoncpp_lib_static
+	${Boost_LIBRARIES}
+	ActWebSocketImguiOverlay
+	d3d11.lib
+	d3dcompiler.lib
+	dxgi.lib
+)
diff --git a/src/awio/main.cpp b/src/awio/main.cpp
@@ -0,0 +1,217 @@
+// modified example to overlay tester
+
+#include <imgui.h>
+#include "imgui_impl_dx11.h"
+#include <d3d11.h>
+#define DIRECTINPUT_VERSION 0x0800
+#include <dinput.h>
+#include <tchar.h>
+
+/////////////////////////////////////////////////////////////////////////////////
+#include <boost/filesystem.hpp>
+#include <Windows.h>
+typedef int(*TModUnInit)(ImGuiContext* context);
+typedef int(*TModRender)(ImGuiContext* context);
+typedef int(*TModInit)(ImGuiContext* context);
+
+TModUnInit modUnInit = nullptr;
+TModRender modRender = nullptr;
+TModInit modInit = nullptr;
+HMODULE mod = nullptr;
+/////////////////////////////////////////////////////////////////////////////////
+
+// Data
+static ID3D11Device*            g_pd3dDevice = NULL;
+static ID3D11DeviceContext*     g_pd3dDeviceContext = NULL;
+static IDXGISwapChain*          g_pSwapChain = NULL;
+static ID3D11RenderTargetView*  g_mainRenderTargetView = NULL;
+
+void CreateRenderTarget()
+{
+    DXGI_SWAP_CHAIN_DESC sd;
+    g_pSwapChain->GetDesc(&sd);
+
+    // Create the render target
+    ID3D11Texture2D* pBackBuffer;
+    D3D11_RENDER_TARGET_VIEW_DESC render_target_view_desc;
+    ZeroMemory(&render_target_view_desc, sizeof(render_target_view_desc));
+    render_target_view_desc.Format = sd.BufferDesc.Format;
+    render_target_view_desc.ViewDimension = D3D11_RTV_DIMENSION_TEXTURE2D;
+    g_pSwapChain->GetBuffer(0, __uuidof(ID3D11Texture2D), (LPVOID*)&pBackBuffer);
+    g_pd3dDevice->CreateRenderTargetView(pBackBuffer, &render_target_view_desc, &g_mainRenderTargetView);
+    g_pd3dDeviceContext->OMSetRenderTargets(1, &g_mainRenderTargetView, NULL);
+    pBackBuffer->Release();
+}
+
+void CleanupRenderTarget()
+{
+    if (g_mainRenderTargetView) { g_mainRenderTargetView->Release(); g_mainRenderTargetView = NULL; }
+}
+
+HRESULT CreateDeviceD3D(HWND hWnd)
+{
+    // Setup swap chain
+    DXGI_SWAP_CHAIN_DESC sd;
+    {
+        ZeroMemory(&sd, sizeof(sd));
+        sd.BufferCount = 2;
+        sd.BufferDesc.Width = 0;
+        sd.BufferDesc.Height = 0;
+        sd.BufferDesc.Format = DXGI_FORMAT_R8G8B8A8_UNORM;
+        sd.BufferDesc.RefreshRate.Numerator = 60;
+        sd.BufferDesc.RefreshRate.Denominator = 1;
+        sd.Flags = DXGI_SWAP_CHAIN_FLAG_ALLOW_MODE_SWITCH;
+        sd.BufferUsage = DXGI_USAGE_RENDER_TARGET_OUTPUT;
+        sd.OutputWindow = hWnd;
+        sd.SampleDesc.Count = 1;
+        sd.SampleDesc.Quality = 0;
+        sd.Windowed = TRUE;
+        sd.SwapEffect = DXGI_SWAP_EFFECT_DISCARD;
+    }
+
+    UINT createDeviceFlags = 0;
+    //createDeviceFlags |= D3D11_CREATE_DEVICE_DEBUG;
+    D3D_FEATURE_LEVEL featureLevel;
+    const D3D_FEATURE_LEVEL featureLevelArray[1] = { D3D_FEATURE_LEVEL_11_0, };
+    if (D3D11CreateDeviceAndSwapChain(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, createDeviceFlags, featureLevelArray, 1, D3D11_SDK_VERSION, &sd, &g_pSwapChain, &g_pd3dDevice, &featureLevel, &g_pd3dDeviceContext) != S_OK)
+        return E_FAIL;
+
+    CreateRenderTarget();
+
+    return S_OK;
+}
+
+void CleanupDeviceD3D()
+{
+    CleanupRenderTarget();
+    if (g_pSwapChain) { g_pSwapChain->Release(); g_pSwapChain = NULL; }
+    if (g_pd3dDeviceContext) { g_pd3dDeviceContext->Release(); g_pd3dDeviceContext = NULL; }
+    if (g_pd3dDevice) { g_pd3dDevice->Release(); g_pd3dDevice = NULL; }
+}
+
+extern LRESULT ImGui_ImplDX11_WndProcHandler(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam);
+LRESULT WINAPI WndProc(HWND hWnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+    if (ImGui_ImplDX11_WndProcHandler(hWnd, msg, wParam, lParam))
+        return true;
+
+    switch (msg)
+    {
+    case WM_SIZE:
+        if (g_pd3dDevice != NULL && wParam != SIZE_MINIMIZED)
+        {
+            ImGui_ImplDX11_InvalidateDeviceObjects();
+            CleanupRenderTarget();
+            g_pSwapChain->ResizeBuffers(0, (UINT)LOWORD(lParam), (UINT)HIWORD(lParam), DXGI_FORMAT_UNKNOWN, 0);
+            CreateRenderTarget();
+            ImGui_ImplDX11_CreateDeviceObjects();
+        }
+        return 0;
+    case WM_SYSCOMMAND:
+        if ((wParam & 0xfff0) == SC_KEYMENU) // Disable ALT application menu
+            return 0;
+        break;
+    case WM_DESTROY:
+        PostQuitMessage(0);
+        return 0;
+    }
+    return DefWindowProc(hWnd, msg, wParam, lParam);
+}
+
+int main(int, char**)
+{
+
+	/////////////////////////////////////////////////////////////////////////////////
+	wchar_t szPath[1024] = { 0, };
+	GetModuleFileNameW(NULL, szPath, 1023);
+	boost::filesystem::path p(szPath);
+	p = p.parent_path() / "ActWebSocketImguiOverlay.dll";
+	mod = LoadLibraryW(p.wstring().c_str());
+	if (mod)
+	{
+		modInit = (TModInit)GetProcAddress(mod, "ModInit");
+		modRender = (TModInit)GetProcAddress(mod, "ModRender");
+		modUnInit = (TModInit)GetProcAddress(mod, "ModUnInit");
+	}
+	/////////////////////////////////////////////////////////////////////////////////
+
+    // Create application window
+    WNDCLASSEX wc = { sizeof(WNDCLASSEX), CS_CLASSDC, WndProc, 0L, 0L, GetModuleHandle(NULL), NULL, LoadCursor(NULL, IDC_ARROW), NULL, NULL, _T("ImGui Example"), NULL };
+    RegisterClassEx(&wc);
+    HWND hwnd = CreateWindow(_T("ImGui Example"), _T("ImGui DirectX11 Example"), WS_OVERLAPPEDWINDOW, 100, 100, 1280, 800, NULL, NULL, wc.hInstance, NULL);
+
+    // Initialize Direct3D
+    if (CreateDeviceD3D(hwnd) < 0)
+    {
+        CleanupDeviceD3D();
+        UnregisterClass(_T("ImGui Example"), wc.hInstance);
+        return 1;
+    }
+
+    // Show the window
+    ShowWindow(hwnd, SW_SHOWDEFAULT);
+    UpdateWindow(hwnd);
+
+    // Setup ImGui binding
+    ImGui_ImplDX11_Init(hwnd, g_pd3dDevice, g_pd3dDeviceContext);
+
+    // Load Fonts
+    // (there is a default font, this is only if you want to change it. see extra_fonts/README.txt for more details)
+    //ImGuiIO& io = ImGui::GetIO();
+    //io.Fonts->AddFontDefault();
+    //io.Fonts->AddFontFromFileTTF("../../extra_fonts/Cousine-Regular.ttf", 15.0f);
+    //io.Fonts->AddFontFromFileTTF("../../extra_fonts/DroidSans.ttf", 16.0f);
+    //io.Fonts->AddFontFromFileTTF("../../extra_fonts/ProggyClean.ttf", 13.0f);
+    //io.Fonts->AddFontFromFileTTF("../../extra_fonts/ProggyTiny.ttf", 10.0f);
+    //io.Fonts->AddFontFromFileTTF("c:\\Windows\\Fonts\\ArialUni.ttf", 18.0f, NULL, io.Fonts->GetGlyphRangesJapanese());
+
+    bool show_test_window = true;
+    bool show_another_window = false;
+    ImVec4 clear_col = ImColor(114, 144, 154);
+
+    // Main loop
+    MSG msg;
+    ZeroMemory(&msg, sizeof(msg));
+
+	/////////////////////////////////////////////////////////////////////////////////
+	if (modInit)
+	{
+		modInit(ImGui::GetCurrentContext());
+	}
+	/////////////////////////////////////////////////////////////////////////////////
+    while (msg.message != WM_QUIT)
+    {
+        if (PeekMessage(&msg, NULL, 0U, 0U, PM_REMOVE))
+        {
+            TranslateMessage(&msg);
+            DispatchMessage(&msg);
+            continue;
+        }
+        ImGui_ImplDX11_NewFrame();
+
+		/////////////////////////////////////////////////////////////////////////////////
+		if (modRender)
+		{
+			modRender(ImGui::GetCurrentContext());
+		}
+		/////////////////////////////////////////////////////////////////////////////////
+
+        // Rendering
+        g_pd3dDeviceContext->ClearRenderTargetView(g_mainRenderTargetView, (float*)&clear_col);
+        ImGui::Render();
+        g_pSwapChain->Present(0, 0);
+    }
+
+    ImGui_ImplDX11_Shutdown();
+    CleanupDeviceD3D();
+    UnregisterClass(_T("ImGui Example"), wc.hInstance);
+
+	/////////////////////////////////////////////////////////////////////////////////
+	if (modUnInit)
+	{
+		modUnInit(ImGui::GetCurrentContext());
+	}
+	/////////////////////////////////////////////////////////////////////////////////
+
+    return 0;
+}
diff --git a/src/awio/overlay.cpp b/src/awio/overlay.cpp
diff --git a/src/awio/overlay.def b/src/awio/overlay.def
