Made OR work with different camera modes.

barnold1953 committed 12 years ago

Commit eb5b0c41 parent eccf99c1 file · +3 −4Browse files

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

Unified · Split

interface/src/Application.cpp+3−4

@@ -560,10 +560,9 @@ void Application::paintGL() { · 559 unmodified lines
560	_myCamera.setUpShift(0.0f);	560	_myCamera.setUpShift(0.0f);
561	_myCamera.setDistance(0.0f);	561	_myCamera.setDistance(0.0f);
562	_myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing	562	_myCamera.setTightness(0.0f); // Camera is directly connected to head without smoothing
563	_myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());	563	}
564	_myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());	564
565		565	if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
566	} else if (_myCamera.getMode() == CAMERA_MODE_FIRST_PERSON) {
567	_myCamera.setTightness(0.0f); // In first person, camera follows (untweaked) head exactly without delay	566	_myCamera.setTightness(0.0f); // In first person, camera follows (untweaked) head exactly without delay
568	_myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());	567	_myCamera.setTargetPosition(_myAvatar->getHead()->calculateAverageEyePosition());
569	_myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());	568	_myCamera.setTargetRotation(_myAvatar->getHead()->getCameraOrientation());