PostProcesswing: add gen-aabb process to postprocessing.

pull/2521/head
Kim Kulling 2019-06-23 20:24:32 +02:00
parent 3929ea0644
commit 26bd54ae0b
7 changed files with 198 additions and 9 deletions

View File

@ -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

View File

@ -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

View File

@ -0,0 +1,61 @@
/*
---------------------------------------------------------------------------
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_GENBOUNDINGBOXESPROCESS_H_INC
#define AI_GENBOUNDINGBOXESPROCESS_H_INC
#include "Common/BaseProcess.h"
namespace Assimp {
class GenBoundingBoxesProcess : public BaseProcess {
public:
GenBoundingBoxesProcess();
~GenBoundingBoxesProcess();
bool IsActive(unsigned int pFlags) const override;
void Execute(aiScene* pScene) override;
};
} // Namespace Assimp
#endif // AI_GENBOUNDINGBOXESPROCESS_H_INC

View File

@ -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

View File

@ -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
@ -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

View File

@ -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" {
@ -715,6 +716,11 @@ struct aiMesh
*/ */
unsigned int mMethod; unsigned int mMethod;
/**
*
*/
C_STRUCT aiAABB mAABB;
#ifdef __cplusplus #ifdef __cplusplus
//! Default constructor. Initializes all members to 0 //! Default constructor. Initializes all members to 0
@ -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;

View File

@ -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
}; };