Merge. Also fixed interpolation for scale and rotation.
Merge remote-tracking branch 'origin/master' into Networking # Conflicts: # include/Game/Game.h # src/Game/CMakeLists.txt # src/Game/Game.cpp
This commit is contained in:
@@ -122,8 +122,8 @@ void Client::InterpolateFields(Packet& packet, const ComponentInfo& componentInf
|
||||
sizeOfFields += fieldInfo.Stride;
|
||||
}
|
||||
// Is the size correct?
|
||||
boost::shared_array<char> eventData(new char[componentInfo.Meta.Stride]);
|
||||
memcpy(eventData.get(), packet.ReadData(componentInfo.Meta.Stride), componentInfo.Meta.Stride);
|
||||
boost::shared_array<char> eventData(new char[componentInfo.Stride]);
|
||||
memcpy(eventData.get(), packet.ReadData(componentInfo.Stride), componentInfo.Stride);
|
||||
//Send event to interpolat system
|
||||
Events::Interpolate e;
|
||||
e.Entity = entityID;
|
||||
|
||||
Reference in New Issue
Block a user