BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Scraping queues for interpolation

Browse Source
This commit is contained in:
stiffly
2016-01-18 18:07:59 +01:00
parent 765509b510
commit 88eb3ca2db
4 changed files with 50 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/InterpolationSystem.cpp
+36 -24
View File
@@ -1,23 +1,32 @@
#include "InterpolationSystem.h"
//void InterpolationSystem::UpdateComponent(World * world, ComponentWrapper & transform, double dt)
//{
// if (m_InterpolationPoints[transform.EntityID].size() > 0) {
// Transform& sTransform = m_InterpolationPoints[transform.EntityID].front();
// sTransform.interpolationTime += dt;
// if (sTransform.interpolationTime > 0.05) {
// double time = std::fmod(sTransform.interpolationTime, 0.05f);
// m_InterpolationPoints[transform.EntityID].pop();
// if (m_InterpolationPoints[transform.EntityID].size() <= 0) {
// return;
// }
// sTransform = m_InterpolationPoints[transform.EntityID].front();
// sTransform.interpolationTime = time;
// }
// glm::vec3 nextPosition = sTransform.Position;
// glm::vec3 currentPosition = static_cast<glm::vec3>(transform["Position"]);
// transform["Position"] = vectorInterpolation(currentPosition, nextPosition, sTransform.interpolationTime);
// }
//}
void InterpolationSystem::UpdateComponent(World * world, ComponentWrapper & transform, double dt)
{
if (m_InterpolationPoints[transform.EntityID].size() > 0) {
Transform& sTransform = m_InterpolationPoints[transform.EntityID].front();
sTransform.interpolationTime += dt;
if (sTransform.interpolationTime > 0.05) {
double time = std::fmod(sTransform.interpolationTime, 0.05f);
m_InterpolationPoints[transform.EntityID].pop();
if (m_InterpolationPoints[transform.EntityID].size() <= 0) {
return;
}
sTransform = m_InterpolationPoints[transform.EntityID].front();
sTransform.interpolationTime = time;
}
glm::vec3 nextPosition = sTransform.Position;
glm::vec3 currentPosition = static_cast<glm::vec3>(transform["Position"]);
transform["Position"] = vectorInterpolation(currentPosition, nextPosition, sTransform.interpolationTime);
}
Transform& sTransform = m_InterpolationPoints[transform.EntityID];
sTransform.interpolationTime += dt;
glm::vec3 nextPosition = sTransform.Position;
glm::vec3 currentPosition = static_cast<glm::vec3>(transform["Position"]);
transform["Position"] = vectorInterpolation(currentPosition, nextPosition, sTransform.interpolationTime);
}
glm::vec3 InterpolationSystem::vectorInterpolation(glm::vec3 prev, glm::vec3 next, double currentTime)
@@ -37,14 +46,17 @@ bool InterpolationSystem::OnInterpolate(const Events::Interpolate & e)
memcpy(&transform.Orientation, e.DataArray.get() + offset, sizeof(glm::vec3));
offset += sizeof(glm::vec3);
memcpy(&transform.Scale, e.DataArray.get() + offset, sizeof(glm::vec3));
transform.interpolationTime = 0;
m_InterpolationPoints[e.Entity] = transform;
// Check if queue already exists
if (m_InterpolationPoints.find(e.Entity) != m_InterpolationPoints.end()) { // Did exist, push to queue
m_InterpolationPoints[e.Entity].push(transform);
} else { // Did not exist, create queue
std::queue<Transform> transformQueue;
transformQueue.push(transform);
m_InterpolationPoints[e.Entity] = transformQueue;
}
//if (m_InterpolationPoints.find(e.Entity) != m_InterpolationPoints.end()) { // Did exist, push to queue
// m_InterpolationPoints[e.Entity].push(transform);
//}
//else { // Did not exist, create queue
// std::queue<Transform> transformQueue;
// transformQueue.push(transform);
// m_InterpolationPoints[e.Entity] = transformQueue;
//}
return false;
}