Merge branch 'release/0.13.0'

.travis.yml

@@ -1,9 +1,8 @@
 language: cpp
 
-dist: trusty
-sudo: required
+dist: xenial
 
-matrix:
+jobs:
   include:
 
   # Emscripten cross compiling
@@ -23,6 +22,7 @@ matrix:
     compiler: clang
     env:
     - env_cmake_configuration=Release
+
   # Xcode mac os clang build
   - os: osx
     compiler: clang
@@ -34,6 +34,22 @@ matrix:
     - 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
@@ -50,11 +66,11 @@ matrix:
   - os: linux
     compiler: clang
     env:
-    - env_build_cpp11=1
+    - env_build_fbx=0
   - os: linux
     compiler: clang
     env:
-    - env_build_fbx=0 
+    - env_build_gltf=0
   - os: linux
     compiler: clang
     env:
@@ -83,17 +99,20 @@ matrix:
     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
@@ -174,18 +193,6 @@ matrix:
         - 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:
@@ -195,7 +202,7 @@ matrix:
       apt:
         sources:
         - ubuntu-toolchain-r-test
-        - llvm-toolchain-precise-3.9
+        - llvm-toolchain-xenial-3.9
         packages:
         - clang-3.9
   - os: linux
@@ -207,7 +214,7 @@ matrix:
       apt:
         sources:
         - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-4.0
+        - llvm-toolchain-xenial-4.0
         packages:
         - clang-4.0
   - os: linux
@@ -219,7 +226,7 @@ matrix:
       apt:
         sources:
         - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-5.0
+        - llvm-toolchain-xenial-5.0
         packages:
         - clang-5.0
   - os: linux
@@ -231,7 +238,7 @@ matrix:
       apt:
         sources:
         - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-6.0
+        - llvm-toolchain-xenial-6.0
         packages:
         - clang-6.0
   - os: linux
@@ -243,9 +250,21 @@ matrix:
       apt:
         sources:
         - ubuntu-toolchain-r-test
-        - llvm-toolchain-trusty-7
+        - 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
@@ -317,8 +336,8 @@ before_script:
 
 # Setup default environment variables
 - if [[ -z $env_src_root ]]; then export env_src_root=".."; fi
-- if [[ -z $env_build_cpp11 ]]; then export env_build_cpp11=0; 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
@@ -343,7 +362,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_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
+- 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

AUTHORS.md

@@ -8,3 +8,4 @@ The following authors have all licensed their contributions to ozz-animation und
 - Cloud Wu <[email protected]>
 - Kyle Rocha <[email protected]>
 - Andreas Streichardt <[email protected]>
+- Chen Junjie <[email protected]>

CHANGES.md

@@ -1,3 +1,27 @@
+Release version 0.13.0
+----------------------
+
+* Tools
+  - [gltf2ozz] Command line tool utility to import animations and skeletons from glTF files. gltf2ozz can be configured via command line options and [json configuration files](src/animation/offline/tools/reference.json), in the exact same way as fbx2ozz.
+  - #91 Fixup animation name when used as an output filename (via json configuration wildcard option), so they comply with most os filename restrictions.
+
+* Samples
+  - [skinning] Adds a new sample to explain skinning matrices setup.
+
+* Build pipeline
+  - Enables c++11 feature by default for all targets.
+
+* Library
+  - [animation] Removes skeleton_utils.h IterateMemFun helper that can be replaced by std::bind.
+  - [base] Removes ozz::memory::Allocator::Reallocate() function as it's rarely used and complex to overload.
+  - [base] Replaces OZZ_NEW and OZZ_DELETE macros with template functions ozz::New and ozz::Delete.
+  - [base] Removes ScopedPtr in favor of an alias to standard unique_ptr that remaps to ozz deallocator. Implements make_unique using ozz allocator.
+  - [base] Uses template aliasing (using keyword) to redirect ozz to std containers. This allows to get rid of ::Std when using ozz containers.
+  - [base] Renames all aliased ozz containers to their original std name: vector, map etc... 
+  - [base] Renames ozz::Range to ozz::span, ozz::make_range to ozz::make_span to comply with std containers. Range count() and size() methods are renamed to size() and size_bytes() respectively, so this needs special attention to avoid mistakes.
+  - [base] Replaces OZZ_ALIGN_OF and OZZ_ALIGN by standard alignof and alignas keywords.
+  - [base] Replaces OZZ_STATIC_ASSERT by standard static_assert keyword.
+
 Release version 0.12.1
 ----------------------
 
@@ -308,4 +332,4 @@ Release version 0.1.0, initial open source release
 
 * Build pipeline
   - CMake based build pipeline.
-  - CTest/GTest based unit test framework.
+  - CTest/GTest based unit test framework.

CMakeLists.txt

@@ -1,43 +1,36 @@
-cmake_minimum_required (VERSION 3.1)
+cmake_minimum_required (VERSION 3.3)
 
 # Defines the project's name
 project(ozz)
 
 # Current version
 set(OZZ_VERSION_MAJOR 0)
