Skip to content

Commit 5404090

Browse files
author
aramis_acg
committed
- update Assimp.NET
git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1330 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
1 parent 3f38d91 commit 5404090

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+6106
-5394
lines changed

‎include/assimp/defs.h

+5
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
135135
/* Tells the compiler that a function never returns. Used in code analysis
136136
* to skip dead paths (e.g. after an assertion evaluated to false). */
137137
# define AI_WONT_RETURN __declspec(noreturn)
138+
139+
#elif defined(SWIG)
140+
141+
/* Do nothing, the relevant defines are all in AssimpSwigPort.i */
142+
138143
#else
139144

140145
# define AI_WONT_RETURN

‎port/Assimp.NET/Assimp.NET/AssimpSwigPort.i

+58-47
Original file line numberDiff line numberDiff line change
@@ -43,38 +43,39 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4343
%include "carrays.i"
4444
%include "typemaps.i"
4545
%{
46-
#include "..\..\..\include\aiDefines.h"
47-
#include "..\..\..\include\aiConfig.h"
48-
#include "..\..\..\include\aiTypes.h"
49-
#include "..\..\..\include\aiVersion.h"
50-
#include "..\..\..\include\aiPostProcess.h"
51-
#include "..\..\..\include\aiVector2D.h"
52-
#include "..\..\..\include\aiVector3D.h"
53-
#include "..\..\..\include\aiColor4D.h"
54-
#include "..\..\..\include\aiMatrix3x3.h"
55-
#include "..\..\..\include\aiMatrix4x4.h"
56-
#include "..\..\..\include\aiCamera.h"
57-
#include "..\..\..\include\aiLight.h"
58-
#include "..\..\..\include\aiAnim.h"
59-
#include "..\..\..\include\aiMesh.h"
60-
#include "..\..\..\include\aiFileIO.h"
61-
#include "..\..\..\include\aiMaterial.h"
62-
#include "..\..\..\include\aiQuaternion.h"
63-
#include "..\..\..\include\aiScene.h"
64-
#include "..\..\..\include\aiTexture.h"
65-
#include "..\..\..\include\assimp.hpp"
66-
#include "..\..\..\include\IOSystem.h"
67-
#include "..\..\..\include\IOStream.h"
68-
#include "..\..\..\include\Logger.h"
69-
#include "..\..\..\include\LogStream.h"
70-
#include "..\..\..\include\NullLogger.h"
71-
#include "..\..\..\include\ProgressHandler.h"
46+
#include "..\..\..\include\assimp\defs.h"
47+
#include "..\..\..\include\assimp\config.h"
48+
#include "..\..\..\include\assimp\types.h"
49+
#include "..\..\..\include\assimp\version.h"
50+
#include "..\..\..\include\assimp\postprocess.h"
51+
#include "..\..\..\include\assimp\vector2.h"
52+
#include "..\..\..\include\assimp\vector3.h"
53+
#include "..\..\..\include\assimp\color4.h"
54+
#include "..\..\..\include\assimp\matrix3x3.h"
55+
#include "..\..\..\include\assimp\matrix4x4.h"
56+
#include "..\..\..\include\assimp\camera.h"
57+
#include "..\..\..\include\assimp\light.h"
58+
#include "..\..\..\include\assimp\anim.h"
59+
#include "..\..\..\include\assimp\mesh.h"
60+
#include "..\..\..\include\assimp\cfileio.h"
61+
#include "..\..\..\include\assimp\material.h"
62+
#include "..\..\..\include\assimp\quaternion.h"
63+
#include "..\..\..\include\assimp\scene.h"
64+
#include "..\..\..\include\assimp\texture.h"
65+
#include "..\..\..\include\assimp\Importer.hpp"
66+
#include "..\..\..\include\assimp\IOSystem.hpp"
67+
#include "..\..\..\include\assimp\IOStream.hpp"
68+
#include "..\..\..\include\assimp\Logger.hpp"
69+
#include "..\..\..\include\assimp\LogStream.hpp"
70+
#include "..\..\..\include\assimp\NullLogger.hpp"
71+
#include "..\..\..\include\assimp\ProgressHandler.hpp"
7272
%}
7373

