Skip to content

Commit

Permalink
Update
Browse files Browse the repository at this point in the history
  • Loading branch information
Futuremappermydud committed Nov 28, 2023
1 parent 0845ff0 commit 0cdbbb8
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 6 deletions.
4 changes: 2 additions & 2 deletions mod.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"name": "assimp",
"id": "assimp",
"author": "assimp, FutureMapper",
"version": "5.3.1",
"description": "assimp, version 5.3.1!",
"version": "5.3.2",
"description": "assimp, version 5.3.2!",
"dependencies": [],
"modFiles": [
"libassimp.so"
Expand Down
4 changes: 3 additions & 1 deletion qpm.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
"info": {
"name": "assimp",
"id": "assimp",
"version": "5.3.1",
"version": "5.3.2",
"url": "https://github.com/BSQ-VRM/Assimp-QPM",
"additionalData": {
"soLink": "https://github.com/BSQ-VRM/Assimp-QPM/releases/download/5.3.2/libassimp.so",
"modLink": "https://github.com/BSQ-VRM/Assimp-QPM/releases/download/5.3.2/assimp.qmod",
"overrideSoName": "libassimp.so",
"compileOptions": {
"systemIncludes": [
Expand Down
2 changes: 2 additions & 0 deletions qpm.shared.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@
"version": "5.3.1",
"url": "https://github.com/BSQ-VRM/Assimp-QPM",
"additionalData": {
"soLink": "https://github.com/BSQ-VRM/Assimp-QPM/releases/download/5.3.1/libassimp.so",
"overrideSoName": "libassimp.so",
"modLink": "https://github.com/BSQ-VRM/Assimp-QPM/releases/download/5.3.1/assimp.qmod",
"compileOptions": {
"systemIncludes": [
"shared/"
Expand Down
4 changes: 4 additions & 0 deletions shared/assimp/BaseImporter.h
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ struct aiImporterDesc;

namespace Assimp {

// Forward declarations
class Importer;
class IOSystem;
class BaseProcess;
Expand All @@ -73,6 +74,9 @@ class IOStream;
#define AI_MAKE_MAGIC(string) ((uint32_t)((string[0] << 24) + \
(string[1] << 16) + (string[2] << 8) + string[3]))

using UByteBuffer = std::vector<uint8_t>;
using ByteBuffer = std::vector<int8_t>;

// ---------------------------------------------------------------------------
/** FOR IMPORTER PLUGINS ONLY: The BaseImporter defines a common interface
* for all importer worker classes.
Expand Down
2 changes: 1 addition & 1 deletion shared/assimp/IOStreamBuffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ static AI_FORCE_INLINE bool isEndOfCache(size_t pos, size_t cacheSize) {
template <class T>
AI_FORCE_INLINE bool IOStreamBuffer<T>::getNextLine(std::vector<T> &buffer) {
buffer.resize(m_cacheSize);
if (isEndOfCache(m_cachePos, m_cacheSize) || 0 == m_filePos) {
if (m_cachePos >= m_cacheSize || 0 == m_filePos) {
if (!readNextBlock()) {
return false;
}
Expand Down
1 change: 0 additions & 1 deletion shared/assimp/ParsingUtils.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@ namespace Assimp {

static const unsigned int BufferSize = 4096;


// ---------------------------------------------------------------------------------
template <class char_t>
AI_FORCE_INLINE bool IsUpper(char_t in) {
Expand Down
8 changes: 7 additions & 1 deletion shared/assimp/mesh.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <assimp/types.h>

#ifdef __cplusplus
#include <unordered_set>

extern "C" {
#endif

Expand Down Expand Up @@ -872,11 +874,15 @@ struct aiMesh {

// DO NOT REMOVE THIS ADDITIONAL CHECK
if (mNumBones && mBones) {
std::unordered_set<const aiBone *> bones;
for (unsigned int a = 0; a < mNumBones; a++) {
if (mBones[a]) {
delete mBones[a];
bones.insert(mBones[a]);
}
}
for (const aiBone *bone: bones) {
delete bone;
}
delete[] mBones;
}

Expand Down
2 changes: 2 additions & 0 deletions shared/assimp/vector3.h
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,8 @@ class aiVector3t {


typedef aiVector3t<ai_real> aiVector3D;
typedef aiVector3t<float> aiVector3f;
typedef aiVector3t<double> aiVector3d;

#else

Expand Down

0 comments on commit 0cdbbb8

Please sign in to comment.