wbrawner/reone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ci: Remove Azure from APT sources

Browse source 
This should fix the GitHub actions build.
This commit is contained in:
Vsevolod Kremianskii 2021-03-23 09:39:27 +07:00
parent 76ef2b481e
commit c71a513401
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.github/workflows/cmake.yml vendored
View file

@ -16,7 +16,10 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: sudo apt install libboost-all-dev libsdl2-dev libglew-dev libopenal-dev libmad0-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev run: >
sudo sed -i 's/azure\.//' /etc/apt/sources.list &&
sudo apt-get update &&
sudo apt install libboost-all-dev libsdl2-dev libglew-dev libopenal-dev libmad0-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
- name: Create Build Environment - name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build run: cmake -E make_directory ${{github.workspace}}/build

5
.github/workflows/coverity-scan.yml vendored
View file

@ -16,7 +16,10 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- name: Install dependencies - name: Install dependencies
run: sudo apt install libboost-all-dev libsdl2-dev libglew-dev libopenal-dev libmad0-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev run: >
sudo sed -i 's/azure\.//' /etc/apt/sources.list &&
sudo apt-get update &&
sudo apt install libboost-all-dev libsdl2-dev libglew-dev libopenal-dev libmad0-dev libavcodec-dev libavformat-dev libavutil-dev libswresample-dev libswscale-dev
- name: Create Build Environment - name: Create Build Environment
run: cmake -E make_directory ${{github.workspace}}/build run: cmake -E make_directory ${{github.workspace}}/build

4
src/render/model/animatedproperty.h
View file

@ -50,8 +50,8 @@ public:
bool getByTime(float time, V &value) const { bool getByTime(float time, V &value) const {
if (_keyframes.empty()) return false; if (_keyframes.empty()) return false;
const pair<float, V> *frame1 = &_keyframes[0]; const std::pair<float, V> *frame1 = &_keyframes[0];
const pair<float, V> *frame2 = &_keyframes[0]; const std::pair<float, V> *frame2 = &_keyframes[0];
for (auto it = _keyframes.begin(); it != _keyframes.end(); ++it) { for (auto it = _keyframes.begin(); it != _keyframes.end(); ++it) {
if (it->first >= time) { if (it->first >= time) {
frame2 = &*it; frame2 = &*it;

2
src/scene/node/modelnodescenenode.cpp
View file

@ -134,7 +134,7 @@ void ModelNodeSceneNode::update(float dt) {
bool ModelNodeSceneNode::shouldRender() const { bool ModelNodeSceneNode::shouldRender() const {
shared_ptr<ModelMesh> mesh(_modelNode->mesh()); shared_ptr<ModelMesh> mesh(_modelNode->mesh());
if (!mesh || !mesh->shouldRender() /* || _modelNode->alpha() == 0.0f */) return false; if (!mesh || !mesh->shouldRender() || _modelNode->alphas().getByKeyframeOrDefault(0, 1.0f) == 0.0f) return false;
return _modelNode->isAABB() ? g_debugWalkmesh : true; return _modelNode->isAABB() ? g_debugWalkmesh : true;
} }