Skip to content
This repository was archived by the owner on Jul 1, 2021. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
matrix:
include:
- os: linux
dist: bionic
compiler: gcc
addons: &mesa-dev
apt:
packages:
- libgl1-mesa-dev
- os: linux
dist: bionic
compiler: clang
addons: *mesa-dev
sudo: false
language: cpp
script:
- git clone https://github.com/urho3d/Urho3D
- cd Urho3D
- cmake . -DURHO3D_SAMPLES=OFF
- cmake --build . --target all
- cd ../
- cmake . -DURHO3D_SRC=${CWD}/Urho3D -DURHO3D_HOME=${CWD}/Urho3D
- cmake --build . --target all
57 changes: 57 additions & 0 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
version: 1.0.{build}
image:
- Visual Studio 2019
- Ubuntu1804

environment:
CLICOLOR_FORCE: 1
CHERE_INVOKING: 1 # Tell Bash to inherit the current working directory
matrix:
- MSYSTEM: MSVC
- MSYSTEM: LINUX

matrix:
exclude:
- image: Visual Studio 2019
MSYSTEM: LINUX
- image: Ubuntu1804
MSYSTEM: MSVC

for:
- matrix:
only:
- MSYSTEM: MSVC
build_script:
- cmd: >-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvars64.bat"

git clone https://github.com/urho3d/Urho3D

cd Urho3D

cmake . -DURHO3D_SAMPLES=OFF

dir

cmake --build . --target ALL_BUILD --parallel

cd ../

cmake . -DURHO3D_SRC=Urho3D -DURHO3D_HOME=Urho3D

cmake --build . --target ALL_BUILD --parallel

- matrix:
only:
- image: Ubuntu1804
install: sudo apt install -y libgl1-mesa-dev
build_script:
- git clone https://github.com/urho3d/Urho3D
- cd Urho3D
- cmake . -DURHO3D_SAMPLES=OFF
- cmake --build . --target all --parallel
- cd ../
- cmake . -DURHO3D_SRC=${CWD}/Urho3D -DURHO3D_HOME=${CWD}/Urho3D
- cmake --build . --target all --parallel

test: off
4 changes: 2 additions & 2 deletions src/Terrain/PlanetWrenderer.h
Original file line number Diff line number Diff line change
Expand Up @@ -352,12 +352,12 @@ class PlanetWrenderer
void find_refs(SubTriangle& tri);
};

inline bool PlanetWrenderer::is_ready() const
constexpr bool PlanetWrenderer::is_ready() const
{
return m_ready;
}

inline unsigned PlanetWrenderer::get_index(int x, int y) const
constexpr unsigned PlanetWrenderer::get_index(int x, int y) const
{
return unsigned(y * (y + 1) / 2 + x);
}