[memory] Fix alignment issues

[body] expose getWorld()
gideros · Aug 17, 2023 · 495f644 · 495f644
1 parent 6ea5716
commit 495f644
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/include/reactphysics3d/body/CollisionBody.h b/include/reactphysics3d/body/CollisionBody.h
@@ -164,6 +164,7 @@ class CollisionBody {
 
 #endif
 
+        PhysicsWorld &getWorld() { return mWorld; };
         // -------------------- Friendship -------------------- //
 
         friend class PhysicsWorld;

diff --git a/include/reactphysics3d/memory/HeapAllocator.h b/include/reactphysics3d/memory/HeapAllocator.h
@@ -63,20 +63,21 @@ class HeapAllocator : public MemoryAllocator {
                 /// True if the memory unit is currently allocated
                 bool isAllocated;
 
+                /// True if the next memory unit has been allocated with the same call to malloc()
+                bool isNextContiguousMemory;
+
                 /// Pointer to the previous memory unit
                 MemoryUnitHeader* previousUnit;
 
                 /// Pointer to the next memory unit
                 MemoryUnitHeader* nextUnit;
 
-                /// True if the next memory unit has been allocated with the same call to malloc()
-                bool isNextContiguousMemory;
 
                 // -------------------- Methods -------------------- //
 
                 MemoryUnitHeader(size_t size, MemoryUnitHeader* previousUnit, MemoryUnitHeader* nextUnit, bool isNextContiguousMemory)
-                    : size(size), isAllocated(false), previousUnit(previousUnit),
-                      nextUnit(nextUnit), isNextContiguousMemory(isNextContiguousMemory) {
+                    : size(size), isAllocated(false), isNextContiguousMemory(isNextContiguousMemory), previousUnit(previousUnit),
+                      nextUnit(nextUnit) {
 
                     assert(size > 0);
                 }

diff --git a/src/memory/HeapAllocator.cpp b/src/memory/HeapAllocator.cpp
@@ -117,6 +117,9 @@ void* HeapAllocator::allocate(size_t size) {
     // We cannot allocate zero bytes
     if (size == 0) return nullptr;
 
+    //Ensure allocated size is a multiple of 8
+    size=(size+7)&(~7);
+
 #ifndef NDEBUG
         mNbTimesAllocateMethodCalled++;
 #endif