mirror of
https://github.com/ClassiCube/ClassiCube.git
synced 2025-09-12 09:06:55 -04:00
Build fixes
This commit is contained in:
parent
50eeaa0409
commit
c84d21c0f0
1
.github/workflows/build_nds.yml
vendored
1
.github/workflows/build_nds.yml
vendored
@ -21,6 +21,7 @@ jobs:
|
|||||||
- name: Compile NDS build
|
- name: Compile NDS build
|
||||||
id: compile
|
id: compile
|
||||||
run: |
|
run: |
|
||||||
|
apt-get update
|
||||||
apt-get -y install curl
|
apt-get -y install curl
|
||||||
export BLOCKSDS=/opt/blocksds/core
|
export BLOCKSDS=/opt/blocksds/core
|
||||||
export BLOCKSDSEXT=/opt/blocksds/external
|
export BLOCKSDSEXT=/opt/blocksds/external
|
||||||
|
@ -509,7 +509,8 @@ void Gfx_CalcPerspectiveMatrix(struct Matrix* matrix, float fov, float aspect, f
|
|||||||
|
|
||||||
void Gfx_LoadMatrix(MatrixType type, const struct Matrix* matrix) {
|
void Gfx_LoadMatrix(MatrixType type, const struct Matrix* matrix) {
|
||||||
const float* m = (const float*)matrix;
|
const float* m = (const float*)matrix;
|
||||||
float tmp[16];
|
Mtx44 dst;
|
||||||
|
float* tmp = (float*)dst;
|
||||||
|
|
||||||
// Transpose matrix
|
// Transpose matrix
|
||||||
for (int i = 0; i < 4; i++)
|
for (int i = 0; i < 4; i++)
|
||||||
@ -521,10 +522,10 @@ void Gfx_LoadMatrix(MatrixType type, const struct Matrix* matrix) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (type == MATRIX_PROJ) {
|
if (type == MATRIX_PROJ) {
|
||||||
GX_LoadProjectionMtx(tmp,
|
GX_LoadProjectionMtx(dst,
|
||||||
tmp[3*4+3] == 0.0f ? GX_PERSPECTIVE : GX_ORTHOGRAPHIC);
|
tmp[3*4+3] == 0.0f ? GX_PERSPECTIVE : GX_ORTHOGRAPHIC);
|
||||||
} else {
|
} else {
|
||||||
GX_LoadPosMtxImm(tmp, GX_PNMTX0);
|
GX_LoadPosMtxImm(dst, GX_PNMTX0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@ static cc_result File_Do(cc_file* file, const char* path, int mode) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
cc_result File_Open(cc_file* file, const cc_filepath* path) {
|
cc_result File_Open(cc_file* file, const cc_filepath* path) {
|
||||||
return File_Do(file, path, O_RDONLY);
|
return File_Do(file, path->buffer, O_RDONLY);
|
||||||
}
|
}
|
||||||
cc_result File_Create(cc_file* file, const cc_filepath* path) {
|
cc_result File_Create(cc_file* file, const cc_filepath* path) {
|
||||||
return File_Do(file, path->buffer, O_RDWR | O_CREAT | O_TRUNC);
|
return File_Do(file, path->buffer, O_RDWR | O_CREAT | O_TRUNC);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user