7474
#define C_STRUCT
7575
#define C_ENUM
7676
#define ASSIMP_API
7777
#define PACK_STRUCT
78+
#define AI_FORCE_INLINE
7879

7980
%rename(__add__) operator+;
8081
%rename(__addnset__) operator+=;
@@ -504,33 +505,43 @@ ASSIMP_POINTER_POINTER(aiScene,aiTexture,mTextures,$self->mNumTextures);
504505
%ignore ::aiGetMaterialTexture;
505506

506507

507-
%include "..\..\..\include\aiDefines.h"
508-
%include "..\..\..\include\aiConfig.h"
509-
%include "..\..\..\include\aiTypes.h"
510-
%include "..\..\..\include\aiVersion.h"
511-
%include "..\..\..\include\aiPostProcess.h"
512-
%include "..\..\..\include\aiVector2D.h"
513-
%include "..\..\..\include\aiVector3D.h"
514-
%include "..\..\..\include\aiColor4D.h"
515-
%include "..\..\..\include\aiMatrix3x3.h"
516-
%include "..\..\..\include\aiMatrix4x4.h"
517-
%include "..\..\..\include\aiCamera.h"
518-
%include "..\..\..\include\aiLight.h"
519-
%include "..\..\..\include\aiAnim.h"
520-
%include "..\..\..\include\aiMesh.h"
521-
%include "..\..\..\include\aiFileIO.h"
522-
%include "..\..\..\include\aiMaterial.h"
523-
%include "..\..\..\include\aiQuaternion.h"
524-
%include "..\..\..\include\aiScene.h"
525-
%include "..\..\..\include\aiTexture.h"
526-
%include "..\..\..\include\assimp.hpp"
527-
%include "..\..\..\include\ProgressHandler.h"
508+
%include "..\..\..\include\assimp\defs.h"
509+
%include "..\..\..\include\assimp\config.h"
510+
%include "..\..\..\include\assimp\types.h"
511+
%include "..\..\..\include\assimp\version.h"
512+
%include "..\..\..\include\assimp\postprocess.h"
513+
%include "..\..\..\include\assimp\vector2.h"
514+
%include "..\..\..\include\assimp\vector3.h"
515+
%include "..\..\..\include\assimp\color4.h"
516+
%include "..\..\..\include\assimp\matrix3x3.h"
517+
%include "..\..\..\include\assimp\matrix4x4.h"
518+
%include "..\..\..\include\assimp\camera.h"
519+
%include "..\..\..\include\assimp\light.h"
520+
%include "..\..\..\include\assimp\anim.h"
521+
%include "..\..\..\include\assimp\mesh.h"
522+
%include "..\..\..\include\assimp\cfileio.h"
523+
%include "..\..\..\include\assimp\material.h"
524+
%include "..\..\..\include\assimp\quaternion.h"
525+
%include "..\..\..\include\assimp\scene.h"
526+
%include "..\..\..\include\assimp\texture.h"
527+
%include "..\..\..\include\assimp\Importer.hpp"
528+
%include "..\..\..\include\assimp\ProgressHandler.hpp"
528529
//%include "..\..\..\include\IOSystem.h"
529530
//%include "..\..\..\include\IOStream.h"
530531
//%include "..\..\..\include\Logger.h"
531532
//%include "..\..\..\include\LogStream.h"
532533
//%include "..\..\..\include\NullLogger.h"
533534

535+
536+
%template(aiColor4D) aiColor4t<float>;
537+
538+
%template(aiVector3D) aiVector3t<float>;
539+
%template(aiVector2D) aiVector2t<float>;
540+
541+
%template(aiQuaternion) aiQuaterniont<float>;
542+
%template(aiMatrix3x3) aiMatrix3x3t<float>;
543+
%template(aiMatrix4x4) aiMatrix4x4t<float>;
544+
534545
%template(FloatVector) std::vector<float>;
535546
%template(UintVector) std::vector<unsigned int>;
536547
%template(aiAnimationVector) std::vector<aiAnimation *>;

0 commit comments

Comments
 (0)