voxelcoreprojects/voxelcore
1
0
Fork 0
mirror of https://github.com/MihailRis/voxelcore.git synced 2026-10-04 18:41:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

world-wide commit to ruin everything

Browse source
This commit is contained in:
MihailRis 2022-10-28 22:44:32 +03:00
parent fbce36a05c
commit 8a073e4e8a
57 changed files with 1433 additions and 958 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/window/Camera.cpp
View file

@ -1,10 +1,3 @@
/*
* Camera.cpp
*
* Created on: Feb 11, 2020
* Author: MihailRis
*/
#include "Camera.h"
#include "Window.h"
@ -36,7 +29,10 @@ void Camera::rotate(float x, float y, float z){
}
mat4 Camera::getProjection(){
float aspect = (float)Window::width / (float)Window::height;
float aspect = this->aspect;
if (aspect == 0.0f){
aspect = (float)Window::width / (float)Window::height;
}
if (perspective)
return glm::perspective(fov*zoom, aspect, 0.05f, 1500.0f);
else
@ -50,5 +46,5 @@ mat4 Camera::getView(){
if (perspective)
return glm::lookAt(position, position+front, up);
else
return glm::mat4(1.0f);
return glm::translate(glm::mat4(1.0f), position);
}