lisyarus/psemek
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add orthographic & window cameras

Browse source
This commit is contained in:
Nikita Lisitsa 2020-08-30 08:46:42 +03:00
parent fd26d8a3a3
commit 4d6f5d6f85
2 changed files with 40 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
libs/geom/include/psemek/geom/camera.hpp
View file

@ -3,6 +3,7 @@
#include <psemek/geom/vector.hpp> #include <psemek/geom/vector.hpp>
#include <psemek/geom/point.hpp> #include <psemek/geom/point.hpp>
#include <psemek/geom/matrix.hpp> #include <psemek/geom/matrix.hpp>
#include <psemek/geom/box.hpp>
namespace psemek::geom namespace psemek::geom
{ {
@ -31,6 +32,24 @@ namespace psemek::geom
virtual ~camera() = default; virtual ~camera() = default;
}; };
struct window_camera
: camera
{
float width, height;
matrix<float, 4, 4> view() const override;
matrix<float, 4, 4> projection() const override;
};
struct orthographic_camera
: camera
{
geom::box<float_t, 3> box;
matrix<float, 4, 4> view() const override;
matrix<float, 4, 4> projection() const override;
};
struct perspective_camera struct perspective_camera
: camera : camera
{ {

21
libs/geom/source/camera.cpp
View file

@ -1,5 +1,6 @@
#include <psemek/geom/camera.hpp> #include <psemek/geom/camera.hpp>
#include <psemek/geom/gauss.hpp> #include <psemek/geom/gauss.hpp>
#include <psemek/geom/orthographic.hpp>
#include <psemek/geom/perspective.hpp> #include <psemek/geom/perspective.hpp>
#include <psemek/geom/translation.hpp> #include <psemek/geom/translation.hpp>
#include <psemek/geom/rotation.hpp> #include <psemek/geom/rotation.hpp>
@ -68,6 +69,26 @@ namespace psemek::geom
return p; return p;
} }
matrix<float, 4, 4> window_camera::view() const
{
return matrix<float, 4, 4>::identity();
}
matrix<float, 4, 4> window_camera::projection() const
{
return orthographic<float, 3>({{ {0.f, width}, {height, 0.f}, {-1.f, 1.f} }}).homogeneous_matrix();
}
matrix<float, 4, 4> orthographic_camera::view() const
{
return matrix<float, 4, 4>::identity();
}
matrix<float, 4, 4> orthographic_camera::projection() const
{
return orthographic<float, 3>(box).homogeneous_matrix();
}
matrix<float, 4, 4> perspective_camera::projection() const matrix<float, 4, 4> perspective_camera::projection() const
{ {
return perspective<float, 3>(fov_x, fov_y, near_clip, far_clip).homogeneous_matrix(); return perspective<float, 3>(fov_x, fov_y, near_clip, far_clip).homogeneous_matrix();