LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-07-14 21:18:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

BoundingBox - Move 'Abs' function into extension class

Browse Source
This commit is contained in:
miku-666
2024-10-23 10:26:32 +02:00
parent b9d7cebb1c
commit 1effa243fd
4 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
PCK-Studio/Extensions/OpenTKExtensions.cs Normal file
View File

@@ -0,0 +1,25 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OpenTK;
namespace PckStudio.Extensions
{
internal static class OpenTKExtensions
{
internal static Matrix4 Pivoted(this Matrix4 rotation, Vector3 pivot)
{
var model = Matrix4.CreateTranslation(pivot);
model *= rotation;
model *= Matrix4.CreateTranslation(pivot).Inverted();
return model;
}
public static Vector3 Abs(Vector3 value)
{
return new Vector3(Math.Abs(value.X), Math.Abs(value.Y), Math.Abs(value.Z));
}
}
}

21
PCK-Studio/Extensions/OpenTkMatrixExtensions.cs
View File

@@ -1,21 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OpenTK;
namespace PckStudio.Extensions
{
internal static class OpenTkMatrixExtensions
{
internal static Matrix4 Pivoted(this Matrix4 target, Vector3 translation, Vector3 pivot)
{
var model = Matrix4.CreateTranslation(translation);
model *= Matrix4.CreateTranslation(pivot);
model *= target;
model *= Matrix4.CreateTranslation(pivot).Inverted();
return model;
}
}
}

2
PCK-Studio/PckStudio.csproj
View File

@@ -151,7 +151,7 @@
<Compile Include="Forms\ContributorsForm.Designer.cs">
<DependentUpon>ContributorsForm.cs</DependentUpon>
</Compile>
<Compile Include="Extensions\OpenTkMatrixExtensions.cs" />
<Compile Include="Extensions\OpenTKExtensions.cs" />
<Compile Include="Forms\Editor\ModelEditor.cs">
<SubType>Form</SubType>
</Compile>

6
PCK-Studio/Rendering/BoundingBox.cs
View File

@@ -20,7 +20,7 @@ namespace PckStudio.Rendering
Start = start;
End = end;
OpenTK.Vector3 size = End - Start;
Volume = Abs(size);
Volume = OpenTKExtensions.Abs(size);
Center = start + Volume / 2;
}
@@ -29,10 +29,6 @@ namespace PckStudio.Rendering
{
}
private static OpenTK.Vector3 Abs(OpenTK.Vector3 value)
{
return new OpenTK.Vector3(Math.Abs(value.X), Math.Abs(value.Y), Math.Abs(value.Z));
}
public ColorVertex[] GetVertices()
{