More compiley.

Andrzej Kapolka committed 13 years ago

Commit a7c265d1 parent ba6f2301 file · +1 −1Browse files

Showing the changes to interface/src/SerialInterface.cpp (1 of 1 file). Show all

Unified · Split

interface/src/SerialInterface.cpp+1−1

@@ -266,7 +266,7 @@ void SerialInterface::readData(float deltaTime) { · 265 unmodified lines
266	// Without a compass heading, always decay estimated Yaw slightly	266	// Without a compass heading, always decay estimated Yaw slightly
267	const float YAW_DECAY = 0.995;	267	const float YAW_DECAY = 0.995;
268	glm::vec3 forward = estimatedRotation * glm::vec3(0.0f, 0.0f, -1.0f);	268	glm::vec3 forward = estimatedRotation * glm::vec3(0.0f, 0.0f, -1.0f);
269	esimatedRotation = safeMix(glm::angleAxis(glm::degrees(atan2f(forward.x, -forward.z)),	269	estimatedRotation = safeMix(glm::angleAxis(glm::degrees(atan2f(forward.x, -forward.z)),
270	glm::vec3(0.0f, 1.0f, 0.0f)) * estimatedRotation, estimatedRotation, YAW_DECAY);	270	glm::vec3(0.0f, 1.0f, 0.0f)) * estimatedRotation, estimatedRotation, YAW_DECAY);
271	}	271	}
272	}	272	}