Add missig docs and fix some small review findings.

pull/1871/head
Kim Kulling 2018-04-06 12:01:22 +02:00
parent d17cf76c85
commit 32b466941b
4 changed files with 53 additions and 37 deletions

View File

@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
/** @file Stuff to deal with aiScene::mPrivate /** @file Stuff to deal with aiScene::mPrivate
*/ */
#pragma once
#ifndef AI_SCENEPRIVATE_H_INCLUDED #ifndef AI_SCENEPRIVATE_H_INCLUDED
#define AI_SCENEPRIVATE_H_INCLUDED #define AI_SCENEPRIVATE_H_INCLUDED
@ -49,15 +50,16 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
// Forward declarations
class Importer; class Importer;
struct ScenePrivateData { struct ScenePrivateData {
ScenePrivateData() ScenePrivateData()
: mOrigImporter() : mOrigImporter( nullptr )
, mPPStepsApplied() , mPPStepsApplied( 0 )
, mIsCopy() , mIsCopy( false ) {
{} // empty
}
// Importer that originally loaded the scene though the C-API // Importer that originally loaded the scene though the C-API
// If set, this object is owned by this private data instance. // If set, this object is owned by this private data instance.
@ -75,14 +77,24 @@ struct ScenePrivateData {
}; };
// Access private data stored in the scene // Access private data stored in the scene
inline ScenePrivateData* ScenePriv(aiScene* in) { inline
ScenePrivateData* ScenePriv(aiScene* in) {
ai_assert( nullptr != in );
if ( nullptr == in ) {
return nullptr;
}
return static_cast<ScenePrivateData*>(in->mPrivate); return static_cast<ScenePrivateData*>(in->mPrivate);
} }
inline const ScenePrivateData* ScenePriv(const aiScene* in) { inline
const ScenePrivateData* ScenePriv(const aiScene* in) {
ai_assert( nullptr != in );
if ( nullptr == in ) {
return nullptr;
}
return static_cast<const ScenePrivateData*>(in->mPrivate); return static_cast<const ScenePrivateData*>(in->mPrivate);
} }
} } // Namespace Assimp
#endif #endif // AI_SCENEPRIVATE_H_INCLUDED

View File

@ -43,6 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "simd.h" #include "simd.h"
namespace Assimp { namespace Assimp {
bool CPUSupportsSSE2() { bool CPUSupportsSSE2() {
#if defined(__x86_64__) || defined(_M_X64) #if defined(__x86_64__) || defined(_M_X64)
//* x86_64 always has SSE2 instructions */ //* x86_64 always has SSE2 instructions */
@ -73,4 +74,5 @@ namespace Assimp {
return false; return false;
#endif #endif
} }
}
} // Namespace Assimp

View File

@ -46,6 +46,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
namespace Assimp { namespace Assimp {
/// @brief Checks if the platform supports SSE2 optimization
/// @return true, if SSE2 is supported. false if SSE2 is not supported.
bool ASSIMP_API CPUSupportsSSE2(); bool ASSIMP_API CPUSupportsSSE2();
} // Namespace Assimp } // Namespace Assimp