Updated ozz-animation to version 0.14.1 @35b2efd4
This commit is contained in:
@@ -0,0 +1,44 @@
|
||||
//----------------------------------------------------------------------------//
|
||||
// //
|
||||
// ozz-animation is hosted at http://github.com/guillaumeblanc/ozz-animation //
|
||||
// and distributed under the MIT License (MIT). //
|
||||
// //
|
||||
// Copyright (c) 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 the Software without restriction, including without limitation //
|
||||
// the rights to use, copy, modify, merge, publish, distribute, sublicense, //
|
||||
// and/or sell copies of the Software, and to permit persons to whom the //
|
||||
// Software is furnished to do so, subject to the following conditions: //
|
||||
// //
|
||||
// The above copyright notice and this permission notice shall be included in //
|
||||
// all copies or substantial portions of the Software. //
|
||||
// //
|
||||
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR //
|
||||
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, //
|
||||
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL //
|
||||
// THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER //
|
||||
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING //
|
||||
// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER //
|
||||
// DEALINGS IN THE SOFTWARE. //
|
||||
// //
|
||||
//----------------------------------------------------------------------------//
|
||||
|
||||
#ifndef OZZ_OZZ_ANIMATION_OFFLINE_TOOLS_EXPORT_H_
|
||||
#define OZZ_OZZ_ANIMATION_OFFLINE_TOOLS_EXPORT_H_
|
||||
|
||||
#if defined(_MSC_VER) && defined(OZZ_USE_DYNAMIC_LINKING)
|
||||
|
||||
#ifdef OZZ_BUILD_ANIMATIONTOOLS_LIB
|
||||
// Import/Export for dynamic linking while building ozz
|
||||
#define OZZ_ANIMTOOLS_DLL __declspec(dllexport)
|
||||
#else
|
||||
#define OZZ_ANIMTOOLS_DLL __declspec(dllimport)
|
||||
#endif
|
||||
#else // defined(_MSC_VER) && defined(OZZ_USE_DYNAMIC_LINKING)
|
||||
// Static or non msvc linking
|
||||
#define OZZ_ANIMTOOLS_DLL
|
||||
#endif // defined(_MSC_VER) && defined(OZZ_USE_DYNAMIC_LINKING)
|
||||
|
||||
#endif // OZZ_OZZ_ANIMATION_OFFLINE_TOOLS_EXPORT_H_
|
||||
@@ -28,6 +28,8 @@
|
||||
#ifndef OZZ_OZZ_ANIMATION_OFFLINE_TOOLS_IMPORT2OZZ_H_
|
||||
#define OZZ_OZZ_ANIMATION_OFFLINE_TOOLS_IMPORT2OZZ_H_
|
||||
|
||||
#include "ozz/animation/offline/tools/export.h"
|
||||
|
||||
#include "ozz/base/containers/string.h"
|
||||
#include "ozz/base/containers/vector.h"
|
||||
|
||||
@@ -35,6 +37,8 @@
|
||||
#include "ozz/animation/offline/raw_skeleton.h"
|
||||
#include "ozz/animation/offline/raw_track.h"
|
||||
|
||||
#include "ozz/base/platform.h"
|
||||
|
||||
namespace ozz {
|
||||
namespace animation {
|
||||
|
||||
@@ -51,7 +55,7 @@ namespace offline {
|
||||
// To import a new source data format, one will implement the pure virtual
|
||||
// functions of this interface. All the conversions end error processing are
|
||||
// done by the tool.
|
||||
class OzzImporter {
|
||||
class OZZ_ANIMTOOLS_DLL OzzImporter {
|
||||
public:
|
||||
virtual ~OzzImporter() {}
|
||||
|
||||
@@ -72,6 +76,7 @@ class OzzImporter {
|
||||
bool camera : 1; // Uses camera nodes as skeleton joints.
|
||||
bool geometry : 1; // Uses geometry nodes as skeleton joints.
|
||||
bool light : 1; // Uses light nodes as skeleton joints.
|
||||
bool null : 1; // Uses null nodes as skeleton joints.
|
||||
bool any : 1; // Uses any node type as skeleton joints, including those
|
||||
// listed above and any other.
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user