diff --git a/CommunityMapLocation/.gitignore b/CommunityMapLocation/.gitignore new file mode 100644 index 0000000..db4a068 --- /dev/null +++ b/CommunityMapLocation/.gitignore @@ -0,0 +1,405 @@ +## 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 +[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 +# but not Directory.Build.rsp, as it configures directory-level build defaults +!Directory.Build.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 + +# External Libraries +lib/*.dll + +# Custom diff --git a/CommunityMapLocation/Api/ApiServer.cs b/CommunityMapLocation/Api/ApiServer.cs new file mode 100644 index 0000000..6079596 --- /dev/null +++ b/CommunityMapLocation/Api/ApiServer.cs @@ -0,0 +1,148 @@ +using CommunityMapLocation.Config; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Net; +using System.Reflection; +using System.Text; +using System.Text.Json; +using System.Text.Json.Serialization; +using UnityModManagerNet; + +namespace CommunityMapLocation.Api +{ + public class ApiServer + { + public ApiServer(Settings settings, UnityModManager.ModEntry.ModLogger logger) + { + listener = new HttpListener(); + + serializerOptions = new JsonSerializerOptions() + { + ReferenceHandler = ReferenceHandler.IgnoreCycles, + PropertyNamingPolicy = JsonNamingPolicy.CamelCase, + WriteIndented = true + }; + + this.settings = settings; + this.logger = logger; + } + + private static string GetPrefix(int port) => $"http://localhost:{port}/"; + + private readonly Settings settings; + private readonly UnityModManager.ModEntry.ModLogger logger; + + private readonly HttpListener listener; + + private readonly JsonSerializerOptions serializerOptions; + + private readonly List endpoints = new List(); + + public void AutoRegister(Assembly assembly = null) + { + if (assembly == null) + { + assembly = Assembly.GetExecutingAssembly(); + } + + foreach (var endpointType in assembly.ExportedTypes.Where(t => !t.IsInterface && !t.IsAbstract && typeof(IEndpoint).IsAssignableFrom(t))) + { + try + { + endpoints.Add((IEndpoint)Activator.CreateInstance(endpointType)); + } + catch (Exception ex) + { + logger.Warning($"Could not register endpoint {endpointType.Name}: {ex}"); + } + } + } + + public void RegisterEndpoint(IEndpoint endpoint) + { + endpoints.Add(endpoint); + } + + public void Start() + { + try + { + listener.Prefixes.Add(GetPrefix(settings.Port)); + listener.Start(); + listener.BeginGetContext(HandleConnection, null); + } + catch (Exception ex) + { + logger.Warning(ex.ToString()); + Stop(); + } + } + + private void HandleConnection(IAsyncResult ar) + { + try + { + var context = listener.EndGetContext(ar); + + listener.BeginGetContext(HandleConnection, listener); + + var request = context.Request; + var response = context.Response; + + var matchedEndpoints = endpoints.Where(e => e.Matches(request.Url) && + (request.HttpMethod == "OPTIONS" || request.HttpMethod.Equals(e.HttpMethod.ToString(), StringComparison.OrdinalIgnoreCase))); + + if (!endpoints.Any()) + { + response.StatusCode = (int)HttpStatusCode.NotFound; + } + else + { + var methods = matchedEndpoints.Select(e => e.HttpMethod).Distinct(); + + response.AppendHeader("Access-Control-Allow-Origin", settings.RequestSourceType == RequestSourceType.All ? "*" : settings.RequestSource); + + if (request.HttpMethod == "OPTIONS") + { + response.AddHeader("Access-Control-Allow-Headers", "Content-Type, Accept, X-Requested-With"); + response.AddHeader("Access-Control-Allow-Methods", String.Join(", ", methods.Select(m => m.ToString().ToUpper()))); + response.AddHeader("Access-Control-Max-Age", "1728000"); + } + else + { + var responseBody = matchedEndpoints.First().Handle(logger, request); + + var buffer = Encoding.UTF8.GetBytes(JsonSerializer.Serialize(responseBody, serializerOptions)); + + response.ContentLength64 = buffer.Length; + response.OutputStream.Write(buffer, 0, buffer.Length); + } + } + + response.OutputStream.Close(); + } + catch (HttpListenerException) + { + // HttpListener is stopping, swallow exception + } + } + + public void UpdateSettings() + { + var prefix = GetPrefix(settings.Port); + + if (listener.Prefixes.Count != 1 || listener.Prefixes.Single() != prefix) + { + listener.Prefixes.Clear(); + listener.Prefixes.Add(prefix); + } + } + + public void Stop() + { + listener.Stop(); + listener.Prefixes.Clear(); + } + } +} diff --git a/CommunityMapLocation/Api/Endpoint.cs b/CommunityMapLocation/Api/Endpoint.cs new file mode 100644 index 0000000..e6e0321 --- /dev/null +++ b/CommunityMapLocation/Api/Endpoint.cs @@ -0,0 +1,24 @@ +using System; +using System.Net; +using System.Net.Http; +using UnityModManagerNet; + +namespace CommunityMapLocation.Api +{ + public abstract class Endpoint : IEndpoint + { + public abstract HttpMethod HttpMethod { get; } + public abstract string RoutePattern { get; } + public virtual bool Matches(Uri uri) + { + return String.Concat(uri.Segments).Equals(RoutePattern, StringComparison.OrdinalIgnoreCase); + } + + public abstract T Handle(UnityModManager.ModEntry.ModLogger logger, HttpListenerRequest request); + + object IEndpoint.Handle(UnityModManager.ModEntry.ModLogger logger, HttpListenerRequest request) + { + return Handle(logger, request); + } + } +} diff --git a/CommunityMapLocation/Api/IEndpoint.cs b/CommunityMapLocation/Api/IEndpoint.cs new file mode 100644 index 0000000..bd4ce8f --- /dev/null +++ b/CommunityMapLocation/Api/IEndpoint.cs @@ -0,0 +1,15 @@ +using System; +using System.Net; +using System.Net.Http; +using UnityModManagerNet; + +namespace CommunityMapLocation.Api +{ + public interface IEndpoint + { + HttpMethod HttpMethod { get; } + string RoutePattern { get; } + bool Matches(Uri uri); + object Handle(UnityModManager.ModEntry.ModLogger logger, HttpListenerRequest request); + } +} diff --git a/CommunityMapLocation/Api/Location/CarLocationResponse.cs b/CommunityMapLocation/Api/Location/CarLocationResponse.cs new file mode 100644 index 0000000..e23236c --- /dev/null +++ b/CommunityMapLocation/Api/Location/CarLocationResponse.cs @@ -0,0 +1,42 @@ +using DV.OriginShift; +using UnityEngine; + +namespace CommunityMapLocation.Api.Location +{ + public class CarLocationResponse + { + public CarLocationResponse(TrainCar trainCar) + { + IsLoco = trainCar.IsLoco; + Name = trainCar.name; + Id = trainCar.ID; + CarGuid = trainCar.CarGUID; + + // Probable not needed. Commented to remove additional dll dependency + //HandbrakePosition = trainCar.brakeSystem.handbrakePosition; + + // TrainCar.Bounds does not seem to represent the actual bounds of the car. + // Approximate the car length as the distance between the couplers + Length = (trainCar.FrontCouplerAnchor.AbsolutePosition() - trainCar.RearCouplerAnchor.AbsolutePosition()).magnitude; + + var transform = trainCar.transform.AbsolutePosition(); + X = transform.x; + Y = transform.y; + Z = transform.z; + + Rotation = trainCar.transform.rotation.eulerAngles.y * (Mathf.PI / 180); + } + + public string Id { get; } + public string CarGuid { get; } + public string Name { get; } + public bool IsLoco { get; } + //public float HandbrakePosition { get; } + + public float X { get; } + public float Y { get; } + public float Z { get; } + public float Length { get; } + public float Rotation { get; } + } +} diff --git a/CommunityMapLocation/Api/Location/LocationEndpoint.cs b/CommunityMapLocation/Api/Location/LocationEndpoint.cs new file mode 100644 index 0000000..de7e32d --- /dev/null +++ b/CommunityMapLocation/Api/Location/LocationEndpoint.cs @@ -0,0 +1,51 @@ +using DV.HUD; +using System; +using System.Linq; +using System.Net; +using System.Net.Http; +using UnityEngine; +using UnityModManagerNet; + +namespace CommunityMapLocation.Api.Location +{ + public class LocationEndpoint : Endpoint + { + public override HttpMethod HttpMethod => HttpMethod.Get; + + public override string RoutePattern => "/Location"; + + public override LocationResponse Handle(UnityModManager.ModEntry.ModLogger logger, HttpListenerRequest request) + { + Transform rotationTransform; + var reverse = false; + + // If the player is in a loco, we want to get the heading of the loco instead of the play + if (PlayerManager.Car?.IsLoco == true) + { + rotationTransform = PlayerManager.Car.transform; + + // If the loco is in reverse, rotate the direction 180 degrees to match the direction of travel + if (PlayerManager.Car.interior.GetComponentInChildren().TryGetControl(InteriorControlsManager.ControlType.Reverser, out var control) && + control.controlImplBase.Value <= 0.25) + { + reverse = true; + } + } + else + { + rotationTransform = PlayerManager.PlayerCamera.transform; + } + + var cars = Array.Empty(); + if (PlayerManager.Car != null) + { + cars = PlayerManager.Car.trainset.cars.Select(c => new CarLocationResponse(c)).ToArray(); + } + + return new LocationResponse(PlayerManager.PlayerTransform, reverse) + { + Cars = cars + }; + } + } +} diff --git a/CommunityMapLocation/Api/Location/LocationResponse.cs b/CommunityMapLocation/Api/Location/LocationResponse.cs new file mode 100644 index 0000000..12385b0 --- /dev/null +++ b/CommunityMapLocation/Api/Location/LocationResponse.cs @@ -0,0 +1,34 @@ +using DV.OriginShift; +using System.Collections.Generic; +using UnityEngine; + +namespace CommunityMapLocation.Api.Location +{ + public class LocationResponse + { + public LocationResponse(Transform playerTransform, bool reverse) + { + var position = playerTransform.AbsolutePosition(); + + X = position.x; + Y = position.y; + Z = position.z; + + var angle = playerTransform.rotation.eulerAngles.y; + + if (reverse) + { + angle += 180; + } + + Rotation = angle * (Mathf.PI / 180); + } + + public float X { get; } + public float Y { get; } + public float Z { get; } + public float Rotation { get; } + + public IEnumerable Cars { get; set; } + } +} diff --git a/CommunityMapLocation/CommunityMapLocation.csproj b/CommunityMapLocation/CommunityMapLocation.csproj new file mode 100644 index 0000000..10eaba7 --- /dev/null +++ b/CommunityMapLocation/CommunityMapLocation.csproj @@ -0,0 +1,121 @@ + + + + + Debug + AnyCPU + {0A8392E4-B2FA-4018-BD0C-DD6261F10699} + Library + Properties + CommunityMapLocation + CommunityMapLocation + v4.8 + 512 + true + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + false + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + false + + + + lib\0Harmony.dll + False + + + lib\Assembly-CSharp.dll + False + + + lib\DV.Common.dll + False + + + lib\DV.OriginShiftInfo.dll + False + + + lib\DV.RailTrack.dll + False + + + lib\DV.UserManagement.dll + False + + + lib\DV.Utils.dll + False + + + + + + + + + + + lib\UnityEngine.dll + False + + + lib\UnityEngine.CoreModule.dll + False + + + lib\UnityEngine.IMGUIModule.dll + False + + + lib\UnityEngine.InputLegacyModule.dll + False + + + lib\UnityEngine.UI.dll + False + + + lib\UnityModManager.dll + False + + + + + + + + + + + + + + + + + PreserveNewest + + + + + 9.0.6 + + + + \ No newline at end of file diff --git a/CommunityMapLocation/CommunityMapLocation.sln b/CommunityMapLocation/CommunityMapLocation.sln new file mode 100644 index 0000000..975052f --- /dev/null +++ b/CommunityMapLocation/CommunityMapLocation.sln @@ -0,0 +1,25 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.14.36109.1 d17.14 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommunityMapLocation", "CommunityMapLocation.csproj", "{0A8392E4-B2FA-4018-BD0C-DD6261F10699}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0A8392E4-B2FA-4018-BD0C-DD6261F10699}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0A8392E4-B2FA-4018-BD0C-DD6261F10699}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0A8392E4-B2FA-4018-BD0C-DD6261F10699}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0A8392E4-B2FA-4018-BD0C-DD6261F10699}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {044646D0-2953-41CC-A775-C1C2BAECADCD} + EndGlobalSection +EndGlobal diff --git a/CommunityMapLocation/Config/RequestSourceType.cs b/CommunityMapLocation/Config/RequestSourceType.cs new file mode 100644 index 0000000..6a5e0ec --- /dev/null +++ b/CommunityMapLocation/Config/RequestSourceType.cs @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace CommunityMapLocation.Config +{ + public enum RequestSourceType + { + Specific, + All + } +} diff --git a/CommunityMapLocation/Config/Settings.cs b/CommunityMapLocation/Config/Settings.cs new file mode 100644 index 0000000..9bec364 --- /dev/null +++ b/CommunityMapLocation/Config/Settings.cs @@ -0,0 +1,54 @@ +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Runtime.CompilerServices; +using UnityEngine; +using UnityModManagerNet; + +namespace CommunityMapLocation.Config +{ + public class Settings : UnityModManager.ModSettings, INotifyPropertyChanged + { + private int port = 9090; + public int Port { get => port; set => Set(ref port, value); } + + private RequestSourceType requestSourceType = RequestSourceType.Specific; + public RequestSourceType RequestSourceType { get => requestSourceType; set => Set(ref requestSourceType, value); } + + private string requestSource = "https://pyronicampt.github.io"; + public string RequestSource { get => requestSource; set => Set(ref requestSource, value); } + + public void Draw() + { + GUILayout.BeginVertical(GUILayout.ExpandWidth(false)); + + GUILayout.Label("Listening Port:"); + Port = Int32.TryParse(GUILayout.TextField(Port.ToString()), out var port) ? port : Port; + + GUILayout.Label("Allow connections from websites hosted anywhere, or a specific website?"); + + UnityModManager.UI.ToggleGroup((int)RequestSourceType, Enum.GetNames(typeof(RequestSourceType)), i => RequestSourceType = (RequestSourceType)i); + + if (RequestSourceType == RequestSourceType.Specific) + { + GUILayout.Label("Website:"); + RequestSource = GUILayout.TextField(RequestSource); + } + + GUILayout.EndVertical(); + } + + public event PropertyChangedEventHandler PropertyChanged; + + // Todo: store and hold back property changes until Settings is saved to prevent rapidly reconfiguring server on each keypress? + // Not yet used anywhere, so could revert to using standard auto-properties + private void Set(ref T field, T value, [CallerMemberName] string propertyName = null) + { + if (!EqualityComparer.Default.Equals(field, value)) + { + field = value; + PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName)); + } + } + } +} diff --git a/CommunityMapLocation/Info.json b/CommunityMapLocation/Info.json new file mode 100644 index 0000000..517f69b --- /dev/null +++ b/CommunityMapLocation/Info.json @@ -0,0 +1,8 @@ +{ + "Id":"CommunityMapLocation", + "DisplayName":"Derail Valley Community Map Location", + "Author":"BenjaminGreene", + "Version":"0.0.1", + "ManagerVersion":"0.31.1.0", + "EntryMethod":"CommunityMapLocation.Main.Load" +} \ No newline at end of file diff --git a/CommunityMapLocation/Main.cs b/CommunityMapLocation/Main.cs new file mode 100644 index 0000000..4f29ee3 --- /dev/null +++ b/CommunityMapLocation/Main.cs @@ -0,0 +1,53 @@ +using CommunityMapLocation.Api; +using CommunityMapLocation.Config; +using UnityModManagerNet; + +namespace CommunityMapLocation +{ + [EnableReloading] + public static class Main + { + public static Settings Settings { get; private set; } + private static ApiServer apiServer; + + static bool Load(UnityModManager.ModEntry modEntry) + { + Settings = Settings.Load(modEntry); + + apiServer = new ApiServer(Settings, modEntry.Logger); + apiServer.AutoRegister(); + + modEntry.OnToggle = OnToggle; + modEntry.OnGUI = OnGUI; + modEntry.OnSaveGUI = OnSaveGUI; + + return true; + } + + public static bool OnToggle(UnityModManager.ModEntry modEntry, bool value) + { + if (value) + { + apiServer.Start(); + } + else + { + apiServer.Stop(); + } + + return true; + } + + static void OnGUI(UnityModManager.ModEntry modEntry) + { + Settings.Draw(); + } + + static void OnSaveGUI(UnityModManager.ModEntry modEntry) + { + Settings.Save(modEntry); + + apiServer.UpdateSettings(); + } + } +} diff --git a/CommunityMapLocation/Properties/AssemblyInfo.cs b/CommunityMapLocation/Properties/AssemblyInfo.cs new file mode 100644 index 0000000..d056248 --- /dev/null +++ b/CommunityMapLocation/Properties/AssemblyInfo.cs @@ -0,0 +1,33 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("CommunityMapLocation")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("CommunityMapLocation")] +[assembly: AssemblyCopyright("Copyright © 2025")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("0a8392e4-b2fa-4018-bd0c-dd6261f10699")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +[assembly: AssemblyVersion("1.0.0.0")] +[assembly: AssemblyFileVersion("1.0.0.0")] diff --git a/CommunityMapLocation/build_guide.md b/CommunityMapLocation/build_guide.md new file mode 100644 index 0000000..efc0f48 --- /dev/null +++ b/CommunityMapLocation/build_guide.md @@ -0,0 +1,29 @@ +Assuming Visual Studio Community: + +1. Add the following to the `lib` folder from `[steam common dir]/Derail Valley/DerailValley_Data/Managed`: +- `Assembly-CSharp.dll` +- `DV.OriginShiftInfo.dll` +- `UnityEngine.dll` +- `UnityEngine.IMGUIModule.dll` +- `UnityEngine.CoreModule.dll` +- `/UnityModManager/0Harmony.dll` +- `/UnityModManager/UnityModManager.dll` + +2. Build Solution +3. Copy the following files from `bin/Debug/` to `Derail Valley/Mods/CommunityMapLocation` +- `info.json` +- `CommunityMapLocation.dll` +- `Microsoft.Bcl.AsyncInterfaces.dll` +- `System.Buffers.dll` +- `System.IO.Pipelines.dll` +- `System.Memory.dll` +- `System.Numerics.Vectors.dll` +- `System.Runtime.CompilerServices.Unsafe.dll` +- `System.Text.Encodings.Web.dll` +- `System.Text.Json.dll` +- `System.Threading.Tasks.Extensions.dll` +- `System.ValueTuple.dll` + +4. Run game using [Unity Mod Manager](https://www.nexusmods.com/site/mods/21) + +Mod functions are all within the UMM settings screen. \ No newline at end of file diff --git a/CommunityMapLocation/lib/.gitkeep b/CommunityMapLocation/lib/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/config.js b/config.js index a0beadf..b0e6b85 100644 --- a/config.js +++ b/config.js @@ -91,4 +91,5 @@ export const spriteBounds = { service_repair: new SpriteBounds(20,120,20,20), service_diesel: new SpriteBounds(40,120,20,20), service_charger: new SpriteBounds(60,120,20,20), + player: new SpriteBounds(20,0,20,20), } \ No newline at end of file diff --git a/index.html b/index.html index 9f118d7..c2c4abe 100644 --- a/index.html +++ b/index.html @@ -15,7 +15,8 @@
- + +
diff --git a/index.js b/index.js index 820b0f5..700e1a1 100644 --- a/index.js +++ b/index.js @@ -10,9 +10,13 @@ import * as Legend from './legend.js'; const mapContainer = document.getElementById('mapContainer'); const mapCanvas = document.getElementById('mapCanvas'); +const dynCanvas = document.getElementById('dynCanvas'); /** The main map drawing context. * @type {CanvasRenderingContext2D} */ const mapctx = mapCanvas.getContext('2d'); +/** The dynamic map drawing context. + * @type {CanvasRenderingContext2D} */ +const dynctx = dynCanvas.getContext('2d'); const mapSprites = document.getElementById('mapSprites'); const mapTerrain = document.getElementById('mapTerrain'); const zoomLevelDisplay = document.getElementById('zoomLevelDisplay'); @@ -110,6 +114,9 @@ function mapNavigationSetup(){ if(ts && MapData.view.dirty){ redrawMap(); } + if(ts && MapData.view.dynDirty){ + redrawDynamics(); + } requestAnimationFrame(navUpdate); } @@ -297,10 +304,11 @@ function redrawMap(){ let spriteSize; let textMeasure; let tempMeasure = {}; + //Draw Static Markers for(const marker of MapData.markers){ curSprite = null; marker.visible = false; - if((marker.minZoom && MapData.view.scale < marker.minZoom) || (marker.maxZoom && MapData.view.scale > marker.maxZoom)) continue; + if(marker.hidden || (marker.minZoom && MapData.view.scale < marker.minZoom) || (marker.maxZoom && MapData.view.scale > marker.maxZoom)) continue; let markerX = MapData.view.convertX(marker.position.x); let markerY = MapData.view.convertY(marker.position.z); if(markerX > mapCanvas.width + Config.viewCullMargin || markerX < -Config.viewCullMargin || markerY > mapCanvas.height + Config.viewCullMargin || markerY < -Config.viewCullMargin) continue; // View Culling @@ -475,5 +483,103 @@ function redrawMap(){ ); } } + MapData.view.dirty = false; + + redrawDynamics(); +} + +function redrawDynamics(){ + dynCanvas.width = mapCanvas.width; + dynCanvas.height = mapCanvas.height; + let curSprite; + let spriteSize; + for(const marker of MapData.dynamicMarkers){ + curSprite = null; + marker.visible = false; + if(marker.hidden || (marker.minZoom && MapData.view.scale < marker.minZoom) || (marker.maxZoom && MapData.view.scale > marker.maxZoom)) continue; + let markerX = MapData.view.convertX(marker.position.x); + let markerY = MapData.view.convertY(marker.position.z); + if(markerX > mapCanvas.width + Config.viewCullMargin || markerX < -Config.viewCullMargin || markerY > mapCanvas.height + Config.viewCullMargin || markerY < -Config.viewCullMargin) continue; // View Culling + switch(marker.type){ + case 'player': + if(!(MapData.layers.poi)) break; + marker.visible = true; + curSprite = Config.spriteBounds.player; + spriteSize = 45; + + dynctx.translate(markerX, markerY); + dynctx.rotate(marker.rotation); + dynctx.translate(-0.5 * spriteSize * MapData.view.pixelRatio, -0.5 * spriteSize * MapData.view.pixelRatio); + dynctx.drawImage( + mapSprites, + curSprite.x, + curSprite.y, + curSprite.width, + curSprite.height, + 0, + 0, + spriteSize * MapData.view.pixelRatio, + spriteSize * MapData.view.pixelRatio + ); + dynctx.resetTransform(); + curSprite = null; + break; + case 'car': + if(!(MapData.layers.poi)) break; + let scale = MapData.view.pixelRatio * MapData.view.scale; + let limitScaleRatio = (MapData.view.pixelRatio * Math.max(MapData.view.scale, 3)) / scale; + let width = marker.width * scale; + let length = marker.length * scale; + + marker.visible = true; + dynctx.beginPath(); + dynctx.translate(markerX, markerY); + dynctx.rotate(marker.rotation); + dynctx.translate(-0.5 * width, -0.5 * length); + dynctx.rect(0, 0, width, length); + dynctx.moveTo(0, width); + dynctx.lineTo(0.5 * width, 0); + dynctx.lineTo(width, width); + dynctx.moveTo(0.5 * width, 0); + dynctx.arc(0.5 * width, 0.5 * length, 15, -0.5*Math.PI, 1.5*Math.PI); + dynctx.resetTransform(); + dynctx.strokeStyle = '#fff'; + dynctx.lineWidth = 0.75 * scale * limitScaleRatio; + dynctx.miterLimit = 1.5; + dynctx.stroke(); + + dynctx.fillStyle = marker.isLoco ? '#e79830aa' : '#559bd4aa'; + dynctx.fill(); + dynctx.strokeStyle = '#000'; + dynctx.lineWidth = 0.3 * scale * limitScaleRatio; + dynctx.stroke(); + if(!marker.tooltipHitzone){ + marker.tooltipHitzone = { + radius: 15, + }; + } + break; + default: + if(!MapData.layers.poi) break; + marker.visible = true; + curSprite = Config.spriteBounds.unknown; + spriteSize = 30; + break; + } + if(curSprite != null){ + dynctx.drawImage( + mapSprites, + curSprite.x, + curSprite.y, + curSprite.width, + curSprite.height, + markerX-(0.5*spriteSize)*MapData.view.pixelRatio, + markerY-(0.5*spriteSize)*MapData.view.pixelRatio, + spriteSize*MapData.view.pixelRatio, + spriteSize*MapData.view.pixelRatio + ); + } + } + MapData.view.dynDirty = false; } \ No newline at end of file diff --git a/js/mapdata.js b/js/mapdata.js index 8452f58..b77dc8e 100644 --- a/js/mapdata.js +++ b/js/mapdata.js @@ -8,6 +8,7 @@ import * as Config from './../config.js'; export let railTracks = []; export let markers = []; +export let dynamicMarkers = []; let visibleMarkers = []; @@ -15,6 +16,16 @@ let uniqueTrackNames = {}; export let testPoint = {x:0,y:0}; +let locationData = null; +export let playerMarker = { + type: 'player', + position: {x:8192, y:200, z:8192}, + rotation: 0.0, + minZoom: 0.0, + hidden: true, +}; +let locationUpdateRate = 500; + export let Shops = { Common:[] } @@ -59,6 +70,7 @@ export let view = { view.y = -(mapContainer.clientHeight*0.5 - (matrix.height * 0.5 + matrix.minY)*view.scale); } view.dirty = false; + view.dynDirty = false; view.convertX = x => { return x * view.scale * view.pixelRatio + view.x * view.pixelRatio; @@ -92,7 +104,13 @@ export function sortTracks(){ } export function sortMarkers(){ - markers.sort((a,b) => { + markers.sort(markerSortFunction); +} + +function markerSortFunction(a, b){ + (a,b) => { + if(a.type == 'player') return 1; + if(b.type == 'player') return -1; if(a.type == b.type){ switch(a.type){ case 'speed': @@ -113,7 +131,7 @@ export function sortMarkers(){ if(a.type == 'demonstratorSpawnHint') return -1; if(b.type == 'demonstratorSpawnHint') return 1; return 0; - }); + } } export function sortShops(){ @@ -498,6 +516,32 @@ export function testTooltip(cursorX, cursorY){ let radius = 0; let width = 0; let height = 0; + for(const marker of dynamicMarkers){ + if(!marker.visible) continue; + if(marker.boundsCheck != null){ + if(marker.boundsCheck(cursorX, cursorY)) + finalTooltip = marker.tooltip ?? finalTooltip; + }else if(marker.tooltipHitzone && marker.tooltipHitzone.width && marker.tooltipHitzone.height){ + width = marker.tooltipHitzone.width * 0.5/view.scale; + height = marker.tooltipHitzone.height * 0.5/view.scale; + if( marker.position.x - cursorX + (marker.tooltipHitzone.offsetX ?? 0)/view.scale <= width + && marker.position.x - cursorX + (marker.tooltipHitzone.offsetX ?? 0)/view.scale >= -width + && marker.position.z - cursorY + (marker.tooltipHitzone.offsetY ?? 0)/view.scale <= height + && marker.position.z - cursorY + (marker.tooltipHitzone.offsetY ?? 0)/view.scale >= -height){ + finalTooltip = marker.tooltip ?? finalTooltip; + } + }else{ + if(marker.tooltipHitzone) + radius = (marker.tooltipHitzone.radius ?? Config.tooltipHitzone.default.radius) / view.scale; + else + radius = Config.tooltipHitzone.default.radius / view.scale; + if(Math.pow(marker.position.x - cursorX, 2) + Math.pow(marker.position.z - cursorY, 2) <= radius * radius){ + finalTooltip = marker.tooltip ?? finalTooltip; + } + } + } + if(finalTooltip != '') return finalTooltip; + for(const marker of markers){ if(!marker.visible) continue; if(marker.boundsCheck != null){ @@ -634,4 +678,83 @@ export function setTrackColorMode(mode){ } } view.dirty = true; +} + +export function setLocationUpdateRate(rate){ + locationUpdateRate = rate; +} + +export function connectPlayerLocation(address, status){ + if(!address.startsWith('http://')){ + address.replaceAll(/.*:\/\//g, ''); + address = 'http://' + address; + } + address += '/location'; + console.log(`Connecting to game at ${address}`); + let started = false; + const endConnect = () => { + locationData = null; + status.value = 'Connect'; + playerMarker.hidden = true; + view.dynDirty = true; + } + const pingLocation = async () => { + if(locationData == null && started){ + endConnect(); + return; + } + status.value = 'Disconnect...'; + try { + const fetchRequest = await fetch(new Request(address), {signal: AbortSignal.timeout(5000)}); + if(!fetchRequest.ok || (locationData == null && started)){ + endConnect(); + return; + } + status.value = 'Disconnect '; + locationData = await (fetchRequest).json(); + playerMarker.position = { + x: locationData.x, + y: locationData.y, + z: locationData.z, + }; + playerMarker.rotation = locationData.rotation; + playerMarker.tooltip = `

Player

X: ${playerMarker.position.x.toFixed(2)}\nY: ${playerMarker.position.y.toFixed(2)}\nZ: ${playerMarker.position.z.toFixed(2)}\nBearing ${(playerMarker.rotation * (180/Math.PI)).toFixed(1)} (${Utils.angleToCardinalDirection(playerMarker.rotation)})`; + playerMarker.hidden = false; + + dynamicMarkers = []; + if(!locationData.cars) locationData.cars = []; + for(let car of locationData.cars){ + car.name = car.name.replaceAll('(Clone)', '').replaceAll('_',' ').replaceAll(/(Car|Loco)/g, ''); + dynamicMarkers.push({ + type: 'car', + name: 'car.id', + position: { + x: car.x, + y: car.y, + z: car.z + }, + length: car.length, + width: 2.0, + rotation: car.rotation, + guid: car.carGuid, + isLoco: car.isLoco, + tooltip: `

${car.id}

Type: ${car.name}\nLength: ${car.length.toFixed(1)}m`, + }); + } + dynamicMarkers.push(playerMarker); + + started = true; + view.dynDirty = true; + setTimeout(pingLocation, locationUpdateRate); + }catch(e){ + endConnect(); + console.log(e); + } + } + pingLocation(); +} + +export function disconnectPlayerLocation(){ + console.log('Disconnecting'); + locationData = null; } \ No newline at end of file diff --git a/legend.js b/legend.js index 93d4fe8..c7a656c 100644 --- a/legend.js +++ b/legend.js @@ -162,6 +162,51 @@ let settingEntries = [ } } } + }, + { + label: '
Community Map Location Mod
', + id: 'header_cmlm', + }, + { + label: 'Location Host', + id: 'field_locationHost', + state: 'localhost:9090', + button: 'Wait', + func: state =>{ + let button = document.getElementById('field_locationHost').nextSibling; + if(button.value.startsWith('Connect')){ + MapData.connectPlayerLocation(state, button); + }else if(button.value.startsWith('Disconnect')){ + button.value = 'Disconnect'; + MapData.disconnectPlayerLocation(); + }else if(!button.value.startsWith('Fetch')){ + button.value = 'Connect'; + MapData.disconnectPlayerLocation(); + }else{ + MapData.disconnectPlayerLocation(); + } + } + }, + { + label: 'Location Update Rate (seconds)', + id: 'dropdown_locationFrequency', + tooltip: 'Lower update intervals may cause poor performance', + state: '0.2', + options: [ + '0.05', + '0.1', + '0.2', + '0.25', + '0.5', + '1', + '2', + '5', + '10', + '30', + ], + func: state =>{ + MapData.setLocationUpdateRate(Number(state) * 1000); + } } ]; @@ -194,8 +239,8 @@ function addSettingEntry(thisSetting, parent, indent=0){ thisSetting.labelElement = document.createElement('label'); thisSetting.divContainer.appendChild(thisSetting.labelElement); - let settingType = thisSetting.id.split('_')[0]; - switch(settingType){ + thisSetting.settingType = thisSetting.id.split('_')[0]; + switch(thisSetting.settingType){ case 'toggle': thisSetting.inputElement = document.createElement('input'); thisSetting.inputElement.type = 'checkbox'; @@ -244,6 +289,23 @@ function addSettingEntry(thisSetting, parent, indent=0){ }); } break; + case 'field': + thisSetting.inputElement = document.createElement('input'); + thisSetting.inputElement.type = 'text'; + thisSetting.inputElement.value = thisSetting.state; + if(thisSetting.button){ + thisSetting.buttonElement = document.createElement('input'); + thisSetting.buttonElement.type = 'button'; + thisSetting.buttonElement.value = thisSetting.button; + if(thisSetting.func){ + thisSetting.buttonElement.addEventListener('click', e => { + thisSetting.func(thisSetting.inputElement.value); + }); + } + } + break; + case 'header': + break; default: thisSetting.divContainer.remove(); return; @@ -251,10 +313,18 @@ function addSettingEntry(thisSetting, parent, indent=0){ parent.appendChild(thisSetting.divContainer); thisSetting.labelElement.innerHTML = thisSetting.label; thisSetting.labelElement.htmlFor = thisSetting.id; - thisSetting.inputElement.id = thisSetting.id; + if(thisSetting.tooltip) thisSetting.labelElement.title = thisSetting.tooltip; - thisSetting.inputElement.style.margin = `0 0.5em 0 ${indent}em`; - thisSetting.divContainer.prepend(thisSetting.inputElement); + if(thisSetting.settingType == 'field'){ + thisSetting.buttonElement.style.margin = `0 0.5em 0 ${indent}em`; + thisSetting.buttonElement.style.padding = `0 0.2em`; + thisSetting.divContainer.prepend(thisSetting.buttonElement); + } + if(thisSetting.inputElement){ + thisSetting.inputElement.id = thisSetting.id; + thisSetting.inputElement.style.margin = `0 0.5em 0 ${indent}em`; + thisSetting.divContainer.prepend(thisSetting.inputElement); + } if(thisSetting.func){ thisSetting.func(thisSetting.state); @@ -304,10 +374,11 @@ function populateKey(){ addKeyEntry('landmark', 'Landmark'); addKeyEntry('garage', 'Garage'); addKeyEntry('demonstrator', 'Demonstrator Spawn'); + addKeyEntry('player', 'Player'); //Add empty entries to make entries align right in the columns. - for(let i=0; i<3; i++){ + /*for(let i=0; i<1; i++){ addKeyEntry(); - } + }*/ } /** diff --git a/mapSprites.svg b/mapSprites.svg index ee1012c..ee3b8d4 100644 --- a/mapSprites.svg +++ b/mapSprites.svg @@ -12,7 +12,8 @@ xmlns="http://www.w3.org/2000/svg" xmlns:svg="http://www.w3.org/2000/svg"> + d="m 115.6875,105.5 -0.125,2.5625 -2.5625,0.0625 -0.875,1.1875 0.875,-0.0625 -2.07583,2.73928 0.45267,-2.13259 -1.08081,0.0183 0.37814,-1.37814 -3.61167,0.19064 L 107,106.5 l 0.4375,0.0625 0.125,-0.9375 -5.25,0.375 0.8125,6.5625 12.6875,-0.4375 -0.125,1.5625 h 2.125 L 117.25,111.5 l 0.4375,-3.5625 h -0.875 l 0.25,-2.25 z m -9.48828,1.14062 0.0879,2.1211 -2.29883,0.13281 -0.4414,-1.94531 z m 8.17578,5.98438 c -0.51777,0 -0.9375,0.4757 -0.9375,1.0625 0,0.5868 0.41973,1.0625 0.9375,1.0625 0.51777,0 0.9375,-0.4757 0.9375,-1.0625 0,-0.5868 -0.41973,-1.0625 -0.9375,-1.0625 z m -2.125,0.0625 c -0.5868,0 -1.0625,0.51767 -1.0625,1.15625 0,0.63858 0.4757,1.15625 1.0625,1.15625 0.5868,0 1.0625,-0.51767 1.0625,-1.15625 0,-0.63858 -0.4757,-1.15625 -1.0625,-1.15625 z m -2.65625,0.125 c -0.63858,0 -1.15625,0.51767 -1.15625,1.15625 0,0.63858 0.51767,1.15625 1.15625,1.15625 0.63858,0 1.15625,-0.51767 1.15625,-1.15625 0,-0.63858 -0.51767,-1.15625 -1.15625,-1.15625 z m -2.625,0.25 c -0.63858,0 -1.15625,0.48969 -1.15625,1.09375 0,0.60406 0.51767,1.09375 1.15625,1.09375 0.63858,0 1.15625,-0.48969 1.15625,-1.09375 0,-0.60406 -0.51767,-1.09375 -1.15625,-1.09375 z m 9.125,0.75 c -0.25888,0 -0.46875,0.22386 -0.46875,0.5 0,0.27614 0.20987,0.5 0.46875,0.5 0.25888,0 0.46875,-0.22386 0.46875,-0.5 0,-0.27614 -0.20987,-0.5 -0.46875,-0.5 z m -11.9375,0.5 c -0.25888,0 -0.46875,0.22386 -0.46875,0.5 0,0.27614 0.20987,0.5 0.46875,0.5 0.25888,0 0.46875,-0.22386 0.46875,-0.5 0,-0.27614 -0.20987,-0.5 -0.46875,-0.5 z" /> diff --git a/style.css b/style.css index d765e83..4858a56 100644 --- a/style.css +++ b/style.css @@ -122,9 +122,12 @@ a:visited{ #settingsPanel{ user-select: none; - input, label{ + input:not([type=text]), label{ cursor: pointer; } + input[type=text], div{ + cursor:unset; + } } #stats{ @@ -161,6 +164,12 @@ a:visited{ background: linear-gradient(#444, #333); } +#mapCanvas, #dynCanvas{ + position: fixed; + width:100%; + height:100%; +} + .colorKey, .gradientKey{ border:1px #858585 solid; border-radius: 4px;