diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..34c8dee --- /dev/null +++ b/.gitignore @@ -0,0 +1,388 @@ +## 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/master/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 +*.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 + +# Nuget personal access tokens and Credentials +nuget.config + +# 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 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/ + +# 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 +.idea/ +*.sln.iml diff --git a/BBQLib.cs b/BBQLib.cs index c9720d4..8bb5f96 100644 --- a/BBQLib.cs +++ b/BBQLib.cs @@ -6,7 +6,8 @@ namespace BBQLib { public static class BBQLib { - private static WindowImplementation window; + internal static WindowImplementation window; + public static string rootDirectory = ""; public static void Init(WindowConfig config, BackendType type = BackendType.SFML) { switch (type) @@ -28,18 +29,12 @@ public static float DeltaTime } public static Sprite RegisterSprite(string filename) { - Sprite sprite = Json.Deserialize(filename); - sprite.json = filename; - window.RegisterSprite(sprite, filename); - return sprite; + return window.CreateSprite(filename); } - public static Font RegisterFont(string filename) + public static void LoadFonts(string filename) { - Font font = Json.Deserialize(filename); - font.jsonFilename = filename; - window.RegisterFont(font); - return font; + window.LoadFonts(filename); } public static void Clear() @@ -52,13 +47,22 @@ public static void Dispose() } + public static Vector2 Camera = new Vector2(); + + public static Vector2 Size + { + get + { + return window.Size; + } + } public static void Draw(Sprite sprite) { window.Draw(sprite); } - public static void Draw(Font font, string text, Vector2 position) + public static void Draw(string font, string text, Vector2 position) { window.Draw(font, text, position); } diff --git a/BoundingBox.cs b/BoundingBox.cs new file mode 100644 index 0000000..e02adc7 --- /dev/null +++ b/BoundingBox.cs @@ -0,0 +1,93 @@ +using System.Numerics; +namespace BBQLib +{ + public class BoundingBox + { + public Vector2 min = new Vector2(); + + + + public Vector2 size = new Vector2(); + + public Vector2 origin; + + public Vector2 max + { + get + { + return min + (size); + } + } + + public Vector2 topRight + { + get + { + return new Vector2(min.X + size.X, min.Y); + } + } + + public Vector2 bottomCenter + { + get + { + return new Vector2(size.X / 2, size.Y); + } + } + + public Vector2 topCenter + { + get + { + return new Vector2(size.X / 2, 0); + } + } + + public static BoundingBox Create(Vector2 size) + { + return new BoundingBox(size); + } + + public void SetOrigin(OriginType type) + { + switch (type) + { + case OriginType.topLeft: + origin = new Vector2(); + break; + case OriginType.topCenter: + origin = topCenter; + break; + case OriginType.topRight: + origin = topRight; + break; + case OriginType.centerLeft: + break; + case OriginType.centerCenter: + break; + case OriginType.centerRight: + break; + case OriginType.bottomLeft: + break; + case OriginType.bottomCenter: + origin = bottomCenter; + break; + case OriginType.bottomRight: + break; + } + } + + public static bool AABB(BoundingBox A, BoundingBox B) + { + return A.min.X <= B.max.X && + A.max.X >= B.min.X && + A.min.Y <= B.max.Y && + A.max.Y >= B.min.Y; + } + + public BoundingBox(Vector2 size) + { + this.size = size; + } + } +} \ No newline at end of file diff --git a/Font.cs b/Font.cs index 71caa0b..fc43bfd 100644 --- a/Font.cs +++ b/Font.cs @@ -5,6 +5,7 @@ public class Font { [JsonIgnore] public string jsonFilename = ""; + public string name = ""; public string ttf = ""; public uint size = 24; } diff --git a/IDrawableSurface.cs b/IDrawableSurface.cs index eb40b90..b866cf4 100644 --- a/IDrawableSurface.cs +++ b/IDrawableSurface.cs @@ -3,7 +3,6 @@ namespace BBQLib { public interface IDrawableSurface { - void Draw(Sprite sprite); void Clear(); void Present(); Vector2 Size{get;} diff --git a/Input.cs b/Input.cs new file mode 100644 index 0000000..9eed975 --- /dev/null +++ b/Input.cs @@ -0,0 +1,43 @@ +using System.Collections.Generic; +using System; +namespace BBQLib +{ + public static class Input + { + static Dictionary axes = new Dictionary(); + + + public static bool IsKeyDown(KeyboardKey key) + { + return BBQLib.window.IsKeyDown(key); + } + + public static void LoadAxisFile(string filename) + { + axes = Json.Deserialize>(filename); + } + + public static void ProcessInputs() + { + foreach(var axis in axes.Values) + { + axis.currentValue = 0; + if(IsKeyDown(axis.up)) + { + axis.currentValue = 1; + } + if(IsKeyDown(axis.down)) + { + axis.currentValue = -1; + } + + } + } + + public static float GetAxis(string name) + { + return axes[name].currentValue; + } + + } +} \ No newline at end of file diff --git a/InputAxis.cs b/InputAxis.cs new file mode 100644 index 0000000..9b8f326 --- /dev/null +++ b/InputAxis.cs @@ -0,0 +1,11 @@ +using Newtonsoft.Json; +namespace BBQLib +{ + public class InputAxis + { + + public KeyboardKey up, down; + [JsonIgnore] + public float currentValue; + } +} diff --git a/Json.cs b/Json.cs index bab46fb..45e96a2 100644 --- a/Json.cs +++ b/Json.cs @@ -13,16 +13,16 @@ public static class Json public static void Serialize(object o, string filename) { - File.WriteAllText(filename, JsonConvert.SerializeObject(o, settings)); + File.WriteAllText(BBQLib.rootDirectory + filename, JsonConvert.SerializeObject(o, settings)); } public static T Deserialize(string filename) { - if(!File.Exists(filename)) + if(!File.Exists(BBQLib.rootDirectory + filename)) { Serialize(Activator.CreateInstance(), filename); } - return JsonConvert.DeserializeObject(File.ReadAllText(filename), settings); + return JsonConvert.DeserializeObject(File.ReadAllText(BBQLib.rootDirectory + filename), settings); } } } \ No newline at end of file diff --git a/KeyboardKey.cs b/KeyboardKey.cs new file mode 100644 index 0000000..1f15ef8 --- /dev/null +++ b/KeyboardKey.cs @@ -0,0 +1,110 @@ +namespace BBQLib +{ + public enum KeyboardKey + { + Unknown = -1, //!< Unhandled key + A = 0, //!< The A key + B, //!< The B key + C, //!< The C key + D, //!< The D key + E, //!< The E key + F, //!< The F key + G, //!< The G key + H, //!< The H key + I, //!< The I key + J, //!< The J key + K, //!< The K key + L, //!< The L key + M, //!< The M key + N, //!< The N key + O, //!< The O key + P, //!< The P key + Q, //!< The Q key + R, //!< The R key + S, //!< The S key + T, //!< The T key + U, //!< The U key + V, //!< The V key + W, //!< The W key + X, //!< The X key + Y, //!< The Y key + Z, //!< The Z key + Num0, //!< The 0 key + Num1, //!< The 1 key + Num2, //!< The 2 key + Num3, //!< The 3 key + Num4, //!< The 4 key + Num5, //!< The 5 key + Num6, //!< The 6 key + Num7, //!< The 7 key + Num8, //!< The 8 key + Num9, //!< The 9 key + Escape, //!< The Escape key + LControl, //!< The left Control key + LShift, //!< The left Shift key + LAlt, //!< The left Alt key + LSystem, //!< The left OS specific key: window (Windows and Linux), apple (MacOS X), ... + RControl, //!< The right Control key + RShift, //!< The right Shift key + RAlt, //!< The right Alt key + RSystem, //!< The right OS specific key: window (Windows and Linux), apple (MacOS X), ... + Menu, //!< The Menu key + LBracket, //!< The [ key + RBracket, //!< The ] key + Semicolon, //!< The ; key + Comma, //!< The , key + Period, //!< The . key + Quote, //!< The ' key + Slash, //!< The / key + Backslash, //!< The \ key + Tilde, //!< The ~ key + Equal, //!< The = key + Hyphen, //!< The - key (hyphen) + Space, //!< The Space key + Enter, //!< The Enter/Return keys + Backspace, //!< The Backspace key + Tab, //!< The Tabulation key + PageUp, //!< The Page up key + PageDown, //!< The Page down key + End, //!< The End key + Home, //!< The Home key + Insert, //!< The Insert key + Delete, //!< The Delete key + Add, //!< The + key + Subtract, //!< The - key (minus, usually from numpad) + Multiply, //!< The * key + Divide, //!< The / key + Left, //!< Left arrow + Right, //!< Right arrow + Up, //!< Up arrow + Down, //!< Down arrow + Numpad0, //!< The numpad 0 key + Numpad1, //!< The numpad 1 key + Numpad2, //!< The numpad 2 key + Numpad3, //!< The numpad 3 key + Numpad4, //!< The numpad 4 key + Numpad5, //!< The numpad 5 key + Numpad6, //!< The numpad 6 key + Numpad7, //!< The numpad 7 key + Numpad8, //!< The numpad 8 key + Numpad9, //!< The numpad 9 key + F1, //!< The F1 key + F2, //!< The F2 key + F3, //!< The F3 key + F4, //!< The F4 key + F5, //!< The F5 key + F6, //!< The F6 key + F7, //!< The F7 key + F8, //!< The F8 key + F9, //!< The F9 key + F10, //!< The F10 key + F11, //!< The F11 key + F12, //!< The F12 key + F13, //!< The F13 key + F14, //!< The F14 key + F15, //!< The F15 key + Pause, //!< The Pause key + + KeyCount, //!< Keep last -- the total number of keyboard keys + } +} \ No newline at end of file diff --git a/OriginType.cs b/OriginType.cs new file mode 100644 index 0000000..df58e0f --- /dev/null +++ b/OriginType.cs @@ -0,0 +1,15 @@ +namespace BBQLib +{ + public enum OriginType + { + topLeft, + topCenter, + topRight, + centerLeft, + centerCenter, + centerRight, + bottomLeft, + bottomCenter, + bottomRight + } +} \ No newline at end of file diff --git a/Program.cs b/Program.cs index 9349ade..97cd40f 100644 --- a/Program.cs +++ b/Program.cs @@ -1,5 +1,5 @@ -using System; - +using System.Numerics; +using System; namespace BBQLib { class Program @@ -15,17 +15,22 @@ static void Main(string[] args) }; - BBQLib.Init(config, BackendType.SDL); + BBQLib.Init(config, BackendType.SFML); Sprite sprite = BBQLib.RegisterSprite("testsprite.json"); - Font font = BBQLib.RegisterFont("font.json"); - + sprite.position = new Vector2(); + + // BBQLib.RegisterFont("font.json"); + Input.LoadAxisFile("axes.json"); while(BBQLib.IsOpen) { BBQLib.Clear(); + + Vector2 input = new Vector2(Input.GetAxis("horizontal"), -Input.GetAxis("vertical")); + sprite.position += input * BBQLib.DeltaTime * 90; BBQLib.Draw(sprite); - BBQLib.Draw(font, string.Format("FPS:{0}", (int)(1f / BBQLib.DeltaTime)), new System.Numerics.Vector2()); - sprite.rotation += 180 * BBQLib.DeltaTime; + + BBQLib.Draw("semen", string.Format("FPS:{0}", (int)(1f / BBQLib.DeltaTime)), new Vector2()); BBQLib.Display(); } } diff --git a/README.md b/README.md index a97427e..c29e7cc 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,8 @@ cross-platform game library (Bring Your Own Engine) * easily create new backends * easy to understand and great for beginners +## used in + * [Snowball Engine](https://github.com/Sn0wball-Studios/Snowball-Engine) ## purpose of this project I like making game engines but I hate that diff --git a/Sound.cs b/Sound.cs new file mode 100644 index 0000000..7e7e743 --- /dev/null +++ b/Sound.cs @@ -0,0 +1,7 @@ +namespace BBQLib +{ + public static class Sound + { + + } +} \ No newline at end of file diff --git a/Sprite.cs b/Sprite.cs index 15a54ed..9f553f3 100644 --- a/Sprite.cs +++ b/Sprite.cs @@ -11,12 +11,28 @@ public sealed class Sprite public int layer = 0; public bool drawn = false; public bool repeat = false; - public string name = ""; + public string textureFile = ""; [JsonIgnore] public string json; [JsonIgnore] public Vector2 size = new Vector2(); + + [JsonIgnore] + public BoundingBox bounds + { + get + { + return GetBounds(); + } + } + + public BoundingBox GetBounds() + { + BoundingBox output = new BoundingBox(new Vector2(size.X, size.Y) * 1.5f); + output.min = position - (size / 1.5f); + return output; + } } } \ No newline at end of file diff --git a/WindowImplementation.cs b/WindowImplementation.cs index 192a13e..61dead6 100644 --- a/WindowImplementation.cs +++ b/WindowImplementation.cs @@ -7,12 +7,12 @@ public abstract class WindowImplementation : IDrawableSurface, IDisposable { public abstract void Clear(); public abstract void Draw(Sprite sprite); - public abstract void Draw(Font font, string text, Vector2 position); + public abstract void Draw(string font, string text, Vector2 position); public abstract void Present(); - public abstract void RegisterSprite(Sprite sprite, string name); - public abstract void RegisterFont(Font font); + public abstract Sprite CreateSprite(string filename); + public abstract void LoadFonts(string filename); public abstract void Dispose(); - + public abstract bool IsKeyDown(KeyboardKey key); protected abstract void DrawSpriteInternal(Sprite sprite); protected readonly List usedLayers = new List(); diff --git a/alagard.ttf b/alagard.ttf deleted file mode 100644 index c7ed1d9..0000000 Binary files a/alagard.ttf and /dev/null differ diff --git a/backends/SDLWindow.cs b/backends/SDLWindow.cs index 3a4153a..1374488 100644 --- a/backends/SDLWindow.cs +++ b/backends/SDLWindow.cs @@ -1,6 +1,7 @@ using System; using System.Numerics; using System.Collections.Generic; +using System.Runtime.InteropServices; using static SDL2.SDL; using static SDL2.SDL_image; using static SDL2.SDL_ttf; @@ -19,7 +20,15 @@ public override float DeltaTime } float deltaTime; - public override Vector2 Size => throw new System.NotImplementedException(); + public override Vector2 Size + { + get + { + return winSize; + } + } + private Vector2 winSize = new Vector2(); + private bool open = true; public override bool IsOpen @@ -34,20 +43,40 @@ public override bool IsOpen private IntPtr renderer; public SDLWindow(WindowConfig config) { - Console.WriteLine("starting SDL2... {0}", SDL_Init(SDL_INIT_EVERYTHING) > -1); - Console.WriteLine("starting SDL2 TTF... {0}", TTF_Init() > -1); - Console.WriteLine("starting SDL2 Image... {0}", IMG_Init(IMG_InitFlags.IMG_INIT_PNG) > -1); + Console.WriteLine("checking if SDL2 is working... {0}", SDL_Init(SDL_INIT_EVERYTHING) > -1); + Console.WriteLine("checking if SDL2 TTF is working... {0}", TTF_Init() > -1); + Console.WriteLine("checking if SDL2 Image is working... {0}", IMG_Init(IMG_InitFlags.IMG_INIT_PNG) > -1); window = SDL_CreateWindow(config.name, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED,(int)config.width, (int)config.height, SDL_WindowFlags.SDL_WINDOW_RESIZABLE); renderer = SDL_CreateRenderer(window, -1, SDL_RendererFlags.SDL_RENDERER_ACCELERATED); Console.WriteLine("setting logical render size... {0}", SDL_RenderSetLogicalSize(renderer, (int)config.width, (int)config.height) > -1); + Console.WriteLine("mapping SDL2 keys...."); + + winSize = new Vector2(config.width, config.height); + MapSDLKeys(); } + public + uint tickCount; SDL_Event sdlEvent; + public override bool IsKeyDown(KeyboardKey key) + { + return keyState[(int)sdlKeys[key]] > 0; + } + + byte[] keyState; + void PollEvents() { + int keyCount = 0; + IntPtr keys = SDL_GetKeyboardState(out keyCount); + keyState = new byte[keyCount]; + + Marshal.Copy(keys, keyState, 0, keyCount); + Input.ProcessInputs(); + while(SDL_PollEvent(out sdlEvent) > 0){ switch (sdlEvent.type) { @@ -58,8 +87,35 @@ void PollEvents() } } + Dictionary sdlKeys = new Dictionary(); + + void MapSDLKeys() + { + sdlKeys.Add(KeyboardKey.Q, SDL_Scancode.SDL_SCANCODE_Q); + sdlKeys.Add(KeyboardKey.W, SDL_Scancode.SDL_SCANCODE_W); + sdlKeys.Add(KeyboardKey.E, SDL_Scancode.SDL_SCANCODE_E); + sdlKeys.Add(KeyboardKey.R, SDL_Scancode.SDL_SCANCODE_R); + sdlKeys.Add(KeyboardKey.T, SDL_Scancode.SDL_SCANCODE_T); + sdlKeys.Add(KeyboardKey.Y, SDL_Scancode.SDL_SCANCODE_Y); + sdlKeys.Add(KeyboardKey.U, SDL_Scancode.SDL_SCANCODE_U); + sdlKeys.Add(KeyboardKey.I, SDL_Scancode.SDL_SCANCODE_I); + sdlKeys.Add(KeyboardKey.O, SDL_Scancode.SDL_SCANCODE_O); + sdlKeys.Add(KeyboardKey.P, SDL_Scancode.SDL_SCANCODE_P); + sdlKeys.Add(KeyboardKey.A, SDL_Scancode.SDL_SCANCODE_A); + sdlKeys.Add(KeyboardKey.S, SDL_Scancode.SDL_SCANCODE_S); + sdlKeys.Add(KeyboardKey.D, SDL_Scancode.SDL_SCANCODE_D); + + + + sdlKeys.Add(KeyboardKey.Up, SDL_Scancode.SDL_SCANCODE_UP); + sdlKeys.Add(KeyboardKey.Down, SDL_Scancode.SDL_SCANCODE_DOWN); + sdlKeys.Add(KeyboardKey.Left, SDL_Scancode.SDL_SCANCODE_LEFT); + + } + public override void Clear() { + sprites.Clear(); PollEvents(); deltaTime = (SDL_GetTicks() - tickCount) / 1000.0f; tickCount = SDL_GetTicks(); @@ -68,22 +124,34 @@ public override void Clear() } static Dictionary textures = new Dictionary(); - static Dictionary fonts = new Dictionary(); + static Dictionary sdlFonts = new Dictionary(); - public override void RegisterFont(Font font) + public override void LoadFonts(string filename) { - var sdlFont = TTF_OpenFont(font.ttf, (int)font.size); - fonts.Add(font.jsonFilename, sdlFont); + var fonts = Json.Deserialize>(filename); + foreach(var font in fonts) + { + var sdlFont = TTF_OpenFont(BBQLib.rootDirectory + font.Value.ttf, (int)font.Value.size); + sdlFonts.Add(font.Key, sdlFont); + } } - public override void RegisterSprite(Sprite sprite, string name) + public override Sprite CreateSprite(string filename) { - IntPtr texture = IMG_LoadTexture(renderer, sprite.name); + var sprite = Json.Deserialize(filename); + sprite.json = filename; + IntPtr texture; + if(!textures.ContainsKey(filename)) + { + texture = IMG_LoadTexture(renderer, BBQLib.rootDirectory + sprite.textureFile); + textures.Add(filename, texture); + } + texture = textures[filename]; int w, h, asdf; uint asdfasdf; SDL_QueryTexture(texture, out asdfasdf, out asdf, out w, out h); sprite.size = new Vector2(w, h); - textures.Add(name, texture); + return sprite; } public override void Present() @@ -102,7 +170,7 @@ public override void Draw(Sprite sprite) protected override void DrawSpriteInternal(Sprite sprite) { IntPtr texture = textures[sprite.json]; - DrawSDLTexture(sprite.position, texture, sprite.scale, sprite.rotation, sprite.origin); + DrawSDLTexture(sprite.position - BBQLib.Camera + BBQLib.Size/2, texture, sprite.scale, sprite.rotation, sprite.origin); } @@ -124,24 +192,24 @@ void DrawSDLTexture(Vector2 position, IntPtr texture, Vector2 scale, float rotat x = (int)origin.X, y = (int)origin.Y }; - - - //SDL_RenderCopyExF was REFUSING to work properly so I guess - //if you want to use SDL2 you're stuck with integer sprite positions + SDL_Rect rect = new SDL_Rect() { - x = (int)position.X, - y = (int)position.Y, - w = width * (int)scale.X, - h = height * (int)scale.Y + x = (int)(position.X - origin.X), + y = (int)(position.Y - origin.Y), + w = (int)(width * scale.X), + h = (int)(height * scale.Y) }; + //SDL_RenderCopyExF(renderer, texture, ref src, (IntPtr)GCHandle.Alloc(rect), rotation, ref center, SDL_RendererFlip.SDL_FLIP_NONE); + //SDL_RenderCopyExF(renderer, texture, ref src, ref rect, rotation, (IntPtr)GCHandle.Alloc(center), SDL_RendererFlip.SDL_FLIP_NONE); + SDL_RenderCopyEx(renderer, texture, ref src, ref rect, rotation, ref center, SDL_RendererFlip.SDL_FLIP_NONE); } - public override void Draw(Font font, string text, Vector2 position) + public override void Draw(string fontName, string text, Vector2 position) { - var sdlFont = fonts[font.jsonFilename]; + var sdlFont = sdlFonts[fontName]; SDL_Color color = new SDL_Color() { r = 255, diff --git a/backends/SFMLWindow.cs b/backends/SFMLWindow.cs index aec32f4..032ffc3 100644 --- a/backends/SFMLWindow.cs +++ b/backends/SFMLWindow.cs @@ -23,10 +23,12 @@ public override Vector2 Size { get { - return new Vector2(window.Size.X, window.Size.Y); + return windowSize; } } + private Vector2 windowSize = new Vector2(); + public override float DeltaTime { get @@ -46,6 +48,7 @@ public SFMLWindow(WindowConfig config) { window = new RenderWindow(new VideoMode(config.width, config.height), config.name); window.SetFramerateLimit(config.fps); + windowSize = new Vector2(config.width, config.height); window.Closed += (object o, EventArgs a) => window.Close(); } @@ -60,6 +63,7 @@ public override bool IsOpen public override void Clear() { + Input.ProcessInputs(); sprites.Clear(); usedLayers.Clear(); window.DispatchEvents(); @@ -67,10 +71,21 @@ public override void Clear() deltaTime = deltaTimer.Restart().AsSeconds(); } - public override void RegisterSprite(Sprite sprite, string name) + public override Sprite CreateSprite(string filename) + { + var sprite = Json.Deserialize(filename); + sprite.json = filename; + if(!sfSprites.ContainsKey(filename)) + { + var sfSprite = new SFML.Graphics.Sprite(new Texture(BBQLib.rootDirectory + sprite.textureFile)); + sfSprites.Add(filename, sfSprite); + } + return sprite; + } + + public override bool IsKeyDown(KeyboardKey key) { - var sfSprite = new SFML.Graphics.Sprite(new Texture(sprite.name)); - sfSprites.Add(sprite.name, sfSprite); + return Keyboard.IsKeyPressed((Keyboard.Key)key); } public override void Draw(Sprite sprite) @@ -102,25 +117,30 @@ public override string ToString() return base.ToString(); } - public override void Draw(Font font, string text, Vector2 position) + public override void Draw(string font, string text, Vector2 position) { - var sfText = sfTexts[font.jsonFilename]; + var sfText = sfTexts[font]; sfText.Position = new Vector2f(position.X, position.Y); sfText.DisplayedString = text; window.Draw(sfText); } - public override void RegisterFont(Font font) + public override void LoadFonts(string filename) { - var sfFont = new SFML.Graphics.Font(font.ttf); - var sfText = new Text("OWO yiff me harder daddy", sfFont); - sfTexts.Add(font.jsonFilename, sfText); + var fonts = Json.Deserialize>(filename); + foreach(var font in fonts) + { + var sfFont = new SFML.Graphics.Font(BBQLib.rootDirectory + font.Value.ttf); + var sfText = new Text("Example Text", sfFont, font.Value.size); + sfTexts.Add(font.Key, sfText); + } } protected override void DrawSpriteInternal(Sprite sprite) { - var sfSprite = sfSprites[sprite.name]; - sfSprite.Position = new Vector2f(sprite.position.X, sprite.position.Y); + var sfSprite = sfSprites[sprite.json]; + Vector2 pos = sprite.position - BBQLib.Camera + Size / 2; + sfSprite.Position = new Vector2f(pos.X, pos.Y); sfSprite.Rotation = sprite.rotation; sfSprite.Origin = new Vector2f(sprite.origin.X, sprite.origin.Y); window.Draw(sfSprite); diff --git a/bin/Debug/net5.0/BBQLib b/bin/Debug/net5.0/BBQLib deleted file mode 100755 index 29af3ec..0000000 Binary files a/bin/Debug/net5.0/BBQLib and /dev/null differ diff --git a/bin/Debug/net5.0/BBQLib.deps.json b/bin/Debug/net5.0/BBQLib.deps.json deleted file mode 100644 index 99377b2..0000000 --- a/bin/Debug/net5.0/BBQLib.deps.json +++ /dev/null @@ -1,450 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v5.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v5.0": { - "BBQLib/1.0.0": { - "dependencies": { - "Newtonsoft.Json": "13.0.1", - "SFML.Net": "2.5.0", - "SDL2-CS": "0.0.0.0" - }, - "runtime": { - "BBQLib.dll": {} - } - }, - "CSFML/2.5.0": { - "runtimeTargets": { - "runtimes/alpine-x64/native/libcsfml-audio.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libcsfml-graphics.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libcsfml-system.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libcsfml-window.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-audio.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-audio.so.2.5": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-audio.so.2.5.1": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-graphics.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-graphics.so.2.5": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-graphics.so.2.5.1": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-system.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-system.so.2.5": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-system.so.2.5.1": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-window.so": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-window.so.2.5": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/alpine-x64/native/libsfml-window.so.2.5.1": { - "rid": "alpine-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libcsfml-audio.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libcsfml-graphics.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libcsfml-system.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libcsfml-window.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-audio.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-audio.so.2.5": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-audio.so.2.5.1": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-graphics.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-graphics.so.2.5": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-graphics.so.2.5.1": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-system.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-system.so.2.5": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-system.so.2.5.1": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-window.so": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-window.so.2.5": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/debian-x64/native/libsfml-window.so.2.5.1": { - "rid": "debian-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libcsfml-audio.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libcsfml-graphics.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libcsfml-system.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libcsfml-window.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-audio.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-audio.so.2.5": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-audio.so.2.5.1": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-graphics.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-graphics.so.2.5": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-graphics.so.2.5.1": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-system.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-system.so.2.5": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-system.so.2.5.1": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-window.so": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-window.so.2.5": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/fedora-x64/native/libsfml-window.so.2.5.1": { - "rid": "fedora-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x64/native/csfml-Audio.dll": { - "rid": "win-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x64/native/csfml-Graphics.dll": { - "rid": "win-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x64/native/csfml-System.dll": { - "rid": "win-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x64/native/csfml-Window.dll": { - "rid": "win-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x64/native/openal32.dll": { - "rid": "win-x64", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x86/native/csfml-Audio.dll": { - "rid": "win-x86", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x86/native/csfml-Graphics.dll": { - "rid": "win-x86", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x86/native/csfml-System.dll": { - "rid": "win-x86", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x86/native/csfml-Window.dll": { - "rid": "win-x86", - "assetType": "native", - "fileVersion": "0.0.0.0" - }, - "runtimes/win-x86/native/openal32.dll": { - "rid": "win-x86", - "assetType": "native", - "fileVersion": "0.0.0.0" - } - } - }, - "Newtonsoft.Json/13.0.1": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.1.25517" - } - } - }, - "SFML.Audio/2.5.0": { - "dependencies": { - "CSFML": "2.5.0", - "SFML.Graphics": "2.5.0", - "SFML.System": "2.5.0", - "SFML.Window": "2.5.0" - }, - "runtime": { - "lib/netstandard2.0/SFML.Audio.dll": { - "assemblyVersion": "2.5.0.0", - "fileVersion": "2.5.0.0" - } - } - }, - "SFML.Graphics/2.5.0": { - "dependencies": { - "CSFML": "2.5.0", - "SFML.System": "2.5.0", - "SFML.Window": "2.5.0" - }, - "runtime": { - "lib/netstandard2.0/SFML.Graphics.dll": { - "assemblyVersion": "2.5.0.0", - "fileVersion": "2.5.0.0" - } - } - }, - "SFML.Net/2.5.0": { - "dependencies": { - "SFML.Audio": "2.5.0", - "SFML.Graphics": "2.5.0", - "SFML.System": "2.5.0", - "SFML.Window": "2.5.0" - } - }, - "SFML.System/2.5.0": { - "dependencies": { - "CSFML": "2.5.0" - }, - "runtime": { - "lib/netstandard2.0/SFML.System.dll": { - "assemblyVersion": "2.5.0.0", - "fileVersion": "2.5.0.0" - } - } - }, - "SFML.Window/2.5.0": { - "dependencies": { - "CSFML": "2.5.0", - "SFML.System": "2.5.0" - }, - "runtime": { - "lib/netstandard2.0/SFML.Window.dll": { - "assemblyVersion": "2.5.0.0", - "fileVersion": "2.5.0.0" - } - } - }, - "SDL2-CS/0.0.0.0": { - "runtime": { - "SDL2-CS.dll": { - "assemblyVersion": "0.0.0.0", - "fileVersion": "0.0.0.0" - } - } - } - } - }, - "libraries": { - "BBQLib/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "CSFML/2.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-A3X+zyjAtvIQkpwCSS/F5fDOFRWeT+USIAK+DhGujNufF+qV1ty5cYGJihmmGeokX3yd89uZoNH8mcsmXCY/yw==", - "path": "csfml/2.5.0", - "hashPath": "csfml.2.5.0.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-ppPFpBcvxdsfUonNcvITKqLl3bqxWbDCZIzDWHzjpdAHRFfZe0Dw9HmA0+za13IdyrgJwpkDTDA9fHaxOrt20A==", - "path": "newtonsoft.json/13.0.1", - "hashPath": "newtonsoft.json.13.0.1.nupkg.sha512" - }, - "SFML.Audio/2.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-M5EIksRefT3nsLT32oEpESStsnlixR+YjKS6fUMl+vDQ3gdMaV4jc84pg3kbfM9w4RYKAyH6OWV4bzDU5FNZyA==", - "path": "sfml.audio/2.5.0", - "hashPath": "sfml.audio.2.5.0.nupkg.sha512" - }, - "SFML.Graphics/2.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-77Nuz0qmK2q2+901J0439LC6qFNw5VT0qjqqA7zSaM0WrV7K/UozBjfO/ROCY0iW+w7IEqPYiXBK4A7xO5nvsQ==", - "path": "sfml.graphics/2.5.0", - "hashPath": "sfml.graphics.2.5.0.nupkg.sha512" - }, - "SFML.Net/2.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-XVxrtNX6FJOpI7OzsTlKUKI92C8CKVe1rYtNbyj9fdIdZgidwpK/kExhxH5XYxpJ5C1/EUsGdOrGx4BCfsQvbw==", - "path": "sfml.net/2.5.0", - "hashPath": "sfml.net.2.5.0.nupkg.sha512" - }, - "SFML.System/2.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-vdlmLjPRhOD25WX/L2wP3F9dg/3mTj6hhyHkqtleC0fA5WNr71F0ijLbvs32BBpow5OoyU7BryKMjy1WNmU0GQ==", - "path": "sfml.system/2.5.0", - "hashPath": "sfml.system.2.5.0.nupkg.sha512" - }, - "SFML.Window/2.5.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-KuQvC0TrsxzhFJw9hDvMAzKD8/12jvXjP7sC3UO5MSM0sy5sfYNTqQktnQ3ELAV+rP1cqRKLsvosBfMfl1HkRw==", - "path": "sfml.window/2.5.0", - "hashPath": "sfml.window.2.5.0.nupkg.sha512" - }, - "SDL2-CS/0.0.0.0": { - "type": "reference", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/bin/Debug/net5.0/BBQLib.dll b/bin/Debug/net5.0/BBQLib.dll deleted file mode 100644 index 39a0243..0000000 Binary files a/bin/Debug/net5.0/BBQLib.dll and /dev/null differ diff --git a/bin/Debug/net5.0/BBQLib.pdb b/bin/Debug/net5.0/BBQLib.pdb deleted file mode 100644 index b90f349..0000000 Binary files a/bin/Debug/net5.0/BBQLib.pdb and /dev/null differ diff --git a/bin/Debug/net5.0/BBQLib.runtimeconfig.dev.json b/bin/Debug/net5.0/BBQLib.runtimeconfig.dev.json deleted file mode 100644 index 3e4a7e9..0000000 --- a/bin/Debug/net5.0/BBQLib.runtimeconfig.dev.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "runtimeOptions": { - "additionalProbingPaths": [ - "/home/bbq/.dotnet/store/|arch|/|tfm|", - "/home/bbq/.nuget/packages" - ] - } -} \ No newline at end of file diff --git a/bin/Debug/net5.0/BBQLib.runtimeconfig.json b/bin/Debug/net5.0/BBQLib.runtimeconfig.json deleted file mode 100644 index a8e7e82..0000000 --- a/bin/Debug/net5.0/BBQLib.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net5.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "5.0.0" - } - } -} \ No newline at end of file diff --git a/bin/Debug/net5.0/Newtonsoft.Json.dll b/bin/Debug/net5.0/Newtonsoft.Json.dll deleted file mode 100755 index 1ffeabe..0000000 Binary files a/bin/Debug/net5.0/Newtonsoft.Json.dll and /dev/null differ diff --git a/bin/Debug/net5.0/SDL2-CS.dll b/bin/Debug/net5.0/SDL2-CS.dll deleted file mode 100644 index 8b169a5..0000000 Binary files a/bin/Debug/net5.0/SDL2-CS.dll and /dev/null differ diff --git a/bin/Debug/net5.0/SDL2-CS.dll.config b/bin/Debug/net5.0/SDL2-CS.dll.config deleted file mode 100644 index 5176b29..0000000 --- a/bin/Debug/net5.0/SDL2-CS.dll.config +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/bin/Debug/net5.0/SFML.Audio.dll b/bin/Debug/net5.0/SFML.Audio.dll deleted file mode 100755 index a93b12c..0000000 Binary files a/bin/Debug/net5.0/SFML.Audio.dll and /dev/null differ diff --git a/bin/Debug/net5.0/SFML.Graphics.dll b/bin/Debug/net5.0/SFML.Graphics.dll deleted file mode 100755 index 927d8aa..0000000 Binary files a/bin/Debug/net5.0/SFML.Graphics.dll and /dev/null differ diff --git a/bin/Debug/net5.0/SFML.System.dll b/bin/Debug/net5.0/SFML.System.dll deleted file mode 100755 index 1cd8ded..0000000 Binary files a/bin/Debug/net5.0/SFML.System.dll and /dev/null differ diff --git a/bin/Debug/net5.0/SFML.Window.dll b/bin/Debug/net5.0/SFML.Window.dll deleted file mode 100755 index ec4d631..0000000 Binary files a/bin/Debug/net5.0/SFML.Window.dll and /dev/null differ diff --git a/bin/Debug/net5.0/criminal.png b/bin/Debug/net5.0/criminal.png deleted file mode 100644 index 3fd6e48..0000000 Binary files a/bin/Debug/net5.0/criminal.png and /dev/null differ diff --git a/bin/Debug/net5.0/ref/BBQLib.dll b/bin/Debug/net5.0/ref/BBQLib.dll deleted file mode 100644 index 25f6fac..0000000 Binary files a/bin/Debug/net5.0/ref/BBQLib.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-audio.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-audio.so deleted file mode 100755 index b290caf..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-audio.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-graphics.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-graphics.so deleted file mode 100755 index 0de2764..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-graphics.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-system.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-system.so deleted file mode 100755 index b2118bb..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-system.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-window.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-window.so deleted file mode 100755 index 01fb1bb..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-window.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so deleted file mode 100755 index 85ee263..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5 deleted file mode 100755 index 85ee263..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5.1 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5.1 deleted file mode 100755 index 85ee263..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so deleted file mode 100755 index 8280e12..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5 deleted file mode 100755 index 8280e12..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5.1 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5.1 deleted file mode 100755 index 8280e12..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so deleted file mode 100755 index 6f7b336..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5 deleted file mode 100755 index 6f7b336..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5.1 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5.1 deleted file mode 100755 index 6f7b336..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so deleted file mode 100755 index eb8a474..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5 deleted file mode 100755 index eb8a474..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5.1 b/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5.1 deleted file mode 100755 index eb8a474..0000000 Binary files a/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-audio.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-audio.so deleted file mode 100755 index 446c727..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-audio.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-graphics.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-graphics.so deleted file mode 100755 index 6591bba..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-graphics.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-system.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-system.so deleted file mode 100755 index b3548d6..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-system.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-window.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-window.so deleted file mode 100755 index 335446d..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-window.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so deleted file mode 100755 index 717d7c1..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5 deleted file mode 100755 index 717d7c1..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5.1 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5.1 deleted file mode 100755 index 717d7c1..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so deleted file mode 100755 index 68f0cc3..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5 deleted file mode 100755 index 68f0cc3..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5.1 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5.1 deleted file mode 100755 index 68f0cc3..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so deleted file mode 100755 index 4f40c6a..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5 deleted file mode 100755 index 4f40c6a..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5.1 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5.1 deleted file mode 100755 index 4f40c6a..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so deleted file mode 100755 index 08a4fa3..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5 deleted file mode 100755 index 08a4fa3..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5.1 b/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5.1 deleted file mode 100755 index 08a4fa3..0000000 Binary files a/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-audio.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-audio.so deleted file mode 100755 index d729b36..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-audio.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-graphics.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-graphics.so deleted file mode 100755 index 691ffa8..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-graphics.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-system.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-system.so deleted file mode 100755 index e869246..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-system.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-window.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-window.so deleted file mode 100755 index 57b1801..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-window.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so deleted file mode 100755 index 178b532..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5 deleted file mode 100755 index 178b532..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5.1 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5.1 deleted file mode 100755 index 178b532..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so deleted file mode 100755 index 17170dd..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5 deleted file mode 100755 index 17170dd..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5.1 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5.1 deleted file mode 100755 index 17170dd..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so deleted file mode 100755 index 8b69896..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5 deleted file mode 100755 index 8b69896..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5.1 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5.1 deleted file mode 100755 index 8b69896..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so deleted file mode 100755 index 0157bd6..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5 deleted file mode 100755 index 0157bd6..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5.1 b/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5.1 deleted file mode 100755 index 0157bd6..0000000 Binary files a/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5.1 and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Audio.dll b/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Audio.dll deleted file mode 100755 index 65e35ca..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Audio.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Graphics.dll b/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Graphics.dll deleted file mode 100755 index 77988c8..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Graphics.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-System.dll b/bin/Debug/net5.0/runtimes/win-x64/native/csfml-System.dll deleted file mode 100755 index dafd529..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-System.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Window.dll b/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Window.dll deleted file mode 100755 index f32bd8d..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Window.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x64/native/openal32.dll b/bin/Debug/net5.0/runtimes/win-x64/native/openal32.dll deleted file mode 100755 index 7760c05..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x64/native/openal32.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Audio.dll b/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Audio.dll deleted file mode 100755 index f117919..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Audio.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Graphics.dll b/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Graphics.dll deleted file mode 100755 index ec67f1f..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Graphics.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-System.dll b/bin/Debug/net5.0/runtimes/win-x86/native/csfml-System.dll deleted file mode 100755 index 95ae5cc..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-System.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Window.dll b/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Window.dll deleted file mode 100755 index 74381d8..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Window.dll and /dev/null differ diff --git a/bin/Debug/net5.0/runtimes/win-x86/native/openal32.dll b/bin/Debug/net5.0/runtimes/win-x86/native/openal32.dll deleted file mode 100755 index 1bb27f0..0000000 Binary files a/bin/Debug/net5.0/runtimes/win-x86/native/openal32.dll and /dev/null differ diff --git a/bin/Debug/net5.0/testsprite.json b/bin/Debug/net5.0/testsprite.json deleted file mode 100644 index e7d3f58..0000000 --- a/bin/Debug/net5.0/testsprite.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "position": { - "X": 0.0, - "Y": 0.0 - }, - "origin": { - "X": 0.0, - "Y": 0.0 - }, - "scale": { - "X": 1.0, - "Y": 1.0 - }, - "rotation": 0.0, - "layer": 0, - "drawn": false, - "repeat": false, - "name": "criminal.png" -} \ No newline at end of file diff --git a/criminal.png b/criminal.png deleted file mode 100644 index 3fd6e48..0000000 Binary files a/criminal.png and /dev/null differ diff --git a/dllmap.xml b/dllmap.xml deleted file mode 100644 index d7ee69f..0000000 --- a/dllmap.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/font.json b/font.json deleted file mode 100644 index dfa2af9..0000000 --- a/font.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "ttf": "alagard.ttf", - "size": 32 -} \ No newline at end of file diff --git a/obj/Debug/net5.0/BBQLib.csproj.AssemblyReference.cache b/obj/Debug/net5.0/BBQLib.csproj.AssemblyReference.cache deleted file mode 100644 index 0ba69c8..0000000 Binary files a/obj/Debug/net5.0/BBQLib.csproj.AssemblyReference.cache and /dev/null differ diff --git a/obj/Debug/net5.0/BBQLib.csproj.CopyComplete b/obj/Debug/net5.0/BBQLib.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/obj/Debug/net5.0/BBQLib.csproj.CoreCompileInputs.cache b/obj/Debug/net5.0/BBQLib.csproj.CoreCompileInputs.cache deleted file mode 100644 index e5664fe..0000000 --- a/obj/Debug/net5.0/BBQLib.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -882587dc7df75a6c53b54e7acff2d34db04a4a3a diff --git a/obj/Debug/net5.0/BBQLib.csproj.FileListAbsolute.txt b/obj/Debug/net5.0/BBQLib.csproj.FileListAbsolute.txt deleted file mode 100644 index 25183eb..0000000 --- a/obj/Debug/net5.0/BBQLib.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,81 +0,0 @@ -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/BBQLib -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/BBQLib.deps.json -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/BBQLib.runtimeconfig.json -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/BBQLib.runtimeconfig.dev.json -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/BBQLib.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/ref/BBQLib.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/BBQLib.pdb -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/SDL2-CS.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/SFML.Audio.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/SFML.Graphics.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/SFML.System.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/SFML.Window.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-audio.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-graphics.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-system.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libcsfml-window.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-audio.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-graphics.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-system.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/alpine-x64/native/libsfml-window.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-audio.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-graphics.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-system.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libcsfml-window.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-audio.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-graphics.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-system.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/debian-x64/native/libsfml-window.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-audio.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-graphics.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-system.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libcsfml-window.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-audio.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-graphics.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-system.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/fedora-x64/native/libsfml-window.so.2.5.1 -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Audio.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Graphics.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x64/native/csfml-System.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x64/native/csfml-Window.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x64/native/openal32.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Audio.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Graphics.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x86/native/csfml-System.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x86/native/csfml-Window.dll -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/runtimes/win-x86/native/openal32.dll -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.csproj.AssemblyReference.cache -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.GeneratedMSBuildEditorConfig.editorconfig -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.AssemblyInfoInputs.cache -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.AssemblyInfo.cs -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.csproj.CoreCompileInputs.cache -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.csproj.CopyComplete -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.dll -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/ref/BBQLib.dll -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.pdb -/home/bbq/Projects/BBQLib/obj/Debug/net5.0/BBQLib.genruntimeconfig.cache -/home/bbq/Projects/BBQLib/bin/Debug/net5.0/Newtonsoft.Json.dll diff --git a/obj/Debug/net5.0/BBQLib.dll b/obj/Debug/net5.0/BBQLib.dll deleted file mode 100644 index 39a0243..0000000 Binary files a/obj/Debug/net5.0/BBQLib.dll and /dev/null differ diff --git a/obj/Debug/net5.0/BBQLib.genruntimeconfig.cache b/obj/Debug/net5.0/BBQLib.genruntimeconfig.cache deleted file mode 100644 index 40c84aa..0000000 --- a/obj/Debug/net5.0/BBQLib.genruntimeconfig.cache +++ /dev/null @@ -1 +0,0 @@ -73316207ba26e2a17e0b2da9aabf2e1b2e9dadde diff --git a/obj/Debug/net5.0/BBQLib.pdb b/obj/Debug/net5.0/BBQLib.pdb deleted file mode 100644 index b90f349..0000000 Binary files a/obj/Debug/net5.0/BBQLib.pdb and /dev/null differ diff --git a/obj/Debug/net5.0/apphost b/obj/Debug/net5.0/apphost deleted file mode 100755 index 29af3ec..0000000 Binary files a/obj/Debug/net5.0/apphost and /dev/null differ diff --git a/obj/Debug/net5.0/ref/BBQLib.dll b/obj/Debug/net5.0/ref/BBQLib.dll deleted file mode 100644 index 25f6fac..0000000 Binary files a/obj/Debug/net5.0/ref/BBQLib.dll and /dev/null differ diff --git a/testsprite.json b/testsprite.json index e7d3f58..61681af 100644 --- a/testsprite.json +++ b/testsprite.json @@ -15,5 +15,5 @@ "layer": 0, "drawn": false, "repeat": false, - "name": "criminal.png" + "textureFile": "" } \ No newline at end of file