Merge branch 'release/0.11.0'

guillaumeblanc · Jul 12, 2019 · 3e86c6f · 3e86c6f
2 parents f35614e + b56d45e
commit 3e86c6f
Show file tree

Hide file tree

Showing 311 changed files with 13,503 additions and 5,429 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,6 +14,9 @@ matrix:
 
   # mac os
   # Default mac os clang build
+  - os: osx
+    osx_image: xcode10
+    compiler: clang
   - os: osx
     compiler: clang
   - os: osx
@@ -32,17 +35,11 @@ matrix:
     - env_cmake_configuration=Release
 
   # Linux
-  # Default linux gcc
-  - os: linux
-    compiler: gcc
-  # Default linux gcc
-  - os: linux
-    compiler: gcc
-    env:
-    - env_cmake_configuration=Release
-  # Default linux clang
+  # Default linux clang debug
   - os: linux
     compiler: clang
+    env:
+    - env_cmake_configuration=Debug
   # Default linux release clang
   - os: linux
     compiler: clang
@@ -69,7 +66,15 @@ matrix:
   - os: linux
     compiler: clang
     env:
-    - env_build_simdref=1
+    - 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:
@@ -100,8 +105,18 @@ matrix:
     env:
     - env_src_root="../test/sub/"
 
-  # Newer compilers
-  # gcc
+  # 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: 
@@ -135,18 +150,112 @@ matrix:
         - ubuntu-toolchain-r-test
         packages:
         - g++-6
-  # clang
   - os: linux
-    compiler: clang-3.8
+    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.5
+    env:
+    - env_cmake_cxx_compiler=clang++-3.5
+    - env_cmake_c_compiler=clang-3.5
+    addons:
+      apt:
+        sources:
+        - ubuntu-toolchain-r-test
+        - llvm-toolchain-precise-3.5
+        packages:
+        - clang-3.5
+  - 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-precise-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-trusty-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-trusty-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-trusty-6.0
+        packages:
+        - clang-6.0
+  - os: linux
+    compiler: clang-7
     env:
-    - env_cmake_cxx_compiler=clang++-3.8
-    - env_cmake_c_compiler=clang-3.8
+    - env_cmake_cxx_compiler=clang++-7
+    - env_cmake_c_compiler=clang-7
     addons:
       apt:
         sources:
-        - llvm-toolchain-precise-3.8
+        - ubuntu-toolchain-r-test
+        - llvm-toolchain-trusty-7
         packages:
-        - clang-3.8
+        - clang-7
+
+  # 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----------------------------------------------------------
@@ -158,20 +267,34 @@ install:
     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 http://download.autodesk.com/us/fbx/2017/2017.1/fbx20171_fbxsdk_linux.tar.gz;
-    sudo tar -xf "fbx20171_fbxsdk_linux.tar.gz";
-    yes yes | sudo ./fbx20171_fbxsdk_linux /usr/local;
+    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 http://download.autodesk.com/us/fbx/2017/2017.1/fbx20171_fbxsdk_clang_mac.pkg.tgz;
-    sudo tar -xf "fbx20171_fbxsdk_clang_mac.pkg.tgz";
-    sudo installer -pkg fbx20171_fbxsdk_clang_macos.pkg -target /;
+    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  
@@ -198,6 +321,8 @@ before_script:
 - if [[ -z $env_build_fbx ]]; then export env_build_fbx=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
@@ -218,7 +343,7 @@ script:
 - 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_cpp11=$env_build_cpp11 -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_simd_ref=$env_build_simd_ref -Dozz_build_tests=$env_build_tests $env_src_root
+- 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_cpp11=$env_build_cpp11 -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

diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,37 @@
+Release version 0.11.0
+----------------------
+* Library
+  - [animation] Adds two-bone and aim inverse kinematic solvers. They can be used at runtime to procedurally affect joint local-space transforms.
+  - [animation] Allows resizing SamplingCache, meaning the can be allocated without knowing the number of joints the cache needs to support.
+  - [animation] Allow ozz::animation::LocalToModelJob to partially update a hierarchy, aka all children of a joint. This is useful when changes to a local-space pose has been limited to part of the joint hierarchy, like when applying IK or modifying model-space matrices independently from local-space transform.
+  - [animation] Changes ozz::animation::Skeleton joints from breadth-first to depth-first. This change breaks compatibility of previous ozz::animation::offline::RawAnimation, ozz::animation::Animation and ozz::animation::Skeleton archives.
+  - [animation] Renames track_triggering_job_stl.h to track_triggering_job_trait.h.
+  - [offline] #62 Adds an a way to specify additive animation reference pose to ozz::animation::offline::AdditiveAnimationBuilder.
+  - [memory] Removes (too error prone) ozz::memory::Allocator typed allocation functions.
+  - [math] Changes all conversion from AxisAngle to use separate arguments for axis and angle. This is more in line with function use cases.
+  - [math] Adds quaternions initialization from two vectors.
+  - [simd math] Updates simd math functions to prevent unnecessary operations. Some functions now return undefined values for some components, like Dot3 that will return the dot value in x and undefined values for x, y, z. See [simd_math.h](include/ozz/base/maths/simd_math.h) for each function documentation.
+  - [simd math] Implements AVX and FMA optimizations (when enabled at compile time).
+  - [simd math] Implements simd quaternions, making it easier and more efficient to use quaternion with other simd math code.
+  - [simd math] Exposes swizzling operations.
+
+* Samples
+  - [two bone ik] Adds two-bone ik sample, showing how ozz::animation::IKTwoBoneJob can be used on a robot arm.
+  - [look at] Adds a look-at sample, using ozz::animation::IKAimJob on a chain of bones to distribute aiming contribution to more than a single joint.
+  - [foot_ik] Adds foot-ik sample, which corrects character legs and ankles procedurally at runtime, as well as character/pelvis height, so that the feet can touch and adapt to the ground.
+
+* Build pipeline
+  - Adds support for fbx sdk 2019. This version is now mandatory for vs2017 builds.
+  - Add support to macos 10.14 Mojave and Xcode 10.0.
+
+* Tools
+  - Adds point and vector property types (used to import tracks). These two types are actually float3 types, with scene axis and unit conversion applied.
+  - Adds an option to importer tools to select additive animation reference pose.
+
+* Build pipeline
+  - #40 Adds ozz_build_postfix option.
+  - #41 Adds ozz_build_tools option.
+
 Release version 0.10.0
 ----------------------
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,11 +5,12 @@ project(ozz)
 
 # Current version
 set(OZZ_VERSION_MAJOR 0)
