DrSocalkwe3n/LuaVox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*

Browse Source
This commit is contained in:
DrSocalkwe3n
2025-07-10 22:19:13 +06:00
parent 62959a36b2
commit 8f3af0c687
7 changed files with 140 additions and 1897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -14,3 +14,5 @@
/imgui.ini /imgui.ini
/data /data
/gmon.out /gmon.out
/log.raw

4
CMakeLists.txt
View File

@@ -23,8 +23,8 @@ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--gc-sections") # -rdy
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -fsanitize=address -fno-omit-frame-pointer") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -fsanitize=address -fno-omit-frame-pointer")
# set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -fsanitize=address") # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=undefined -fno-sanitize-recover=all -fsanitize=float-divide-by-zero -fsanitize=float-cast-overflow -fno-sanitize=null -fno-sanitize=alignment -fsanitize=address")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined -fno-omit-frame-pointer -fno-sanitize-recover=all") # set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=address,undefined -fno-omit-frame-pointer -fno-sanitize-recover=all")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined") # set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=address,undefined")
project(LuaVox VERSION 0.0 DESCRIPTION "LuaVox Description") project(LuaVox VERSION 0.0 DESCRIPTION "LuaVox Description")

7
Src/Client/Vulkan/Vulkan.hpp
View File

@@ -1,5 +1,10 @@
#pragma once #pragma once
// Cmake
// #define GLM_FORCE_DEPTH_ZERO_TO_ONE
#include <glm/ext.hpp>
static_assert(GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_RH_ZO);
#include "Client/ServerSession.hpp" #include "Client/ServerSession.hpp"
#include "Common/Async.hpp" #include "Common/Async.hpp"
#include <TOSLib.hpp> #include <TOSLib.hpp>
@@ -19,14 +24,12 @@
#include "freetype/freetype.h" #include "freetype/freetype.h"
#include <vulkan/vulkan_core.h> #include <vulkan/vulkan_core.h>
#include <glm/ext.hpp>
#include <map> #include <map>
#define TOS_VULKAN_NO_VIDEO #define TOS_VULKAN_NO_VIDEO
#include <vulkan/vulkan.h> #include <vulkan/vulkan.h>
#define GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE
#include <GLFW/glfw3.h> #include <GLFW/glfw3.h>
static_assert(GLM_CONFIG_CLIP_CONTROL == GLM_CLIP_CONTROL_RH_ZO);
#define IMGUI_ENABLE_STB_TEXTEDIT_UNICODE #define IMGUI_ENABLE_STB_TEXTEDIT_UNICODE

224
Src/Client/Vulkan/VulkanRenderSession.cpp
View File

