Skip to content
Snippets Groups Projects
Commit b01ceb54 authored by Martin Schultz's avatar Martin Schultz
Browse files

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
parent fd7c45e0
No related branches found
No related tags found
1 merge request!5Prepare assimp plugin
......@@ -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),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment