Updated ozz-animation to version 0.14.1.
This commit is contained in:
Martin Felis
Generated
-8
@@ -1,8 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
# Editor-based HTTP Client requests
|
||||
/httpRequests/
|
||||
# Datasource local storage ignored files
|
||||
/dataSources/
|
||||
/dataSources.local.xml
|
||||
-1
@@ -1 +0,0 @@
|
||||
ozz
|
||||
-4
@@ -1,4 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CMakeWorkspace" PROJECT_DIR="$PROJECT_DIR$" />
|
||||
</project>
|
||||
-8
@@ -1,8 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/ozz-animation.iml" filepath="$PROJECT_DIR$/.idea/ozz-animation.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
-2
@@ -1,2 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module classpath="CMake" type="CPP_MODULE" version="4" />
|
||||
-6
@@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
Vendored
-387
@@ -1,387 +0,0 @@
|
||||
language: cpp
|
||||
|
||||
dist: xenial
|
||||
|
||||
jobs:
|
||||
include:
|
||||
|
||||
# Emscripten cross compiling
|
||||
#- os: linux
|
||||
# compiler: gcc
|
||||
# env:
|
||||
# - env_build_emscripten=1
|
||||
|
||||
# mac os
|
||||
# Default mac os clang build
|
||||
- os: osx
|
||||
osx_image: xcode10
|
||||
compiler: clang
|
||||
- os: osx
|
||||
compiler: clang
|
||||
- os: osx
|
||||
compiler: clang
|
||||
env:
|
||||
- env_cmake_configuration=Release
|
||||
|
||||
# Xcode mac os clang build
|
||||
- os: osx
|
||||
compiler: clang
|
||||
env :
|
||||
- env_cmake_generator=Xcode
|
||||
- os: osx
|
||||
compiler: clang
|
||||
env :
|
||||
- env_cmake_generator=Xcode
|
||||
- env_cmake_configuration=Release
|
||||
|
||||
# Linux ARM
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_fbx=0
|
||||
- env_cmake_configuration=Debug
|
||||
arch:
|
||||
- arm64
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_fbx=0
|
||||
- env_cmake_configuration=Release
|
||||
arch:
|
||||
- arm64
|
||||
|
||||
# Linux
|
||||
# Default linux clang debug
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_cmake_configuration=Debug
|
||||
# Default linux release clang
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_cmake_configuration=Release
|
||||
|
||||
# Specific configurations
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_fbx=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_gltf=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_howtos=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_samples=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_tools=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_postfix=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_simd_ref=1
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_tests=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_fbx=0
|
||||
- env_build_gltf=0
|
||||
- env_build_samples=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_fbx=0
|
||||
- env_build_gltf=0
|
||||
- env_build_tests=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_data=0
|
||||
- env_build_fbx=0
|
||||
- env_build_gltf=0
|
||||
- env_build_samples=0
|
||||
- env_build_tests=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_build_data=0
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env:
|
||||
- env_src_root="../test/sub/"
|
||||
|
||||
# Default linux gcc debug
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env:
|
||||
- env_cmake_configuration=Debug
|
||||
# Default linux gcc release
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env:
|
||||
- env_cmake_configuration=Release
|
||||
|
||||
# Newer gcc
|
||||
- os: linux
|
||||
compiler: gcc-4.9
|
||||
env:
|
||||
- env_cmake_cxx_compiler=g++-4.9
|
||||
- env_cmake_c_compiler=gcc-4.9
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-4.9
|
||||
- os: linux
|
||||
compiler: gcc-5
|
||||
env:
|
||||
- env_cmake_cxx_compiler=g++-5
|
||||
- env_cmake_c_compiler=gcc-5
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-5
|
||||
- os: linux
|
||||
compiler: gcc-6
|
||||
env:
|
||||
- env_cmake_cxx_compiler=g++-6
|
||||
- env_cmake_c_compiler=gcc-6
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-6
|
||||
- os: linux
|
||||
compiler: gcc-7
|
||||
env:
|
||||
- env_cmake_cxx_compiler=g++-7
|
||||
- env_cmake_c_compiler=gcc-7
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-7
|
||||
- os: linux
|
||||
compiler: gcc-8
|
||||
env:
|
||||
- env_cmake_cxx_compiler=g++-8
|
||||
- env_cmake_c_compiler=gcc-8
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
packages:
|
||||
- g++-8
|
||||
|
||||
# Newer clang
|
||||
- os: linux
|
||||
compiler: clang-3.9
|
||||
env:
|
||||
- env_cmake_cxx_compiler=clang++-3.9
|
||||
- env_cmake_c_compiler=clang-3.9
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-xenial-3.9
|
||||
packages:
|
||||
- clang-3.9
|
||||
- os: linux
|
||||
compiler: clang-4.0
|
||||
env:
|
||||
- env_cmake_cxx_compiler=clang++-4.0
|
||||
- env_cmake_c_compiler=clang-4.0
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-xenial-4.0
|
||||
packages:
|
||||
- clang-4.0
|
||||
- os: linux
|
||||
compiler: clang-5.0
|
||||
env:
|
||||
- env_cmake_cxx_compiler=clang++-5.0
|
||||
- env_cmake_c_compiler=clang-5.0
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-xenial-5.0
|
||||
packages:
|
||||
- clang-5.0
|
||||
- os: linux
|
||||
compiler: clang-6.0
|
||||
env:
|
||||
- env_cmake_cxx_compiler=clang++-6.0
|
||||
- env_cmake_c_compiler=clang-6.0
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-xenial-6.0
|
||||
packages:
|
||||
- clang-6.0
|
||||
- os: linux
|
||||
compiler: clang-7
|
||||
env:
|
||||
- env_cmake_cxx_compiler=clang++-7
|
||||
- env_cmake_c_compiler=clang-7
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-xenial-7
|
||||
packages:
|
||||
- clang-7
|
||||
- os: linux
|
||||
compiler: clang-8
|
||||
env:
|
||||
- env_cmake_cxx_compiler=clang++-8
|
||||
- env_cmake_c_compiler=clang-8
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-xenial-8
|
||||
packages:
|
||||
- clang-8
|
||||
|
||||
# older fbx sdk
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env:
|
||||
- fbx_download=http://download.autodesk.com/us/fbx/2017/2017.1/fbx20171_fbxsdk_linux.tar.gz
|
||||
- os: osx
|
||||
compiler: clang
|
||||
env:
|
||||
- fbx_download=http://download.autodesk.com/us/fbx/2017/2017.1/fbx20171_fbxsdk_clang_mac.pkg.tgz
|
||||
|
||||
before_install:
|
||||
- echo before_install----------------------------------------------------------
|
||||
|
||||
install:
|
||||
- echo install-----------------------------------------------------------------
|
||||
# Download and install mesa dev
|
||||
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
||||
sudo apt-get install libgl1-mesa-dev libglu1-mesa-dev;
|
||||
fi
|
||||
# Download and install fbx sdk
|
||||
# "|| true" because 2019 sdk would return code 130 when reading the readme
|
||||
# chmod because fbx2019 will install with 700
|
||||
- if [[ $TRAVIS_OS_NAME == "linux" ]]; then
|
||||
if [ -z "$fbx_download" ]; then
|
||||
FBX_DOWNLOAD=${fbx_download:-"http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20192/fbx20192_fbxsdk_linux.tar.gz"};
|
||||
else
|
||||
FBX_DOWNLOAD="$fbx_download";
|
||||
fi;
|
||||
mkdir fbx;
|
||||
cd fbx;
|
||||
sudo wget $FBX_DOWNLOAD -O fbx.tar.gz;
|
||||
sudo tar -xf "fbx.tar.gz";
|
||||
(yes yes | sudo ./*_fbxsdk_linux /usr/local) || true;
|
||||
sudo chmod -R 755 /usr/local/lib;
|
||||
sudo chmod -R 755 /usr/local/include;
|
||||
cd ..;
|
||||
fi
|
||||
- if [[ $TRAVIS_OS_NAME == "osx" ]]; then
|
||||
if [ -z "$fbx_download" ]; then
|
||||
FBX_DOWNLOAD=${fbx_download:-"http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20192/fbx20192_fbxsdk_clang_mac.pkg.tgz"};
|
||||
else
|
||||
FBX_DOWNLOAD="$fbx_download";
|
||||
fi;
|
||||
mkdir fbx;
|
||||
cd fbx;
|
||||
sudo wget $FBX_DOWNLOAD -O fbx.tgz;
|
||||
sudo tar -xf "fbx.tgz";
|
||||
sudo installer -pkg *_fbxsdk_clang_macos.pkg -target /;
|
||||
cd ..;
|
||||
fi
|
||||
# Download and install emscripten sdk
|
||||
- if [[ $env_build_emscripten ]]; then
|
||||
sudo apt-get install software-properties-common -y;
|
||||
sudo add-apt-repository ppa:george-edison55/cmake-3.x -y;
|
||||
sudo apt-get update;
|
||||
sudo apt-get install --only-upgrade cmake -y;
|
||||
git clone https://github.com/juj/emsdk.git;
|
||||
cd emsdk;
|
||||
sudo ./emsdk update-tags;
|
||||
sudo ./emsdk install sdk-nightly-latest-64bit;
|
||||
sudo ./emsdk activate --embedded sdk-nightly-latest-64bit;
|
||||
source ./emsdk_env.sh;
|
||||
cd ..;
|
||||
fi
|
||||
|
||||
before_script:
|
||||
- echo before_script-----------------------------------------------------------
|
||||
|
||||
# Setup default environment variables
|
||||
- if [[ -z $env_src_root ]]; then export env_src_root=".."; fi
|
||||
- if [[ -z $env_build_fbx ]]; then export env_build_fbx=1; fi
|
||||
- if [[ -z $env_build_gltf ]]; then export env_build_gltf=1; fi
|
||||
- if [[ -z $env_build_data ]]; then export env_build_data=1; fi
|
||||
- if [[ -z $env_build_howtos ]]; then export env_build_howtos=1; fi
|
||||
- if [[ -z $env_build_tools ]]; then export env_build_tools=1; fi
|
||||
- if [[ -z $env_build_postfix ]]; then export env_build_postfix=1; fi
|
||||
- if [[ -z $env_build_samples ]]; then export env_build_samples=1; fi
|
||||
- if [[ -z $env_build_simd_ref ]]; then export env_build_simd_ref=0; fi
|
||||
- if [[ -z $env_build_tests ]]; then export env_build_tests=1; fi
|
||||
- if [[ -z $env_cmake_configuration ]]; then export env_cmake_configuration=Debug; fi
|
||||
- if [[ -z $env_cmake_cxx_compiler ]]; then export env_cmake_cxx_compiler=$CXX; fi
|
||||
- if [[ -z $env_cmake_c_compiler ]]; then export env_cmake_c_compiler=$CC; fi
|
||||
- if [[ -z $env_cmake_generator ]]; then export env_cmake_generator="Unix Makefiles"; fi
|
||||
- if [[ $env_cmake_generator == "Unix Makefiles" ]]; then export env_cmake_generator_specific="-j2"; fi
|
||||
- if [[ $env_cmake_generator == "Unix Makefiles" ]]; then export env_ctest_generator_specific="-j16"; fi
|
||||
- if [[ $EMSCRIPTEN ]]; then env_cmake_toolchain="-DCMAKE_TOOLCHAIN_FILE=$EMSCRIPTEN/cmake/Modules/Platform/Emscripten.cmake"; fi
|
||||
|
||||
# Display cmake version
|
||||
- cmake --version
|
||||
|
||||
script:
|
||||
- echo script------------------------------------------------------------------
|
||||
# Configure build
|
||||
- mkdir build
|
||||
- cd build
|
||||
- echo $env_cmake_toolchain
|
||||
- cmake -G "$env_cmake_generator" $env_cmake_toolchain -DCMAKE_CXX_COMPILER=$env_cmake_cxx_compiler -DCMAKE_C_COMPILER=$env_cmake_c_compiler -DCMAKE_BUILD_TYPE=$env_cmake_configuration -Dozz_build_fbx=$env_build_fbx -Dozz_build_data=$env_build_data -Dozz_build_howtos=$env_build_howtos -Dozz_build_samples=$env_build_samples -Dozz_build_postfix=$env_build_postfix -Dozz_build_tools=$env_build_tools -Dozz_build_simd_ref=$env_build_simd_ref -Dozz_build_tests=$env_build_tests $env_src_root
|
||||
# Build
|
||||
- cmake --build ./ --config $env_cmake_configuration --use-stderr -- $env_cmake_generator_specific
|
||||
# Test
|
||||
- ctest --build-config $env_cmake_configuration --output-on-failure -- $env_ctest_generator_specific
|
||||
|
||||
after_success:
|
||||
- echo after_success-----------------------------------------------------------
|
||||
|
||||
after_failure:
|
||||
- echo after_failure-----------------------------------------------------------
|
||||
|
||||
before_deploy:
|
||||
#- echo before_deploy-----------------------------------------------------------
|
||||
|
||||
deploy:
|
||||
#- echo deploy------------------------------------------------------------------
|
||||
|
||||
after_deploy:
|
||||
#- echo after_deploy------------------------------------------------------------
|
||||
|
||||
after_script:
|
||||
#- echo after_script------------------------------------------------------------
|
||||
Vendored
+1
@@ -14,3 +14,4 @@ The following authors have all licensed their contributions to ozz-animation und
|
||||
- Kota Iguchi <developer@infosia.co.jp>
|
||||
- Mikołaj Siedlarek <mikolaj@siedlarek.net>
|
||||
- Paul Gruenbacher <pgruenbacher@gmail.com>
|
||||
- Christophe Meyer <christophe.meyer.pro@gmail.com>
|
||||
|
||||
Vendored
+14
@@ -1,3 +1,17 @@
|
||||
Release version 0.14.1
|
||||
----------------------
|
||||
|
||||
* Samples
|
||||
- Allows reusing sample framework outside of sample directory.
|
||||
- #154 Exposes swap interval
|
||||
|
||||
* Library
|
||||
- #153 Fixes deprecated implicit copy warning.
|
||||
- #141 Removes non-ASCII characters in source codes.
|
||||
|
||||
* Build pipeline
|
||||
- Exposes ozz cmake configuration variables to PARENT_SCOPE, so it can be used/changed by an external project.
|
||||
|
||||
Release version 0.14.0
|
||||
----------------------
|
||||
|
||||
|
||||
+13
-2
@@ -3,10 +3,13 @@ cmake_minimum_required (VERSION 3.3)
|
||||
# Defines the project's name
|
||||
project(ozz)
|
||||
|
||||
# Check if project is top level or a sub project
|
||||
get_directory_property(is_sub_project PARENT_DIRECTORY)
|
||||
|
||||
# Current version
|
||||
set(OZZ_VERSION_MAJOR 0)
|
||||
set(OZZ_VERSION_MINOR 14)
|
||||
set(OZZ_VERSION_PATCH 0)
|
||||
set(OZZ_VERSION_PATCH 1)
|
||||
set(OZZ_VERSION ${OZZ_VERSION_MAJOR}.${OZZ_VERSION_MINOR}.${OZZ_VERSION_PATCH})
|
||||
|
||||
# Add project build options
|
||||
@@ -27,6 +30,9 @@ if(WIN32 AND BUILD_SHARED_LIBS AND NOT ozz_build_msvc_rt_dll)
|
||||
message("Forcing ozz_build_msvc_rt_dll to ON as ozz is being built as dll (BUILD_SHARED_LIBS is ON).")
|
||||
set(ozz_build_msvc_rt_dll ON)
|
||||
endif()
|
||||
if(is_sub_project)
|
||||
set(ozz_build_msvc_rt_dll ${ozz_build_msvc_rt_dll} PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
# Include ozz cmake parameters and scripts
|
||||
include(CheckCXXCompilerFlag)
|
||||
@@ -63,12 +69,18 @@ else()
|
||||
# Disables fbx if tools are disabled
|
||||
set(ozz_build_fbx OFF)
|
||||
endif()
|
||||
if(is_sub_project)
|
||||
set(ozz_build_fbx ${ozz_build_fbx} PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
# gltf
|
||||
if(ozz_build_tools AND ozz_build_gltf)
|
||||
else()
|
||||
set(ozz_build_gltf OFF)
|
||||
endif()
|
||||
if(is_sub_project)
|
||||
set(ozz_build_gltf ${ozz_build_gltf} PARENT_SCOPE)
|
||||
endif()
|
||||
|
||||
# Enables unit tests.
|
||||
if(ozz_build_tests)
|
||||
@@ -115,7 +127,6 @@ if(ozz_build_tests AND NOT EMSCRIPTEN)
|
||||
add_subdirectory(test)
|
||||
endif()
|
||||
|
||||
|
||||
install(FILES
|
||||
${PROJECT_SOURCE_DIR}/CHANGES.md
|
||||
${PROJECT_SOURCE_DIR}/LICENSE.md
|
||||
|
||||
Vendored
-88
@@ -1,88 +0,0 @@
|
||||
version: '{build}'
|
||||
image: Visual Studio 2019
|
||||
environment:
|
||||
matrix:
|
||||
# Comilers matrix
|
||||
- env_cmake_generator: "Visual Studio 14 2015"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
env_cmake_configuration: Debug
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2015_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 14 2015 Win64"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
|
||||
env_cmake_configuration: Debug
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2015_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 15 2017"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
env_cmake_configuration: Debug
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 15 2017 Win64"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
env_cmake_configuration: Debug
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 15 2017"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
env_cmake_configuration: Release
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 15 2017 Win64"
|
||||
APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
|
||||
env_cmake_configuration: Release
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Debug
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Release
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Release
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
env_build_msvc_rt_dll: "1"
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Release
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
env_build_msvc_rt_dll: "0"
|
||||
|
||||
# No fbx sdk
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Release
|
||||
|
||||
# Use ozz as a sub project (should set msvc rt dll for ozz as this is the default in cmake)
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Release
|
||||
env_src_root: "../test/sub/"
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
- env_cmake_generator: "Visual Studio 16 2019"
|
||||
env_cmake_configuration: Debug
|
||||
env_src_root: "../test/sub/"
|
||||
env_fbxsdk_path: "http://www.autodesk.com/content/dam/autodesk/www/adn/fbx/20195/fbx20195_fbxsdk_vs2017_win.exe"
|
||||
|
||||
install:
|
||||
# Setup Fbx sdk
|
||||
- ps: >-
|
||||
if ($Env:env_fbxsdk_path) {
|
||||
md fbx
|
||||
cd fbx
|
||||
Start-FileDownload $Env:env_fbxsdk_path "fbxsdk.exe"
|
||||
Start-Process -FilePath "fbxsdk.exe" /S -Wait
|
||||
cd ..
|
||||
}
|
||||
# Fixes up env_src_root if it isn't defined
|
||||
- ps: >-
|
||||
if (!$Env:env_src_root) {
|
||||
$Env:env_src_root=".."
|
||||
}
|
||||
# Fixes up env_build_msvc_rt_dll if it isn't defined
|
||||
- ps: >-
|
||||
if (!$Env:env_build_msvc_rt_dll) {
|
||||
$Env:env_build_msvc_rt_dll="1"
|
||||
}
|
||||
|
||||
build_script:
|
||||
- cmake --version
|
||||
- mkdir build
|
||||
- cd build
|
||||
- cmake -G "%env_cmake_generator%" -Dozz_build_tests=1 -Dozz_build_data=1 -Dozz_build_msvc_rt_dll=%env_build_msvc_rt_dll% -DCMAKE_BUILD_TYPE=%env_cmake_configuration% %env_src_root%
|
||||
- cmake --build ./ --config %env_cmake_configuration%
|
||||
|
||||
test_script:
|
||||
- ctest --build-config %env_cmake_configuration%
|
||||
@@ -7917,7 +7917,7 @@ namespace edit_distance {
|
||||
// Returns the optimal edits to go from 'left' to 'right'.
|
||||
// All edits cost the same, with replace having lower priority than
|
||||
// add/remove.
|
||||
// Simple implementation of the Wagner–Fischer algorithm.
|
||||
// Simple implementation of the Wagner-Fischer algorithm.
|
||||
// See http://en.wikipedia.org/wiki/Wagner-Fischer_algorithm
|
||||
enum EditType { kMatch, kAdd, kRemove, kReplace };
|
||||
GTEST_API_ std::vector<EditType> CalculateOptimalEdits(
|
||||
|
||||
@@ -61,6 +61,9 @@ struct span {
|
||||
// elements.
|
||||
span(_Ty* _begin, size_t _size) : data_(_begin), size_(_size) {}
|
||||
|
||||
// Copy constructor.
|
||||
span(const span& _other) = default;
|
||||
|
||||
// Copy operator.
|
||||
void operator=(const span& _other) {
|
||||
data_ = _other.data_;
|
||||
|
||||
BIN
Binary file not shown.
@@ -36,6 +36,10 @@ target_link_libraries(sample_framework
|
||||
ozz_geometry
|
||||
ozz_animation_offline
|
||||
ozz_options)
|
||||
|
||||
target_include_directories(sample_framework PUBLIC
|
||||
$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/samples>
|
||||
$<INSTALL_INTERFACE:$<INSTALL_PREFIX>/samples>)
|
||||
|
||||
if(TARGET BUILD_DATA_SAMPLE)
|
||||
add_dependencies(sample_framework BUILD_DATA_SAMPLE)
|
||||
|
||||
+11
-5
@@ -98,6 +98,8 @@ Application::Application()
|
||||
time_(0.f),
|
||||
last_idle_time_(0.),
|
||||
show_help_(false),
|
||||
vertical_sync_(true),
|
||||
swap_interval_(1),
|
||||
show_grid_(true),
|
||||
show_axes_(true),
|
||||
capture_video_(false),
|
||||
@@ -209,7 +211,7 @@ int Application::Run(int _argc, const char** _argv, const char* _version,
|
||||
#endif // EMSCRIPTEN
|
||||
|
||||
// Setup the window and installs callbacks.
|
||||
glfwSwapInterval(1); // Enables vertical sync by default.
|
||||
glfwSwapInterval(vertical_sync_ ? swap_interval_ : 0);
|
||||
glfwSetWindowSizeCallback(&ResizeCbk);
|
||||
glfwSetWindowCloseCallback(&CloseCbk);
|
||||
|
||||
@@ -611,10 +613,14 @@ bool Application::FrameworkGui() {
|
||||
GL(Disable(GL_MULTISAMPLE));
|
||||
}
|
||||
}
|
||||
// Vertical sync
|
||||
static bool vertical_sync_ = true; // On by default.
|
||||
if (im_gui->DoCheckBox("Vertical sync", &vertical_sync_, true)) {
|
||||
glfwSwapInterval(vertical_sync_ ? 1 : 0);
|
||||
// Vertical sync & swap interval
|
||||
bool changed = im_gui->DoCheckBox("Vertical sync", &vertical_sync_);
|
||||
char szLabel[64];
|
||||
std::sprintf(szLabel, "Swap interval: %d", swap_interval_);
|
||||
changed |=
|
||||
im_gui->DoSlider(szLabel, 1, 4, &swap_interval_, 1.f, vertical_sync_);
|
||||
if (changed) {
|
||||
glfwSwapInterval(vertical_sync_ ? swap_interval_ : 0);
|
||||
}
|
||||
|
||||
im_gui->DoCheckBox("Show grid", &show_grid_, true);
|
||||
|
||||
@@ -216,6 +216,9 @@ class Application {
|
||||
// Set to true to display help.
|
||||
bool show_help_;
|
||||
|
||||
bool vertical_sync_; // On by default.
|
||||
int swap_interval_;
|
||||
|
||||
// Grid display settings.
|
||||
bool show_grid_;
|
||||
bool show_axes_;
|
||||
|
||||
+26
-1
@@ -32,6 +32,7 @@
|
||||
|
||||
#include "framework/imgui.h"
|
||||
#include "framework/mesh.h"
|
||||
#include "ozz/animation/offline/raw_animation.h"
|
||||
#include "ozz/animation/offline/raw_skeleton.h"
|
||||
#include "ozz/animation/runtime/animation.h"
|
||||
#include "ozz/animation/runtime/local_to_model_job.h"
|
||||
@@ -326,6 +327,30 @@ bool LoadAnimation(const char* _filename,
|
||||
return true;
|
||||
}
|
||||
|
||||
bool LoadRawAnimation(const char* _filename,
|
||||
ozz::animation::offline::RawAnimation* _animation) {
|
||||
assert(_filename && _animation);
|
||||
ozz::log::Out() << "Loading raw animation archive: " << _filename << "."
|
||||
<< std::endl;
|
||||
ozz::io::File file(_filename, "rb");
|
||||
if (!file.opened()) {
|
||||
ozz::log::Err() << "Failed to open raw animation file " << _filename << "."
|
||||
<< std::endl;
|
||||
return false;
|
||||
}
|
||||
ozz::io::IArchive archive(&file);
|
||||
if (!archive.TestTag<ozz::animation::offline::RawAnimation>()) {
|
||||
ozz::log::Err() << "Failed to load raw animation instance from file "
|
||||
<< _filename << "." << std::endl;
|
||||
return false;
|
||||
}
|
||||
|
||||
// Once the tag is validated, reading cannot fail.
|
||||
archive >> *_animation;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
namespace {
|
||||
template <typename _Track>
|
||||
bool LoadTrackImpl(const char* _filename, _Track* _track) {
|
||||
@@ -411,7 +436,7 @@ bool LoadMeshes(const char* _filename,
|
||||
}
|
||||
|
||||
namespace {
|
||||
// Moller–Trumbore intersection algorithm
|
||||
// Moller-Trumbore intersection algorithm
|
||||
// https://en.wikipedia.org/wiki/M%C3%B6ller%E2%80%93Trumbore_intersection_algorithm
|
||||
bool RayIntersectsTriangle(const ozz::math::Float3& _ray_origin,
|
||||
const ozz::math::Float3& _ray_direction,
|
||||
|
||||
@@ -167,6 +167,14 @@ bool LoadSkeleton(const char* _filename, ozz::animation::Skeleton* _skeleton);
|
||||
bool LoadAnimation(const char* _filename,
|
||||
ozz::animation::Animation* _animation);
|
||||
|
||||
// Loads a raw animation from an ozz archive file named _filename.
|
||||
// This function will fail and return false if the file cannot be opened or if
|
||||
// it is not a valid ozz animation archive. A valid animation archive can be
|
||||
// produced with ozz tools (fbx2ozz) or using ozz animation serialization API.
|
||||
// _filename and _animation must be non-nullptr.
|
||||
bool LoadRawAnimation(const char* _filename,
|
||||
ozz::animation::offline::RawAnimation* _animation);
|
||||
|
||||
// Loads a float track from an ozz archive file named _filename.
|
||||
// This function will fail and return false if the file cannot be opened or if
|
||||
// it is not a valid ozz float track archive. A valid float track archive can be
|
||||
|
||||
+1
-1
@@ -41,7 +41,7 @@ namespace ozz {
|
||||
namespace animation {
|
||||
namespace offline {
|
||||
|
||||
// Decimation algorithm based on Ramer–Douglas–Peucker.
|
||||
// Decimation algorithm based on Ramer-Douglas-Peucker.
|
||||
// https://en.wikipedia.org/wiki/Ramer%E2%80%93Douglas%E2%80%93Peucker_algorithm
|
||||
// _Track must have std::vector interface.
|
||||
// Adapter must have the following interface:
|
||||
|
||||
@@ -184,7 +184,7 @@ bool SoftenTarget(const IKTwoBoneJob& _job, const IKConstantSetup& _setup,
|
||||
|
||||
// The maximum distance we can reach is the soften bone chain length: da
|
||||
// (stored in !x). The minimum distance we can reach is the absolute value of
|
||||
// the difference of the 2 bone lengths, |d1−d2| (stored in z). x is 0 and z
|
||||
// the difference of the 2 bone lengths, |d1-d2| (stored in z). x is 0 and z
|
||||
// is 1, yw are untested.
|
||||
return (comp_mask & 0x5) == 0x4;
|
||||
}
|
||||
|
||||
@@ -645,10 +645,9 @@ class is_to_be_removed {
|
||||
public:
|
||||
explicit is_to_be_removed(int _which) : which_(_which) {}
|
||||
bool operator()(typename _List::const_reference) { return which_-- == 0; }
|
||||
void operator=(const is_to_be_removed&) = delete;
|
||||
|
||||
private:
|
||||
void operator=(const is_to_be_removed&);
|
||||
|
||||
int which_;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user