LegacyConsole/PCK-Studio
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/PCK-Studio.git synced 2026-07-11 10:05:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move Camera and Texture into folders

Browse Source
This commit is contained in:
miku-666
2024-01-31 19:30:30 +01:00
parent 2d9440b401
commit 9bc448e317
9 changed files with 185 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PCK-Studio/PckStudio.csproj
View File

@@ -150,12 +150,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Rendering\Camera.cs" />
<Compile Include="Rendering\Camera\Camera.cs" />
<Compile Include="Rendering\Camera\PerspectiveCamera.cs" />
<Compile Include="Rendering\CubeData.cs" />
<Compile Include="Rendering\CubeRenderGroup.cs" />
<Compile Include="Rendering\IndexBuffer.cs" />
<Compile Include="Rendering\IVertexLayout.cs" />
<Compile Include="Rendering\PerspectiveCamera.cs" />
<Compile Include="Rendering\RenderBuffer.cs" />
<Compile Include="Rendering\Renderer.cs" />
<Compile Include="Rendering\RenderGroup.cs" />
@@ -167,9 +167,11 @@
<Compile Include="Rendering\SkinRenderer.Designer.cs">
<DependentUpon>SkinRenderer.cs</DependentUpon>
</Compile>
<Compile Include="Rendering\Texture2D.cs" />
<Compile Include="Rendering\TextureChangingEventArgs.cs" />
<Compile Include="Rendering\TextureVertex.cs" />
<Compile Include="Rendering\Texture\CubeTexture.cs" />
<Compile Include="Rendering\Texture\Texture.cs" />
<Compile Include="Rendering\Texture\Texture2D.cs" />
<Compile Include="Rendering\VertexArray.cs" />
<Compile Include="Rendering\VertexBuffer.cs" />
<Compile Include="Rendering\VertexBufferLayout.cs" />

2
PCK-Studio/Rendering/Camera.cs → PCK-Studio/Rendering/Camera/Camera.cs
View File

