forked from LeenkxTeam/LNXRNT
Kore Update
This commit is contained in:
@ -11,11 +11,11 @@
|
||||
#define NOMINMAX
|
||||
#include <windows.h>
|
||||
#ifndef XINPUT
|
||||
#ifdef KORE_WINDOWS
|
||||
#ifdef KINC_WINDOWS
|
||||
#define XINPUT 1
|
||||
#endif
|
||||
|
||||
#ifdef KORE_WINDOWSAPP
|
||||
#ifdef KINC_WINDOWSAPP
|
||||
#define XINPUT !(WINAPI_PARTITION_PHONE_APP)
|
||||
#endif
|
||||
#endif
|
||||
@ -28,11 +28,11 @@
|
||||
#include <dxgi1_5.h>
|
||||
#include <wrl.h>
|
||||
|
||||
#ifdef KORE_WINDOWSAPP
|
||||
#ifdef KINC_WINDOWSAPP
|
||||
using namespace ::Microsoft::WRL;
|
||||
using namespace Windows::UI::Core;
|
||||
using namespace Windows::Foundation;
|
||||
#ifdef KORE_HOLOLENS
|
||||
#ifdef KINC_HOLOLENS
|
||||
using namespace Windows::Graphics::Holographic;
|
||||
using namespace Windows::Graphics::DirectX::Direct3D11;
|
||||
#endif
|
||||
@ -160,10 +160,6 @@ bool kinc_internal_handle_messages(void) {
|
||||
// return vec2i(mouseX, mouseY);
|
||||
//}
|
||||
|
||||
#ifdef KINC_KONG
|
||||
extern "C" void kong_init(void);
|
||||
#endif
|
||||
|
||||
#undef CreateWindow
|
||||
|
||||
int kinc_init(const char *name, int width, int height, struct kinc_window_options *win, struct kinc_framebuffer_options *frame) {
|
||||
@ -184,10 +180,6 @@ int kinc_init(const char *name, int width, int height, struct kinc_window_option
|
||||
kinc_g4_internal_init();
|
||||
kinc_g4_internal_init_window(0, frame->depth_bits, frame->stencil_bits, true);
|
||||
|
||||
#ifdef KINC_KONG
|
||||
kong_init();
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
@ -245,7 +237,7 @@ void Win8Application::SetWindow(CoreWindow ^ window) {
|
||||
ref new Windows::Foundation::TypedEventHandler<Windows::UI::Core::CoreWindow ^, Windows::UI::Core::KeyEventArgs ^>(this, &Win8Application::OnKeyUp);
|
||||
// m_renderer->Initialize(CoreWindow::GetForCurrentThread());
|
||||
|
||||
#ifdef KORE_HOLOLENS
|
||||
#ifdef KINC_HOLOLENS
|
||||
// Create holographics space - needs to be created before window is activated
|
||||
holographicFrameController = std::make_unique<HolographicFrameController>(window);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user