Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Removes int initializer in SharedMemoryUserDataHashKey, changes '>>' into '> >' for nexted templates.

Browse Source
This commit is contained in:
Tigran Gasparian
2018-07-04 14:25:48 +02:00
parent 7c7e8af717
commit 8a6db042de
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/PhysicsServerCommandProcessor.cpp
View File

@@ -1538,7 +1538,7 @@ struct PhysicsServerCommandProcessorInternalData
b3ResizablePool< InternalBodyHandle > m_bodyHandles; b3ResizablePool< InternalBodyHandle > m_bodyHandles;
b3ResizablePool<InternalCollisionShapeHandle> m_userCollisionShapeHandles; b3ResizablePool<InternalCollisionShapeHandle> m_userCollisionShapeHandles;
b3ResizablePool<InternalVisualShapeHandle> m_userVisualShapeHandles; b3ResizablePool<InternalVisualShapeHandle> m_userVisualShapeHandles;
b3ResizablePool<b3PoolBodyHandle<SharedMemoryUserData>> m_userDataHandles; b3ResizablePool<b3PoolBodyHandle<SharedMemoryUserData> > m_userDataHandles;
btHashMap<SharedMemoryUserDataHashKey, int> m_userDataHandleLookup; btHashMap<SharedMemoryUserDataHashKey, int> m_userDataHandleLookup;
b3PluginManager m_pluginManager; b3PluginManager m_pluginManager;

5
examples/SharedMemory/SharedMemoryUserData.h
View File

@@ -48,15 +48,14 @@ struct SharedMemoryUserData
} }
}; };
class SharedMemoryUserDataHashKey { struct SharedMemoryUserDataHashKey {
unsigned int m_hash = 0; unsigned int m_hash;
btHashString m_key; btHashString m_key;
btHashInt m_bodyUniqueId; btHashInt m_bodyUniqueId;
btHashInt m_linkIndex; btHashInt m_linkIndex;
btHashInt m_visualShapeIndex; btHashInt m_visualShapeIndex;
public:
SIMD_FORCE_INLINE unsigned int getHash()const { SIMD_FORCE_INLINE unsigned int getHash()const {
return m_hash; return m_hash;
} }