sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix IPO actuator (Bug #1694)

Browse Source
This commit is contained in:
Kester Maddock 2004-11-03 10:48:02 +00:00
parent 15f17707ca
commit 318fb94c4b
2 changed files with 51 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
source/gameengine/Ketsji/KX_IpoActuator.cpp
View File

@ -128,17 +128,52 @@ void KX_IpoActuator::SetEnd(float endtime)
m_endframe=endtime;
}
bool KX_IpoActuator::ClampLocalTime()
{
if (m_startframe < m_endframe)
{
if (m_localtime < m_startframe)
{
m_localtime = m_startframe;
return true;
}
else if (m_localtime > m_endframe)
{
m_localtime = m_endframe;
return true;
}
} else {
if (m_localtime > m_startframe)
{
m_localtime = m_startframe;
return true;
}
else if (m_localtime < m_endframe)
{
m_localtime = m_endframe;
return true;
}
}
return false;
}
void KX_IpoActuator::SetStartTime(float curtime)
{
float direction = m_startframe < m_endframe ? 1.0 : -1.0;
if (m_direction > 0)
m_starttime = curtime - (m_localtime - m_startframe)/KX_FIXED_FRAME_PER_SEC;
m_starttime = curtime - direction*(m_localtime - m_startframe)/KX_FIXED_FRAME_PER_SEC;
else
m_starttime = curtime - (m_endframe - m_localtime)/KX_FIXED_FRAME_PER_SEC;
m_starttime = curtime - direction*(m_endframe - m_localtime)/KX_FIXED_FRAME_PER_SEC;
}
void KX_IpoActuator::SetLocalTime(float curtime)
{
float delta_time = (curtime - m_starttime)*KX_FIXED_FRAME_PER_SEC;
if (m_endframe < m_startframe)
delta_time = -delta_time;
if (m_direction > 0)
m_localtime = m_startframe + delta_time;
else
@ -190,9 +225,8 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
SetLocalTime(curtime);
/* Perform clamping */
if ((m_localtime*start_smaller_then_end)>(m_endframe*start_smaller_then_end))
m_localtime=m_endframe;
ClampLocalTime();
CIpoAction ipoaction(
(KX_GameObject*)GetParent(),
m_localtime,
@ -215,19 +249,12 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
result = false;
else
SetLocalTime(curtime);
if (m_localtime*start_smaller_then_end < m_startframe*start_smaller_then_end)
if (ClampLocalTime())
{
m_localtime = m_startframe;
result = false;
m_direction = 1;
m_direction = -m_direction;
}
else if (m_localtime*start_smaller_then_end > m_endframe*start_smaller_then_end)
{
m_localtime = m_endframe;
result = false;
m_direction = -1;
}
CIpoAction ipoaction(
(KX_GameObject*) GetParent(),
@ -251,17 +278,10 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
}
SetLocalTime(curtime);
if (m_localtime*start_smaller_then_end > m_endframe*start_smaller_then_end)
{
m_localtime = m_endframe;
}
else if (m_localtime*start_smaller_then_end < m_startframe*start_smaller_then_end)
{
m_localtime = m_startframe;
result = false;
}
if (ClampLocalTime() && m_localtime == m_startframe)
result = false;
CIpoAction ipoaction(
(KX_GameObject*) GetParent(),
m_localtime,
@ -296,7 +316,8 @@ bool KX_IpoActuator::Update(double curtime, bool frame)
if (bNegativeEvent && m_localtime == m_startframe){
result = false;
}
else{
else
{
if (m_localtime*start_smaller_then_end < m_endframe*start_smaller_then_end)
{
SetLocalTime(curtime);

4
source/gameengine/Ketsji/KX_IpoActuator.h
View File

@ -47,6 +47,9 @@ private:
/** Computes the current frame from the current time
and the IPO start time. */
void SetLocalTime(float curtime);
/** Ensures the current frame is between the start and
end frames. */
bool ClampLocalTime();
protected:
bool m_bNegativeEvent;
@ -63,6 +66,7 @@ protected:
/** Current active frame of the ipo. */
float m_localtime;
/** The time this ipo started at. */
float m_starttime;
/** play backwards or forwards? (positive means forward). */