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

-

Browse Source
This commit is contained in:
Евгений
2025-02-18 07:34:16 +06:00
parent 5e42628595
commit 0368e3d654
14 changed files with 238 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Client/Abstract.hpp
View File

@@ -32,7 +32,7 @@ struct GlobalTime {
struct VoxelCube {
DefVoxelId_c VoxelId;
Pos::Local256_u Left, Right;
Pos::Local256_u Left, Size;
};
struct Node {

11
Src/Client/ServerSession.cpp
View File

@@ -157,7 +157,8 @@ void ServerSession::onResize(uint32_t width, uint32_t height) {
}
void ServerSession::onChangeFocusState(bool isFocused) {
if(!isFocused)
CursorMode = EnumCursorMoveMode::Default;
}
void ServerSession::onCursorPosChange(int32_t width, int32_t height) {
@@ -273,7 +274,7 @@ void ServerSession::atFreeDrawTime(GlobalTime gTime, float dTime) {
float deltaTime = 1-std::min<float>(gTime-PYR_At, 1/PYR_TIME_DELTA)*PYR_TIME_DELTA;
glm::quat quat =
glm::angleAxis(PYR.x-deltaTime*PYR_Offset.x, glm::vec3(-1.f, 0.f, 0.f))
glm::angleAxis(PYR.x-deltaTime*PYR_Offset.x, glm::vec3(1.f, 0.f, 0.f))
* glm::angleAxis(PYR.y-deltaTime*PYR_Offset.y, glm::vec3(0.f, -1.f, 0.f));
RS->setCameraPos(0, Pos, quat);
@@ -465,9 +466,9 @@ coro<> ServerSession::rP_Content(Net::AsyncSocket &sock) {
cube.Left.X = co_await sock.read<uint8_t>();
cube.Left.Y = co_await sock.read<uint8_t>();
cube.Left.Z = co_await sock.read<uint8_t>();
cube.Right.X = co_await sock.read<uint8_t>();
cube.Right.Y = co_await sock.read<uint8_t>();
cube.Right.Z = co_await sock.read<uint8_t>();
cube.Size.X = co_await sock.read<uint8_t>();
cube.Size.Y = co_await sock.read<uint8_t>();
cube.Size.Z = co_await sock.read<uint8_t>();
}
PP_Content_ChunkVoxels *packet = new PP_Content_ChunkVoxels(

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

@@ -3,6 +3,7 @@
#include "Client/Vulkan/Vulkan.hpp"
#include "Common/Abstract.hpp"
#include "assets.hpp"
#include "glm/trigonometric.hpp"
#include <memory>
#include <vector>
#include <vulkan/vulkan_core.h>
@@ -194,9 +195,17 @@ void VulkanRenderSession::init(Vulkan *instance) {
int width, height;
bool hasAlpha;
ByteBuffer image = VK::loadPNG(std::ifstream("/home/mr_s/Workspace/Alpha/LuaVox/assets/grass.png"), width, height, hasAlpha);
uint16_t texId = VKCTX->MainTest.atlasAddTexture(width, height);
VKCTX->MainTest.atlasChangeTextureData(texId, (const uint32_t*) image.data());
for(const char *path : {
"grass.png",
"tropical_rainforest_wood.png",
"willow_wood.png",
"xnether_blue_wood.png",
"xnether_purple_wood.png"
}) {
ByteBuffer image = VK::loadPNG(getResource(std::string("textures/") + path)->makeStream().Stream, width, height, hasAlpha);
uint16_t texId = VKCTX->MainTest.atlasAddTexture(width, height);
VKCTX->MainTest.atlasChangeTextureData(texId, (const uint32_t*) image.data());
}
/*
x left -1 ~ right 1
@@ -221,15 +230,22 @@ void VulkanRenderSession::init(Vulkan *instance) {
{
std::vector<VoxelCube> cubes;
cubes.emplace_back(0, Pos::Local256_u{0, 0, 0}, Pos::Local256_u{1, 1, 1});
cubes.emplace_back(0, Pos::Local256_u{0, 0, 0}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(1, Pos::Local256_u{255, 0, 0}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(1, Pos::Local256_u{0, 255, 0}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(1, Pos::Local256_u{0, 0, 255}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(2, Pos::Local256_u{255, 255, 0}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(2, Pos::Local256_u{0, 255, 255}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(2, Pos::Local256_u{255, 0, 255}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(3, Pos::Local256_u{255, 255, 255}, Pos::Local256_u{0, 0, 0});
cubes.emplace_back(4, Pos::Local256_u{64, 64, 64}, Pos::Local256_u{127, 127, 127});
std::vector<VoxelVertexPoint> vertexs = generateMeshForVoxelChunks(cubes);
if(!vertexs.empty()) {
VKCTX->TestVoxel.emplace(VkInst, vertexs.size()*sizeof(VoxelVertexPoint));
VoxelVertexPoint *result = (VoxelVertexPoint*) VKCTX->TestVoxel->mapMemory();
std::copy(vertexs.data(), vertexs.data()+vertexs.size(), result);
TOS::Logger("Test").debug() << result[0].FX << " " << result[0].FY << " " << result[0].FZ;
std::copy(vertexs.data(), vertexs.data()+vertexs.size(), (VoxelVertexPoint*) VKCTX->TestVoxel->mapMemory());
VKCTX->TestVoxel->unMapMemory();
}
}
@@ -655,11 +671,19 @@ void VulkanRenderSession::beforeDraw() {
}
void VulkanRenderSession::drawWorld(GlobalTime gTime, float dTime, VkCommandBuffer drawCmd) {
glm::mat4 proj = glm::perspective<float>(75, float(VkInst->Screen.Width)/float(VkInst->Screen.Height), 0.5, std::pow(2, 17));
// Сместить в координаты игрока, повернуть относительно взгляда, ещё поворот на 180 и проецировать на экран
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
PCO.ProjView = glm::mat4(1);
PCO.ProjView = glm::translate(PCO.ProjView, -glm::vec3(Pos)/float(Pos::Object_t::BS));
PCO.ProjView = proj*glm::mat4(Quat)*glm::rotate(glm::mat4(1), glm::pi<float>(), glm::vec3(0, 1, 0))*PCO.ProjView;
PCO.ProjView = proj*glm::mat4(Quat)*PCO.ProjView;
PCO.Model = glm::mat4(1);
vkCmdBindPipeline(drawCmd, VK_PIPELINE_BIND_POINT_GRAPHICS, NodeStaticOpaquePipeline);
@@ -692,6 +716,7 @@ void VulkanRenderSession::drawWorld(GlobalTime gTime, float dTime, VkCommandBuff
if(VKCTX->TestVoxel) {
vkBuffer = *VKCTX->TestVoxel;
vkCmdBindVertexBuffers(drawCmd, 0, 1, &vkBuffer, &vkOffsets);
vkCmdDraw(drawCmd, VKCTX->TestVoxel->getSize() / sizeof(VoxelVertexPoint), 1, 0, 0);
}
}
@@ -706,9 +731,74 @@ std::vector<VoxelVertexPoint> VulkanRenderSession::generateMeshForVoxelChunks(co
cube.Left.Y,
cube.Left.Z,
0,
0,
cube.Right.X-cube.Left.X,
cube.Right.Z-cube.Left.Z,
0, 0,
cube.Size.X,
cube.Size.Z,
cube.VoxelId,
0, 0,
0
);
out.emplace_back(
cube.Left.X,
cube.Left.Y,
cube.Left.Z,
1,
0, 0,
cube.Size.X,
cube.Size.Y,
cube.VoxelId,
0, 0,
0
);
out.emplace_back(
cube.Left.X,
cube.Left.Y,
cube.Left.Z,
2,
0, 0,
cube.Size.Z,
cube.Size.Y,
cube.VoxelId,
0, 0,
0
);
out.emplace_back(
cube.Left.X,
cube.Left.Y+cube.Size.Y+1,
cube.Left.Z,
3,
0, 0,
cube.Size.X,
cube.Size.Z,
cube.VoxelId,
0, 0,
0
);
out.emplace_back(
cube.Left.X,
cube.Left.Y,
cube.Left.Z+cube.Size.Z+1,
4,
0, 0,
cube.Size.X,
cube.Size.Y,
cube.VoxelId,
0, 0,
0
);
out.emplace_back(
cube.Left.X+cube.Size.X+1,
cube.Left.Y,
cube.Left.Z,
5,
0, 0,
cube.Size.Z,
cube.Size.Y,
cube.VoxelId,
0, 0,
0

190
assets/shaders/chunk/voxel.geom
View File

@@ -5,11 +5,12 @@ layout (triangle_strip, max_vertices = 4) out;
layout(location = 0) in highp uvec3 Geometry[];
layout(location = 0) out Fragment {
layout(location = 0) out FragmentObj {
vec3 GeoPos; // Реальная позиция в мире
uint VoxMTL; // Материал вокселя
flat uint VoxMTL; // Материал вокселя
vec2 LUV;
} fragment;
flat uint Place;
} Fragment;
layout(push_constant) uniform UniformBufferObject {
mat4 projview;
@@ -43,195 +44,214 @@ void main() {
uint voxMTL = ((Geometry[0].y >> 16) & 0xffff);
vec2 luv = vec2(float(Geometry[0].z & 0x3fff)+0.5f, float((Geometry[0].z >> 14) & 0x3fff)+0.5f);
int place = int(Geometry[0].x >> 27) & 0x7;
// Стартовая вершина
vec4 tempVec = baseVec;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv;
Fragment.GeoPos = vec3(tempVec);
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv;
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
int place = int(Geometry[0].x >> 27) & 0x3;
switch(place) {
case 0: // xz
tempVec = baseVec;
tempVec.x += size.x;
tempVec.z += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, 0);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(0, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.z += size.y;
tempVec.x += size.x / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(0, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, 0);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.x += size.x;
tempVec.z += size.y;
tempVec.x += size.x / 16.f;
tempVec.z += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
break;
case 1: // xy
tempVec = baseVec;
tempVec.x += size.x;
tempVec.x += size.x / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, 0);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, 0);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.y += size.y;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(0, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(0, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.x += size.x;
tempVec.y += size.y;
tempVec.x += size.x / 16.f;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
break;
case 2: // zy
tempVec = baseVec;
tempVec.z += size.x;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, 0);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(0, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.y += size.y;
tempVec.z += size.x / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(0, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, 0);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.z += size.x;
tempVec.y += size.y;
tempVec.z += size.x / 16.f;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
break;
case 3: // xz inv
tempVec = baseVec;
tempVec.z += size.y;
tempVec.x += size.x / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, 0);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, 0);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.x += size.x;
tempVec.z += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(0, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(0, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.x += size.x;
tempVec.z += size.y;
tempVec.x += size.x / 16.f;
tempVec.z += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
break;
case 4: // xy inv
tempVec = baseVec;
tempVec.y += size.y;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, 0);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(0, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.x += size.x;
tempVec.x += size.x / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(0, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, 0);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.x += size.x;
tempVec.y += size.y;
tempVec.x += size.x / 16.f;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
break;
case 5: // zy inv
tempVec = baseVec;
tempVec.y += size.y;
tempVec.z += size.x / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, 0);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, 0);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.z += size.x;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(0, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(0, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();
tempVec = baseVec;
tempVec.z += size.x;
tempVec.y += size.y;
tempVec.z += size.x / 16.f;
tempVec.y += size.y / 16.f;
tempVec = ubo.model*tempVec;
fragment.GeoPos = vec3(tempVec);
fragment.VoxMTL = voxMTL;
fragment.LUV = luv+vec2(size.x, size.y);
Fragment.GeoPos = tempVec.xyz;
Fragment.VoxMTL = voxMTL;
Fragment.LUV = luv+vec2(size.x, size.y);
Fragment.Place = place;
gl_Position = ubo.projview*tempVec;
EmitVertex();

BIN
assets/shaders/chunk/voxel.geom.bin
View File

Binary file not shown.

24
assets/shaders/chunk/voxel_opaque.frag
View File

@@ -2,8 +2,9 @@
layout(location = 0) in FragmentObj {
vec3 GeoPos; // Реальная позиция в мире
uint VoxMTL; // Материал вокселя
flat uint VoxMTL; // Материал вокселя
vec2 LUV;
flat uint Place;
} Fragment;
layout(location = 0) out vec4 Frame;
@@ -73,5 +74,24 @@ vec4 atlasColor(uint texId, vec2 uv)
}
void main() {
Frame = atlasColor(0, Fragment.GeoPos.xy);
vec2 uv;
switch(Fragment.Place) {
case 0:
uv = Fragment.GeoPos.xz; break;
case 1:
uv = Fragment.GeoPos.xy; break;
case 2:
uv = Fragment.GeoPos.zy; break;
case 3:
uv = Fragment.GeoPos.xz*vec2(-1, -1); break;
case 4:
uv = Fragment.GeoPos.xy*vec2(-1, 1); break;
case 5:
uv = Fragment.GeoPos.zy*vec2(-1, 1); break;
default:
uv = vec2(0);
}
Frame = atlasColor(Fragment.VoxMTL, uv);
}

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

Binary file not shown.

1
assets/shaders/chunk/voxel_transparent.frag
View File

@@ -4,6 +4,7 @@ layout(location = 0) in Fragment {
vec3 GeoPos; // Реальная позиция в мире
uint VoxMTL; // Материал вокселя
vec2 LUV;
uint Place;
} fragment;
layout(location = 0) out vec4 Frame;

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

Binary file not shown.

0
assets/grass.png → assets/textures/grass.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 10 KiB

After

Width:  |  Height:  |  Size: 10 KiB

BIN
assets/textures/tropical_rainforest_wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
assets/textures/willow_wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
assets/textures/xnether_blue_wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

BIN
assets/textures/xnether_purple_wood.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 6.0 KiB