Merge pull request #454 from ASleepyCat/laser-fix-2

Fix regression in laser logic when turning in the opposite direction of an incoming laser
Drewol · Apr 13, 2021 · cd86945 · cd86945
2 parents afd52a9 + 1c88047
commit cd86945
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/Main/src/Scoring.cpp b/Main/src/Scoring.cpp
@@ -1116,6 +1116,7 @@ void Scoring::m_UpdateLasers(float deltaTime)
 {
  MapTime mapTime = m_playback->GetLastTime() + m_inputOffset;
  bool currentlySlamNextSegmentStraight[2] = { false };
+
  // Check for new laser segments in laser queue
  for (auto it = m_laserSegmentQueue.begin(); it != m_laserSegmentQueue.end();)
  {
@@ -1181,14 +1182,14 @@ void Scoring::m_UpdateLasers(float deltaTime)
  }
 
  m_laserInput[i] = autoplay ? 0.0f : m_input->GetInputLaserDir(i);
+ float inputDir = Math::Sign(m_laserInput[i]);
 
  if (currentSegment)
  {
  // Update laser gameplay
  float positionDelta = laserTargetPositions[i] - laserPositions[i];
  float laserDir = currentSegment->GetDirection();
  float input = m_laserInput[i];
- float inputDir = Math::Sign(input);
 
  if (inputDir != 0)
  {
@@ -1224,8 +1225,14 @@ void Scoring::m_UpdateLasers(float deltaTime)
  timeSinceLaserUsed[i] += deltaTime;
 
  // Always snap laser to start sections
- if (m_GetLaserObjectWithinTwoBeats(i))
- m_autoLaserTime[i] = m_autoLaserDuration;
+ auto incomingLaser = m_GetLaserObjectWithinTwoBeats(i);
+ if (incomingLaser)
+ {
+ laserPositions[i] = incomingLaser->points[0];
+ m_autoLaserTime[i] = inputDir == incomingLaser->GetDirection() || inputDir == 0
+ ? m_autoLaserDuration
+ : 0;
+ }
  }
 
  if (currentlySlamNextSegmentStraight[i])