From b01ceb54f3478770445ec342d87543f6aea5c74f Mon Sep 17 00:00:00 2001 From: Martin Schultz Date: Tue, 8 May 2018 13:26:58 +0200 Subject: [PATCH] removed bad aiScene / material implementations, which someone added because of linker problems. Also removed misleading comment, as proper linking is the right way to go here --- .../Plugin-Assimp/AssimpPlugin.cc | 62 ------------------- 1 file changed, 62 deletions(-) diff --git a/PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc b/PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc index 1a79ca8..ada0651 100644 --- a/PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc +++ b/PluginCollection-FilePlugins/Plugin-Assimp/AssimpPlugin.cc @@ -45,68 +45,6 @@ #include "AssimpPlugin.hh" -/* - * we have to implement our own aiScene and aiMaterial constructor/destructor - * since the linker cannot find the corresponding symbols from the - * assimp library - */ - -aiMaterial::aiMaterial() { - mNumAllocated = 0; - mNumProperties = 0; - mProperties = NULL; -} -aiMaterial::~aiMaterial() { - for (unsigned int i = 0; i < mNumProperties; ++i) - delete mProperties[i]; - delete[] mProperties; -} - -aiScene::aiScene() { - mFlags = 0; - mRootNode = NULL; - mNumMeshes = 0; - mMeshes = NULL; - mNumMaterials = 0; - mMaterials = NULL; - mNumAnimations = 0; - mAnimations = NULL; - mNumTextures = 0; - mTextures = NULL; - mNumLights = 0; - mLights = NULL; - mNumCameras = 0; - mCameras = NULL; -} -aiScene::~aiScene() { - delete mRootNode; - - for (unsigned int i = 0; i < mNumMeshes; ++i) - delete mMeshes[i]; - delete[] mMeshes; - - for (unsigned int i = 0; i < mNumMaterials; ++i) - delete mMaterials[i]; - delete[] mMaterials; - - for (unsigned int i = 0; i < mNumAnimations; ++i) - delete mAnimations[i]; - delete[] mAnimations; - - for (unsigned int i = 0; i < mNumTextures; ++i) - delete mTextures[i]; - delete[] mTextures; - - for (unsigned int i = 0; i < mNumLights; ++i) - delete mLights[i]; - delete[] mLights; - - for (unsigned int i = 0; i < mNumCameras; ++i) - delete mCameras[i]; - delete[] mCameras; -} - - AssimpPlugin::AssimpPlugin() : loadOptions_(0), -- 2.22.0