Merge branch 'main' into heightmaps
This commit is contained in:
commit
dc79c150da
2
.github/workflows/appimage.yml
vendored
2
.github/workflows/appimage.yml
vendored
@ -43,7 +43,7 @@ jobs:
|
||||
UPDATE_INFO: gh-releases-zsync|MihailRis|VoxelEngine-Cpp|latest|*x86_64.AppImage.zsync
|
||||
with:
|
||||
recipe: dev/AppImageBuilder.yml
|
||||
- uses: actions/upload-artifact@v2
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: AppImage
|
||||
path: './*.AppImage*'
|
||||
|
||||
2
.github/workflows/windows.yml
vendored
2
.github/workflows/windows.yml
vendored
@ -43,7 +43,7 @@ jobs:
|
||||
working-directory: ${{ github.workspace }}
|
||||
- name: Run tests
|
||||
run: ctest --output-on-failure --test-dir build
|
||||
- uses: actions/upload-artifact@v2
|
||||
- uses: actions/upload-artifact@v4
|
||||
with:
|
||||
name: Windows-Build
|
||||
path: 'packaged/Release/*'
|
||||
|
||||
@ -246,6 +246,9 @@ void Batch3D::blockCube(
|
||||
}
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user