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

(Breaking) Made VertexLayout initialization sexy

Browse Source
This commit is contained in:
Simon Lübeß
2021-01-02 16:32:08 +01:00
parent 3c58e20787
commit 523da5536b
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GlitchyEngine/src/Application.bf
+3 -3
View File
@@ -91,9 +91,9 @@ namespace GlitchyEngine
// Create Input Layout // Create Input Layout
_vertexLayout = new VertexLayout(_window.Context, new .( _vertexLayout = new VertexLayout(_window.Context, new .(
VertexElement("POSITION", 0, .R32G32B32_Float, 0), VertexElement(.R32G32B32_Float, "POSITION"),
VertexElement("COLOR", 0, .R8G8B8A8_UNorm, 0) VertexElement(.R8G8B8A8_UNorm, "COLOR"),
), _vertexShader.[Friend]nativeCode); ), _vertexShader);
// //
// Load pixel shader // Load pixel shader
GlitchyEngine/src/Platform/DX11/Renderer/Dx11VertexLayout.bf
+3 -3
View File
@@ -11,11 +11,11 @@ namespace GlitchyEngine.Renderer
{ {
internal ID3D11InputLayout* nativeLayout ~ _?.Release(); internal ID3D11InputLayout* nativeLayout ~ _?.Release();
public ID3DBlob* nativeShaderCode; public ID3DBlob* nativeShaderCode ~ _?.Release();
public this(GraphicsContext context, VertexElement[] ownElements, ID3DBlob* nativeShaderCode) public this(GraphicsContext context, VertexElement[] ownElements, VertexShader vertexShader)
{ {
this.nativeShaderCode = nativeShaderCode; nativeShaderCode = vertexShader.nativeCode..AddRef();
_context = context; _context = context;
_elements = ownElements; _elements = ownElements;
GlitchyEngine/src/Renderer/VertexLayout.bf
+3 -3
View File
@@ -56,11 +56,11 @@ namespace GlitchyEngine.Renderer
public this() => this = default; public this() => this = default;
public this(String semanticName, uint32 semanticIndex, Format format, uint32 inputSlot, uint32 offset = (.)-1, InputClassification slotClass = .PerVertexData, uint32 instanceStepRate = 0) public this(Format format, String semanticName, uint32 semanticIndex = 0, uint32 inputSlot = 0, uint32 offset = (.)-1, InputClassification slotClass = .PerVertexData, uint32 instanceStepRate = 0)
{ {
Format = format;
SemanticName = semanticName; SemanticName = semanticName;
SemanticIndex = semanticIndex; SemanticIndex = semanticIndex;
Format = format;
InputSlot = inputSlot; InputSlot = inputSlot;
AlignedByteOffset = offset; AlignedByteOffset = offset;
InputSlotClass = slotClass; InputSlotClass = slotClass;
@@ -85,7 +85,7 @@ namespace GlitchyEngine.Renderer
// Todo: DirectX needs shader! // Todo: DirectX needs shader!
/// Takes ownership of ownElements! /// Takes ownership of ownElements!
public this(GraphicsContext context, VertexElement[] ownElements) public this(GraphicsContext context, VertexElement[] ownElements, VertexShader vertexShader)
{ {
_context = context; _context = context;
_elements = ownElements; _elements = ownElements;