Merge branch 'master' into fix_issue_2507_collada_import
commit
853afdf42b
|
@ -60,6 +60,7 @@ SOURCE_GROUP( Compiler FILES ${COMPILER_HEADERS})
|
||||||
|
|
||||||
SET( PUBLIC_HEADERS
|
SET( PUBLIC_HEADERS
|
||||||
${HEADER_PATH}/anim.h
|
${HEADER_PATH}/anim.h
|
||||||
|
${HEADER_PATH}/aabb.h
|
||||||
${HEADER_PATH}/ai_assert.h
|
${HEADER_PATH}/ai_assert.h
|
||||||
${HEADER_PATH}/camera.h
|
${HEADER_PATH}/camera.h
|
||||||
${HEADER_PATH}/color4.h
|
${HEADER_PATH}/color4.h
|
||||||
|
@ -668,6 +669,8 @@ SET( PostProcessing_SRCS
|
||||||
PostProcessing/MakeVerboseFormat.h
|
PostProcessing/MakeVerboseFormat.h
|
||||||
PostProcessing/ScaleProcess.cpp
|
PostProcessing/ScaleProcess.cpp
|
||||||
PostProcessing/ScaleProcess.h
|
PostProcessing/ScaleProcess.h
|
||||||
|
PostProcessing/GenBoundingBoxesProcess.cpp
|
||||||
|
PostProcessing/GenBoundingBoxesProcess.h
|
||||||
)
|
)
|
||||||
SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
|
SOURCE_GROUP( PostProcessing FILES ${PostProcessing_SRCS})
|
||||||
|
|
||||||
|
|
|
@ -1671,4 +1671,4 @@ void ColladaExporter::WriteNode( const aiScene* pScene, aiNode* pNode)
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
|
@ -150,7 +150,6 @@ public:
|
||||||
/// Stringstream to write all output into
|
/// Stringstream to write all output into
|
||||||
std::stringstream mOutput;
|
std::stringstream mOutput;
|
||||||
|
|
||||||
protected:
|
|
||||||
/// The IOSystem for output
|
/// The IOSystem for output
|
||||||
IOSystem* mIOSystem;
|
IOSystem* mIOSystem;
|
||||||
|
|
||||||
|
@ -204,7 +203,7 @@ protected:
|
||||||
|
|
||||||
std::map<unsigned int, std::string> textures;
|
std::map<unsigned int, std::string> textures;
|
||||||
|
|
||||||
protected:
|
public:
|
||||||
/// Dammit C++ - y u no compile two-pass? No I have to add all methods below the struct definitions
|
/// Dammit C++ - y u no compile two-pass? No I have to add all methods below the struct definitions
|
||||||
/// Reads a single surface entry from the given material keys
|
/// Reads a single surface entry from the given material keys
|
||||||
void ReadMaterialSurface( Surface& poSurface, const aiMaterial* pSrcMat, aiTextureType pTexture, const char* pKey, size_t pType, size_t pIndex);
|
void ReadMaterialSurface( Surface& poSurface, const aiMaterial* pSrcMat, aiTextureType pTexture, const char* pKey, size_t pType, size_t pIndex);
|
||||||
|
|
|
@ -89,7 +89,7 @@ void BaseProcess::ExecuteOnScene( Importer* pImp)
|
||||||
|
|
||||||
// and kill the partially imported data
|
// and kill the partially imported data
|
||||||
delete pImp->Pimpl()->mScene;
|
delete pImp->Pimpl()->mScene;
|
||||||
pImp->Pimpl()->mScene = NULL;
|
pImp->Pimpl()->mScene = nullptr;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -131,6 +131,10 @@ corresponding preprocessor flag to selectively disable steps.
|
||||||
#if (!defined ASSIMP_BUILD_NO_GLOBALSCALE_PROCESS)
|
#if (!defined ASSIMP_BUILD_NO_GLOBALSCALE_PROCESS)
|
||||||
# include "PostProcessing/ScaleProcess.h"
|
# include "PostProcessing/ScaleProcess.h"
|
||||||
#endif
|
#endif
|
||||||
|
#if (!defined ASSIMP_BUILD_NO_GENBOUNDINGBOXES_PROCESS)
|
||||||
|
# include "PostProcessing/GenBoundingBoxesProcess.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
namespace Assimp {
|
namespace Assimp {
|
||||||
|
|
||||||
|
@ -246,6 +250,9 @@ void GetPostProcessingStepInstanceList(std::vector< BaseProcess* >& out)
|
||||||
#if (!defined ASSIMP_BUILD_NO_IMPROVECACHELOCALITY_PROCESS)
|
#if (!defined ASSIMP_BUILD_NO_IMPROVECACHELOCALITY_PROCESS)
|
||||||
out.push_back( new ImproveCacheLocalityProcess());
|
out.push_back( new ImproveCacheLocalityProcess());
|
||||||
#endif
|
#endif
|
||||||
|
#if (!defined ASSIMP_BUILD_NO_GENBOUNDINGBOXES_PROCESS)
|
||||||
|
out.push_back(new GenBoundingBoxesProcess);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,115 @@
|
||||||
|
/*
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
Open Asset Import Library (assimp)
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Copyright (c) 2006-2019, assimp team
|
||||||
|
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
with or without modification, are permitted provided that the following
|
||||||
|
conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer in the documentation and/or other
|
||||||
|
materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the name of the assimp team, nor the names of its
|
||||||
|
contributors may be used to endorse or promote products
|
||||||
|
derived from this software without specific prior
|
||||||
|
written permission of the assimp team.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef ASSIMP_BUILD_NO_GENBOUNDINGBOXES_PROCESS
|
||||||
|
|
||||||
|
#include "PostProcessing/GenBoundingBoxesProcess.h"
|
||||||
|
|
||||||
|
#include <assimp/postprocess.h>
|
||||||
|
#include <assimp/scene.h>
|
||||||
|
|
||||||
|
namespace Assimp {
|
||||||
|
|
||||||
|
GenBoundingBoxesProcess::GenBoundingBoxesProcess()
|
||||||
|
: BaseProcess() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
GenBoundingBoxesProcess::~GenBoundingBoxesProcess() {
|
||||||
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
|
bool GenBoundingBoxesProcess::IsActive(unsigned int pFlags) const {
|
||||||
|
return 0 != ( pFlags & aiProcess_GenBoundingBoxes );
|
||||||
|
}
|
||||||
|
|
||||||
|
void checkMesh(aiMesh* mesh, aiVector3D& min, aiVector3D& max) {
|
||||||
|
ai_assert(nullptr != mesh);
|
||||||
|
|
||||||
|
if (0 == mesh->mNumVertices) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < mesh->mNumVertices; ++i) {
|
||||||
|
const aiVector3D &pos = mesh->mVertices[i];
|
||||||
|
if (pos.x < min.x) {
|
||||||
|
min.x = pos.x;
|
||||||
|
}
|
||||||
|
if (pos.y < min.y) {
|
||||||
|
min.y = pos.y;
|
||||||
|
}
|
||||||
|
if (pos.z < min.z) {
|
||||||
|
min.z = pos.z;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pos.x > max.x) {
|
||||||
|
max.x = pos.x;
|
||||||
|
}
|
||||||
|
if (pos.y > max.y) {
|
||||||
|
max.y = pos.y;
|
||||||
|
}
|
||||||
|
if (pos.z > max.z) {
|
||||||
|
max.z = pos.z;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void GenBoundingBoxesProcess::Execute(aiScene* pScene) {
|
||||||
|
if (nullptr == pScene) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (unsigned int i = 0; i < pScene->mNumMeshes; ++i) {
|
||||||
|
aiMesh* mesh = pScene->mMeshes[i];
|
||||||
|
if (nullptr == mesh) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
aiVector3D min(999999, 999999, 999999), max(-999999, -999999, -999999);
|
||||||
|
checkMesh(mesh, min, max);
|
||||||
|
mesh->mAABB.mMin = min;
|
||||||
|
mesh->mAABB.mMax = max;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
} // Namespace Assimp
|
||||||
|
|
||||||
|
#endif // ASSIMP_BUILD_NO_GENBOUNDINGBOXES_PROCESS
|
|
@ -0,0 +1,76 @@
|
||||||
|
/*
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
Open Asset Import Library (assimp)
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Copyright (c) 2006-2019, assimp team
|
||||||
|
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
with or without modification, are permitted provided that the following
|
||||||
|
conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer in the documentation and/or other
|
||||||
|
materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the name of the assimp team, nor the names of its
|
||||||
|
contributors may be used to endorse or promote products
|
||||||
|
derived from this software without specific prior
|
||||||
|
written permission of the assimp team.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** @file Defines a post-processing step to generate Axis-aligned bounding
|
||||||
|
* volumes for all meshes.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#ifndef AI_GENBOUNDINGBOXESPROCESS_H_INC
|
||||||
|
#define AI_GENBOUNDINGBOXESPROCESS_H_INC
|
||||||
|
|
||||||
|
#ifndef ASSIMP_BUILD_NO_GENBOUNDINGBOXES_PROCESS
|
||||||
|
|
||||||
|
#include "Common/BaseProcess.h"
|
||||||
|
|
||||||
|
namespace Assimp {
|
||||||
|
|
||||||
|
/** Post-processing process to find axis-aligned bounding volumes for amm meshes
|
||||||
|
* used in a scene
|
||||||
|
*/
|
||||||
|
class ASSIMP_API GenBoundingBoxesProcess : public BaseProcess {
|
||||||
|
public:
|
||||||
|
/// The class constructor.
|
||||||
|
GenBoundingBoxesProcess();
|
||||||
|
/// The class destructor.
|
||||||
|
~GenBoundingBoxesProcess();
|
||||||
|
/// Will return true, if aiProcess_GenBoundingBoxes is defined.
|
||||||
|
bool IsActive(unsigned int pFlags) const override;
|
||||||
|
/// The execution callback.
|
||||||
|
void Execute(aiScene* pScene) override;
|
||||||
|
};
|
||||||
|
|
||||||
|
} // Namespace Assimp
|
||||||
|
|
||||||
|
#endif // #ifndef ASSIMP_BUILD_NO_GENBOUNDINGBOXES_PROCESS
|
||||||
|
|
||||||
|
#endif // AI_GENBOUNDINGBOXESPROCESS_H_INC
|
|
@ -4,7 +4,6 @@ Open Asset Import Library (assimp)
|
||||||
|
|
||||||
Copyright (c) 2006-2019, assimp team
|
Copyright (c) 2006-2019, assimp team
|
||||||
|
|
||||||
|
|
||||||
All rights reserved.
|
All rights reserved.
|
||||||
|
|
||||||
Redistribution and use of this software in source and binary forms,
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
@ -40,7 +39,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
----------------------------------------------------------------------
|
----------------------------------------------------------------------
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/** @file Defines a post processing step to split large meshes into submeshes
|
/** @file Defines a post processing step to split large meshes into sub-meshes
|
||||||
*/
|
*/
|
||||||
#ifndef AI_SPLITLARGEMESHES_H_INC
|
#ifndef AI_SPLITLARGEMESHES_H_INC
|
||||||
#define AI_SPLITLARGEMESHES_H_INC
|
#define AI_SPLITLARGEMESHES_H_INC
|
||||||
|
@ -51,10 +50,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#include <assimp/mesh.h>
|
#include <assimp/mesh.h>
|
||||||
#include <assimp/scene.h>
|
#include <assimp/scene.h>
|
||||||
|
|
||||||
|
// Forward declarations
|
||||||
class SplitLargeMeshesTest;
|
class SplitLargeMeshesTest;
|
||||||
|
|
||||||
namespace Assimp
|
namespace Assimp {
|
||||||
{
|
|
||||||
|
|
||||||
class SplitLargeMeshesProcess_Triangle;
|
class SplitLargeMeshesProcess_Triangle;
|
||||||
class SplitLargeMeshesProcess_Vertex;
|
class SplitLargeMeshesProcess_Vertex;
|
||||||
|
|
|
@ -196,8 +196,7 @@ bool GetNextLine( const char_t*& buffer, char_t out[ BufferSize ] ) {
|
||||||
|
|
||||||
// ---------------------------------------------------------------------------------
|
// ---------------------------------------------------------------------------------
|
||||||
template <class char_t>
|
template <class char_t>
|
||||||
AI_FORCE_INLINE bool IsNumeric( char_t in)
|
AI_FORCE_INLINE bool IsNumeric( char_t in) {
|
||||||
{
|
|
||||||
return ( in >= '0' && in <= '9' ) || '-' == in || '+' == in;
|
return ( in >= '0' && in <= '9' ) || '-' == in || '+' == in;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,76 @@
|
||||||
|
/*
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
Open Asset Import Library (assimp)
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Copyright (c) 2006-2019, assimp team
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
with or without modification, are permitted provided that the following
|
||||||
|
conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer in the documentation and/or other
|
||||||
|
materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the name of the assimp team, nor the names of its
|
||||||
|
contributors may be used to endorse or promote products
|
||||||
|
derived from this software without specific prior
|
||||||
|
written permission of the assimp team.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
#ifndef AI_AABB_H_INC
|
||||||
|
#define AI_AABB_H_INC
|
||||||
|
|
||||||
|
#include <assimp/vector3.h>
|
||||||
|
|
||||||
|
struct aiAABB {
|
||||||
|
C_STRUCT aiVector3D mMin;
|
||||||
|
C_STRUCT aiVector3D mMax;
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
aiAABB()
|
||||||
|
: mMin()
|
||||||
|
, mMax() {
|
||||||
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
|
aiAABB(const aiVector3D &min, const aiVector3D &max )
|
||||||
|
: mMin(min)
|
||||||
|
, mMax(max) {
|
||||||
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
|
~aiAABB() {
|
||||||
|
// empty
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
#endif
|
|
@ -162,7 +162,6 @@ struct aiCamera
|
||||||
*/
|
*/
|
||||||
float mClipPlaneFar;
|
float mClipPlaneFar;
|
||||||
|
|
||||||
|
|
||||||
/** Screen aspect ratio.
|
/** Screen aspect ratio.
|
||||||
*
|
*
|
||||||
* This is the ration between the width and the height of the
|
* This is the ration between the width and the height of the
|
||||||
|
|
|
@ -122,7 +122,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
* OPTIMIZEANIMS
|
* OPTIMIZEANIMS
|
||||||
* OPTIMIZEGRAPH
|
* OPTIMIZEGRAPH
|
||||||
* GENENTITYMESHES
|
* GENENTITYMESHES
|
||||||
* FIXTEXTUREPATHS */
|
* FIXTEXTUREPATHS
|
||||||
|
* GENBOUNDINGBOXES */
|
||||||
//////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef _MSC_VER
|
#ifdef _MSC_VER
|
||||||
|
@ -214,10 +215,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(__BORLANDC__) || defined (__BCPLUSPLUS__))
|
#if (defined(__BORLANDC__) || defined (__BCPLUSPLUS__))
|
||||||
#error Currently, Borland is unsupported. Feel free to port Assimp.
|
# error Currently, Borland is unsupported. Feel free to port Assimp.
|
||||||
|
|
||||||
// "W8059 Packgröße der Struktur geändert"
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
@ -267,6 +265,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#define AI_DEG_TO_RAD(x) ((x)*(ai_real)0.0174532925)
|
#define AI_DEG_TO_RAD(x) ((x)*(ai_real)0.0174532925)
|
||||||
#define AI_RAD_TO_DEG(x) ((x)*(ai_real)57.2957795)
|
#define AI_RAD_TO_DEG(x) ((x)*(ai_real)57.2957795)
|
||||||
|
|
||||||
|
/* Numerical limits */
|
||||||
|
static const ai_real ai_epsilon = (ai_real) 0.00001;
|
||||||
|
|
||||||
/* Support for big-endian builds */
|
/* Support for big-endian builds */
|
||||||
#if defined(__BYTE_ORDER__)
|
#if defined(__BYTE_ORDER__)
|
||||||
# if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
|
# if (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
|
||||||
|
@ -298,6 +299,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
# else
|
# else
|
||||||
# define AI_NO_EXCEPT
|
# define AI_NO_EXCEPT
|
||||||
# endif
|
# endif
|
||||||
#endif
|
#endif // _MSC_VER
|
||||||
|
|
||||||
#endif // !! AI_DEFINES_H_INC
|
#endif // !! AI_DEFINES_H_INC
|
||||||
|
|
|
@ -48,7 +48,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
#ifndef AI_MESH_H_INC
|
#ifndef AI_MESH_H_INC
|
||||||
#define AI_MESH_H_INC
|
#define AI_MESH_H_INC
|
||||||
|
|
||||||
#include "types.h"
|
#include <assimp/types.h>
|
||||||
|
#include <assimp/aabb.h>
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
extern "C" {
|
extern "C" {
|
||||||
|
@ -714,6 +715,11 @@ struct aiMesh
|
||||||
* Method of morphing when animeshes are specified.
|
* Method of morphing when animeshes are specified.
|
||||||
*/
|
*/
|
||||||
unsigned int mMethod;
|
unsigned int mMethod;
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
C_STRUCT aiAABB mAABB;
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
|
||||||
|
@ -735,7 +741,8 @@ struct aiMesh
|
||||||
, mMaterialIndex( 0 )
|
, mMaterialIndex( 0 )
|
||||||
, mNumAnimMeshes( 0 )
|
, mNumAnimMeshes( 0 )
|
||||||
, mAnimMeshes(nullptr)
|
, mAnimMeshes(nullptr)
|
||||||
, mMethod( 0 ) {
|
, mMethod( 0 )
|
||||||
|
, mAABB() {
|
||||||
for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a ) {
|
for( unsigned int a = 0; a < AI_MAX_NUMBER_OF_TEXTURECOORDS; ++a ) {
|
||||||
mNumUVComponents[a] = 0;
|
mNumUVComponents[a] = 0;
|
||||||
mTextureCoords[a] = nullptr;
|
mTextureCoords[a] = nullptr;
|
||||||
|
|
|
@ -438,7 +438,7 @@ enum aiPostProcessSteps
|
||||||
aiProcess_FindInstances = 0x100000,
|
aiProcess_FindInstances = 0x100000,
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
/** <hr>A postprocessing step to reduce the number of meshes.
|
/** <hr>A post-processing step to reduce the number of meshes.
|
||||||
*
|
*
|
||||||
* This will, in fact, reduce the number of draw calls.
|
* This will, in fact, reduce the number of draw calls.
|
||||||
*
|
*
|
||||||
|
@ -450,7 +450,7 @@ enum aiPostProcessSteps
|
||||||
|
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
/** <hr>A postprocessing step to optimize the scene hierarchy.
|
/** <hr>A post-processing step to optimize the scene hierarchy.
|
||||||
*
|
*
|
||||||
* Nodes without animations, bones, lights or cameras assigned are
|
* Nodes without animations, bones, lights or cameras assigned are
|
||||||
* collapsed and joined.
|
* collapsed and joined.
|
||||||
|
@ -514,7 +514,7 @@ enum aiPostProcessSteps
|
||||||
|
|
||||||
// -------------------------------------------------------------------------
|
// -------------------------------------------------------------------------
|
||||||
/** <hr>This step splits meshes with many bones into sub-meshes so that each
|
/** <hr>This step splits meshes with many bones into sub-meshes so that each
|
||||||
* su-bmesh has fewer or as many bones as a given limit.
|
* sub-mesh has fewer or as many bones as a given limit.
|
||||||
*/
|
*/
|
||||||
aiProcess_SplitByBoneCount = 0x2000000,
|
aiProcess_SplitByBoneCount = 0x2000000,
|
||||||
|
|
||||||
|
@ -541,7 +541,7 @@ enum aiPostProcessSteps
|
||||||
* global scaling from your importer settings like in FBX. Use the flag
|
* global scaling from your importer settings like in FBX. Use the flag
|
||||||
* AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY from the global property table to configure this.
|
* AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY from the global property table to configure this.
|
||||||
*
|
*
|
||||||
* Use <tt>#AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY</tt> to setup the global scaing factor.
|
* Use <tt>#AI_CONFIG_GLOBAL_SCALE_FACTOR_KEY</tt> to setup the global scaling factor.
|
||||||
*/
|
*/
|
||||||
aiProcess_GlobalScale = 0x8000000,
|
aiProcess_GlobalScale = 0x8000000,
|
||||||
|
|
||||||
|
@ -574,6 +574,11 @@ enum aiPostProcessSteps
|
||||||
* This process gives sense back to aiProcess_JoinIdenticalVertices
|
* This process gives sense back to aiProcess_JoinIdenticalVertices
|
||||||
*/
|
*/
|
||||||
aiProcess_DropNormals = 0x40000000,
|
aiProcess_DropNormals = 0x40000000,
|
||||||
|
|
||||||
|
// -------------------------------------------------------------------------
|
||||||
|
/**
|
||||||
|
*/
|
||||||
|
aiProcess_GenBoundingBoxes = 0x80000000
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -161,6 +161,7 @@ SET( POST_PROCESSES
|
||||||
unit/utTargetAnimation.cpp
|
unit/utTargetAnimation.cpp
|
||||||
unit/utSortByPType.cpp
|
unit/utSortByPType.cpp
|
||||||
unit/utSceneCombiner.cpp
|
unit/utSceneCombiner.cpp
|
||||||
|
unit/utGenBoundingBoxesProcess.cpp
|
||||||
)
|
)
|
||||||
|
|
||||||
SOURCE_GROUP( UnitTests\\Compiler FILES unit/CCompilerTest.c )
|
SOURCE_GROUP( UnitTests\\Compiler FILES unit/CCompilerTest.c )
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
ply
|
ply
|
||||||
format ascii 1.0
|
format ascii 1.0
|
||||||
comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.3945266037)
|
comment Created by Open Asset Import Library - http://assimp.sf.net (v4.1.649942190)
|
||||||
element vertex 8
|
element vertex 8
|
||||||
property float x
|
property float x
|
||||||
property float y
|
property float y
|
||||||
|
|
|
@ -0,0 +1,88 @@
|
||||||
|
/*
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
Open Asset Import Library (assimp)
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
Copyright (c) 2006-2019, assimp team
|
||||||
|
|
||||||
|
All rights reserved.
|
||||||
|
|
||||||
|
Redistribution and use of this software in source and binary forms,
|
||||||
|
with or without modification, are permitted provided that the following
|
||||||
|
conditions are met:
|
||||||
|
|
||||||
|
* Redistributions of source code must retain the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer.
|
||||||
|
|
||||||
|
* Redistributions in binary form must reproduce the above
|
||||||
|
copyright notice, this list of conditions and the
|
||||||
|
following disclaimer in the documentation and/or other
|
||||||
|
materials provided with the distribution.
|
||||||
|
|
||||||
|
* Neither the name of the assimp team, nor the names of its
|
||||||
|
contributors may be used to endorse or promote products
|
||||||
|
derived from this software without specific prior
|
||||||
|
written permission of the assimp team.
|
||||||
|
|
||||||
|
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
||||||
|
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
||||||
|
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
||||||
|
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||||
|
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
||||||
|
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
||||||
|
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
||||||
|
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
---------------------------------------------------------------------------
|
||||||
|
*/
|
||||||
|
#include "UnitTestPCH.h"
|
||||||
|
|
||||||
|
#include "PostProcessing/GenBoundingBoxesProcess.h"
|
||||||
|
#include <assimp/mesh.h>
|
||||||
|
#include <assimp/scene.h>
|
||||||
|
|
||||||
|
using namespace Assimp;
|
||||||
|
|
||||||
|
class utGenBoundingBoxesProcess : public ::testing::Test {
|
||||||
|
public:
|
||||||
|
void SetUp() override {
|
||||||
|
mProcess = new GenBoundingBoxesProcess;
|
||||||
|
mMesh = new aiMesh();
|
||||||
|
mMesh->mNumVertices = 100;
|
||||||
|
mMesh->mVertices = new aiVector3D[100];
|
||||||
|
for (unsigned int i = 0; i < 100; ++i) {
|
||||||
|
mMesh->mVertices[i] = aiVector3D(i, i, i);
|
||||||
|
}
|
||||||
|
mScene = new aiScene();
|
||||||
|
mScene->mNumMeshes = 1;
|
||||||
|
mScene->mMeshes = new aiMesh*[1];
|
||||||
|
mScene->mMeshes[0] = mMesh;
|
||||||
|
}
|
||||||
|
|
||||||
|
void TearDown() override {
|
||||||
|
delete mProcess;
|
||||||
|
delete mScene;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected:
|
||||||
|
GenBoundingBoxesProcess *mProcess;
|
||||||
|
aiMesh *mMesh;
|
||||||
|
aiScene* mScene;
|
||||||
|
};
|
||||||
|
|
||||||
|
TEST_F(utGenBoundingBoxesProcess, executeTest) {
|
||||||
|
mProcess->Execute(mScene);
|
||||||
|
|
||||||
|
aiMesh* mesh = mScene->mMeshes[0];
|
||||||
|
EXPECT_NE(nullptr, mesh);
|
||||||
|
EXPECT_EQ(0, mesh->mAABB.mMin.x);
|
||||||
|
EXPECT_EQ(0, mesh->mAABB.mMin.y);
|
||||||
|
EXPECT_EQ(0, mesh->mAABB.mMin.z);
|
||||||
|
|
||||||
|
EXPECT_EQ(99, mesh->mAABB.mMax.x);
|
||||||
|
EXPECT_EQ(99, mesh->mAABB.mMax.y);
|
||||||
|
EXPECT_EQ(99, mesh->mAABB.mMax.z);
|
||||||
|
}
|
Loading…
Reference in New Issue