mirror of
https://github.com/RandomityGuy/MBHaxe.git
synced 2025-10-30 08:11:25 +00:00
UWP: Hookup keyboard to text inputs
This commit is contained in:
=
parent
2dbcf2590a
commit
beecf897f1
6 changed files with 4171 additions and 0 deletions
|
|
@ -8,6 +8,7 @@ import h2d.Scene;
|
|||
import hxd.res.BitmapFont;
|
||||
import gui.GuiText.Justification;
|
||||
import h2d.Text;
|
||||
import src.Gamepad;
|
||||
import src.ResourceLoader;
|
||||
import src.MarbleGame;
|
||||
|
||||
|
|
@ -87,4 +88,16 @@ class GuiTextInput extends GuiControl {
|
|||
text.cursorTile = h2d.Tile.fromColor(col, Std.int(1 / hxd.Window.getInstance().windowToPixelRatio), text.font.size);
|
||||
text.cursorTile.dy = 2 / hxd.Window.getInstance().windowToPixelRatio;
|
||||
}
|
||||
|
||||
#if uwp
|
||||
override public function update(dt:Float, mouseState:MouseState) {
|
||||
super.update(dt, mouseState);
|
||||
|
||||
// Calling focus on init causes issue with cursor pos and event tracking but works fine here
|
||||
// This will break if there are ever multiple text inputs, but works nice for simple popup dialogs
|
||||
if (Gamepad.isPressed(["dpadUp"]) || (Gamepad.getAxis('analogY') < -0.75)) {
|
||||
this.text.focus();
|
||||
}
|
||||
}
|
||||
#end
|
||||
}
|
||||
|
|
|
|||
399
uwp/.gitignore
vendored
Normal file
399
uwp/.gitignore
vendored
Normal file
|
|
@ -0,0 +1,399 @@
|
|||
## Ignore Visual Studio temporary files, build results, and
|
||||
## files generated by popular Visual Studio add-ons.
|
||||
##
|
||||
## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore
|
||||
|
||||
# User-specific files
|
||||
*.rsuser
|
||||
*.suo
|
||||
*.user
|
||||
*.userosscache
|
||||
*.sln.docstates
|
||||
|
||||
# User-specific files (MonoDevelop/Xamarin Studio)
|
||||
*.userprefs
|
||||
|
||||
# Mono auto generated files
|
||||
mono_crash.*
|
||||
|
||||
# Build results
|
||||
build*
|
||||
[Dd]ebug/
|
||||
[Dd]ebugPublic/
|
||||
[Rr]elease/
|
||||
[Rr]eleases/
|
||||
x64/
|
||||
x86/
|
||||
[Ww][Ii][Nn]32/
|
||||
[Aa][Rr][Mm]/
|
||||
[Aa][Rr][Mm]64/
|
||||
bld/
|
||||
[Bb]in/
|
||||
[Oo]bj/
|
||||
[Ll]og/
|
||||
[Ll]ogs/
|
||||
|
||||
# Visual Studio 2015/2017 cache/options directory
|
||||
.vs/
|
||||
# Uncomment if you have tasks that create the project's static files in wwwroot
|
||||
#wwwroot/
|
||||
|
||||
# Visual Studio 2017 auto generated files
|
||||
Generated\ Files/
|
||||
|
||||
# MSTest test Results
|
||||
[Tt]est[Rr]esult*/
|
||||
[Bb]uild[Ll]og.*
|
||||
|
||||
# NUnit
|
||||
*.VisualState.xml
|
||||
TestResult.xml
|
||||
nunit-*.xml
|
||||
|
||||
# Build Results of an ATL Project
|
||||
[Dd]ebugPS/
|
||||
[Rr]eleasePS/
|
||||
dlldata.c
|
||||
|
||||
# Benchmark Results
|
||||
BenchmarkDotNet.Artifacts/
|
||||
|
||||
# .NET Core
|
||||
project.lock.json
|
||||
project.fragment.lock.json
|
||||
artifacts/
|
||||
|
||||
# ASP.NET Scaffolding
|
||||
ScaffoldingReadMe.txt
|
||||
|
||||
# StyleCop
|
||||
StyleCopReport.xml
|
||||
|
||||
# Files built by Visual Studio
|
||||
*_i.c
|
||||
*_p.c
|
||||
*_h.h
|
||||
*.ilk
|
||||
*.meta
|
||||
*.obj
|
||||
*.iobj
|
||||
*.pch
|
||||
*.pdb
|
||||
*.ipdb
|
||||
*.pgc
|
||||
*.pgd
|
||||
*.rsp
|
||||
*.sbr
|
||||
*.tlb
|
||||
*.tli
|
||||
*.tlh
|
||||
*.tmp
|
||||
*.tmp_proj
|
||||
*_wpftmp.csproj
|
||||
*.log
|
||||
*.tlog
|
||||
*.vspscc
|
||||
*.vssscc
|
||||
.builds
|
||||
*.pidb
|
||||
*.svclog
|
||||
*.scc
|
||||
|
||||
# Chutzpah Test files
|
||||
_Chutzpah*
|
||||
|
||||
# Visual C++ cache files
|
||||
ipch/
|
||||
*.aps
|
||||
*.ncb
|
||||
*.opendb
|
||||
*.opensdf
|
||||
*.sdf
|
||||
*.cachefile
|
||||
*.VC.db
|
||||
*.VC.VC.opendb
|
||||
|
||||
# Visual Studio profiler
|
||||
*.psess
|
||||
*.vsp
|
||||
*.vspx
|
||||
*.sap
|
||||
|
||||
# Visual Studio Trace Files
|
||||
*.e2e
|
||||
|
||||
# TFS 2012 Local Workspace
|
||||
$tf/
|
||||
|
||||
# Guidance Automation Toolkit
|
||||
*.gpState
|
||||
|
||||
# ReSharper is a .NET coding add-in
|
||||
_ReSharper*/
|
||||
*.[Rr]e[Ss]harper
|
||||
*.DotSettings.user
|
||||
|
||||
# TeamCity is a build add-in
|
||||
_TeamCity*
|
||||
|
||||
# DotCover is a Code Coverage Tool
|
||||
*.dotCover
|
||||
|
||||
# AxoCover is a Code Coverage Tool
|
||||
.axoCover/*
|
||||
!.axoCover/settings.json
|
||||
|
||||
# Coverlet is a free, cross platform Code Coverage Tool
|
||||
coverage*.json
|
||||
coverage*.xml
|
||||
coverage*.info
|
||||
|
||||
# Visual Studio code coverage results
|
||||
*.coverage
|
||||
*.coveragexml
|
||||
|
||||
# NCrunch
|
||||
_NCrunch_*
|
||||
.*crunch*.local.xml
|
||||
nCrunchTemp_*
|
||||
|
||||
# MightyMoose
|
||||
*.mm.*
|
||||
AutoTest.Net/
|
||||
|
||||
# Web workbench (sass)
|
||||
.sass-cache/
|
||||
|
||||
# Installshield output folder
|
||||
[Ee]xpress/
|
||||
|
||||
# DocProject is a documentation generator add-in
|
||||
DocProject/buildhelp/
|
||||
DocProject/Help/*.HxT
|
||||
DocProject/Help/*.HxC
|
||||
DocProject/Help/*.hhc
|
||||
DocProject/Help/*.hhk
|
||||
DocProject/Help/*.hhp
|
||||
DocProject/Help/Html2
|
||||
DocProject/Help/html
|
||||
|
||||
# Click-Once directory
|
||||
publish/
|
||||
|
||||
# Publish Web Output
|
||||
*.[Pp]ublish.xml
|
||||
*.azurePubxml
|
||||
# Note: Comment the next line if you want to checkin your web deploy settings,
|
||||
# but database connection strings (with potential passwords) will be unencrypted
|
||||
*.pubxml
|
||||
*.publishproj
|
||||
|
||||
# Microsoft Azure Web App publish settings. Comment the next line if you want to
|
||||
# checkin your Azure Web App publish settings, but sensitive information contained
|
||||
# in these scripts will be unencrypted
|
||||
PublishScripts/
|
||||
|
||||
# NuGet Packages
|
||||
*.nupkg
|
||||
# NuGet Symbol Packages
|
||||
*.snupkg
|
||||
# The packages folder can be ignored because of Package Restore
|
||||
**/[Pp]ackages/*
|
||||
# except build/, which is used as an MSBuild target.
|
||||
!**/[Pp]ackages/build/
|
||||
# Uncomment if necessary however generally it will be regenerated when needed
|
||||
#!**/[Pp]ackages/repositories.config
|
||||
# NuGet v3's project.json files produces more ignorable files
|
||||
*.nuget.props
|
||||
*.nuget.targets
|
||||
|
||||
# Microsoft Azure Build Output
|
||||
csx/
|
||||
*.build.csdef
|
||||
|
||||
# Microsoft Azure Emulator
|
||||
ecf/
|
||||
rcf/
|
||||
|
||||
# Windows Store app package directories and files
|
||||
AppPackages/
|
||||
BundleArtifacts/
|
||||
Package.StoreAssociation.xml
|
||||
_pkginfo.txt
|
||||
*.appx
|
||||
*.appxbundle
|
||||
*.appxupload
|
||||
|
||||
# Visual Studio cache files
|
||||
# files ending in .cache can be ignored
|
||||
*.[Cc]ache
|
||||
# but keep track of directories ending in .cache
|
||||
!?*.[Cc]ache/
|
||||
|
||||
# Others
|
||||
ClientBin/
|
||||
~$*
|
||||
*~
|
||||
*.dbmdl
|
||||
*.dbproj.schemaview
|
||||
*.jfm
|
||||
*.pfx
|
||||
*.publishsettings
|
||||
orleans.codegen.cs
|
||||
|
||||
# Including strong name files can present a security risk
|
||||
# (https://github.com/github/gitignore/pull/2483#issue-259490424)
|
||||
#*.snk
|
||||
|
||||
# Since there are multiple workflows, uncomment next line to ignore bower_components
|
||||
# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
|
||||
#bower_components/
|
||||
|
||||
# RIA/Silverlight projects
|
||||
Generated_Code/
|
||||
|
||||
# Backup & report files from converting an old project file
|
||||
# to a newer Visual Studio version. Backup files are not needed,
|
||||
# because we have git ;-)
|
||||
_UpgradeReport_Files/
|
||||
Backup*/
|
||||
UpgradeLog*.XML
|
||||
UpgradeLog*.htm
|
||||
ServiceFabricBackup/
|
||||
*.rptproj.bak
|
||||
|
||||
# SQL Server files
|
||||
*.mdf
|
||||
*.ldf
|
||||
*.ndf
|
||||
|
||||
# Business Intelligence projects
|
||||
*.rdl.data
|
||||
*.bim.layout
|
||||
*.bim_*.settings
|
||||
*.rptproj.rsuser
|
||||
*- [Bb]ackup.rdl
|
||||
*- [Bb]ackup ([0-9]).rdl
|
||||
*- [Bb]ackup ([0-9][0-9]).rdl
|
||||
|
||||
# Microsoft Fakes
|
||||
FakesAssemblies/
|
||||
|
||||
# GhostDoc plugin setting file
|
||||
*.GhostDoc.xml
|
||||
|
||||
# Node.js Tools for Visual Studio
|
||||
.ntvs_analysis.dat
|
||||
node_modules/
|
||||
|
||||
# Visual Studio 6 build log
|
||||
*.plg
|
||||
|
||||
# Visual Studio 6 workspace options file
|
||||
*.opt
|
||||
|
||||
# Visual Studio 6 auto-generated workspace file (contains which files were open etc.)
|
||||
*.vbw
|
||||
|
||||
# Visual Studio 6 auto-generated project file (contains which files were open etc.)
|
||||
*.vbp
|
||||
|
||||
# Visual Studio 6 workspace and project file (working project files containing files to include in project)
|
||||
*.dsw
|
||||
*.dsp
|
||||
|
||||
# Visual Studio 6 technical files
|
||||
*.ncb
|
||||
*.aps
|
||||
|
||||
# Visual Studio LightSwitch build output
|
||||
**/*.HTMLClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/GeneratedArtifacts
|
||||
**/*.DesktopClient/ModelManifest.xml
|
||||
**/*.Server/GeneratedArtifacts
|
||||
**/*.Server/ModelManifest.xml
|
||||
_Pvt_Extensions
|
||||
|
||||
# Paket dependency manager
|
||||
.paket/paket.exe
|
||||
paket-files/
|
||||
|
||||
# FAKE - F# Make
|
||||
.fake/
|
||||
|
||||
# CodeRush personal settings
|
||||
.cr/personal
|
||||
|
||||
# Python Tools for Visual Studio (PTVS)
|
||||
__pycache__/
|
||||
*.pyc
|
||||
|
||||
# Cake - Uncomment if you are using it
|
||||
# tools/**
|
||||
# !tools/packages.config
|
||||
|
||||
# Tabs Studio
|
||||
*.tss
|
||||
|
||||
# Telerik's JustMock configuration file
|
||||
*.jmconfig
|
||||
|
||||
# BizTalk build output
|
||||
*.btp.cs
|
||||
*.btm.cs
|
||||
*.odx.cs
|
||||
*.xsd.cs
|
||||
|
||||
# OpenCover UI analysis results
|
||||
OpenCover/
|
||||
|
||||
# Azure Stream Analytics local run output
|
||||
ASALocalRun/
|
||||
|
||||
# MSBuild Binary and Structured Log
|
||||
*.binlog
|
||||
|
||||
# NVidia Nsight GPU debugger configuration file
|
||||
*.nvuser
|
||||
|
||||
# MFractors (Xamarin productivity tool) working folder
|
||||
.mfractor/
|
||||
|
||||
# Local History for Visual Studio
|
||||
.localhistory/
|
||||
|
||||
# Visual Studio History (VSHistory) files
|
||||
.vshistory/
|
||||
|
||||
# BeatPulse healthcheck temp database
|
||||
healthchecksdb
|
||||
|
||||
# Backup folder for Package Reference Convert tool in Visual Studio 2017
|
||||
MigrationBackup/
|
||||
|
||||
# Ionide (cross platform F# VS Code tools) working folder
|
||||
.ionide/
|
||||
|
||||
# Fody - auto-generated XML schema
|
||||
FodyWeavers.xsd
|
||||
|
||||
# VS Code files for those working on multiple tools
|
||||
.vscode/*
|
||||
!.vscode/settings.json
|
||||
!.vscode/tasks.json
|
||||
!.vscode/launch.json
|
||||
!.vscode/extensions.json
|
||||
*.code-workspace
|
||||
|
||||
# Local History for Visual Studio Code
|
||||
.history/
|
||||
|
||||
# Windows Installer files from build outputs
|
||||
*.cab
|
||||
*.msi
|
||||
*.msix
|
||||
*.msm
|
||||
*.msp
|
||||
|
||||
# JetBrains Rider
|
||||
*.sln.iml
|
||||
102
uwp/CMakeLists.txt
Normal file
102
uwp/CMakeLists.txt
Normal file
|
|
@ -0,0 +1,102 @@
|
|||
cmake_minimum_required(VERSION 3.14)
|
||||
include(FetchContent)
|
||||
|
||||
# Define project
|
||||
project(mbhaxe-uwp LANGUAGES CXX)
|
||||
|
||||
# Fetch shared UWP deps
|
||||
FetchContent_Declare(UwpLibs
|
||||
GIT_REPOSITORY https://github.com/worleydl/uwp-dep.git
|
||||
GIT_TAG fccbcd95794f57c949caf94c6a7160f7f8d2b7e0
|
||||
)
|
||||
FetchContent_MakeAvailable(UwpLibs)
|
||||
|
||||
# Setup UWP platform
|
||||
set(CMAKE_SYSTEM_NAME WindowsStore) # Seems like you gotta specify these from cli for some reason
|
||||
set(CMAKE_SYSTEM_VERSION 10.0)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 17)
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
|
||||
# Config for deps
|
||||
set(DATACHANNEL_DIR CACHE PATH "")
|
||||
set(HASHLINK_DIR CACHE PATH "")
|
||||
set(MBHAXE_DIR CACHE PATH "")
|
||||
|
||||
set(BinDeps
|
||||
${DATACHANNEL_DIR}/datachannel.hdll
|
||||
${HASHLINK_DIR}/fmt.hdll
|
||||
${HASHLINK_DIR}/libhl.dll
|
||||
${HASHLINK_DIR}/openal.hdll
|
||||
${HASHLINK_DIR}/sdl.hdll
|
||||
${HASHLINK_DIR}/ssl.hdll
|
||||
${HASHLINK_DIR}/ui.hdll
|
||||
${HASHLINK_DIR}/uv.hdll
|
||||
|
||||
${CMAKE_BINARY_DIR}/_deps/uwplibs-src/x64/bin/dxil.dll
|
||||
${CMAKE_BINARY_DIR}/_deps/uwplibs-src/x64/bin/libgallium_wgl.dll
|
||||
${CMAKE_BINARY_DIR}/_deps/uwplibs-src/x64/bin/OpenAL32.dll
|
||||
${CMAKE_BINARY_DIR}/_deps/uwplibs-src/x64/bin/opengl32.dll
|
||||
${CMAKE_BINARY_DIR}/_deps/uwplibs-src/x64/bin/SDL2.dll
|
||||
${CMAKE_BINARY_DIR}/_deps/uwplibs-src/x64/bin/z-1.dll
|
||||
|
||||
cacert.pem
|
||||
Package.appxmanifest
|
||||
)
|
||||
|
||||
set(BinLibs
|
||||
${DATACHANNEL_DIR}/datachannel.lib
|
||||
${HASHLINK_DIR}/fmt.lib
|
||||
${HASHLINK_DIR}/libhl.lib
|
||||
${HASHLINK_DIR}/openal.lib
|
||||
${HASHLINK_DIR}/sdl.lib
|
||||
${HASHLINK_DIR}/ssl.lib
|
||||
${HASHLINK_DIR}/ui.lib
|
||||
${HASHLINK_DIR}/uv.lib
|
||||
${MBHAXE_DIR}/marblegame.lib
|
||||
)
|
||||
source_group("BinDep" FILES ${BinDeps})
|
||||
|
||||
|
||||
set_property(SOURCE ${BinDeps} PROPERTY VS_DEPLOYMENT_CONTENT 1)
|
||||
set_property(SOURCE ${BinDeps} PROPERTY VS_DEPLOYMENT_LOCATION ".")
|
||||
|
||||
# Set the app source
|
||||
add_executable(mbhaxe WIN32
|
||||
main.cpp
|
||||
)
|
||||
|
||||
# Setup data deployment
|
||||
file(GLOB_RECURSE DATA_FILES
|
||||
RELATIVE ${CMAKE_SOURCE_DIR}/..
|
||||
${CMAKE_SOURCE_DIR}/../data/*
|
||||
)
|
||||
|
||||
foreach(ASSET ${DATA_FILES})
|
||||
set(FULL_PATH "${CMAKE_SOURCE_DIR}/../${ASSET}")
|
||||
|
||||
get_filename_component(DEST_DIR ${ASSET} DIRECTORY)
|
||||
|
||||
set_source_files_properties(${FULL_PATH} PROPERTIES
|
||||
VS_DEPLOYMENT_CONTENT TRUE
|
||||
VS_DEPLOYMENT_LOCATION "${DEST_DIR}" # preserves folder structure
|
||||
)
|
||||
|
||||
# Optionally add to target (so VS sees them)
|
||||
target_sources(mbhaxe PRIVATE ${FULL_PATH})
|
||||
|
||||
# Organize under "Assets" virtual folder
|
||||
source_group("BinData" FILES ${FULL_PATH})
|
||||
endforeach()
|
||||
|
||||
|
||||
|
||||
target_sources(mbhaxe PRIVATE
|
||||
cacert.pem
|
||||
Package.appxmanifest
|
||||
${BinDeps}
|
||||
)
|
||||
|
||||
target_link_libraries(mbhaxe PRIVATE ${BinLibs} SDL2 WindowsApp.lib OneCore.lib)
|
||||
|
||||
set_target_properties(mbhaxe PROPERTIES VS_WINDOWS_TARGET_PLATFORM_MIN_VERSION 10.0.19041.0)
|
||||
58
uwp/Package.appxmanifest
Normal file
58
uwp/Package.appxmanifest
Normal file
|
|
@ -0,0 +1,58 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<Package
|
||||
xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10"
|
||||
xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest"
|
||||
xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10"
|
||||
xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
|
||||
IgnorableNamespaces="uap mp">
|
||||
|
||||
<Identity
|
||||
Name="mbhaxe"
|
||||
Publisher="CN=dlw"
|
||||
Version="1.2.2.0" />
|
||||
|
||||
<mp:PhoneIdentity PhoneProductId="5a528e66-e0fc-43fb-b377-ce0b1bb0d3e8" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
|
||||
|
||||
<Properties>
|
||||
<DisplayName>MBHaxe</DisplayName>
|
||||
<PublisherDisplayName>danwo</PublisherDisplayName>
|
||||
<Logo>Assets\StoreLogo.png</Logo>
|
||||
</Properties>
|
||||
|
||||
<Dependencies>
|
||||
<TargetDeviceFamily Name="Windows.Universal" MinVersion="10.0.0.0" MaxVersionTested="10.0.0.0" />
|
||||
</Dependencies>
|
||||
|
||||
<Resources>
|
||||
<Resource Language="x-generate"/>
|
||||
</Resources>
|
||||
|
||||
<Applications>
|
||||
<Application Id="App"
|
||||
Executable="$targetnametoken$.exe"
|
||||
EntryPoint="uwp.App">
|
||||
<uap:VisualElements
|
||||
DisplayName="MBHaxe"
|
||||
Square150x150Logo="Assets\Square150x150Logo.png"
|
||||
Square44x44Logo="Assets\Square44x44Logo.png"
|
||||
Description="Port of mbhaxe for UWP"
|
||||
BackgroundColor="transparent">
|
||||
<!--<uap:SplashScreen Image="Assets\SplashScreen.png" /> -->
|
||||
<uap:DefaultTile/>
|
||||
</uap:VisualElements>
|
||||
</Application>
|
||||
</Applications>
|
||||
|
||||
<Capabilities>
|
||||
<rescap:Capability Name="runFullTrust"/>
|
||||
<rescap:Capability Name="broadFileSystemAccess" />
|
||||
<rescap:Capability Name="expandedResources" />
|
||||
<Capability Name="internetClient" />
|
||||
<uap:Capability Name="removableStorage"/>
|
||||
<Capability Name="codeGeneration"/>
|
||||
<Capability Name="internetClientServer"/>
|
||||
<Capability Name="privateNetworkClientServer"/>
|
||||
|
||||
</Capabilities>
|
||||
</Package>
|
||||
3581
uwp/cacert.pem
Normal file
3581
uwp/cacert.pem
Normal file
File diff suppressed because it is too large
Load diff
18
uwp/main.cpp
Normal file
18
uwp/main.cpp
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
#include <Windows.h>
|
||||
#define SDL_MAIN_HANDLED = 1
|
||||
#include "SDL.h"
|
||||
|
||||
typedef wchar_t pchar;
|
||||
extern "C" int wmain(int, pchar**);
|
||||
|
||||
int bootstrap(int, char**)
|
||||
{
|
||||
SDL_Init(SDL_INIT_VIDEO);
|
||||
// That's it, run the main process
|
||||
return wmain(0, 0);
|
||||
}
|
||||
|
||||
int CALLBACK WinMain(HINSTANCE h, HINSTANCE, LPSTR argv, int argc)
|
||||
{
|
||||
return SDL_WinRTRunApp(bootstrap, NULL);
|
||||
}
|
||||
Loading…
Add table
Reference in a new issue