v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into kimkulling/introduce_compression

pull/4375/head
Kim Kulling 2022-02-07 10:02:51 +01:00 committed by GitHub
parent eb5a7938e0 ed8612ea35
commit ce61ea56a5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.github/workflows/ccpp.yml vendored
View File

@ -13,7 +13,8 @@ jobs:
strategy: strategy:
fail-fast: false fail-fast: false
matrix: matrix:
name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter] #name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter, windows-msvc-hunter]
name: [ubuntu-latest-g++, macos-latest-clang++, windows-latest-cl.exe, ubuntu-latest-clang++, ubuntu-gcc-hunter, macos-clang-hunter]
# For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux. # For Windows msvc, for Linux and macOS let's use the clang compiler, use gcc for Linux.
include: include:
- name: windows-latest-cl.exe - name: windows-latest-cl.exe
@ -38,9 +39,9 @@ jobs:
- name: macos-clang-hunter - name: macos-clang-hunter
os: macos-latest os: macos-latest
toolchain: ninja-clang-cxx17-fpic toolchain: ninja-clang-cxx17-fpic
- name: windows-msvc-hunter #- name: windows-msvc-hunter
os: windows-latest # os: windows-latest
toolchain: ninja-vs-win64-cxx17 # toolchain: ninja-vs-win64-cxx17
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v2

8
code/AssetLib/LWO/LWOAnimation.cpp
View File

@ -83,9 +83,13 @@ AnimResolver::AnimResolver(std::list<Envelope> &_envelopes, double tick) :
(*it).old_first = 0; (*it).old_first = 0;
(*it).old_last = (*it).keys.size() - 1; (*it).old_last = (*it).keys.size() - 1;
if ((*it).keys.empty()) continue; if ((*it).keys.empty()) {
continue;
}
if ((int)(*it).type < 1 || (int)(*it).type>EnvelopeType_Unknown) {
continue;
}
switch ((*it).type) { switch ((*it).type) {
// translation // translation
case LWO::EnvelopeType_Position_X: case LWO::EnvelopeType_Position_X:
trans_x = &*it; trans_x = &*it;