summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--engine/xe_engine.cpp42
-rw-r--r--engine/xe_engine.hpp22
-rwxr-xr-xengine/xe_pipeline.cpp2
-rw-r--r--engine/xe_render_system.cpp73
-rw-r--r--engine/xe_render_system.hpp27
-rw-r--r--engine/xe_renderer.cpp1
6 files changed, 119 insertions, 48 deletions
diff --git a/engine/xe_engine.cpp b/engine/xe_engine.cpp
index ff9c95b..6de221a 100644
--- a/engine/xe_engine.cpp
+++ b/engine/xe_engine.cpp
@@ -1,15 +1,17 @@
#include "xe_engine.hpp"
#include "xe_descriptors.hpp"
+#include <string>
namespace xe {
XeEngine::XeEngine(int width, int height, std::string name)
- : xeWindow{width, height, name}, xeDevice{xeWindow}, xeRenderer{xeWindow, xeDevice} {
+ : xeWindow{width, height, name},
+ xeDevice{xeWindow},
+ xeRenderer{xeWindow, xeDevice},
+ xeCamera{} {
loadDescriptors();
};
-XeEngine::~XeEngine() {};
-
void XeEngine::loadDescriptors() {
xeDescriptorPool = XeDescriptorPool::Builder(xeDevice)
.setMaxSets(XeSwapChain::MAX_FRAMES_IN_FLIGHT)
@@ -22,12 +24,12 @@ void XeEngine::loadDescriptors() {
.build();
}
-std::unique_ptr<XeRenderSystem> XeEngine::createRenderSystem(const std::string &vert, const std::string &frag, typename pushCunstant, typename uniformBuffer) {
+std::unique_ptr<XeRenderSystem> XeEngine::createRenderSystem(const std::string &vert, const std::string &frag, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize) {
return std::make_unique<XeRenderSystem>(
xeDevice,
xeRenderer,
- xeDescriptorPool,
- xeDescriptorSetLayout,
+ *xeDescriptorPool,
+ *xeDescriptorSetLayout,
vert,
frag,
pushCunstantDataSize,
@@ -35,4 +37,32 @@ std::unique_ptr<XeRenderSystem> XeEngine::createRenderSystem(const std::string &
);
}
+std::shared_ptr<XeModel> XeEngine::createModel(const std::string &filename) {
+ return XeModel::createModelFromFile(xeDevice, filename);
+}
+
+void XeEngine::render(
+ XeRenderSystem& xeRenderSystem,
+ std::vector<XeGameObject>& gameObjects,
+ void* pushConstantData,
+ uint32_t pushConstantSize,
+ void* uniformBufferData,
+ uint32_t uniformBufferSize) {
+
+ auto commandBuffer = xeRenderer.getCurrentCommandBuffer();
+ xeRenderer.beginSwapChainRenderPass(commandBuffer);
+
+ xeRenderSystem.renderGameObjects(
+ xeRenderer.getFrameIndex(),
+ commandBuffer,
+ gameObjects,
+ pushConstantData,
+ pushConstantSize,
+ uniformBufferData,
+ uniformBufferSize
+ );
+
+ xeRenderer.endSwapChainRenderPass(commandBuffer);
+}
+
} \ No newline at end of file
diff --git a/engine/xe_engine.hpp b/engine/xe_engine.hpp
index 7beb962..d9f79ca 100644
--- a/engine/xe_engine.hpp
+++ b/engine/xe_engine.hpp
@@ -6,6 +6,7 @@
#include "xe_render_system.hpp"
#include "xe_descriptors.hpp"
+#include <string>
namespace xe {
class XeEngine {
@@ -26,8 +27,28 @@ class XeEngine {
return xeRenderer;
};
+ XeCamera& getCamera() {
+ return xeCamera;
+ };
+
std::unique_ptr<XeRenderSystem> createRenderSystem(const std::string &vert, const std::string &frag, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize);
+ std::shared_ptr<XeModel> createModel(const std::string &filename);
+
+ bool beginFrame() { return xeRenderer.beginFrame(); }
+
+ void endFrame() { return xeRenderer.endFrame(); }
+
+ void render(
+ XeRenderSystem& xeRenderSystem,
+ std::vector<XeGameObject>& gameObjects,
+ void* pushConstantData,
+ uint32_t pushConstantSize,
+ void* uniformBufferData,
+ uint32_t uniformBufferSize);
+
+ void close() { vkDeviceWaitIdle(xeDevice.device()); }
+
private:
void loadDescriptors();
@@ -35,6 +56,7 @@ class XeEngine {
XeWindow xeWindow;
XeDevice xeDevice;
XeRenderer xeRenderer;
+ XeCamera xeCamera;
std::unique_ptr<XeDescriptorPool> xeDescriptorPool;
std::unique_ptr<XeDescriptorSetLayout> xeDescriptorSetLayout;
diff --git a/engine/xe_pipeline.cpp b/engine/xe_pipeline.cpp
index d06d09b..c34d2a9 100755
--- a/engine/xe_pipeline.cpp
+++ b/engine/xe_pipeline.cpp
@@ -145,7 +145,7 @@ namespace xe {
configInfo.rasterizationInfo.rasterizerDiscardEnable = VK_FALSE;
configInfo.rasterizationInfo.polygonMode = VK_POLYGON_MODE_FILL;
configInfo.rasterizationInfo.lineWidth = 1.0f;
- configInfo.rasterizationInfo.cullMode = VK_CULL_MODE_NONE;
+ configInfo.rasterizationInfo.cullMode = VK_CULL_MODE_BACK_BIT;
configInfo.rasterizationInfo.frontFace = VK_FRONT_FACE_CLOCKWISE;
configInfo.rasterizationInfo.depthBiasEnable = VK_FALSE;
configInfo.rasterizationInfo.depthBiasConstantFactor = 0.0f;
diff --git a/engine/xe_render_system.cpp b/engine/xe_render_system.cpp
index ec56972..17e62dc 100644
--- a/engine/xe_render_system.cpp
+++ b/engine/xe_render_system.cpp
@@ -12,14 +12,15 @@
#include <memory>
#include <stdexcept>
+#include <iostream>
+
namespace xe {
-template <typename P, typename U>
XeRenderSystem::XeRenderSystem(
XeDevice &device,
XeRenderer &renderer,
- std::unique_ptr<XeDescriptorPool> &xeDescriptorPool,
- std::unique_ptr<XeDescriptorSetLayout> &xeDescriptorSetLayout,
+ XeDescriptorPool &xeDescriptorPool,
+ XeDescriptorSetLayout &xeDescriptorSetLayout,
std::string vert,
std::string frag,
uint32_t pushCunstantDataSize,
@@ -31,12 +32,9 @@ XeRenderSystem::XeRenderSystem(
}
-template <typename P, typename U>
XeRenderSystem::~XeRenderSystem() {};
-
-template <typename P, typename U>
-void XeRenderSystem::createUniformBuffers(std::unique_ptr<XeDescriptorPool> &xeDescriptorPool, std::unique_ptr<XeDescriptorSetLayout> &xeDescriptorSetLayout, uint32_t uniformBufferDataSize) {
+void XeRenderSystem::createUniformBuffers(XeDescriptorPool &xeDescriptorPool, XeDescriptorSetLayout &xeDescriptorSetLayout, uint32_t uniformBufferDataSize) {
if(uniformBufferDataSize == 0) return;
uboBuffers = std::vector<std::unique_ptr<XeBuffer>>(XeSwapChain::MAX_FRAMES_IN_FLIGHT);
@@ -53,24 +51,24 @@ void XeRenderSystem::createUniformBuffers(std::unique_ptr<XeDescriptorPool> &xeD
descriptorSets = std::vector<VkDescriptorSet>(XeSwapChain::MAX_FRAMES_IN_FLIGHT);
for (int i = 0; i < descriptorSets.size(); i++) {
auto bufferInfo = uboBuffers[i]->descriptorInfo();
- XeDescriptorWriter(*xeDescriptorSetLayout, *xeDescriptorPool)
+ XeDescriptorWriter(xeDescriptorSetLayout, xeDescriptorPool)
.writeBuffer(0, &bufferInfo)
.build(descriptorSets[i]);
}
}
-template <typename P, typename U>
-void XeRenderSystem::createPipelineLayout(std::unique_ptr<XeDescriptorSetLayout> &xeDescriptorSetLayout, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize) {
+void XeRenderSystem::createPipelineLayout(XeDescriptorSetLayout &xeDescriptorSetLayout, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize) {
+
+ VkPushConstantRange pushConstantRange;
+ pushConstantRange.stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
+ pushConstantRange.offset = 0;
+ pushConstantRange.size = pushCunstantDataSize;
VkPipelineLayoutCreateInfo pipelineLayoutInfo{};
pipelineLayoutInfo.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
if (pushCunstantDataSize > 0) {
- VkPushConstantRange pushConstantRange;
- pushConstantRange.stageFlags = VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT;
- pushConstantRange.offset = 0;
- pushConstantRange.size = pushCunstantDataSize;
pipelineLayoutInfo.pushConstantRangeCount = 1;
pipelineLayoutInfo.pPushConstantRanges = &pushConstantRange;
} else {
@@ -79,7 +77,7 @@ void XeRenderSystem::createPipelineLayout(std::unique_ptr<XeDescriptorSetLayout>
}
if (uniformBufferDataSize > 0) {
- std::vector<VkDescriptorSetLayout> descriptorSetLayouts{xeDescriptorSetLayout->getDescriptorSetLayout()};
+ std::vector<VkDescriptorSetLayout> descriptorSetLayouts{xeDescriptorSetLayout.getDescriptorSetLayout()};
pipelineLayoutInfo.setLayoutCount = static_cast<uint32_t>(descriptorSetLayouts.size());
pipelineLayoutInfo.pSetLayouts = descriptorSetLayouts.data();
} else {
@@ -90,10 +88,10 @@ void XeRenderSystem::createPipelineLayout(std::unique_ptr<XeDescriptorSetLayout>
if(vkCreatePipelineLayout(xeDevice.device(), &pipelineLayoutInfo, nullptr, &pipelineLayout) != VK_SUCCESS) {
std::runtime_error("failed to create pipeline layout!");
}
+
}
-template <typename P, typename U>
void XeRenderSystem::createPipeline(VkRenderPass renderPass, std::string vert, std::string frag) {
assert(pipelineLayout != nullptr && "Cannot create pipeline before pipeline layout");
@@ -109,35 +107,46 @@ void XeRenderSystem::createPipeline(VkRenderPass renderPass, std::string vert, s
);
}
+void XeRenderSystem::renderGameObjects(
+ int frameIndex,
+ VkCommandBuffer commandBuffer,
+ std::vector<XeGameObject> &gameObjects,
+ void *pushConstantData,
+ uint32_t pushConstantSize,
+ void* uniformBufferData,
+ uint32_t uniformBufferSize) {
+
+ uboBuffers[frameIndex]->writeToBuffer(uniformBufferData);
+ uboBuffers[frameIndex]->flush();
+
+ xePipeline->bind(commandBuffer);
-template <typename P, typename U>
-void XeRenderSystem::renderGameObjects(XeFrameInfo &frameInfo, std::vector<XeGameObject> &gameObjects, XeRenderSystem::XeData pushConstantData) {
- xePipeline->bind(frameInfo.commandBuffer);
-
- if(uboBuffers.size() > 0) {
+ if(pushConstantData == NULL) {
vkCmdBindDescriptorSets(
- frameInfo.commandBuffer,
+ commandBuffer,
VK_PIPELINE_BIND_POINT_GRAPHICS,
pipelineLayout,
0,
1,
- &descriptorSets[frameInfo.frameIndex],
+ &descriptorSets[frameIndex],
0,
nullptr);
}
for (auto& obj: gameObjects) {
- vkCmdPushConstants(
- frameInfo.commandBuffer,
- pipelineLayout,
- VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
- 0,
- sizeof(pushConstantData),
- &pushConstantData);
+ if(pushConstantData == NULL) {
+ vkCmdPushConstants(
+ commandBuffer,
+ pipelineLayout,
+ VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_FRAGMENT_BIT,
+ 0,
+ pushConstantSize,
+ &pushConstantData);
+ }
- obj.model->bind(frameInfo.commandBuffer);
- obj.model->draw(frameInfo.commandBuffer);
+ obj.model->bind(commandBuffer);
+ obj.model->draw(commandBuffer);
}
}
diff --git a/engine/xe_render_system.hpp b/engine/xe_render_system.hpp
index 42079df..608e03a 100644
--- a/engine/xe_render_system.hpp
+++ b/engine/xe_render_system.hpp
@@ -5,12 +5,13 @@
#include "xe_pipeline.hpp"
#include "xe_frame_info.hpp"
#include "xe_game_object.hpp"
+#include "xe_descriptors.hpp"
+#include "xe_renderer.hpp"
#include <memory>
namespace xe {
-template<typename P, typename U>
class XeRenderSystem {
public:
@@ -19,23 +20,33 @@ class XeRenderSystem {
XeRenderSystem(
XeDevice &device,
XeRenderer &renderer,
- std::unique_ptr<XeDescriptorPool> &xeDescriptorPool,
- std::unique_ptr<XeDescriptorSetLayout> &xeDescriptorSetLayout,
+ XeDescriptorPool &xeDescriptorPool,
+ XeDescriptorSetLayout &xeDescriptorSetLayout,
std::string vert,
std::string frag,
- uint32_t pushCunstantDataSize,
- uint32_t uniformBufferDataSize);
+ uint32_t pushCunstantDataSize,
+ uint32_t uniformBufferDataSize
+ );
~XeRenderSystem();
XeRenderSystem(const XeRenderSystem &) = delete;
XeRenderSystem operator=(const XeRenderSystem &) = delete;
- void renderGameObjects(XeFrameInfo &frameInfo, std::vector<XeGameObject> &gameObjects, XeRenderSystem::XeData pushConstantData);
+ void setUnifroms(XeFrameInfo & frameInfo);
+
+ void renderGameObjects(
+ int frameIndex,
+ VkCommandBuffer commandBuffer,
+ std::vector<XeGameObject> &gameObjects,
+ void *pushConstantData,
+ uint32_t pushConstantSize,
+ void* uniformBufferData,
+ uint32_t uniformBufferSize);
private:
- void createUniformBuffers(std::unique_ptr<XeDescriptorPool> &xeDescriptorPool, std::unique_ptr<XeDescriptorSetLayout> &xeDescriptorSetLayout, uint32_t uniformBufferDataSize);
- void createPipelineLayout(std::unique_ptr<XeDescriptorSetLayout> &xeDescriptorSetLayout, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize);
+ void createUniformBuffers(XeDescriptorPool &xeDescriptorPool, XeDescriptorSetLayout &xeDescriptorSetLayout, uint32_t uniformBufferDataSize);
+ void createPipelineLayout(XeDescriptorSetLayout &xeDescriptorSetLayout, uint32_t pushCunstantDataSize, uint32_t uniformBufferDataSize);
void createPipeline(VkRenderPass renderPass, std::string vert, std::string frag);
XeDevice& xeDevice;
diff --git a/engine/xe_renderer.cpp b/engine/xe_renderer.cpp
index 0c14cec..1714e46 100644
--- a/engine/xe_renderer.cpp
+++ b/engine/xe_renderer.cpp
@@ -17,7 +17,6 @@ namespace xe {
XeRenderer::XeRenderer(XeWindow& window, XeDevice& device) : xeWindow{window}, xeDevice{device} {
recreateSwapChain();
createCommandBuffers();
- loadDescriptorPool();
}
XeRenderer::~XeRenderer() { freeCommandBuffers(); }
generated by cgit v1.2.3-freya (git 2.51.0) at 2025-09-23 16:31:36 +0000