-set(OZZ_VERSION_MINOR 10)
+set(OZZ_VERSION_MINOR 11)
 set(OZZ_VERSION_PATCH 0)
 set(OZZ_VERSION ${OZZ_VERSION_MAJOR}.${OZZ_VERSION_MINOR}.${OZZ_VERSION_PATCH})
 
 # Add project build options
+option(ozz_build_tools "Build tools" ON)
 option(ozz_build_fbx "Build Fbx pipeline (Requires Fbx SDK)" ON)
 option(ozz_build_data "Build data on code change" OFF)
 option(ozz_build_samples "Build samples" ON)
@@ -18,10 +19,12 @@ option(ozz_build_tests "Build unit tests" OFF)
 option(ozz_build_simd_ref "Force SIMD math reference implementation" OFF)
 option(ozz_build_cpp11 "Enable c++11" OFF)
 option(ozz_build_msvc_rt_dll "Select msvc DLL runtime library" ON)
+option(ozz_build_postfix "Use per config postfix name" ON)
 
 # Outputs selected options (can be modified by the command line)
 message("-- ---------------------------------------------------------")
 message("-- Selected options:")
+message("-- - ozz_build_tools: " ${ozz_build_tools})
 message("-- - ozz_build_fbx: " ${ozz_build_fbx})
 message("-- - ozz_build_data: " ${ozz_build_data})
 message("-- - ozz_build_samples: " ${ozz_build_samples})
@@ -30,6 +33,7 @@ message("-- - ozz_build_tests: " ${ozz_build_tests})
 message("-- - ozz_build_simd_ref: " ${ozz_build_simd_ref})
 message("-- - ozz_build_cpp11: " ${ozz_build_cpp11})
 message("-- - ozz_build_msvc_rt_dll: " ${ozz_build_msvc_rt_dll})
+message("-- - ozz_build_postfix: " ${ozz_build_postfix})
 
 # Add project execution options
 option(ozz_run_tests_headless "Run samples without rendering (used for unit tests)" ON)
@@ -39,7 +43,7 @@ set(ozz_sample_testing_loops 20 CACHE INT "Number of loops while running sample
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/build-utils/cmake/modules/")
 
 # Detects Fbx SDK, required to build Fbx pipeline.
-if(ozz_build_fbx)
+if(ozz_build_tools AND ozz_build_fbx)
 
   # Select a msvc runtime compatible with ozz_build_msvc_rt_dll
   set(FBX_MSVC_RT_DLL ${ozz_build_msvc_rt_dll})
@@ -52,9 +56,13 @@ if(ozz_build_fbx)
     message("Fbx SDK not found, FBX tools libraries and samples will be skipped.")
     set(ozz_build_fbx OFF)
   endif()
+else()
+  # Disables fbx if tools are disabled
+  set(ozz_build_fbx OFF)
 endif()
 
 # Include ozz cmake parameters and scripts
+include(CheckCXXCompilerFlag)
 include(${PROJECT_SOURCE_DIR}/build-utils/cmake/compiler_settings.cmake)
 include(${PROJECT_SOURCE_DIR}/build-utils/cmake/package_settings.cmake)
 include(${PROJECT_SOURCE_DIR}/build-utils/cmake/fuse_target.cmake)
@@ -89,3 +97,10 @@ endif()
 if(ozz_build_tests AND NOT EMSCRIPTEN)
   add_subdirectory(test)
 endif()
+
+
+install(FILES
+  ${PROJECT_SOURCE_DIR}/CHANGES.md
+  ${PROJECT_SOURCE_DIR}/LICENSE.md
+  ${PROJECT_SOURCE_DIR}/README.md
+  DESTINATION ./)
diff --git a/LICENSE.md b/LICENSE.md
@@ -3,7 +3,7 @@ distributed under the MIT License (MIT).
 
 ---
 
-Copyright (c) 2017 Guillaume Blanc
+Copyright (c) 2019 Guillaume Blanc
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

diff --git a/README.md b/README.md
@@ -40,7 +40,8 @@ Contributions are welcome: code review, bug fix, feature implementation...
 ozz branching strategy follows [gitflow model](http://nvie.com/posts/a-successful-git-branching-model/). When submitting patches, please:
   - Make pull requests to develop branch for features, to release branch for hotfixes.
   - Do not include merge commits in pull requests; include only commits with the new relevant code.
-  - Add all relevant unit tests.
+  - Respect [Google c++ coding style](https://google.github.io/styleguide/cppguide.html) and run clang-format.
+  - Implement all relevant unit tests.
   - Run all the tests and make sure they pass.
 
 License