Approach the webcam position rapidly.

Andrzej Kapolka committed 13 years ago

Commit 3de76c91 parent 281aee11 file · +2 −2Browse files

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

Unified · Split

interface/src/SerialInterface.cpp+2−2

@@ -310,8 +310,8 @@ void SerialInterface::readData(float deltaTime) { · 309 unmodified lines
310	// Attempt to fuse gyro position with webcam position	310	// Attempt to fuse gyro position with webcam position
311	Webcam* webcam = Application::getInstance()->getWebcam();	311	Webcam* webcam = Application::getInstance()->getWebcam();
312	if (webcam->isActive()) {	312	if (webcam->isActive()) {
313	_estimatedPosition = glm::mix(_estimatedPosition, webcam->getEstimatedPosition(),	313	const float WEBCAM_POSITION_FUSION = 0.5f;
314	1.0f / SENSOR_FUSION_SAMPLES);	314	_estimatedPosition = glm::mix(_estimatedPosition, webcam->getEstimatedPosition(), WEBCAM_POSITION_FUSION);
315		315
316	} else {	316	} else {
317	_estimatedPosition *= DECAY_POSITION;	317	_estimatedPosition *= DECAY_POSITION;