From 55585138da2cc2529a43ef841bba9b3db7d88afb Mon Sep 17 00:00:00 2001 From: Evan Hemsley Date: Thu, 20 Feb 2020 17:37:52 -0800 Subject: [PATCH] remove Core namespace --- .circleci/config.yml | 2 +- Curve/ArgumentChecker.cs | 4 ++-- Curve/CubicBezierCurve2D.cs | 6 +++--- Curve/CubicBezierCurve3D.cs | 4 ++-- Curve/Curve.csproj | 12 ++++++------ Curve/Extensions.cs | 4 ++-- Curve/QuadraticBezierCurve2D.cs | 6 +++--- Curve/QuadraticBezierCurve3D.cs | 4 ++-- Curve/TimeHelper.cs | 4 ++-- README.md | 8 ++++---- Test/CubicBezierCurve2D.cs | 4 ++-- Test/CubicBezierCurve3D.cs | 4 ++-- Test/QuadraticBezierCurve2D.cs | 4 ++-- Test/QuadraticBezierCurve3D.cs | 4 ++-- Test/Test.csproj | 3 +-- 15 files changed, 36 insertions(+), 37 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a5e1415..6d5f1d6 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -26,7 +26,7 @@ jobs: - checkout - attach_workspace: at: . - - run: dotnet nuget push ./Curve/bin/Release/MoonTools.Core.Curve.*.nupkg -k $API_KEY -s https://api.nuget.org/v3/index.json + - run: dotnet nuget push ./Curve/bin/Release/MoonTools.Curve.*.nupkg -k $API_KEY -s https://api.nuget.org/v3/index.json workflows: version: 2 diff --git a/Curve/ArgumentChecker.cs b/Curve/ArgumentChecker.cs index 005d6e6..4326548 100644 --- a/Curve/ArgumentChecker.cs +++ b/Curve/ArgumentChecker.cs @@ -1,4 +1,4 @@ -namespace MoonTools.Core.Curve +namespace MoonTools.Curve { public static class ArgumentChecker { @@ -10,4 +10,4 @@ namespace MoonTools.Core.Curve } } } -} \ No newline at end of file +} diff --git a/Curve/CubicBezierCurve2D.cs b/Curve/CubicBezierCurve2D.cs index 9360a9c..b72e860 100644 --- a/Curve/CubicBezierCurve2D.cs +++ b/Curve/CubicBezierCurve2D.cs @@ -1,8 +1,8 @@ using System; using System.Numerics; -using MoonTools.Core.Curve.Extensions; +using MoonTools.Curve.Extensions; -namespace MoonTools.Core.Curve +namespace MoonTools.Curve { /// /// A 2-dimensional Bezier curve defined by 4 points. @@ -168,4 +168,4 @@ namespace MoonTools.Core.Curve return !(left == right); } } -} \ No newline at end of file +} diff --git a/Curve/CubicBezierCurve3D.cs b/Curve/CubicBezierCurve3D.cs index cc3b328..8ebf5c0 100644 --- a/Curve/CubicBezierCurve3D.cs +++ b/Curve/CubicBezierCurve3D.cs @@ -1,7 +1,7 @@ using System; using System.Numerics; -namespace MoonTools.Core.Curve +namespace MoonTools.Curve { /// /// A 3-dimensional Bezier curve defined by 4 points. @@ -166,4 +166,4 @@ namespace MoonTools.Core.Curve return !(left == right); } } -} \ No newline at end of file +} diff --git a/Curve/Curve.csproj b/Curve/Curve.csproj index 1d119aa..ad7b52c 100644 --- a/Curve/Curve.csproj +++ b/Curve/Curve.csproj @@ -2,17 +2,17 @@ 2.1.0 netstandard2.0 - A Bezier curve library for .NET Core - MoonTools.Core.Curve - MoonTools.Core.Curve + A Bezier curve library for .NET Standard + MoonTools.Curve + MoonTools.Curve Moonside Games Evan Hemsley Evan Hemsley 2019 - MoonTools.Core.Curve + MoonTools.Curve true - MoonTools.Core.Curve + MoonTools.Curve LGPL-3.0-only - https://github.com/MoonsideGames/MoonTools.Core.Curve + https://gitea.moonside.games/MoonsideGames/MoonTools.Curve diff --git a/Curve/Extensions.cs b/Curve/Extensions.cs index 2b50e13..cf3a406 100644 --- a/Curve/Extensions.cs +++ b/Curve/Extensions.cs @@ -1,9 +1,9 @@ using System.Numerics; -namespace MoonTools.Core.Curve.Extensions +namespace MoonTools.Curve.Extensions { public static class Vector2Extensions { public static Vector2 XY(this Vector3 vector) => new Vector2(vector.X, vector.Y); } -} \ No newline at end of file +} diff --git a/Curve/QuadraticBezierCurve2D.cs b/Curve/QuadraticBezierCurve2D.cs index 9816dcf..0a0a682 100644 --- a/Curve/QuadraticBezierCurve2D.cs +++ b/Curve/QuadraticBezierCurve2D.cs @@ -1,8 +1,8 @@ -using MoonTools.Core.Curve.Extensions; +using MoonTools.Curve.Extensions; using System; using System.Numerics; -namespace MoonTools.Core.Curve +namespace MoonTools.Curve { /// /// A 2-dimensional Bezier curve defined by 3 points. @@ -176,4 +176,4 @@ namespace MoonTools.Core.Curve return !(left == right); } } -} \ No newline at end of file +} diff --git a/Curve/QuadraticBezierCurve3D.cs b/Curve/QuadraticBezierCurve3D.cs index d95c538..14da833 100644 --- a/Curve/QuadraticBezierCurve3D.cs +++ b/Curve/QuadraticBezierCurve3D.cs @@ -1,7 +1,7 @@ using System; using System.Numerics; -namespace MoonTools.Core.Curve +namespace MoonTools.Curve { /// /// A 3-dimensional Bezier curve defined by 3 points. @@ -170,4 +170,4 @@ namespace MoonTools.Core.Curve return !(left == right); } } -} \ No newline at end of file +} diff --git a/Curve/TimeHelper.cs b/Curve/TimeHelper.cs index 13d5404..6c5b66e 100644 --- a/Curve/TimeHelper.cs +++ b/Curve/TimeHelper.cs @@ -1,7 +1,7 @@ -namespace MoonTools.Core.Curve +namespace MoonTools.Curve { public static class TimeHelper { public static float Normalized(float t, float minT, float maxT) => (t - minT) / (maxT - minT); } -} \ No newline at end of file +} diff --git a/README.md b/README.md index d665f53..6440059 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# MoonTools.Core.Curve +# MoonTools.Curve -[![NuGet Badge](https://buildstats.info/nuget/MoonTools.Core.Curve)](https://www.nuget.org/packages/MoonTools.Core.Curve/) -[![CircleCI](https://circleci.com/gh/MoonsideGames/MoonTools.Core.Curve.svg?style=svg)](https://circleci.com/gh/MoonsideGames/MoonTools.Core.Curve) +[![NuGet Badge](https://buildstats.info/nuget/MoonTools.Curve)](https://www.nuget.org/packages/MoonTools.Curve/) +[![CircleCI](https://circleci.com/gh/MoonsideGames/MoonTools.Curve.svg?style=svg)](https://circleci.com/gh/MoonsideGames/MoonTools.Curve) Implements quadratic and cubic Bezier curves in 2D and 3D. @@ -19,4 +19,4 @@ Implements quadratic and cubic Bezier curves in 2D and 3D. myCurve.Point(3, 2, 4); // => Vector3(0, 0, 0.75f); myCurve.Velocity(0.5f); // => Vector3(9, 0, 4.5f) myCurve.Velocity(3, 2, 4); // => Vector3(9, 0, 4.5f); -``` \ No newline at end of file +``` diff --git a/Test/CubicBezierCurve2D.cs b/Test/CubicBezierCurve2D.cs index 5724f58..fd140d8 100644 --- a/Test/CubicBezierCurve2D.cs +++ b/Test/CubicBezierCurve2D.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Curve; +using MoonTools.Curve; using System; using System.Numerics; @@ -185,4 +185,4 @@ namespace Tests (myCurve != otherCurve).Should().BeTrue(); } } -} \ No newline at end of file +} diff --git a/Test/CubicBezierCurve3D.cs b/Test/CubicBezierCurve3D.cs index 5971d79..1936234 100644 --- a/Test/CubicBezierCurve3D.cs +++ b/Test/CubicBezierCurve3D.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Curve; +using MoonTools.Curve; using System; using System.Numerics; @@ -193,4 +193,4 @@ namespace Tests (myCurve != otherCurve).Should().BeTrue(); } } -} \ No newline at end of file +} diff --git a/Test/QuadraticBezierCurve2D.cs b/Test/QuadraticBezierCurve2D.cs index 3b14d04..7dae39a 100644 --- a/Test/QuadraticBezierCurve2D.cs +++ b/Test/QuadraticBezierCurve2D.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Curve; +using MoonTools.Curve; using System; using System.Numerics; @@ -180,4 +180,4 @@ namespace Tests (myCurve != otherCurve).Should().BeTrue(); } } -} \ No newline at end of file +} diff --git a/Test/QuadraticBezierCurve3D.cs b/Test/QuadraticBezierCurve3D.cs index 0d2109f..069efcb 100644 --- a/Test/QuadraticBezierCurve3D.cs +++ b/Test/QuadraticBezierCurve3D.cs @@ -1,7 +1,7 @@ using NUnit.Framework; using FluentAssertions; -using MoonTools.Core.Curve; +using MoonTools.Curve; using System; using System.Numerics; @@ -178,4 +178,4 @@ namespace Tests (myCurve != otherCurve).Should().BeTrue(); } } -} \ No newline at end of file +} diff --git a/Test/Test.csproj b/Test/Test.csproj index ece517f..05ca223 100644 --- a/Test/Test.csproj +++ b/Test/Test.csproj @@ -4,7 +4,6 @@ false - @@ -13,4 +12,4 @@ - \ No newline at end of file +