Fix the build.

pull/1180/head
Kim Kulling 2017-02-04 18:15:50 +01:00
parent 692fb216f7
commit 11e2ca173d
5 changed files with 3244 additions and 3448 deletions

View File

@ -261,11 +261,20 @@ std::string TextureConverted_ID;
size_t off_b = 0; size_t off_b = 0;
// Calculate size of the target array and rule how data will be copied. // Calculate size of the target array and rule how data will be copied.
if(!pID_R.empty()) { tex_size += src_texture[0]->Data.size(); step++, off_g++, off_b++; } if ( nullptr != src_texture ) {
if(!pID_G.empty()) { tex_size += src_texture[1]->Data.size(); step++, off_b++; } if(!pID_R.empty()) {
if(!pID_B.empty()) { tex_size += src_texture[2]->Data.size(); step++; } tex_size += src_texture[0]->Data.size(); step++, off_g++, off_b++;
if(!pID_A.empty()) { tex_size += src_texture[3]->Data.size(); step++; } }
if(!pID_G.empty()) {
tex_size += src_texture[1]->Data.size(); step++, off_b++;
}
if(!pID_B.empty()) {
tex_size += src_texture[2]->Data.size(); step++;
}
if(!pID_A.empty()) {
tex_size += src_texture[3]->Data.size(); step++;
}
}
// Create target array. // Create target array.
converted_texture.Data = new uint8_t[tex_size]; converted_texture.Data = new uint8_t[tex_size];
// And copy data // And copy data

View File

@ -53,8 +53,7 @@ struct aiScene;
struct aiNode; struct aiNode;
struct aiMesh; struct aiMesh;
namespace Assimp namespace Assimp {
{
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
/** Helper class to export a given scene to an OBJ file. */ /** Helper class to export a given scene to an OBJ file. */
@ -73,7 +72,6 @@ public:
std::ostringstream mOutput, mOutputMat; std::ostringstream mOutput, mOutputMat;
private: private:
// intermediate data structures // intermediate data structures
struct FaceVertex { struct FaceVertex {
FaceVertex() FaceVertex()

View File

@ -58,7 +58,7 @@ namespace Assimp {
// ======================================================================= // =======================================================================
// Public interface to Assimp // Public interface to Assimp
class Importer; class Importer;
class Exporter; // export.hpp //class Exporter; // export.hpp
class IOStream; class IOStream;
class IOSystem; class IOSystem;
class ProgressHandler; class ProgressHandler;
@ -77,7 +77,7 @@ namespace Assimp {
// ======================================================================= // =======================================================================
// Holy stuff, only for members of the high council of the Jedi. // Holy stuff, only for members of the high council of the Jedi.
class ImporterPimpl; class ImporterPimpl;
class ExporterPimpl; // export.hpp //class ExporterPimpl; // export.hpp
} //! namespace Assimp } //! namespace Assimp
#define AI_PROPERTY_WAS_NOT_EXISTING 0xffffffff #define AI_PROPERTY_WAS_NOT_EXISTING 0xffffffff

File diff suppressed because it is too large Load Diff

View File

@ -42,10 +42,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "UnitTestPCH.h" #include "UnitTestPCH.h"
#include "SceneDiffer.h" #include "SceneDiffer.h"
#include "AbstractImportExportBase.h" #include "AbstractImportExportBase.h"
#include <assimp/scene.h>
#include <assimp/Importer.hpp> #include <assimp/Importer.hpp>
#include <assimp/Exporter.hpp> #include <assimp/Exporter.hpp>
#include <assimp/scene.h>
using namespace Assimp; using namespace Assimp;