Merge branch 'master' into MalcolmTyrrell/loggingImprovements
Malcolm Tyrrell
GitHub
commit
54a27f4514
|
|
@ -66,9 +66,9 @@ Open Asset Import Library is implemented in C++. The directory structure looks l
|
|||
|
||||
The source code is organized in the following way:
|
||||
|
||||
code/Common The base implementation for importers and the infrastructure
|
||||
code/PostProcessing The post-processing steps
|
||||
code/<FormatName> Implementation for import and export for the format
|
||||
code/Common The base implementation for importers and the infrastructure
|
||||
code/PostProcessing The post-processing steps
|
||||
code/AssetLib/<FormatName> Implementation for import and export for the format
|
||||
|
||||
### Where to get help ###
|
||||
For more information, visit [our website](http://assimp.org/). Or check out the `./doc`- folder, which contains the official documentation in HTML format.
|
||||
|
|
|
|||
|
|
@ -200,7 +200,7 @@ void DNAParser::Parse() {
|
|||
|
||||
ASSIMP_LOG_DEBUG("BlenderDNA: Got ", dna.structures.size(), " structures with totally ", fields, " fields");
|
||||
|
||||
#ifdef ASSIMP_BUILD_BLENDER_DEBUG
|
||||
#if ASSIMP_BUILD_BLENDER_DEBUG_DNA
|
||||
dna.DumpToFile();
|
||||
#endif
|
||||
|
||||
|
|
@ -208,7 +208,7 @@ void DNAParser::Parse() {
|
|||
dna.RegisterConverters();
|
||||
}
|
||||
|
||||
#ifdef ASSIMP_BUILD_BLENDER_DEBUG
|
||||
#if ASSIMP_BUILD_BLENDER_DEBUG_DNA
|
||||
|
||||
#include <fstream>
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
|
|
@ -237,7 +237,7 @@ void DNA ::DumpToFile() {
|
|||
|
||||
ASSIMP_LOG_INFO("BlenderDNA: Dumped dna to dna.txt");
|
||||
}
|
||||
#endif
|
||||
#endif // ASSIMP_BUILD_BLENDER_DEBUG_DNA
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
/*static*/ void DNA ::ExtractArraySize(
|
||||
|
|
|
|||
|
|
@ -59,6 +59,13 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
#define ASSIMP_BUILD_BLENDER_DEBUG
|
||||
#endif
|
||||
|
||||
// set this to non-zero to dump BlenderDNA stuff to dna.txt.
|
||||
// you could set it on the assimp build command line too without touching it here.
|
||||
// !!! please make sure this is set to 0 in the repo !!!
|
||||
#ifndef ASSIMP_BUILD_BLENDER_DEBUG_DNA
|
||||
#define ASSIMP_BUILD_BLENDER_DEBUG_DNA 0
|
||||
#endif
|
||||
|
||||
// #define ASSIMP_BUILD_BLENDER_NO_STATS
|
||||
|
||||
namespace Assimp {
|
||||
|
|
@ -495,7 +502,7 @@ public:
|
|||
const Structure &structure,
|
||||
const FileDatabase &db) const;
|
||||
|
||||
#ifdef ASSIMP_BUILD_BLENDER_DEBUG
|
||||
#if ASSIMP_BUILD_BLENDER_DEBUG_DNA
|
||||
// --------------------------------------------------------
|
||||
/** Dump the DNA to a text file. This is for debugging purposes.
|
||||
* The output file is `dna.txt` in the current working folder*/
|
||||
|
|
|
|||
|
|
@ -294,21 +294,17 @@ void ExportSceneM3D(
|
|||
// Worker function for exporting a scene to ASCII A3D.
|
||||
// Prototyped and registered in Exporter.cpp
|
||||
void ExportSceneM3DA(
|
||||
const char *,
|
||||
IOSystem *,
|
||||
const aiScene *,
|
||||
const ExportProperties *
|
||||
const char *pFile,
|
||||
IOSystem *pIOSystem,
|
||||
const aiScene *pScene,
|
||||
const ExportProperties *pProperties
|
||||
|
||||
) {
|
||||
#ifdef M3D_ASCII
|
||||
// initialize the exporter
|
||||
M3DExporter exporter(pScene, pProperties);
|
||||
|
||||
// perform ascii export
|
||||
exporter.doExport(pFile, pIOSystem, true);
|
||||
#else
|
||||
throw DeadlyExportError("Assimp configured without M3D_ASCII support");
|
||||
#endif
|
||||
}
|
||||
|
||||
// ------------------------------------------------------------------------------------------------
|
||||
|
|
|
|||
|
|
@ -95,10 +95,7 @@ static const aiImporterDesc desc = {
|
|||
0,
|
||||
0,
|
||||
0,
|
||||
"m3d"
|
||||
#ifdef M3D_ASCII
|
||||
" a3d"
|
||||
#endif
|
||||
"m3d a3d"
|
||||
};
|
||||
|
||||
namespace Assimp {
|
||||
|
|
@ -118,9 +115,7 @@ bool M3DImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool c
|
|||
const std::string extension = GetExtension(pFile);
|
||||
|
||||
if (extension == "m3d"
|
||||
#ifdef M3D_ASCII
|
||||
|| extension == "a3d"
|
||||
#endif
|
||||
)
|
||||
return true;
|
||||
else if (!extension.length() || checkSig) {
|
||||
|
|
@ -140,9 +135,7 @@ bool M3DImporter::CanRead(const std::string &pFile, IOSystem *pIOHandler, bool c
|
|||
return false;
|
||||
}
|
||||
return !memcmp(data, "3DMO", 4) /* bin */
|
||||
#ifdef M3D_ASCII
|
||||
|| !memcmp(data, "3dmo", 4) /* ASCII */
|
||||
#endif
|
||||
;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -175,12 +168,10 @@ void M3DImporter::InternReadFile(const std::string &file, aiScene *pScene, IOSys
|
|||
if (!memcmp(buffer.data(), "3DMO", 4) && memcmp(buffer.data() + 4, &fileSize, 4)) {
|
||||
throw DeadlyImportError("Bad binary header in file ", file, ".");
|
||||
}
|
||||
#ifdef M3D_ASCII
|
||||
// make sure there's a terminator zero character, as input must be ASCIIZ
|
||||
if (!memcmp(buffer.data(), "3dmo", 4)) {
|
||||
buffer.push_back(0);
|
||||
}
|
||||
#endif
|
||||
|
||||
// Get the path for external assets
|
||||
std::string folderName("./");
|
||||
|
|
|
|||
|
|
@ -54,7 +54,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|||
|
||||
// Assimp specific M3D configuration. Comment out these defines to remove functionality
|
||||
//#define ASSIMP_USE_M3D_READFILECB
|
||||
//#define M3D_ASCII
|
||||
|
||||
#include "m3d.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -231,14 +231,9 @@ enum {
|
|||
typedef struct {
|
||||
uint8_t format;
|
||||
uint8_t id;
|
||||
#ifdef M3D_ASCII
|
||||
#define M3D_PROPERTYDEF(f, i, n) \
|
||||
{ (f), (i), (char *)(n) }
|
||||
char *key;
|
||||
#else
|
||||
#define M3D_PROPERTYDEF(f, i, n) \
|
||||
{ (f), (i) }
|
||||
#endif
|
||||
} m3dpd_t;
|
||||
|
||||
/* material property types */
|
||||
|
|
@ -376,18 +371,11 @@ enum {
|
|||
|
||||
#define M3D_CMDMAXARG 8 /* if you increase this, add more arguments to the macro below */
|
||||
typedef struct {
|
||||
#ifdef M3D_ASCII
|
||||
#define M3D_CMDDEF(t, n, p, a, b, c, d, e, f, g, h) \
|
||||
{ \
|
||||
(char *)(n), (p), { (a), (b), (c), (d), (e), (f), (g), (h) } \
|
||||
}
|
||||
char *key;
|
||||
#else
|
||||
#define M3D_CMDDEF(t, n, p, a, b, c, d, e, f, g, h) \
|
||||
{ \
|
||||
(p), { (a), (b), (c), (d), (e), (f), (g), (h) } \
|
||||
}
|
||||
#endif
|
||||
uint8_t p;
|
||||
uint8_t a[M3D_CMDMAXARG];
|
||||
} m3dcd_t;
|
||||
|
|
@ -2059,15 +2047,13 @@ unsigned char *_m3dstbi_zlib_compress(unsigned char *data, int data_len, int *ou
|
|||
|
||||
#define M3D_CHUNKMAGIC(m, a, b, c, d) ((m)[0] == (a) && (m)[1] == (b) && (m)[2] == (c) && (m)[3] == (d))
|
||||
|
||||
#ifdef M3D_ASCII
|
||||
#include <locale.h> /* sprintf and strtod cares about number locale */
|
||||
#include <stdio.h> /* get sprintf */
|
||||
#endif
|
||||
#ifdef M3D_PROFILING
|
||||
#include <sys/time.h>
|
||||
#endif
|
||||
|
||||
#if !defined(M3D_NOIMPORTER) && defined(M3D_ASCII)
|
||||
#if !defined(M3D_NOIMPORTER)
|
||||
/* helper functions for the ASCII parser */
|
||||
static char *_m3d_findarg(char *s) {
|
||||
while (s && *s && *s != ' ' && *s != '\t' && *s != '\r' && *s != '\n')
|
||||
|
|
@ -2118,7 +2104,7 @@ static char *_m3d_getfloat(char *s, M3D_FLOAT *ret) {
|
|||
return _m3d_findarg(e);
|
||||
}
|
||||
#endif
|
||||
#if !defined(M3D_NODUP) && (!defined(M3D_NOIMPORTER) || defined(M3D_ASCII) || defined(M3D_EXPORTER))
|
||||
#if !defined(M3D_NODUP) && (!defined(M3D_NOIMPORTER) || defined(M3D_EXPORTER))
|
||||
/* helper function to create safe strings */
|
||||
char *_m3d_safestr(char *in, int morelines) {
|
||||
char *out, *o, *i = in;
|
||||
|
|
@ -2426,21 +2412,17 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
|
|||
#ifndef M3D_NOWEIGHTS
|
||||
m3ds_t *sk;
|
||||
#endif
|
||||
#ifdef M3D_ASCII
|
||||
m3ds_t s;
|
||||
M3D_INDEX bi[M3D_BONEMAXLEVEL + 1], level;
|
||||
const char *ol;
|
||||
char *ptr, *pe, *fn;
|
||||
#endif
|
||||
#ifdef M3D_PROFILING
|
||||
struct timeval tv0, tv1, tvd;
|
||||
gettimeofday(&tv0, NULL);
|
||||
#endif
|
||||
|
||||
if (!data || (!M3D_CHUNKMAGIC(data, '3', 'D', 'M', 'O')
|
||||
#ifdef M3D_ASCII
|
||||
&& !M3D_CHUNKMAGIC(data, '3', 'd', 'm', 'o')
|
||||
#endif
|
||||
))
|
||||
return NULL;
|
||||
model = (m3d_t *)M3D_MALLOC(sizeof(m3d_t));
|
||||
|
|
@ -2457,7 +2439,6 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
|
|||
model->texture = mtllib->texture;
|
||||
model->flags |= M3D_FLG_MTLLIB;
|
||||
}
|
||||
#ifdef M3D_ASCII
|
||||
/* ASCII variant? */
|
||||
if (M3D_CHUNKMAGIC(data, '3', 'd', 'm', 'o')) {
|
||||
model->errcode = M3D_ERR_BADFILE;
|
||||
|
|
@ -3034,7 +3015,6 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
|
|||
setlocale(LC_NUMERIC, ol);
|
||||
goto postprocess;
|
||||
}
|
||||
#endif
|
||||
/* Binary variant */
|
||||
if (!M3D_CHUNKMAGIC(data + 8, 'H', 'E', 'A', 'D')) {
|
||||
buff = (unsigned char *)stbi_zlib_decode_malloc_guesssize_headerflag((const char *)data + 8, ((m3dchunk_t *)data)->length - 8,
|
||||
|
|
@ -3698,9 +3678,7 @@ m3d_t *m3d_load(unsigned char *data, m3dread_t readfilecb, m3dfree_t freecb, m3d
|
|||
}
|
||||
}
|
||||
/* calculate normals, normalize skin weights, create bone/vertex cross-references and calculate transform matrices */
|
||||
#ifdef M3D_ASCII
|
||||
postprocess:
|
||||
#endif
|
||||
if (model) {
|
||||
M3D_LOG("Post-process");
|
||||
#ifdef M3D_PROFILING
|
||||
|
|
@ -3989,7 +3967,6 @@ void m3d_free(m3d_t *model) {
|
|||
unsigned int i, j;
|
||||
|
||||
if (!model) return;
|
||||
#ifdef M3D_ASCII
|
||||
/* if model imported from ASCII, we have to free all strings as well */
|
||||
if (model->flags & M3D_FLG_FREESTR) {
|
||||
if (model->name) M3D_FREE(model->name);
|
||||
|
|
@ -4047,7 +4024,6 @@ void m3d_free(m3d_t *model) {
|
|||
if (model->preview.data)
|
||||
M3D_FREE(model->preview.data);
|
||||
}
|
||||
#endif
|
||||
if (model->flags & M3D_FLG_FREERAW) M3D_FREE(model->raw);
|
||||
|
||||
if (model->tmap) M3D_FREE(model->tmap);
|
||||
|
|
@ -4315,7 +4291,6 @@ static void _m3d_round(int quality, m3dv_t *src, m3dv_t *dst) {
|
|||
if (dst->w == (M3D_FLOAT)-0.0) dst->w = (M3D_FLOAT)0.0;
|
||||
}
|
||||
|
||||
#ifdef M3D_ASCII
|
||||
/* add a bone to ascii output */
|
||||
static char *_m3d_prtbone(char *ptr, m3db_t *bone, M3D_INDEX numbone, M3D_INDEX parent, uint32_t level, M3D_INDEX *vrtxidx) {
|
||||
uint32_t i, j;
|
||||
|
|
@ -4334,16 +4309,13 @@ static char *_m3d_prtbone(char *ptr, m3db_t *bone, M3D_INDEX numbone, M3D_INDEX
|
|||
}
|
||||
return ptr;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Function to encode an in-memory model into on storage Model 3D format
|
||||
*/
|
||||
unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size) {
|
||||
#ifdef M3D_ASCII
|
||||
const char *ol;
|
||||
char *ptr;
|
||||
#endif
|
||||
char vc_s, vi_s, si_s, ci_s, ti_s, bi_s, nb_s, sk_s, fc_s, hi_s, fi_s;
|
||||
char *sn = NULL, *sl = NULL, *sa = NULL, *sd = NULL;
|
||||
unsigned char *out = NULL, *z = NULL, weights[M3D_NUMBONE], *norm = NULL;
|
||||
|
|
@ -4369,9 +4341,7 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
|
|||
return NULL;
|
||||
}
|
||||
model->errcode = M3D_SUCCESS;
|
||||
#ifdef M3D_ASCII
|
||||
if (flags & M3D_EXP_ASCII) quality = M3D_EXP_DOUBLE;
|
||||
#endif
|
||||
vrtxidx = (M3D_INDEX *)M3D_MALLOC(model->numvertex * sizeof(M3D_INDEX));
|
||||
if (!vrtxidx) goto memerr;
|
||||
memset(vrtxidx, 255, model->numvertex * sizeof(M3D_INDEX));
|
||||
|
|
@ -4800,7 +4770,6 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
|
|||
}
|
||||
|
||||
M3D_LOG("Serializing model");
|
||||
#ifdef M3D_ASCII
|
||||
if (flags & M3D_EXP_ASCII) {
|
||||
/* use CRLF to make model creators on Win happy... */
|
||||
sd = _m3d_safestr(model->desc, 1);
|
||||
|
|
@ -5073,7 +5042,7 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
|
|||
ptr += sprintf(ptr, "\r\n");
|
||||
}
|
||||
/* mathematical shapes face */
|
||||
if (model->numshape !(flags & M3D_EXP_NOFACE)) {
|
||||
if (model->numshape && (!(flags & M3D_EXP_NOFACE))) {
|
||||
for (j = 0; j < model->numshape; j++) {
|
||||
sn = _m3d_safestr(model->shape[j].name, 0);
|
||||
if (!sn) {
|
||||
|
|
@ -5287,7 +5256,6 @@ unsigned char *m3d_save(m3d_t *model, int quality, int flags, unsigned int *size
|
|||
if (!out) goto memerr;
|
||||
out[len] = 0;
|
||||
} else
|
||||
#endif
|
||||
{
|
||||
/* stricly only use LF (newline) in binary */
|
||||
sd = _m3d_safestr(model->desc, 3);
|
||||
|
|
|
|||
|
|
@ -427,10 +427,6 @@ void MD2Importer::InternReadFile( const std::string& pFile,
|
|||
aiVector3D& vNormal = pcMesh->mNormals[iCurrent];
|
||||
LookupNormalIndex(pcVerts[iIndex].lightNormalIndex,vNormal);
|
||||
|
||||
// flip z and y to become right-handed
|
||||
std::swap((float&)vNormal.z,(float&)vNormal.y);
|
||||
std::swap((float&)vec.z,(float&)vec.y);
|
||||
|
||||
if (m_pcHeader->numTexCoords) {
|
||||
// validate texture coordinates
|
||||
iIndex = pcTriangles[i].textureIndices[c];
|
||||
|
|
@ -448,7 +444,15 @@ void MD2Importer::InternReadFile( const std::string& pFile,
|
|||
}
|
||||
pScene->mMeshes[0]->mFaces[i].mIndices[c] = iCurrent;
|
||||
}
|
||||
// flip the face order
|
||||
std::swap( pScene->mMeshes[0]->mFaces[i].mIndices[0], pScene->mMeshes[0]->mFaces[i].mIndices[2] );
|
||||
}
|
||||
// Now rotate the whole scene 90 degrees around the x axis to convert to internal coordinate system
|
||||
pScene->mRootNode->mTransformation = aiMatrix4x4(
|
||||
1.f, 0.f, 0.f, 0.f,
|
||||
0.f, 0.f, 1.f, 0.f,
|
||||
0.f, -1.f, 0.f, 0.f,
|
||||
0.f, 0.f, 0.f, 1.f);
|
||||
}
|
||||
|
||||
#endif // !! ASSIMP_BUILD_NO_MD2_IMPORTER
|
||||
|
|
|
|||
|
|
@ -75,13 +75,12 @@ protected:
|
|||
uint32_t offset;
|
||||
|
||||
// We define the struct size because sizeof(Header) might return a wrong result because of structure padding.
|
||||
// Moreover, we must use this ugly and error prone syntax because Visual Studio neither support constexpr or sizeof(name_of_field).
|
||||
static const std::size_t header_size =
|
||||
sizeof(uint16_t) + // type
|
||||
sizeof(uint32_t) + // size
|
||||
sizeof(uint16_t) + // reserved1
|
||||
sizeof(uint16_t) + // reserved2
|
||||
sizeof(uint32_t); // offset
|
||||
static constexpr std::size_t header_size =
|
||||
sizeof(type) +
|
||||
sizeof(size) +
|
||||
sizeof(reserved1) +
|
||||
sizeof(reserved2) +
|
||||
sizeof(offset);
|
||||
};
|
||||
|
||||
struct DIB {
|
||||
|
|
@ -98,22 +97,21 @@ protected:
|
|||
uint32_t nb_important_colors;
|
||||
|
||||
// We define the struct size because sizeof(DIB) might return a wrong result because of structure padding.
|
||||
// Moreover, we must use this ugly and error prone syntax because Visual Studio neither support constexpr or sizeof(name_of_field).
|
||||
static const std::size_t dib_size =
|
||||
sizeof(uint32_t) + // size
|
||||
sizeof(int32_t) + // width
|
||||
sizeof(int32_t) + // height
|
||||
sizeof(uint16_t) + // planes
|
||||
sizeof(uint16_t) + // bits_per_pixel
|
||||
sizeof(uint32_t) + // compression
|
||||
sizeof(uint32_t) + // image_size
|
||||
sizeof(int32_t) + // x_resolution
|
||||
sizeof(int32_t) + // y_resolution
|
||||
sizeof(uint32_t) + // nb_colors
|
||||
sizeof(uint32_t); // nb_important_colors
|
||||
static constexpr std::size_t dib_size =
|
||||
sizeof(size) +
|
||||
sizeof(width) +
|
||||
sizeof(height) +
|
||||
sizeof(planes) +
|
||||
sizeof(bits_per_pixel) +
|
||||
sizeof(compression) +
|
||||
sizeof(image_size) +
|
||||
sizeof(x_resolution) +
|
||||
sizeof(y_resolution) +
|
||||
sizeof(nb_colors) +
|
||||
sizeof(nb_important_colors);
|
||||
};
|
||||
|
||||
static const std::size_t mBytesPerPixel = 4;
|
||||
static constexpr std::size_t mBytesPerPixel = 4;
|
||||
|
||||
public:
|
||||
static void Save(aiTexture* texture, IOStream* file);
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@ if os.name=='posix':
|
|||
additional_dirs.append('./')
|
||||
additional_dirs.append('/usr/lib/')
|
||||
additional_dirs.append('/usr/lib/x86_64-linux-gnu/')
|
||||
additional_dirs.append('/usr/lib/aarch64-linux-gnu/')
|
||||
additional_dirs.append('/usr/local/lib/')
|
||||
|
||||
if 'LD_LIBRARY_PATH' in os.environ:
|
||||
|
|
|
|||
Loading…
Reference in New Issue