PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'main' into heightmaps

Browse Source
This commit is contained in:
MihailRis 2024-09-10 15:11:17 +03:00
commit dc79c150da
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/appimage.yml vendored
View File

@ -43,7 +43,7 @@ jobs:
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
with: with:
recipe: dev/AppImageBuilder.yml recipe: dev/AppImageBuilder.yml
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: AppImage name: AppImage
path: './*.AppImage*' path: './*.AppImage*'

2
.github/workflows/windows.yml vendored
View File

@ -43,7 +43,7 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
- name: Run tests - name: Run tests
run: ctest --output-on-failure --test-dir build run: ctest --output-on-failure --test-dir build
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v4
with: with:
name: Windows-Build name: Windows-Build
path: 'packaged/Release/*' path: 'packaged/Release/*'

3
src/graphics/core/Batch3D.cpp
View File

@ -246,6 +246,9 @@ void Batch3D::blockCube(
} }
void Batch3D::point(glm::vec3 coord, glm::vec2 uv, glm::vec4 tint) { void Batch3D::point(glm::vec3 coord, glm::vec2 uv, glm::vec4 tint) {
if (index + B3D_VERTEX_SIZE >= capacity) {
flush();
}
vertex(coord, uv, tint.r, tint.g, tint.b, tint.a); vertex(coord, uv, tint.r, tint.g, tint.b, tint.a);
} }