pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WinRT: code cleanup: attempted to make it more clear what code is specific to what app type (plain Direct3D or XAML)

Browse source 
--HG--
rename : src/core/winrt/SDL_winrtapp.cpp => src/core/winrt/SDL_winrtapp_direct3d.cpp
rename : src/core/winrt/SDL_winrtapp.h => src/core/winrt/SDL_winrtapp_direct3d.h
rename : src/core/winrt/SDL_winrtxaml.cpp => src/core/winrt/SDL_winrtapp_xaml.cpp
rename : src/core/winrt/SDL_winrtxaml_cpp.h => src/core/winrt/SDL_winrtapp_xaml.h
This commit is contained in:
David Ludwig 2013-09-06 21:13:15 -04:00
parent 38ffd780f4
commit e0af19f033
11 changed files with 204 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/core/winrt/SDL_winrtapp.cpp → src/core/winrt/SDL_winrtapp_direct3d.cpp
View file

@ -38,7 +38,7 @@ extern "C" {
#include "../../video/winrt/SDL_winrtevents_c.h"
#include "../../video/winrt/SDL_winrtvideo_cpp.h"
#include "SDL_winrtapp.h"
#include "SDL_winrtapp_direct3d.h"
// Compile-time debugging options:

0
src/core/winrt/SDL_winrtapp.h → src/core/winrt/SDL_winrtapp_direct3d.h
View file

36
src/core/winrt/SDL_winrtxaml.cpp → src/core/winrt/SDL_winrtapp_xaml.cpp
View file

@ -32,7 +32,7 @@
#include "SDL.h"
#include "../../video/winrt/SDL_winrtevents_c.h"
#include "../../video/winrt/SDL_winrtvideo_cpp.h"
#include "SDL_winrtxaml_cpp.h"
#include "SDL_winrtapp_xaml.h"
@ -51,28 +51,28 @@ static Windows::Foundation::EventRegistrationToken WINRT_XAMLAppEventToken;
*/
#if WINAPI_FAMILY == WINAPI_FAMILY_APP
static void
WINRT_OnPointerPressedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerPressedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
static void
WINRT_OnPointerPressedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerPressedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
}
static void
WINRT_OnPointerMovedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerMovedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
static void
WINRT_OnPointerMovedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerMovedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
}
static void
WINRT_OnPointerReleasedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerReleasedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
static void
WINRT_OnPointerReleasedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerReleasedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
}
static void
WINRT_OnPointerWheelChangedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerWheelChangedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
static void
WINRT_OnPointerWheelChangedViaXAML(Platform::Object^ sender, Windows::UI::Xaml::Input::PointerRoutedEventArgs^ args)
{
WINRT_ProcessPointerWheelChangedEvent(WINRT_GlobalSDLWindow, args->GetCurrentPoint(nullptr));
}
#endif // WINAPI_FAMILY == WINAPI_FAMILY_APP
@ -128,7 +128,7 @@ SDL_WinRTInitXAMLApp(Platform::Object ^backgroundPanel, int (*mainFunction)(int,
swapChainBackgroundPanel->PointerMoved += ref new PointerEventHandler(WINRT_OnPointerMovedViaXAML);
// Setup for rendering:
IInspectable *panelInspectable = (IInspectable*) reinterpret_cast<IInspectable*>(swapChainBackgroundPanel);
IInspectable *panelInspectable = (IInspectable*) reinterpret_cast<IInspectable*>(swapChainBackgroundPanel);
panelInspectable->QueryInterface(__uuidof(ISwapChainBackgroundPanelNative), (void **)&WINRT_GlobalSwapChainBackgroundPanelNative);
WINRT_XAMLAppEventToken = CompositionTarget::Rendering::add(ref new EventHandler<Object^>(WINRT_OnRenderViaXAML));

6
src/core/winrt/SDL_winrtxaml_cpp.h → src/core/winrt/SDL_winrtapp_xaml.h
View file

@ -20,8 +20,8 @@
*/
#include "SDL_config.h"
#ifndef _SDL_winrtxaml_h
#define _SDL_winrtxaml_h
#ifndef _SDL_winrtapp_xaml_h
#define _SDL_winrtapp_xaml_h
#include "SDL_types.h"
@ -30,4 +30,4 @@ extern SDL_bool WINRT_XAMLWasEnabled;
extern int (*WINRT_XAMLAppMainFunction)(int, char **);
#endif // ifdef __cplusplus
#endif // ifndef _SDL_winrtxaml_h
#endif // ifndef _SDL_winrtapp_xaml_h