fix build att 6

This commit is contained in:
Kolyah35
2026-03-19 19:31:52 +03:00
parent a72c2c4094
commit 78d218ccb1
4 changed files with 13 additions and 30 deletions

View File

@@ -8,9 +8,6 @@ inputs:
target:
description: 'Target platform: win, linux'
required: true
use-ccache:
description: 'Whether to use ccache/sccache'
required: true
runs:
using: "composite"
@@ -20,7 +17,6 @@ runs:
with:
variant: sccache
key: ${{ inputs.target }}-v1
if: inputs.use-ccache
- name: Setup CPM Cache
uses: actions/cache@v4

View File

@@ -2,12 +2,6 @@ name: Build Game
on:
workflow_dispatch:
inputs:
use-ccache:
description: 'Enable sccache'
required: false
default: true
type: boolean
pull_request:
push:
branches:
@@ -17,6 +11,7 @@ on:
env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
BUILD_TYPE: Release
CPM_SOURCE_CACHE: ${{ github.workspace }}/cpm-cache
jobs:
build-windows:
@@ -31,7 +26,6 @@ jobs:
with:
host: win
target: win
use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
- name: Create Build Environment
# Some projects don't allow in-source building, so create a separate build directory
@@ -53,11 +47,11 @@ jobs:
with:
name: mcpe-windows
path: |
'MinecraftPE.exe'
'glfw3.dll'
'libpng16.dll'
'OpenAL32.dll'
'z.dll'
'./MinecraftPE.exe'
'./glfw3.dll'
'./libpng16.dll'
'./OpenAL32.dll'
'./z.dll'
build-linux:
name: Linux Build
@@ -71,7 +65,6 @@ jobs:
with:
host: linux
target: linux
use-ccache: ${{ github.event_name != 'workflow_dispatch' || inputs.use-ccache }}
- name: Create Build Environment
# Some projects don't allow in-source building, so create a separate build directory
@@ -101,7 +94,7 @@ jobs:
with:
name: mcpe-linux
path: |
'MinecraftPE'
'./MinecraftPE'
publish:
name: Publish
@@ -124,13 +117,13 @@ jobs:
- name: Zip Windows Artifacts
uses: vimtor/action-zip@v1.2
with:
files: data mcpe-windows/MinecraftPE.exe mcpe-windows/glfw3.dll mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/z.dll
files: ${{github.workspace}}/data mcpe-windows/MinecraftPE.exe mcpe-windows/glfw3.dll mcpe-windows/libpng16.dll mcpe-windows/OpenAL32.dll mcpe-windows/z.dll
dest: minecraftpe-${{ steps.ref.outputs.hash }}-windows.zip
- name: Zip Linux Artifacts
uses: vimtor/action-zip@v1.2
with:
files: data mcpe-linux/MinecraftPE # ye, you should install libraries by urself :trollface:
files: ${{github.workspace}}/build/data mcpe-linux/MinecraftPE # ye, you should install libraries by urself :trollface:
dest: minecraftpe-${{ steps.ref.outputs.hash }}-linux.zip
- name: Zip Linux Server Artifacts

View File

@@ -9,11 +9,6 @@ static Random _rand;
namespace Mth
{
constexpr float PI = 3.1415926535897932384626433832795028841971f; // exactly!
constexpr float TWO_PI = 2.0f * PI; // exactly!
constexpr float DEGRAD = PI / 180.0f;
constexpr float RADDEG = 180.0f / PI;
static float _sin[65536];
static const float _sinScale = 65536.0f / (2.0f * PI);

View File

@@ -6,11 +6,10 @@
#include <algorithm>
namespace Mth {
extern const float PI;
extern const float TWO_PI;
extern const float RADDEG;
extern const float DEGRAD;
constexpr float PI = 3.1415926535897932384626433832795028841971f; // exactly!
constexpr float TWO_PI = 2.0f * PI; // exactly!
constexpr float DEGRAD = PI / 180.0f;
const float RADDEG = 180.0f / PI;
void initMth();