kotofyt/funnygame
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added mesh rendering

Browse Source
This commit is contained in:
kotofyt
2025-05-28 14:36:57 +03:00
parent 60fa98e240
commit b83078553e
53 changed files with 1436 additions and 363 deletions
Download Patch File Download Diff File Expand all files Collapse all files

137
engine/vk_brush.cpp
View File

@@ -4,48 +4,27 @@
#include "vk_helper.h"
#include "vulkan/vulkan_core.h"
extern VkSampler g_invalidTextureSampler;
vk_tripipeline_t g_brushPipeline = {};
VkDescriptorPool g_brushDescriptorPool;
VkDescriptorSet g_brushDescriptorSet;
VkSampler g_brushSampler;
abstract_class CBrush: public IBrush
{
public:
void SetPosition( vec3 position ) override;
void SetRotationEuler( vec3 angle ) override;
void SetRotationQuat( vec4 quaternion) override;
void SetMatrix( mat3 matrix ) override;
void SetScale( vec3 scale ) override;
void SetVertexBuffer( IVertexBuffer *pBuffer ) override;
void SetIndexBuffer( IIndexBuffer *pBuffer ) override;
void Draw() override;
IMaterial *m_pMaterial = NULL;
Material_t m_material;
CVertexBuffer *m_pVertexBuffer = NULL;
CIndexBuffer *m_pIndexBuffer = NULL;
};
void CBrush::SetPosition( vec3 position )
{
}
void CBrush::SetRotationEuler( vec3 angle )
{
}
void CBrush::SetRotationQuat( vec4 quaternion)
{
}
void CBrush::SetMatrix( mat3 matrix )
{
}
void CBrush::SetScale( vec3 scale )
{
}
CUtlVector<CBrush> g_drawnBrushes;
void CBrush::SetVertexBuffer( IVertexBuffer *pBuffer )
@@ -58,34 +37,15 @@ void CBrush::SetIndexBuffer( IIndexBuffer *pBuffer )
m_pIndexBuffer = (CIndexBuffer*)pBuffer;
}
CUtlVector<CBrush> g_drawnMeshes;
IMaterial *g_pDefaultMaterial;
IMaterial *g_pCurrentMaterial;
void CBrush::Draw()
{
g_drawnMeshes.AppendTail(*this);
if (!g_pCurrentMaterial)
m_material = {};
else
m_material = g_pCurrentMaterial->m;
g_drawnBrushes.AppendTail(*this);
}
abstract_class CMaterial: public IMaterial
{
};
extern CUtlVector<ITexture*> g_textures;
vk_tripipeline_t g_brushPipeline = {};
vk_image2d_t meshdepth;
vk_image2d_t meshcolor;
extern bool g_bConfigNotify;
VkDescriptorPool g_brushDescriptorPool;
VkDescriptorSet g_brushDescriptorSet;
vk_buffer_t g_brushProjection;
struct MeshProjection {
mat4 projection;
} *g_brushProject;
VkSampler g_brushSampler;
void IBrushRenderer::Init()
{
@@ -111,9 +71,6 @@ void IBrushRenderer::Init()
shaders[1].Destroy();
shaders[0].Destroy();
meshdepth.Create(1280, 720, VK_FORMAT_D32_SFLOAT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
meshcolor.Create(1280, 720, VK_FORMAT_R8G8B8A8_UNORM, VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT);
CUtlVector<VkDescriptorPoolSize> pools;
for (auto &binding: bindings)
{
@@ -137,8 +94,6 @@ void IBrushRenderer::Init()
allocInfo.pSetLayouts = &g_brushPipeline.m_descriptorSetLayout;
vkAllocateDescriptorSets(g_vkDevice, &allocInfo, &g_brushDescriptorSet);
g_brushProjection.Create(64, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT);
g_brushProject = (MeshProjection*)g_brushProjection.Map(0, 64);
VkPhysicalDeviceProperties properties{};
vkGetPhysicalDeviceProperties(g_vkPhysicalDevice, &properties);
@@ -164,17 +119,6 @@ void IBrushRenderer::Init()
void IBrushRenderer::Frame( float fDelta )
{
glm_mat4_identity(g_brushProject->projection);
glm_perspective(glm_rad(90),(float)g_nWindowWidth/g_nWindowHeight, 0.01, 100, g_brushProject->projection);
glm_rotate(g_brushProject->projection, glm_rad(90), (vec4){1,0,0,0});
glm_scale(g_brushProject->projection, (vec4){1,-1,1,1});
glm_rotate(g_brushProject->projection, glm_rad(-90), (vec4){0,0,1,0});
if (g_bConfigNotify)
{
meshdepth.Destroy();
meshdepth.Create(g_nWindowWidth, g_nWindowHeight, VK_FORMAT_D32_SFLOAT, VK_IMAGE_USAGE_DEPTH_STENCIL_ATTACHMENT_BIT);
}
CUtlVector<VkWriteDescriptorSet> writes(2);
for (auto &write: writes)
@@ -186,9 +130,9 @@ void IBrushRenderer::Frame( float fDelta )
}
VkDescriptorBufferInfo bufferInfo = {};
bufferInfo.buffer = g_brushProjection.m_buffer;
bufferInfo.buffer = g_cameraProperties.m_buffer;
bufferInfo.offset = 0;
bufferInfo.range = g_brushProjection.m_nSize;
bufferInfo.range = g_cameraProperties.m_nSize;
writes[0].dstBinding = 0;
writes[0].descriptorType = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER;
writes[0].descriptorCount = 1;
@@ -237,7 +181,7 @@ void IBrushRenderer::Frame( float fDelta )
};
VkRenderingAttachmentInfo depthAttachment = {
.sType = VK_STRUCTURE_TYPE_RENDERING_ATTACHMENT_INFO,
.imageView = meshdepth.m_imageView,
.imageView = g_meshdepth.m_imageView,
.imageLayout = VK_IMAGE_LAYOUT_DEPTH_ATTACHMENT_OPTIMAL,
.loadOp = VK_ATTACHMENT_LOAD_OP_CLEAR,
.storeOp = VK_ATTACHMENT_STORE_OP_STORE,
@@ -317,14 +261,10 @@ void IBrushRenderer::Frame( float fDelta )
vkCmdBindPipeline(g_vkCommandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, g_brushPipeline.m_pipeline);
vkCmdBindDescriptorSets(g_vkCommandBuffer,VK_PIPELINE_BIND_POINT_GRAPHICS, g_brushPipeline.m_layout, 0, 1, &g_brushDescriptorSet, 0, NULL);
for (auto &mesh: g_drawnMeshes)
for (auto &mesh: g_drawnBrushes)
{
VkDeviceSize offset = 0;
uint32_t textureID = 0;
if (g_pCurrentMaterial == 0)
textureID = 0;
else
textureID = ((CMaterial*)g_pCurrentMaterial)->m.albedo;
uint32_t textureID = mesh.m_material.albedo;
vkCmdPushConstants(g_vkCommandBuffer, g_brushPipeline.m_layout, VK_SHADER_STAGE_ALL, 0, 4, &textureID);
vkCmdBindVertexBuffers(g_vkCommandBuffer, 0, 1, &mesh.m_pVertexBuffer->m_buffer.m_buffer, &offset);
if (mesh.m_pIndexBuffer)
@@ -349,7 +289,7 @@ void IBrushRenderer::Frame( float fDelta )
.srcAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT,
.dstAccessMask = 0,
.oldLayout = VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL,
.newLayout = VK_IMAGE_LAYOUT_PRESENT_SRC_KHR,
.newLayout = VK_IMAGE_LAYOUT_GENERAL,
.image = g_swapchainImage,
.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0, 1, 0, 1}
};
@@ -358,23 +298,10 @@ void IBrushRenderer::Frame( float fDelta )
VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT,
VK_PIPELINE_STAGE_BOTTOM_OF_PIPE_BIT,
0, 0, NULL, 0, NULL, 1, &barrier);
g_drawnMeshes = CUtlVector<CBrush>();
g_drawnBrushes = CUtlVector<CBrush>();
}
IVertexBuffer *IBrushRenderer::CreateVertexBuffer( uint32_t uSize )
{
CVertexBuffer *pBuffer = new CVertexBuffer();
pBuffer->m_buffer.Create(uSize, VK_BUFFER_USAGE_VERTEX_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT);
return pBuffer;
}
IIndexBuffer *IBrushRenderer::CreateIndexBuffer( uint32_t uSize )
{
CIndexBuffer *pBuffer = new CIndexBuffer();
pBuffer->m_buffer.Create(uSize, VK_BUFFER_USAGE_INDEX_BUFFER_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT);
return pBuffer;
}
IBrush *IBrushRenderer::CreateMesh()
{
@@ -387,21 +314,3 @@ void IBrushRenderer::Destroy( IBrush *pModel )
}
IMaterial *IBrushRenderer::LoadMaterial( const char *szMaterial )
{
FileHandle_t file = IFileSystem::Open(szMaterial, IFILE_READ);
CMaterial *pMaterial = new CMaterial;
if (!file)
{
return g_pDefaultMaterial;
}
IFileSystem::Close(file);
}
void IBrushRenderer::SetMaterial( IMaterial *pMaterial )
{
g_pCurrentMaterial = pMaterial;
}