From f1fe73d1909a2448a004a88362a1a532d0d4f7c3 Mon Sep 17 00:00:00 2001 From: sanine Date: Sun, 12 Feb 2023 23:53:22 -0600 Subject: switch to tinyobj and nanovg from assimp and cairo --- libs/assimp/port/swig/interface/DefaultLogger.i | 5 --- libs/assimp/port/swig/interface/IOStream.i | 5 --- libs/assimp/port/swig/interface/IOSystem.i | 11 ------ libs/assimp/port/swig/interface/LogStream.i | 5 --- libs/assimp/port/swig/interface/Logger.i | 5 --- libs/assimp/port/swig/interface/NullLogger.i | 5 --- libs/assimp/port/swig/interface/aiAnim.i | 8 ----- libs/assimp/port/swig/interface/aiAssert.i | 5 --- libs/assimp/port/swig/interface/aiCamera.i | 5 --- libs/assimp/port/swig/interface/aiColor4D.i | 5 --- libs/assimp/port/swig/interface/aiConfig.i | 5 --- libs/assimp/port/swig/interface/aiDefines.i | 5 --- libs/assimp/port/swig/interface/aiFileIO.i | 5 --- libs/assimp/port/swig/interface/aiLight.i | 5 --- libs/assimp/port/swig/interface/aiMaterial.i | 33 ------------------ libs/assimp/port/swig/interface/aiMatrix3x3.i | 5 --- libs/assimp/port/swig/interface/aiMatrix4x4.i | 5 --- libs/assimp/port/swig/interface/aiMesh.i | 29 ---------------- libs/assimp/port/swig/interface/aiPostProcess.i | 7 ---- libs/assimp/port/swig/interface/aiQuaternion.i | 5 --- libs/assimp/port/swig/interface/aiScene.i | 17 ---------- libs/assimp/port/swig/interface/aiTexture.i | 5 --- libs/assimp/port/swig/interface/aiTypes.i | 8 ----- libs/assimp/port/swig/interface/aiVector2D.i | 5 --- libs/assimp/port/swig/interface/aiVector3D.i | 5 --- libs/assimp/port/swig/interface/aiVersion.i | 5 --- libs/assimp/port/swig/interface/assimp.i | 45 ------------------------- 27 files changed, 253 deletions(-) delete mode 100644 libs/assimp/port/swig/interface/DefaultLogger.i delete mode 100644 libs/assimp/port/swig/interface/IOStream.i delete mode 100644 libs/assimp/port/swig/interface/IOSystem.i delete mode 100644 libs/assimp/port/swig/interface/LogStream.i delete mode 100644 libs/assimp/port/swig/interface/Logger.i delete mode 100644 libs/assimp/port/swig/interface/NullLogger.i delete mode 100644 libs/assimp/port/swig/interface/aiAnim.i delete mode 100644 libs/assimp/port/swig/interface/aiAssert.i delete mode 100644 libs/assimp/port/swig/interface/aiCamera.i delete mode 100644 libs/assimp/port/swig/interface/aiColor4D.i delete mode 100644 libs/assimp/port/swig/interface/aiConfig.i delete mode 100644 libs/assimp/port/swig/interface/aiDefines.i delete mode 100644 libs/assimp/port/swig/interface/aiFileIO.i delete mode 100644 libs/assimp/port/swig/interface/aiLight.i delete mode 100644 libs/assimp/port/swig/interface/aiMaterial.i delete mode 100644 libs/assimp/port/swig/interface/aiMatrix3x3.i delete mode 100644 libs/assimp/port/swig/interface/aiMatrix4x4.i delete mode 100644 libs/assimp/port/swig/interface/aiMesh.i delete mode 100644 libs/assimp/port/swig/interface/aiPostProcess.i delete mode 100644 libs/assimp/port/swig/interface/aiQuaternion.i delete mode 100644 libs/assimp/port/swig/interface/aiScene.i delete mode 100644 libs/assimp/port/swig/interface/aiTexture.i delete mode 100644 libs/assimp/port/swig/interface/aiTypes.i delete mode 100644 libs/assimp/port/swig/interface/aiVector2D.i delete mode 100644 libs/assimp/port/swig/interface/aiVector3D.i delete mode 100644 libs/assimp/port/swig/interface/aiVersion.i delete mode 100644 libs/assimp/port/swig/interface/assimp.i (limited to 'libs/assimp/port/swig/interface') diff --git a/libs/assimp/port/swig/interface/DefaultLogger.i b/libs/assimp/port/swig/interface/DefaultLogger.i deleted file mode 100644 index 600d28e..0000000 --- a/libs/assimp/port/swig/interface/DefaultLogger.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "DefaultLogger.h" -%} - -%include "DefaultLogger.h" diff --git a/libs/assimp/port/swig/interface/IOStream.i b/libs/assimp/port/swig/interface/IOStream.i deleted file mode 100644 index baca5ef..0000000 --- a/libs/assimp/port/swig/interface/IOStream.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "IOStream.h" -%} - -%include "IOStream.h" diff --git a/libs/assimp/port/swig/interface/IOSystem.i b/libs/assimp/port/swig/interface/IOSystem.i deleted file mode 100644 index 3e3e04a..0000000 --- a/libs/assimp/port/swig/interface/IOSystem.i +++ /dev/null @@ -1,11 +0,0 @@ -%{ -#include "IOSystem.h" -%} - -// The const char* overload is used instead. -%ignore Assimp::IOSystem::Exists(const std::string&) const; -%ignore Assimp::IOSystem::Open(const std::string& pFile); -%ignore Assimp::IOSystem::Open(const std::string& pFile, const std::string& pMode); -%ignore Assimp::IOSystem::ComparePaths(const std::string& one, const std::string& second) const; - -%include "IOSystem.h" diff --git a/libs/assimp/port/swig/interface/LogStream.i b/libs/assimp/port/swig/interface/LogStream.i deleted file mode 100644 index 022f8e5..0000000 --- a/libs/assimp/port/swig/interface/LogStream.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "LogStream.h" -%} - -%include "LogStream.h" diff --git a/libs/assimp/port/swig/interface/Logger.i b/libs/assimp/port/swig/interface/Logger.i deleted file mode 100644 index cadc50b..0000000 --- a/libs/assimp/port/swig/interface/Logger.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "Logger.h" -%} - -%include "Logger.h" diff --git a/libs/assimp/port/swig/interface/NullLogger.i b/libs/assimp/port/swig/interface/NullLogger.i deleted file mode 100644 index 5cf42ed..0000000 --- a/libs/assimp/port/swig/interface/NullLogger.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "NullLogger.h" -%} - -%include "NullLogger.h" diff --git a/libs/assimp/port/swig/interface/aiAnim.i b/libs/assimp/port/swig/interface/aiAnim.i deleted file mode 100644 index de49700..0000000 --- a/libs/assimp/port/swig/interface/aiAnim.i +++ /dev/null @@ -1,8 +0,0 @@ -%{ -#include "aiAnim.h" -%} - -ASSIMP_ARRAY(aiAnimation, aiNodeAnim*, mChannels, $self->mNumChannels); -ASSIMP_ARRAY(aiAnimation, aiMeshAnim*, mMeshChannels, $self->mNumMeshChannels); - -%include "aiAnim.h" diff --git a/libs/assimp/port/swig/interface/aiAssert.i b/libs/assimp/port/swig/interface/aiAssert.i deleted file mode 100644 index bc8a9b8..0000000 --- a/libs/assimp/port/swig/interface/aiAssert.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiAssert.h" -%} - -%include "aiAssert.h" diff --git a/libs/assimp/port/swig/interface/aiCamera.i b/libs/assimp/port/swig/interface/aiCamera.i deleted file mode 100644 index 5c21245..0000000 --- a/libs/assimp/port/swig/interface/aiCamera.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiCamera.h" -%} - -%include "aiCamera.h" diff --git a/libs/assimp/port/swig/interface/aiColor4D.i b/libs/assimp/port/swig/interface/aiColor4D.i deleted file mode 100644 index 3c00916..0000000 --- a/libs/assimp/port/swig/interface/aiColor4D.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiColor4D.h" -%} - -%include "aiColor4D.h" diff --git a/libs/assimp/port/swig/interface/aiConfig.i b/libs/assimp/port/swig/interface/aiConfig.i deleted file mode 100644 index 110abb3..0000000 --- a/libs/assimp/port/swig/interface/aiConfig.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiConfig.h" -%} - -%include "aiConfig.h" diff --git a/libs/assimp/port/swig/interface/aiDefines.i b/libs/assimp/port/swig/interface/aiDefines.i deleted file mode 100644 index 3a61ea6..0000000 --- a/libs/assimp/port/swig/interface/aiDefines.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiDefines.h" -%} - -%include "aiDefines.h" diff --git a/libs/assimp/port/swig/interface/aiFileIO.i b/libs/assimp/port/swig/interface/aiFileIO.i deleted file mode 100644 index 5a1e092..0000000 --- a/libs/assimp/port/swig/interface/aiFileIO.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiFileIO.h" -%} - -%include "aiFileIO.h" diff --git a/libs/assimp/port/swig/interface/aiLight.i b/libs/assimp/port/swig/interface/aiLight.i deleted file mode 100644 index fbefde7..0000000 --- a/libs/assimp/port/swig/interface/aiLight.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiLight.h" -%} - -%include "aiLight.h" diff --git a/libs/assimp/port/swig/interface/aiMaterial.i b/libs/assimp/port/swig/interface/aiMaterial.i deleted file mode 100644 index 630e6b7..0000000 --- a/libs/assimp/port/swig/interface/aiMaterial.i +++ /dev/null @@ -1,33 +0,0 @@ -%{ -#include "aiMaterial.h" -%} - -ASSIMP_ARRAY(aiMaterial, aiMaterialProperty*, mProperties, $self->mNumProperties) - -%include -%apply enum SWIGTYPE *OUTPUT { aiTextureMapping* mapping }; -%apply unsigned int *OUTPUT { unsigned int* uvindex }; -%apply float *OUTPUT { float* blend }; -%apply enum SWIGTYPE *OUTPUT { aiTextureOp* op }; -%apply unsigned int *OUTPUT { unsigned int* flags }; - -%include "aiMaterial.h" - -%clear unsigned int* flags; -%clear aiTextureOp* op; -%clear float *blend; -%clear unsigned int* uvindex; -%clear aiTextureMapping* mapping; - - -%apply int &OUTPUT { int &pOut }; -%apply float &OUTPUT { float &pOut }; - -%template(GetInteger) aiMaterial::Get; -%template(GetFloat) aiMaterial::Get; -%template(GetColor4D) aiMaterial::Get; -%template(GetColor3D) aiMaterial::Get; -%template(GetString) aiMaterial::Get; - -%clear int &pOut; -%clear float &pOut; diff --git a/libs/assimp/port/swig/interface/aiMatrix3x3.i b/libs/assimp/port/swig/interface/aiMatrix3x3.i deleted file mode 100644 index 8336d44..0000000 --- a/libs/assimp/port/swig/interface/aiMatrix3x3.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiMatrix3x3.h" -%} - -%include "aiMatrix3x3.h" diff --git a/libs/assimp/port/swig/interface/aiMatrix4x4.i b/libs/assimp/port/swig/interface/aiMatrix4x4.i deleted file mode 100644 index 976c56b..0000000 --- a/libs/assimp/port/swig/interface/aiMatrix4x4.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiMatrix4x4.h" -%} - -%include "aiMatrix4x4.h" diff --git a/libs/assimp/port/swig/interface/aiMesh.i b/libs/assimp/port/swig/interface/aiMesh.i deleted file mode 100644 index 141366c..0000000 --- a/libs/assimp/port/swig/interface/aiMesh.i +++ /dev/null @@ -1,29 +0,0 @@ -%{ -#include "aiMesh.h" -%} - - -ASSIMP_ARRAY(aiFace, unsigned int, mIndices, $self->mNumIndices); - -ASSIMP_POINTER_ARRAY(aiBone, aiVertexWeight, mWeights, $self->mNumWeights); - -ASSIMP_POINTER_ARRAY(aiAnimMesh, aiVector3D, mVertices, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiAnimMesh, aiVector3D, mNormals, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiAnimMesh, aiVector3D, mTangents, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiAnimMesh, aiVector3D, mBitangents, $self->mNumVertices); -ASSIMP_POINTER_ARRAY_ARRAY(aiAnimMesh, aiVector3D, mTextureCoords, AI_MAX_NUMBER_OF_TEXTURECOORDS, $self->mNumVertices); -ASSIMP_POINTER_ARRAY_ARRAY(aiAnimMesh, aiColor4D, mColors, AI_MAX_NUMBER_OF_COLOR_SETS, $self->mNumVertices); - -ASSIMP_ARRAY(aiMesh, aiAnimMesh*, mAnimMeshes, $self->mNumAnimMeshes); -ASSIMP_ARRAY(aiMesh, aiBone*, mBones, $self->mNumBones); -ASSIMP_ARRAY(aiMesh, unsigned int, mNumUVComponents, AI_MAX_NUMBER_OF_TEXTURECOORDS); -ASSIMP_POINTER_ARRAY(aiMesh, aiVector3D, mVertices, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiMesh, aiVector3D, mNormals, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiMesh, aiVector3D, mTangents, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiMesh, aiVector3D, mBitangents, $self->mNumVertices); -ASSIMP_POINTER_ARRAY(aiMesh, aiFace, mFaces, $self->mNumFaces); -ASSIMP_POINTER_ARRAY_ARRAY(aiMesh, aiVector3D, mTextureCoords, AI_MAX_NUMBER_OF_TEXTURECOORDS, $self->mNumVertices); -ASSIMP_POINTER_ARRAY_ARRAY(aiMesh, aiColor4D, mColors, AI_MAX_NUMBER_OF_COLOR_SETS, $self->mNumVertices); - - -%include "aiMesh.h" diff --git a/libs/assimp/port/swig/interface/aiPostProcess.i b/libs/assimp/port/swig/interface/aiPostProcess.i deleted file mode 100644 index 5f64ec5..0000000 --- a/libs/assimp/port/swig/interface/aiPostProcess.i +++ /dev/null @@ -1,7 +0,0 @@ -%{ -#include "aiPostProcess.h" -%} - -%feature("d:stripprefix", "aiProcess_") aiPostProcessSteps; - -%include "aiPostProcess.h" diff --git a/libs/assimp/port/swig/interface/aiQuaternion.i b/libs/assimp/port/swig/interface/aiQuaternion.i deleted file mode 100644 index 256057a..0000000 --- a/libs/assimp/port/swig/interface/aiQuaternion.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiQuaternion.h" -%} - -%include "aiQuaternion.h" diff --git a/libs/assimp/port/swig/interface/aiScene.i b/libs/assimp/port/swig/interface/aiScene.i deleted file mode 100644 index 7278f33..0000000 --- a/libs/assimp/port/swig/interface/aiScene.i +++ /dev/null @@ -1,17 +0,0 @@ -%{ -#include "aiScene.h" -%} - - -ASSIMP_ARRAY(aiScene, aiAnimation*, mAnimations, $self->mNumAnimations); -ASSIMP_ARRAY(aiScene, aiCamera*, mCameras, $self->mNumCameras); -ASSIMP_ARRAY(aiScene, aiLight*, mLights, $self->mNumLights); -ASSIMP_ARRAY(aiScene, aiMaterial*, mMaterials, $self->mNumMaterials); -ASSIMP_ARRAY(aiScene, aiMesh*, mMeshes, $self->mNumMeshes); -ASSIMP_ARRAY(aiScene, aiTexture*, mTextures, $self->mNumTextures); - -ASSIMP_ARRAY(aiNode, aiNode*, mChildren, $self->mNumChildren); -ASSIMP_ARRAY(aiNode, unsigned int, mMeshes, $self->mNumMeshes); - - -%include "aiScene.h" diff --git a/libs/assimp/port/swig/interface/aiTexture.i b/libs/assimp/port/swig/interface/aiTexture.i deleted file mode 100644 index d07d001..0000000 --- a/libs/assimp/port/swig/interface/aiTexture.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiTexture.h" -%} - -%include "aiTexture.h" diff --git a/libs/assimp/port/swig/interface/aiTypes.i b/libs/assimp/port/swig/interface/aiTypes.i deleted file mode 100644 index a086dfd..0000000 --- a/libs/assimp/port/swig/interface/aiTypes.i +++ /dev/null @@ -1,8 +0,0 @@ -%{ -#include "aiTypes.h" -%} - -// The const char* overload is used instead. -%ignore aiString::Set(const std::string& pString); - -%include "aiTypes.h" diff --git a/libs/assimp/port/swig/interface/aiVector2D.i b/libs/assimp/port/swig/interface/aiVector2D.i deleted file mode 100644 index 5db15c0..0000000 --- a/libs/assimp/port/swig/interface/aiVector2D.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiVector2D.h" -%} - -%include "aiVector2D.h" diff --git a/libs/assimp/port/swig/interface/aiVector3D.i b/libs/assimp/port/swig/interface/aiVector3D.i deleted file mode 100644 index 2c83f60..0000000 --- a/libs/assimp/port/swig/interface/aiVector3D.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiVector3D.h" -%} - -%include "aiVector3D.h" diff --git a/libs/assimp/port/swig/interface/aiVersion.i b/libs/assimp/port/swig/interface/aiVersion.i deleted file mode 100644 index 9ddd532..0000000 --- a/libs/assimp/port/swig/interface/aiVersion.i +++ /dev/null @@ -1,5 +0,0 @@ -%{ -#include "aiVersion.h" -%} - -%include "aiVersion.h" diff --git a/libs/assimp/port/swig/interface/assimp.i b/libs/assimp/port/swig/interface/assimp.i deleted file mode 100644 index a1b1404..0000000 --- a/libs/assimp/port/swig/interface/assimp.i +++ /dev/null @@ -1,45 +0,0 @@ -%{ -#include "assimp.hpp" -%} - - -namespace Assimp { - -// See docs in assimp.hpp. -%ignore Importer::ReadFile(const std::string& pFile, unsigned int pFlags); -%ignore Importer::GetExtensionList(std::string& szOut); -%ignore Importer::IsExtensionSupported(const std::string& szExtension); - -// These are only necessary for extending Assimp with custom importers or post -// processing steps, which would require wrapping the internal BaseImporter and -// BaseProcess classes. -%ignore Importer::RegisterLoader(BaseImporter* pImp); -%ignore Importer::UnregisterLoader(BaseImporter* pImp); -%ignore Importer::RegisterPPStep(BaseProcess* pImp); -%ignore Importer::UnregisterPPStep(BaseProcess* pImp); -%ignore Importer::FindLoader(const char* szExtension); - -} - - -// Each aiScene has to keep a reference to the Importer to prevent it from -// being garbage collected, whose destructor would release the underlying -// C++ memory the scene is stored in. -%typemap(dcode) aiScene "package Object m_importer;" -%typemap(dout) - aiScene* GetScene, - aiScene* ReadFile, - aiScene* ApplyPostProcessing, - aiScene* ReadFileFromMemory { - void* cPtr = $wcall; - $dclassname ret = (cPtr is null) ? null : new $dclassname(cPtr, $owner);$excode - ret.m_importer = this; - return ret; -} - -%include -%apply bool *OUTPUT { bool *bWasExisting }; - -%include "assimp.hpp" - -%clear bool *bWasExisting; -- cgit v1.2.1