devZoGok/PlanetFleet
1
0
Fork 0
mirror of https://github.com/devZoGok/PlanetFleet.git synced 2026-08-26 19:43:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict resolutions

Browse Source
This commit is contained in:
devZoGok
2026-03-15 17:40:28 +02:00
parent adc5f329f0
commit 2b850ca060
5 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cameraController.cpp
+1 -2
View File
@@ -45,8 +45,7 @@ namespace battleship{
}
void CameraController::orientCamera(Vector3 rotAxis, double str){
float minStr = .001;
Quaternion rotQuat = Quaternion(.5 * (fabs(str) > minStr ? str : 0), rotAxis);
Quaternion rotQuat = Quaternion(.025 * str, rotAxis);
Camera *cam = Root::getSingleton()->getCamera();
Vector3 dir = rotQuat * cam->getDirection(), up = rotQuat * cam->getUp();
cam->lookAt(dir, up);