-set(OZZ_VERSION_MINOR 12)
+set(OZZ_VERSION_MINOR 13)
 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_gltf "Build glTF importer (Requires c++11)" ON)
 option(ozz_build_data "Build data on code change" OFF)
 option(ozz_build_samples "Build samples" ON)
 option(ozz_build_howtos "Build howtos" ON)
-option(ozz_build_tests "Build unit tests" OFF)
+option(ozz_build_tests "Build unit tests" ON)
 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})
-message("-- - ozz_build_howtos: " ${ozz_build_howtos})
-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})
+# 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)
+include(${PROJECT_SOURCE_DIR}/build-utils/cmake/clang_format.cmake)
 
 # Add project execution options
 option(ozz_run_tests_headless "Run samples without rendering (used for unit tests)" ON)
-set(ozz_sample_testing_loops 20 CACHE INT "Number of loops while running sample tests (used for unit tests)")
+set(ozz_sample_testing_loops "20" CACHE STRING "Number of loops while running sample tests (used for unit tests)")
 
 # Configure CMake module path
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/build-utils/cmake/modules/")
@@ -61,12 +54,11 @@ else()
   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)
-include(${PROJECT_SOURCE_DIR}/build-utils/cmake/clang_format.cmake)
+# gltf 
+if(ozz_build_tools AND ozz_build_gltf)
+else()
+  set(ozz_build_gltf OFF)
+endif()
 
 # Enables unit tests.
 if(ozz_build_tests)
@@ -80,6 +72,20 @@ set(ozz_media_directory "${PROJECT_SOURCE_DIR}/media")
 set(ozz_temp_directory ${PROJECT_BINARY_DIR}/temp)
 file(MAKE_DIRECTORY ${ozz_temp_directory})
 
+# 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_gltf: " ${ozz_build_gltf})
+message("-- - ozz_build_data: " ${ozz_build_data})
+message("-- - ozz_build_samples: " ${ozz_build_samples})
+message("-- - ozz_build_howtos: " ${ozz_build_howtos})
+message("-- - ozz_build_tests: " ${ozz_build_tests})
+message("-- - ozz_build_simd_ref: " ${ozz_build_simd_ref})
+message("-- - ozz_build_msvc_rt_dll: " ${ozz_build_msvc_rt_dll})
+message("-- - ozz_build_postfix: " ${ozz_build_postfix})
+
 # Starts building the sources tree
 add_subdirectory(src)
 

LICENSE.md

@@ -3,7 +3,7 @@ distributed under the MIT License (MIT).
 
 ---
 
-Copyright (c) 2019 Guillaume Blanc
+Copyright (c) 2020 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

README.md

@@ -8,19 +8,19 @@ open source c++ 3d skeletal animation library and toolset
 
 ozz-animation provides runtime character animation playback functionalities (loading, sampling, blending...). It proposes a low-level renderer agnostic and game-engine agnostic implementation, focusing on performance and memory constraints with a data-oriented design.
 
-ozz-animation comes with the toolchain to convert from major Digital Content Creation formats (Fbx, Collada, Obj, 3ds, dxf) to ozz optimized runtime structures. Offline libraries are also provided to implement the conversion from any other animation and skeleton format.
+ozz-animation comes with the toolchain to convert from major Digital Content Creation formats (gltf, Fbx, Collada, Obj, 3ds, dxf) to ozz optimized runtime structures. Offline libraries are also provided to implement the conversion from any other animation and skeleton format.
 
 Documentation
 -------------
 
-Documentation and samples are available from [ozz-animation website](http://guillaumeblanc.github.io/ozz-animation/).
+Documentation and samples are available from [ozz-animation website](http://guillaumeblanc.github.io/ozz-animation/). Join [Gitter](https://gitter.im/ozz-animation/community) for further discussions.
 
 Supported platforms
 -------------------
 
-Ozz is tested on Linux, Mac OS and Windows. The run-time code (ozz_base, ozz_animation, ozz_geometry) depends only on c++03, the standard CRT and has no OS specific code, portability to any other plateform shouldn't be an issue.
+Ozz is tested on Linux, Mac OS and Windows, for x86, x86-64 and ARM architectures. The run-time code (ozz_base, ozz_animation, ozz_geometry) depends only on c++11, the standard CRT and has no OS specific code, portability to any other platform shouldn't be an issue.
 
-Samples, tools and tests depend on external libraries (glfw, Fbx SDK, jsoncpp, gtest, ...), which could limit portability.
+Samples, tools and tests depend on external libraries (glfw, tinygltf, Fbx SDK, jsoncpp, gtest, ...), which could limit portability.
 
 Build status
 ------------
@@ -42,4 +42,4 @@ Please read [CONTRIBUTING](CONTRIBUTING.md) file for more details about how to s
 License
 -------
 
-ozz-animation is hosted on [github](http://github.com/guillaumeblanc/ozz-animation/) and distributed under the **MIT License** (MIT).
+ozz-animation is hosted on [github](http://github.com/guillaumeblanc/ozz-animation/) and distributed under the **MIT License** (MIT).