@@ -5,6 +5,7 @@
#include "TOSLib.hpp" #include "TOSLib.hpp"
#include "assets.hpp" #include "assets.hpp"
#include "glm/ext/matrix_transform.hpp" #include "glm/ext/matrix_transform.hpp"
#include "glm/ext/scalar_constants.hpp"
#include "glm/trigonometric.hpp" #include "glm/trigonometric.hpp"
#include <cstddef> #include <cstddef>
#include <memory> #include <memory>
@@ -219,8 +220,8 @@ void VulkanRenderSession::init(Vulkan *instance) {
/* /*
x left -1 ~ right 1 x left -1 ~ right 1
y up -1 ~ down 1 y up 1 ~ down -1
z far 1 ~ near 0 z near 0 ~ far -1
glm glm
@@ -228,12 +229,28 @@ void VulkanRenderSession::init(Vulkan *instance) {
{ {
NodeVertexStatic *array = (NodeVertexStatic*) VKCTX->TestQuad.mapMemory(); NodeVertexStatic *array = (NodeVertexStatic*) VKCTX->TestQuad.mapMemory();
array[0] = {112, 114, 50, 0, 0, 0, 0, 0, 0}; array[0] = {135, 135, 135-64, 0, 0, 0, 0, 0, 0};
array[1] = {114, 114, 50, 0, 0, 0, 0, 65535, 0}; array[1] = {135+16, 135, 135-64, 0, 0, 0, 0, 65535, 0};
array[2] = {114, 112, 50, 0, 0, 0, 0, 65535, 65535}; array[2] = {135+16, 135+16, 135-64, 0, 0, 0, 0, 65535, 65535};
array[3] = {112, 114, 50, 0, 0, 0, 0, 0, 0}; array[3] = {135, 135, 135-64, 0, 0, 0, 0, 0, 0};
array[4] = {114, 112, 50, 0, 0, 0, 0, 65535, 65535}; array[4] = {135+16, 135+16, 135-64, 0, 0, 0, 0, 65535, 65535};
array[5] = {112, 112, 50, 0, 0, 0, 0, 0, 65535}; array[5] = {135, 135+16, 135-64, 0, 0, 0, 0, 0, 65535};
array[6] = {135, 135, 135-64-16, 0, 0, 0, 0, 0, 0};
array[7] = {135, 135, 135-64, 0, 0, 0, 0, 65535, 0};
array[8] = {135, 135+16, 135-64, 0, 0, 0, 0, 65535, 65535};
array[9] = {135, 135, 135-64-16, 0, 0, 0, 0, 0, 0};
array[10] = {135, 135+16, 135-64, 0, 0, 0, 0, 65535, 65535};
array[11] = {135, 135+16, 135-64-16, 0, 0, 0, 0, 0, 65535};
array[12] = {135, 135, 135-64, 0, 0, 0, 0, 0, 0};
array[13] = {135+16, 135, 135-64, 0, 0, 0, 0, 65535, 0};
array[14] = {135+16, 135, 135-64-16, 0, 0, 0, 0, 65535, 65535};
array[15] = {135, 135, 135-64, 0, 0, 0, 0, 0, 0};
array[16] = {135+16, 135, 135-64-16, 0, 0, 0, 0, 65535, 65535};
array[17] = {135, 135, 135-64-16, 0, 0, 0, 0, 0, 65535};
VKCTX->TestQuad.unMapMemory(); VKCTX->TestQuad.unMapMemory();
} }
@@ -414,7 +431,7 @@ void VulkanRenderSession::init(Vulkan *instance) {
.flags = 0, .flags = 0,
.depthClampEnable = false, .depthClampEnable = false,
.rasterizerDiscardEnable = false, .rasterizerDiscardEnable = false,
.polygonMode = VK_POLYGON_MODE_FILL, .polygonMode = VK_POLYGON_MODE_LINE,
.cullMode = VK_CULL_MODE_BACK_BIT, .cullMode = VK_CULL_MODE_BACK_BIT,
.frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE, .frontFace = VK_FRONT_FACE_COUNTER_CLOCKWISE,
.depthBiasEnable = false, .depthBiasEnable = false,
@@ -687,19 +704,110 @@ void VulkanRenderSession::beforeDraw() {
} }
void VulkanRenderSession::drawWorld(GlobalTime gTime, float dTime, VkCommandBuffer drawCmd) { void VulkanRenderSession::drawWorld(GlobalTime gTime, float dTime, VkCommandBuffer drawCmd) {
glm::mat4 proj = glm::perspective<float>(glm::radians(75.f), float(VkInst->Screen.Width)/float(VkInst->Screen.Height), 0.5, std::pow(2, 17));
for(int i = 0; i < 4; i++) {
proj[1][i] *= -1;
proj[2][i] *= -1;
}
// Сместить в координаты игрока, повернуть относительно взгляда проецировать на экран // Сместить в координаты игрока, повернуть относительно взгляда проецировать на экран
// Изначально взгляд в z-1 // Изначально взгляд в z-1
PCO.ProjView = glm::mat4(1); // PCO.ProjView = glm::mat4(1);
PCO.ProjView = glm::translate(PCO.ProjView, -glm::vec3(Pos.z, Pos.y, Pos.x)/float(Pos::Object_t::BS)); // PCO.ProjView = glm::translate(PCO.ProjView, -glm::vec3(Pos.x, Pos.y, Pos.z)/float(Pos::Object_t::BS));
PCO.ProjView = proj*glm::mat4(Quat)*PCO.ProjView; // PCO.ProjView = proj*glm::mat4(Quat)*PCO.ProjView;
// PCO.Model = glm::mat4(1);
// vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, NodeStaticOpaquePipeline);
// vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
// VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
// vkCmdBindDescriptorSets(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
// MainAtlas_LightMap_PipelineLayout, 0, 2,
// (const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr);
// VkDeviceSize vkOffsets = 0;
// VkBuffer vkBuffer = VKCTX->TestQuad;
// vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
// for(int i = 0; i < 16; i++) {
// PCO.Model = glm::rotate(PCO.Model, glm::half_pi<float>()/4, glm::vec3(0, 1, 0));
// vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
// VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
// vkCmdDraw(drawCmd, 6, 1, 0, 0);
// }
// PCO.Model = glm::mat4(1);
// // Проба рендера вокселей
// vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, VoxelOpaquePipeline);
// vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
// VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
// vkCmdBindDescriptorSets(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
// MainAtlas_LightMap_PipelineLayout, 0, 2,
// (const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr);
// if(VKCTX->TestVoxel) {
// vkBuffer = *VKCTX->TestVoxel;
// vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
// vkCmdDraw(drawCmd, VKCTX->TestVoxel->getSize() / sizeof(VoxelVertexPoint), 1, 0, 0);
// }
// {
// auto iterWorld = External.ChunkVoxelMesh.find(WorldId);
// if(iterWorld != External.ChunkVoxelMesh.end()) {
// glm::mat4 orig = PCO.Model;
// for(auto &pair : iterWorld->second) {
// if(auto& voxels = std::get<0>(pair.second)) {
// glm::vec3 cpos(pair.first.x, pair.first.y, pair.first.z);
// PCO.Model = glm::translate(orig, cpos*16.f);
// auto [vkBuffer, offset] = VKCTX->VertexPool_Voxels.map(voxels);
// vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
// VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, offsetof(WorldPCO, Model), sizeof(WorldPCO::Model), &PCO.Model);
// vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
// vkCmdDraw(drawCmd, voxels.VertexCount, 1, offset, 0);
// }
// }
// PCO.Model = orig;
// }
// }
// vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, NodeStaticOpaquePipeline);
// vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
// VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
// vkCmdBindDescriptorSets(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
// MainAtlas_LightMap_PipelineLayout, 0, 2,
// (const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr);
// {
// auto iterWorld = External.ChunkVoxelMesh.find(WorldId);
// if(iterWorld != External.ChunkVoxelMesh.end()) {
// glm::mat4 orig = PCO.Model;
// for(auto &pair : iterWorld->second) {
// if(auto& nodes = std::get<1>(pair.second)) {
// glm::vec3 cpos(pair.first.z, pair.first.y, pair.first.x);
// PCO.Model = glm::translate(orig, cpos*16.f);
// auto [vkBuffer, offset] = VKCTX->VertexPool_Nodes.map(nodes);
// vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
// VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, offsetof(WorldPCO, Model), sizeof(WorldPCO::Model), &PCO.Model);
// vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
// vkCmdDraw(drawCmd, nodes.VertexCount, 1, offset, 0);
// }
// }
// PCO.Model = orig;
// }
// }
static float Delta = 0;
Delta += dTime;
glm::mat4 projView = glm::perspective<float>(glm::radians(75.f), float(VkInst->Screen.Width)/float(VkInst->Screen.Height), 0.5, std::pow(2, 17));
projView[1][1] *= -1;
glm::mat4 rotate = glm::mat4(1);
rotate = glm::translate(rotate, {0, 0, -4});
rotate = glm::rotate(rotate, Delta/16*(2*glm::pi<float>()), {0, 1, 0});
rotate = glm::translate(rotate, {0, 0, 4});
PCO.ProjView = projView*rotate;
PCO.Model = glm::mat4(1); PCO.Model = glm::mat4(1);
vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, NodeStaticOpaquePipeline); vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, NodeStaticOpaquePipeline);
@@ -709,83 +817,11 @@ void VulkanRenderSession::drawWorld(GlobalTime gTime, float dTime, VkCommandBuff
MainAtlas_LightMap_PipelineLayout, 0, 2, MainAtlas_LightMap_PipelineLayout, 0, 2,
(const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr); (const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr);
VkDeviceSize vkOffsets = 0;
VkBuffer vkBuffer = VKCTX->TestQuad; VkBuffer vkBuffer = VKCTX->TestQuad;
vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets); VkDeviceSize vkOffset = 0;
for(int i = 0; i < 16; i++) { vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffset);
PCO.Model = glm::rotate(PCO.Model, glm::half_pi<float>()/4, glm::vec3(0, 1, 0)); vkCmdDraw(drawCmd, 6*3, 1, 0, 0);
vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
vkCmdDraw(drawCmd, 6, 1, 0, 0);
}
PCO.Model = glm::mat4(1);
// Проба рендера вокселей
vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, VoxelOpaquePipeline);
vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
vkCmdBindDescriptorSets(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
MainAtlas_LightMap_PipelineLayout, 0, 2,
(const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr);
if(VKCTX->TestVoxel) {
vkBuffer = *VKCTX->TestVoxel;
vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
vkCmdDraw(drawCmd, VKCTX->TestVoxel->getSize() / sizeof(VoxelVertexPoint), 1, 0, 0);
}
{
auto iterWorld = External.ChunkVoxelMesh.find(WorldId);
if(iterWorld != External.ChunkVoxelMesh.end()) {
glm::mat4 orig = PCO.Model;
for(auto &pair : iterWorld->second) {
if(auto& voxels = std::get<0>(pair.second)) {
glm::vec3 cpos(pair.first.x, pair.first.y, pair.first.z);
PCO.Model = glm::translate(orig, cpos*16.f);
auto [vkBuffer, offset] = VKCTX->VertexPool_Voxels.map(voxels);
vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, offsetof(WorldPCO, Model), sizeof(WorldPCO::Model), &PCO.Model);
vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
vkCmdDraw(drawCmd, voxels.VertexCount, 1, offset, 0);
}
}
PCO.Model = orig;
}
}
vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, NodeStaticOpaquePipeline);
vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, 0, sizeof(WorldPCO), &PCO);
vkCmdBindDescriptorSets(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS,
MainAtlas_LightMap_PipelineLayout, 0, 2,
(const VkDescriptorSet[]) {MainAtlasDescriptor, VoxelLightMapDescriptor}, 0, nullptr);
{
auto iterWorld = External.ChunkVoxelMesh.find(WorldId);
if(iterWorld != External.ChunkVoxelMesh.end()) {
glm::mat4 orig = PCO.Model;
for(auto &pair : iterWorld->second) {
if(auto& nodes = std::get<1>(pair.second)) {
glm::vec3 cpos(pair.first.z, pair.first.y, pair.first.x);
PCO.Model = glm::translate(orig, cpos*16.f);
auto [vkBuffer, offset] = VKCTX->VertexPool_Nodes.map(nodes);
vkCmdPushConstants(drawCmd, MainAtlas_LightMap_PipelineLayout,
VK_SHADER_STAGE_VERTEX_BIT | VK_SHADER_STAGE_GEOMETRY_BIT, offsetof(WorldPCO, Model), sizeof(WorldPCO::Model), &PCO.Model);
vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
vkCmdDraw(drawCmd, nodes.VertexCount, 1, offset, 0);
}
}
PCO.Model = orig;
}
}
} }
std::vector<VoxelVertexPoint> VulkanRenderSession::generateMeshForVoxelChunks(const std::vector<VoxelCube> cubes) { std::vector<VoxelVertexPoint> VulkanRenderSession::generateMeshForVoxelChunks(const std::vector<VoxelCube> cubes) {

2
Src/Client/Vulkan/VulkanRenderSession.hpp
View File

@@ -61,7 +61,7 @@ class VulkanRenderSession : public IRenderSession, public IVulkanDependent {
VulkanContext(Vulkan *vkInst) VulkanContext(Vulkan *vkInst)
: MainTest(vkInst), LightDummy(vkInst), : MainTest(vkInst), LightDummy(vkInst),
TestQuad(vkInst, sizeof(NodeVertexStatic)*6), TestQuad(vkInst, sizeof(NodeVertexStatic)*6*3),
VertexPool_Voxels(vkInst), VertexPool_Voxels(vkInst),
VertexPool_Nodes(vkInst) VertexPool_Nodes(vkInst)
{} {}

BIN
assets/shaders/chunk/node_transparent.frag.bin
View File

Binary file not shown.

1798
log.raw
View File

File diff suppressed because it is too large Load Diff