ASSIMP Beta 1, final fixes for the release.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@141 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
This commit is contained in:
aramis_acg
2008-09-13 22:31:15 +00:00
parent e3a871c134
commit 7d21c02e28
16 changed files with 423 additions and 21 deletions

View File

@@ -48,6 +48,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "../include/assimp.hpp"
using namespace Assimp;
// ------------------------------------------------------------------------------------------------
// Constructor to be privately used by Importer
BaseImporter::BaseImporter()
@@ -97,3 +98,5 @@ void BaseImporter::SetupProperties(const Importer* pImp)
// the default implementation does nothing
}

View File

@@ -43,18 +43,18 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#define AI_BASEIMPORTER_H_INC
#include <string>
#include "./../include/aiTypes.h"
struct aiScene;
namespace Assimp
{
namespace Assimp {
class IOSystem;
class Importer;
// ---------------------------------------------------------------------------
/** Simple exception class to be thrown if an error occurs while importing. */
class ImportErrorException
class ASSIMP_API ImportErrorException
{
public:
/** Constructor with arguments */
@@ -82,7 +82,7 @@ private:
* imports the given file. ReadFile is not overridable, it just calls
* InternReadFile() and catches any ImportErrorException that might occur.
*/
class BaseImporter
class ASSIMP_API BaseImporter
{
friend class Importer;
@@ -187,6 +187,8 @@ protected:
std::string mErrorText;
};
} // end of namespace Assimp
#endif // AI_BASEIMPORTER_H_INC

View File

@@ -57,7 +57,7 @@ namespace Assimp
* because the joining of vertices also considers tangents and bitangents for
* uniqueness.
*/
class CalcTangentsProcess : public BaseProcess
class ASSIMP_API CalcTangentsProcess : public BaseProcess
{
friend class Importer;

View File

@@ -57,7 +57,7 @@ namespace Assimp
* invert the orientation of all faces, and adapting skinning and animation
* data in a similar way.
*/
class ConvertToLHProcess : public BaseProcess
class ASSIMP_API ConvertToLHProcess : public BaseProcess
{
friend class Importer;

View File

@@ -55,7 +55,7 @@ namespace Assimp
* vectors of an object are facing inwards. In this case they will be
* flipped.
*/
class FixInfacingNormalsProcess : public BaseProcess
class ASSIMP_API FixInfacingNormalsProcess : public BaseProcess
{
friend class Importer;

View File

@@ -847,6 +847,7 @@ void OptimizeGraphProcess::BuildOutputMeshList()
// Executes the post processing step on the given imported data.
void OptimizeGraphProcess::Execute( aiScene* pScene)
{
throw new ImportErrorException("This step is disabled in this beta");
this->pScene = pScene;
/*

View File

@@ -62,7 +62,7 @@ namespace Assimp
* it has been moved to the main library since others might find it
* useful, too.
*/
class MakeVerboseFormatProcess : public BaseProcess
class ASSIMP_API MakeVerboseFormatProcess : public BaseProcess
{
friend class Importer;