everyonecancode/RedScarfEngine
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Update return types

Browse Source
This commit is contained in:
Piotr Krygier committed 2023-05-13 17:47:42 +02:00
1 parent 6781c1cff1
commit 320c9293b1
2 files changed
+23 -12
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

graphics/src/rse_graphics.cpp
+17 -5
View File
@@ -44,6 +44,11 @@ uint8_t RseGraphics::graphics_run(void)
{{0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 1.0f}},
{{0.5f, 0.5f, 0.0f}, {0.0f, 0.0f, 1.0f}},
{{-0.5f, 0.5f, 0.0f}, {1.0f, 0.0f, 1.0f}}};
const std::vector<rse::graphics::vulkanbase::Vertex> vertices2 = {{{-0.5f, -0.5f, 0.0f}, {1.0f, 0.0f, 1.0f}},
{{0.5f, -0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}},
{{0.5f, 0.5f, 0.0f}, {0.0f, 1.0f, 0.0f}},
{{-0.5f, 0.5f, 0.0f}, {1.0f, 1.0f, 0.0f}}};
// FIXME: Temporary array of vertices, for testing purposes
std::vector<uint16_t> indices = {0, 1, 2, 2, 3, 0};
@@ -55,11 +60,18 @@ uint8_t RseGraphics::graphics_run(void)
1.0f
));
// rse::graphics::mesh::create_mesh_instance(vulkan_state, mesh_id, rse::graphics::mesh::InstanceData(
// glm::vec3(-1.0f, 0.0f, 0.0f),
// glm::vec3(0.0f, 0.0f, 0.0f),
// 1.0f
// ));
rse::graphics::mesh::create_mesh_instance(mesh_id, rse::graphics::mesh::InstanceData(
glm::vec3(-1.0f, 0.0f, 0.0f),
glm::vec3(0.0f, 0.0f, 0.0f),
1.0f
));
mesh_id = rse::graphics::mesh::create_mesh(vertices, indices);
rse::graphics::mesh::create_mesh_instance(mesh_id, rse::graphics::mesh::InstanceData(
glm::vec3(0.0f, 1.0f, 0.0f),
glm::vec3(0.0f, 0.0f, glm::radians(0.0f)),
1.0f
));
window::windowLoop();
graphics/src/vulkan_buffers.cpp
+6 -7
View File
@@ -332,8 +332,8 @@ void updateUniformBuffer()
memcpy(g_vulkan_state.uniformBuffers[g_vulkan_state.currentFrame].allocationInfo.pMappedData, &ubo, sizeof(ubo));
}
uint8_t update_mesh_buffers( const std::vector<rse::graphics::vulkanbase::Vertex>& vertices,
const std::vector<uint16_t>& indices)
uint8_t update_mesh_buffers(const std::vector<rse::graphics::vulkanbase::Vertex>& vertices,
const std::vector<uint16_t>& indices)
{
// void* mapped_data;
Buffer staging_buffer;
@@ -375,7 +375,7 @@ uint8_t update_mesh_buffers( const std::vector<rse::grap
return VULKAN_ERROR_NO_ERROR;
}
uint8_t update_mesh_instances( rse::graphics::mesh::InstanceData& instance_data)
uint8_t update_mesh_instances(rse::graphics::mesh::InstanceData& instance_data)
{
Buffer staging_buffer;
@@ -424,9 +424,6 @@ uint8_t recordCommandBuffer(uint32_t imageIndex)
VkRect2D scissor{};
VkDeviceSize offsets[] = {0};
auto indices = rse::graphics::mesh::get_mesh_indices(0);
auto instances = rse::graphics::mesh::get_instance_data_for_mesh(0);
beginInfo.sType = VK_STRUCTURE_TYPE_COMMAND_BUFFER_BEGIN_INFO;
beginInfo.flags = 0;
beginInfo.pInheritanceInfo = nullptr;
@@ -463,6 +460,8 @@ uint8_t recordCommandBuffer(uint32_t imageIndex)
VkBuffer vertexBuffers[] = {gVertexBuffers[i].buffer};
VkBuffer indexBuffer = {gIndexBuffers[i].buffer};
VkBuffer instanceBuffers[] = {gInstanceBuffers[i].buffer};
auto indices = rse::graphics::mesh::get_mesh_indices(0);
auto instances = rse::graphics::mesh::get_instance_data_for_mesh(0);
/* TODO: Figure out the offset */
vkCmdBindVertexBuffers(commandBuffer, 0, 1, vertexBuffers, offsets);
@@ -471,7 +470,7 @@ uint8_t recordCommandBuffer(uint32_t imageIndex)
vkCmdBindDescriptorSets(commandBuffer, VK_PIPELINE_BIND_POINT_GRAPHICS, g_vulkan_state.pipelineLayout, 0, 1,
&g_vulkan_state.descriptorSets[g_vulkan_state.currentFrame], 0, nullptr);
vkCmdDrawIndexed(commandBuffer, static_cast<uint32_t>(indices.size()), instances.size(), 0, 0, 0);
vkCmdDrawIndexed(commandBuffer, static_cast<uint32_t>(indices.size()+3), instances.size(), 0, 0, 0);
}
vkCmdEndRenderPass(commandBuffer);