Gottfried/glitchy-engine-beef
1
0
Fork 0
mirror of https://github.com/aharabada/glitchy-engine-beef.git synced 2026-09-05 13:01:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Added support for int shader variables

Browse Source
This commit is contained in:
Simon Lübeß
2021-09-19 14:22:37 +02:00
parent 8471b7d7b9
commit 90284739c0
4 changed files with 44 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Platform/DX11/Renderer/Dx11ConstantBuffer.bf
+2
View File
@@ -31,6 +31,8 @@ namespace GlitchyEngine.Renderer
_type = .Bool; _type = .Bool;
case .Float: case .Float:
_type = .Float; _type = .Float;
case .Int:
_type = .Int;
default: default:
Log.EngineLogger.Assert(false, scope $"Unhandled shader variable type: {shaderTypeDescription.Type}"); Log.EngineLogger.Assert(false, scope $"Unhandled shader variable type: {shaderTypeDescription.Type}");
} }
GlitchyEngine/src/Renderer/BufferVariable.bf
+31 -64
View File
@@ -80,6 +80,15 @@ namespace GlitchyEngine.Renderer
case typeof(Vector4): case typeof(Vector4):
EnsureTypeMatch(1, 4, .Float); EnsureTypeMatch(1, 4, .Float);
case typeof(int32):
EnsureTypeMatch(1, 1, .Int);
case typeof(Int32_2):
EnsureTypeMatch(1, 2, .Int);
case typeof(Int32_3):
EnsureTypeMatch(1, 3, .Int);
case typeof(Int32_4):
EnsureTypeMatch(1, 4, .Int);
case typeof(Matrix4x3): case typeof(Matrix4x3):
EnsureTypeMatch(4, 3, .Float); EnsureTypeMatch(4, 3, .Float);
case typeof(Matrix3x3): case typeof(Matrix3x3):
@@ -96,52 +105,36 @@ namespace GlitchyEngine.Renderer
} }
} }
public void SetData(bool value) [Inline]
private void SetData<T>(T value)
{ {
EnsureTypeMatch(1, 1, .Bool); EnsureTypeMatch<T>();
*(bool*)firstByte = value; *(T*)firstByte = value;
} }
public void SetData(float value) public void SetData(bool value) => SetData<bool>(value);
{
EnsureTypeMatch(1, 1, .Float);
*(float*)firstByte = value; public void SetData(float value) => SetData<float>(value);
} public void SetData(Vector2 value) => SetData<Vector2>(value);
public void SetData(Vector3 value) => SetData<Vector3>(value);
public void SetData(Vector4 value) => SetData<Vector4>(value);
public void SetData(Vector2 value) public void SetData(int32 value) => SetData<int32>(value);
{ public void SetData(Int32_2 value) => SetData<Int32_2>(value);
EnsureTypeMatch(1, 2, .Float); public void SetData(Int32_3 value) => SetData<Int32_3>(value);
public void SetData(Int32_4 value) => SetData<Int32_4>(value);
*(Vector2*)firstByte = value; public void SetData(ColorRGB value) => SetData<ColorRGB>(value);
} public void SetData(ColorRGBA value) => SetData<ColorRGBA>(value);
public void SetData(Color value) => SetData<ColorRGBA>((ColorRGBA)value);
public void SetData(Vector3 value)
{
EnsureTypeMatch(1, 3, .Float);
*(Vector3*)firstByte = value; public void SetData(Matrix4x3 value) => SetData<Matrix4x3>(value);
}
public void SetData(Vector4 value)
{
EnsureTypeMatch(1, 4, .Float);
*(Vector4*)firstByte = value;
}
public void SetData(Matrix4x3 value)
{
// I think this is right
EnsureTypeMatch(4, 3, .Float);
*(Matrix4x3*)firstByte = value;
}
public void SetData(Matrix4x3[] value) public void SetData(Matrix4x3[] value)
{ {
EnsureTypeMatch(4, 3, .Float); EnsureTypeMatch<Matrix4x3>();
// TODO: assert length // TODO: assert length
@@ -150,7 +143,7 @@ namespace GlitchyEngine.Renderer
public void SetData(Matrix3x3 value) public void SetData(Matrix3x3 value)
{ {
EnsureTypeMatch(3, 3, .Float); EnsureTypeMatch<Matrix3x3>();
*(Matrix4x3*)firstByte = Matrix4x3(value); *(Matrix4x3*)firstByte = Matrix4x3(value);
@@ -159,7 +152,7 @@ namespace GlitchyEngine.Renderer
public void SetData(Matrix3x3[] value) public void SetData(Matrix3x3[] value)
{ {
EnsureTypeMatch(3, 3, .Float); EnsureTypeMatch<Matrix3x3>();
// TODO: assert length // TODO: assert length
@@ -169,43 +162,17 @@ namespace GlitchyEngine.Renderer
} }
} }
public void SetData(Matrix value) public void SetData(Matrix value) => SetData<Matrix>(value);
{
EnsureTypeMatch(4, 4, .Float);
*(Matrix*)firstByte = value;
}
public void SetData(Matrix[] value) public void SetData(Matrix[] value)
{ {
EnsureTypeMatch(4, 4, .Float); EnsureTypeMatch<Matrix>();
// TODO: assert length // TODO: assert length
Internal.MemCpy(firstByte, value.Ptr, sizeof(Matrix) * Math.Min(value.Count, _elements)); Internal.MemCpy(firstByte, value.Ptr, sizeof(Matrix) * Math.Min(value.Count, _elements));
} }
public void SetData(ColorRGB value)
{
EnsureTypeMatch(1, 3, .Float);
*(ColorRGB*)firstByte = value;
}
public void SetData(ColorRGBA value)
{
EnsureTypeMatch(1, 4, .Float);
*(ColorRGBA*)firstByte = value;
}
public void SetData(Color value)
{
EnsureTypeMatch(1, 4, .Float);
*(ColorRGBA*)firstByte = (ColorRGBA)value;
}
// Todo: add all the other SetData-Methods // Todo: add all the other SetData-Methods
/** /**
GlitchyEngine/src/Renderer/ConstantBuffer.bf
+1
View File
@@ -101,6 +101,7 @@ namespace GlitchyEngine.Renderer
{ {
Bool, Bool,
Float, Float,
Int,
// todo // todo
} }
} }
GlitchyEngine/src/Renderer/Material.bf
+5
View File
@@ -122,6 +122,11 @@ namespace GlitchyEngine.Renderer
public void SetVariable(String name, Vector3 value) => SetVariable<Vector3>(name, value); public void SetVariable(String name, Vector3 value) => SetVariable<Vector3>(name, value);
public void SetVariable(String name, Vector4 value) => SetVariable<Vector4>(name, value); public void SetVariable(String name, Vector4 value) => SetVariable<Vector4>(name, value);
public void SetVariable(String name, int32 value) => SetVariable<int32>(name, value);
public void SetVariable(String name, Int32_2 value) => SetVariable<Int32_2>(name, value);
public void SetVariable(String name, Int32_3 value) => SetVariable<Int32_3>(name, value);
public void SetVariable(String name, Int32_4 value) => SetVariable<Int32_4>(name, value);
public void SetVariable(String name, Color value) => SetVariable<ColorRGBA>(name, value); public void SetVariable(String name, Color value) => SetVariable<ColorRGBA>(name, value);
public void SetVariable(String name, ColorRGB value) => SetVariable<ColorRGB>(name, value); public void SetVariable(String name, ColorRGB value) => SetVariable<ColorRGB>(name, value);
public void SetVariable(String name, ColorRGBA value) => SetVariable<ColorRGBA>(name, value); public void SetVariable(String name, ColorRGBA value) => SetVariable<ColorRGBA>(name, value);