@@ -6,7 +6,7 @@ using System.Threading.Tasks;
using System.Windows.Media.Media3D;
using OpenTK;
namespace PckStudio.Rendering
namespace PckStudio.Rendering.Camera
{
internal abstract class Camera
{

12
PCK-Studio/Rendering/PerspectiveCamera.cs → PCK-Studio/Rendering/Camera/PerspectiveCamera.cs
View File

@@ -5,7 +5,7 @@ using System.Text;
using System.Threading.Tasks;
using OpenTK;
namespace PckStudio.Rendering
namespace PckStudio.Rendering.Camera
{
internal class PerspectiveCamera : Camera
{
@@ -21,6 +21,8 @@ namespace PckStudio.Rendering
set => _position.Xy = value;
}
public Vector3 WorldPosition => _position;
public Vector2 Rotation
{
get => _rotation;
@@ -31,6 +33,9 @@ namespace PckStudio.Rendering
}
}
public Vector3 Orientation => -Vector3.UnitZ;
public Vector3 Up = Vector3.UnitY;
public float MinimumFov { get; set; } = 30f;
public float MaximumFov { get; set; } = 120f;
public float Fov
@@ -55,7 +60,6 @@ namespace PckStudio.Rendering
private Vector3 _position;
private Vector2 _rotation;
private Vector3 _target;
internal override Matrix4 GetViewProjection()
@@ -65,12 +69,11 @@ namespace PckStudio.Rendering
private void UpdateView()
{
var up = Vector3.UnitY;
Matrix4 rotation = Matrix4.CreateFromAxisAngle(new Vector3(-1f, 0f, 0f), MathHelper.DegreesToRadians(Rotation.X))
* Matrix4.CreateFromAxisAngle(new Vector3(0f, 1f, 0f), MathHelper.DegreesToRadians(Rotation.Y));
viewMatrix = Matrix4.LookAt(_position, _target, up) * rotation;
viewMatrix = Matrix4.LookAt(_position, _position + Orientation, Up) * rotation;
}
internal override void Update(float aspect)
@@ -82,7 +85,6 @@ namespace PckStudio.Rendering
internal void LookAt(Vector2 pos)
{
_target = new Vector3(pos);
Position = pos;
}

1
PCK-Studio/Rendering/Renderer3D.cs
View File

@@ -28,6 +28,7 @@ https://github.com/KareemMAX/Minecraft-Skiner/blob/master/src/Minecraft%20skiner
using System;
using System.Windows.Forms;
using OpenTK;
using PckStudio.Rendering.Camera;
namespace PckStudio.Rendering
{

2
PCK-Studio/Rendering/SkinRenderer.cs
View File

@@ -31,6 +31,8 @@ using PckStudio.Forms.Editor;
using System.Collections.ObjectModel;
using System.Collections.Specialized;
using System.Drawing.Imaging;
using PckStudio.Rendering.Camera;
using PckStudio.Rendering.Texture;
namespace PckStudio.Rendering
{

62
PCK-Studio/Rendering/Texture/CubeTexture.cs Normal file
View File

@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using OpenTK.Graphics.OpenGL;
using PckStudio.Extensions;
namespace PckStudio.Rendering.Texture
{
internal class CubeTexture : Texture
{
public CubeTexture(Image cubeTexture)
: base(TextureTarget.TextureCubeMap)
{
Bind();
GL.GenerateMipmap(GenerateMipmapTarget.TextureCubeMap);
SetTexParameter(TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);
SetTexParameter(TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);
SetTexParameter(TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToEdge);
SetTexParameter(TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToEdge);
SetTexParameter(TextureParameterName.TextureWrapR, (int)TextureWrapMode.ClampToEdge);
int heightPerFace = cubeTexture.Height / 3;
int widthPerFace = cubeTexture.Width / 4;
Size faceSize = new Size(widthPerFace, heightPerFace);
Image[] faces = new Image[6];
Point rightFace = new Point(widthPerFace * 2, heightPerFace * 1);
faces[0] = cubeTexture.GetArea(new Rectangle(rightFace, faceSize));
Point lefttFace = new Point(widthPerFace * 0, heightPerFace * 1);
faces[1] = cubeTexture.GetArea(new Rectangle(lefttFace, faceSize));
Point topFace = new Point(widthPerFace * 1, heightPerFace * 0);
faces[2] = cubeTexture.GetArea(new Rectangle(topFace, faceSize));
Point bottomFace = new Point(widthPerFace * 1, heightPerFace * 2);
faces[3] = cubeTexture.GetArea(new Rectangle(bottomFace, faceSize));
Point frontFace = new Point(widthPerFace * 1, heightPerFace * 1);
faces[4] = cubeTexture.GetArea(new Rectangle(frontFace, faceSize));
Point backFace = new Point(widthPerFace * 3, heightPerFace * 1);
faces[5] = cubeTexture.GetArea(new Rectangle(backFace, faceSize));
for(int i = 0; i < 6; i++)
{
var texture = new Bitmap(faces[i]);
BitmapData data = texture.LockBits(new Rectangle(Point.Empty, texture.Size), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
GL.TexImage2D(TextureTarget.TextureCubeMapPositiveX + i, 0, PixelInternalFormat.Rgb8, widthPerFace, heightPerFace, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
}
}
}
}

49
PCK-Studio/Rendering/Texture/Texture.cs Normal file
View File

@@ -0,0 +1,49 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Linq;
using OpenTK;
using OpenTK.Graphics.OpenGL;
namespace PckStudio.Rendering.Texture
{
internal class Texture
{
protected readonly int _id;
protected TextureTarget Target;
protected Texture(TextureTarget target)
{
_id = GL.GenTexture();
Target = target;
}
public void Bind()
{
GL.BindTexture(Target, _id);
}
public void Bind(int slot)
{
Debug.Assert(slot >= 0 || slot < 32, "Slot is out of range");
slot = MathHelper.Clamp(slot, 0, 31);
Bind();
GL.ActiveTexture(TextureUnit.Texture0 + slot);
}
public void Unbind()
{
GL.BindTexture(Target, 0);
}
public void SetTexParameter(TextureParameterName parameterName, int value)
{
GL.TexParameter(Target, parameterName, value);
Debug.WriteLineIf(GL.GetError() != ErrorCode.NoError, $"{Target}: {parameterName} = {value}");
}
}
}

58
PCK-Studio/Rendering/Texture/Texture2D.cs Normal file
View File

@@ -0,0 +1,58 @@
using System;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using OpenTK;
using OpenTK.Graphics.OpenGL;
namespace PckStudio.Rendering.Texture
{
internal class Texture2D : Texture
{
public Texture2D(string filepath)
: this(Image.FromFile(filepath))
{
}
public Texture2D(Image image)
: this(new Bitmap(image))
{
}
public Texture2D(Image image, int slot)
: this(new Bitmap(image), slot)
{
}
private Texture2D(Bitmap bitmap, int slot = 0)
: base(TextureTarget.Texture2D)
{
Bind(slot);
GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
SetTexParameter(TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);
SetTexParameter(TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);
SetTexParameter(TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToBorder);
SetTexParameter(TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToBorder);
var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba8, bitmap.Width, bitmap.Height, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
bitmap.UnlockBits(data);
Unbind();
}
public void Dispose()
{
Unbind();
GL.DeleteTexture(_id);
}
public static implicit operator Texture2D(Bitmap image) => new Texture2D(image);
}
}

66
PCK-Studio/Rendering/Texture2D.cs
View File

@@ -1,66 +0,0 @@
using System;
using System.Diagnostics;
using System.Drawing;
using System.Drawing.Imaging;
using OpenTK;
using OpenTK.Graphics.OpenGL;
namespace PckStudio.Rendering
{
internal class Texture2D : IDisposable
{
private int _id;
public Texture2D(string filepath)
: this(Image.FromFile(filepath))
{
}
public Texture2D(Image image)
: this(new Bitmap(image))
{
}
private Texture2D(Bitmap bitmap)
{
_id = GL.GenTexture();
GL.BindTexture(TextureTarget.Texture2D, _id);
GL.GenerateMipmap(GenerateMipmapTarget.Texture2D);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMinFilter, (int)TextureMinFilter.Nearest);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureMagFilter, (int)TextureMagFilter.Nearest);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapS, (int)TextureWrapMode.ClampToBorder);
GL.TexParameter(TextureTarget.Texture2D, TextureParameterName.TextureWrapT, (int)TextureWrapMode.ClampToBorder);
var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadOnly, System.Drawing.Imaging.PixelFormat.Format32bppArgb);
GL.TexImage2D(TextureTarget.Texture2D, 0, PixelInternalFormat.Rgba8, bitmap.Width, bitmap.Height, 0, OpenTK.Graphics.OpenGL.PixelFormat.Bgra, PixelType.UnsignedByte, data.Scan0);
bitmap.UnlockBits(data);
GL.BindTexture(TextureTarget.Texture2D, 0);
}
public void Bind(int slot)
{
Debug.Assert(slot >= 0 || slot < 32, "Slot is out of range");
slot = MathHelper.Clamp(slot, 0, 31);
GL.ActiveTexture(TextureUnit.Texture0 + slot);
GL.BindTexture(TextureTarget.Texture2D, _id);
}
[Conditional("DEBUG")]
public void Unbind()
{
GL.BindTexture(TextureTarget.Texture2D, 0);
}
public void Dispose()
{
Unbind();
GL.DeleteTexture(_id);
}
}
}