diff options
| -rw-r--r-- | src/Makefile.am | 40 | ||||
| -rw-r--r-- | src/ctrl/keyboard.hpp (renamed from src/ctrl/keyboard.h) | 2 | ||||
| -rw-r--r-- | src/ctrl/mouse.hpp (renamed from src/ctrl/mouse.h) | 2 | ||||
| -rw-r--r-- | src/engine.cpp | 32 | ||||
| -rw-r--r-- | src/fb/chfb.cpp | 10 | ||||
| -rw-r--r-- | src/fb/chfb.hpp (renamed from src/fb/chfb.h) | 4 | ||||
| -rw-r--r-- | src/fb/pixfb.cpp | 10 | ||||
| -rw-r--r-- | src/fb/pixfb.hpp (renamed from src/fb/pixfb.h) | 4 | ||||
| -rw-r--r-- | src/math/mat4.hpp (renamed from src/math/mat4.h) | 2 | ||||
| -rw-r--r-- | src/math/quat.hpp (renamed from src/math/quat.h) | 0 | ||||
| -rw-r--r-- | src/math/tform.hpp (renamed from src/math/tform.h) | 6 | ||||
| -rw-r--r-- | src/math/vector.hpp (renamed from src/math/vector.h) | 2 | ||||
| -rw-r--r-- | src/o3d/camera.hpp (renamed from src/o3d/camera.h) | 4 | ||||
| -rw-r--r-- | src/o3d/deriv_vertex.hpp (renamed from src/o3d/deriv_vertex.h) | 2 | ||||
| -rw-r--r-- | src/o3d/mesh.cpp | 4 | ||||
| -rw-r--r-- | src/o3d/mesh.hpp (renamed from src/o3d/mesh.h) | 2 | ||||
| -rw-r--r-- | src/o3d/obj3d.hpp (renamed from src/o3d/obj3d.h) | 4 | ||||
| -rw-r--r-- | src/o3d/scene.hpp (renamed from src/o3d/scene.h) | 4 | ||||
| -rw-r--r-- | src/o3d/tri.hpp (renamed from src/o3d/tri.h) | 4 | ||||
| -rw-r--r-- | src/o3d/tri_deriv.cpp | 6 | ||||
| -rw-r--r-- | src/o3d/tri_deriv.hpp (renamed from src/o3d/tri_deriv.h) | 4 | ||||
| -rw-r--r-- | src/o3d/vertex.hpp (renamed from src/o3d/vertex.h) | 4 | ||||
| -rw-r--r-- | src/o3d/vertex_data.hpp (renamed from src/o3d/vertex_data.h) | 2 | ||||
| -rw-r--r-- | src/obj_parser.cpp | 8 | ||||
| -rw-r--r-- | src/obj_parser.hpp (renamed from src/obj_parser.h) | 2 | ||||
| -rw-r--r-- | src/renderer.cpp | 12 | ||||
| -rw-r--r-- | src/renderer.hpp (renamed from src/renderer.h) | 6 |
27 files changed, 91 insertions, 91 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 5a3b41d..e45b82d 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,25 +1,25 @@ bin_PROGRAMS = engine -engine_SOURCES = \ - engine.cpp \ - renderer.h renderer.cpp \ - obj_parser.h obj_parser.cpp \ - fb/fb.h fb/chfb.h fb/chfb.cpp fb/pixfb.h fb/pixfb.cpp \ - math/vector.h \ - math/mat4.h \ - math/quat.h \ - math/tform.h \ - o3d/mesh.h o3d/mesh.cpp \ - o3d/obj3d.h \ - o3d/vertex_data.h \ - o3d/vertex.h \ - o3d/deriv_vertex.h \ - o3d/tri.h \ - o3d/tri_deriv.h o3d/tri_deriv.cpp \ - o3d/camera.h \ - o3d/scene.h \ - ctrl/keyboard.h \ - ctrl/mouse.h +engine_SOURCES = \ + engine.cpp \ + renderer.hpp renderer.cpp \ + obj_parser.hpp obj_parser.cpp \ + fb/fb.hpp fb/chfb.hpp fb/chfb.cpp fb/pixfb.hpp fb/pixfb.cpp \ + math/vector.hpp \ + math/mat4.hpp \ + math/quat.hpp \ + math/tform.hpp \ + o3d/mesh.hpp o3d/mesh.cpp \ + o3d/obj3d.hpp \ + o3d/vertex_data.hpp \ + o3d/vertex.hpp \ + o3d/deriv_vertex.hpp \ + o3d/tri.hpp \ + o3d/tri_deriv.hpp o3d/tri_deriv.cpp \ + o3d/camera.hpp \ + o3d/scene.hpp \ + ctrl/keyboard.hpp \ + ctrl/mouse.hpp engine_CPPFLAGS = -std=gnu++23 -Wall -Wextra engine_LDFLAGS = -std=gnu++23 -Wall -Wextra diff --git a/src/ctrl/keyboard.h b/src/ctrl/keyboard.hpp index 4f3b4ef..c8ab983 100644 --- a/src/ctrl/keyboard.h +++ b/src/ctrl/keyboard.hpp @@ -2,7 +2,7 @@ #define CTRL_KEYBOARD_H #include <cstdint> -#include "math/vector.h" +#include "math/vector.hpp" using engine::math::Vector2; diff --git a/src/ctrl/mouse.h b/src/ctrl/mouse.hpp index 521b0a4..8973499 100644 --- a/src/ctrl/mouse.h +++ b/src/ctrl/mouse.hpp @@ -1,7 +1,7 @@ #ifndef CTRL_MOUSE_H #define CTRL_MOUSE_H -#include "math/vector.h" +#include "math/vector.hpp" namespace engine::controllers { diff --git a/src/engine.cpp b/src/engine.cpp index 2acba89..1d17ec2 100644 --- a/src/engine.cpp +++ b/src/engine.cpp @@ -23,22 +23,22 @@ #include <ncurses.h> #endif -#include "fb/chfb.h" -#include "fb/pixfb.h" -#include "o3d/scene.h" -#include "o3d/mesh.h" -#include "o3d/obj3d.h" -#include "o3d/vertex_data.h" -#include "o3d/tri.h" -#include "o3d/camera.h" -#include "math/vector.h" -#include "math/mat4.h" -#include "math/quat.h" -#include "math/tform.h" -#include "ctrl/keyboard.h" -#include "ctrl/mouse.h" -#include "renderer.h" -#include "obj_parser.h" +#include "fb/chfb.hpp" +#include "fb/pixfb.hpp" +#include "o3d/scene.hpp" +#include "o3d/mesh.hpp" +#include "o3d/obj3d.hpp" +#include "o3d/vertex_data.hpp" +#include "o3d/tri.hpp" +#include "o3d/camera.hpp" +#include "math/vector.hpp" +#include "math/mat4.hpp" +#include "math/quat.hpp" +#include "math/tform.hpp" +#include "ctrl/keyboard.hpp" +#include "ctrl/mouse.hpp" +#include "renderer.hpp" +#include "obj_parser.hpp" using engine::Renderer, diff --git a/src/fb/chfb.cpp b/src/fb/chfb.cpp index 8068d8f..9f293ed 100644 --- a/src/fb/chfb.cpp +++ b/src/fb/chfb.cpp @@ -1,10 +1,10 @@ -#include "fb/chfb.h" +#include "fb/chfb.hpp" #include <algorithm> #include <cstdint> -#include "math/vector.h" -#include "math/quat.h" -#include "o3d/vertex_data.h" -#include "o3d/camera.h" +#include "math/vector.hpp" +#include "math/quat.hpp" +#include "o3d/vertex_data.hpp" +#include "o3d/camera.hpp" using namespace engine::fb; using diff --git a/src/fb/chfb.h b/src/fb/chfb.hpp index a866fef..8e47d6b 100644 --- a/src/fb/chfb.h +++ b/src/fb/chfb.hpp @@ -2,8 +2,8 @@ #define FB_CHFB_H #include <vector> -#include "math/vector.h" -#include "o3d/vertex_data.h" +#include "math/vector.hpp" +#include "o3d/vertex_data.hpp" namespace engine::fb { diff --git a/src/fb/pixfb.cpp b/src/fb/pixfb.cpp index d49566e..55c356f 100644 --- a/src/fb/pixfb.cpp +++ b/src/fb/pixfb.cpp @@ -1,10 +1,10 @@ -#include "fb/pixfb.h" +#include "fb/pixfb.hpp" #include <cstdint> #include <algorithm> -#include "math/vector.h" -#include "math/quat.h" -#include "o3d/vertex_data.h" -#include "o3d/camera.h" +#include "math/vector.hpp" +#include "math/quat.hpp" +#include "o3d/vertex_data.hpp" +#include "o3d/camera.hpp" using namespace engine::fb; using diff --git a/src/fb/pixfb.h b/src/fb/pixfb.hpp index 81a7ac3..f7a7acb 100644 --- a/src/fb/pixfb.h +++ b/src/fb/pixfb.hpp @@ -3,8 +3,8 @@ #include <vector> #include <cstdint> -#include "math/vector.h" -#include "o3d/vertex_data.h" +#include "math/vector.hpp" +#include "o3d/vertex_data.hpp" namespace engine::fb { diff --git a/src/math/mat4.h b/src/math/mat4.hpp index df8f533..dfc5a75 100644 --- a/src/math/mat4.h +++ b/src/math/mat4.hpp @@ -3,7 +3,7 @@ #include <array> #include <cmath> -#include "math/vector.h" +#include "math/vector.hpp" namespace engine::math { diff --git a/src/math/quat.h b/src/math/quat.hpp index 271070a..271070a 100644 --- a/src/math/quat.h +++ b/src/math/quat.hpp diff --git a/src/math/tform.h b/src/math/tform.hpp index 74186f8..cd9301f 100644 --- a/src/math/tform.h +++ b/src/math/tform.hpp @@ -2,9 +2,9 @@ #define MATH_TFORM_H #include <array> -#include "math/vector.h" -#include "math/mat4.h" -#include "math/quat.h" +#include "math/vector.hpp" +#include "math/mat4.hpp" +#include "math/quat.hpp" namespace engine::math { diff --git a/src/math/vector.h b/src/math/vector.hpp index fcfc5bd..a0e58e1 100644 --- a/src/math/vector.h +++ b/src/math/vector.hpp @@ -2,7 +2,7 @@ #define MATH_VECTOR_H #include <cmath> -#include "math/quat.h" +#include "math/quat.hpp" namespace engine::math { diff --git a/src/o3d/camera.h b/src/o3d/camera.hpp index 832f473..485c825 100644 --- a/src/o3d/camera.h +++ b/src/o3d/camera.hpp @@ -1,8 +1,8 @@ #ifndef O3D_CAMERA_H #define O3D_CAMERA_H -#include "math/mat4.h" -#include "math/tform.h" +#include "math/mat4.hpp" +#include "math/tform.hpp" using engine::math::Matrix4, diff --git a/src/o3d/deriv_vertex.h b/src/o3d/deriv_vertex.hpp index c435a7e..bc47780 100644 --- a/src/o3d/deriv_vertex.h +++ b/src/o3d/deriv_vertex.hpp @@ -1,7 +1,7 @@ #ifndef O3D_DERIV_VERTEX_H #define O3D_DERIV_VERTEX_H -#include "math/vector.h" +#include "math/vector.hpp" namespace engine::o3d { diff --git a/src/o3d/mesh.cpp b/src/o3d/mesh.cpp index 2423e88..c1af5cd 100644 --- a/src/o3d/mesh.cpp +++ b/src/o3d/mesh.cpp @@ -1,8 +1,8 @@ -#include "o3d/mesh.h" +#include "o3d/mesh.hpp" #include <vector> #include <array> #include <cstddef> -#include "math/vector.h" +#include "math/vector.hpp" using namespace engine::o3d; diff --git a/src/o3d/mesh.h b/src/o3d/mesh.hpp index acc48b5..2c3a065 100644 --- a/src/o3d/mesh.h +++ b/src/o3d/mesh.hpp @@ -5,7 +5,7 @@ #include <array> #include <iterator> #include <cstddef> -#include "math/vector.h" +#include "math/vector.hpp" namespace engine::o3d { diff --git a/src/o3d/obj3d.h b/src/o3d/obj3d.hpp index 9f407f9..295d129 100644 --- a/src/o3d/obj3d.h +++ b/src/o3d/obj3d.hpp @@ -2,8 +2,8 @@ #define O3D_OBJ3D_H #include <type_traits> -#include "math/tform.h" -#include "o3d/mesh.h" +#include "math/tform.hpp" +#include "o3d/mesh.hpp" namespace engine::o3d { diff --git a/src/o3d/scene.h b/src/o3d/scene.hpp index 3b9131c..65008ac 100644 --- a/src/o3d/scene.h +++ b/src/o3d/scene.hpp @@ -3,8 +3,8 @@ #include <vector> #include <type_traits> -#include "o3d/obj3d.h" -#include "o3d/camera.h" +#include "o3d/obj3d.hpp" +#include "o3d/camera.hpp" namespace engine::o3d { diff --git a/src/o3d/tri.h b/src/o3d/tri.hpp index 4b50f91..7538d22 100644 --- a/src/o3d/tri.h +++ b/src/o3d/tri.hpp @@ -2,8 +2,8 @@ #define O3D_TRI_H #include <vector> -#include "o3d/vertex.h" -#include "o3d/tri_deriv.h" +#include "o3d/vertex.hpp" +#include "o3d/tri_deriv.hpp" namespace engine::o3d { diff --git a/src/o3d/tri_deriv.cpp b/src/o3d/tri_deriv.cpp index a22067e..79e3fb4 100644 --- a/src/o3d/tri_deriv.cpp +++ b/src/o3d/tri_deriv.cpp @@ -1,7 +1,7 @@ -#include "o3d/tri_deriv.h" +#include "o3d/tri_deriv.hpp" #include <vector> -#include "math/vector.h" -#include "o3d/deriv_vertex.h" +#include "math/vector.hpp" +#include "o3d/deriv_vertex.hpp" using namespace engine::o3d; diff --git a/src/o3d/tri_deriv.h b/src/o3d/tri_deriv.hpp index 16a21f8..f82bd9b 100644 --- a/src/o3d/tri_deriv.h +++ b/src/o3d/tri_deriv.hpp @@ -2,8 +2,8 @@ #define O3D_TRI_VERTEX_H #include <vector> -#include "o3d/vertex.h" -#include "o3d/deriv_vertex.h" +#include "o3d/vertex.hpp" +#include "o3d/deriv_vertex.hpp" namespace engine::o3d { diff --git a/src/o3d/vertex.h b/src/o3d/vertex.hpp index 438f8b3..70fca7b 100644 --- a/src/o3d/vertex.h +++ b/src/o3d/vertex.hpp @@ -1,8 +1,8 @@ #ifndef O3D_VERTEX_H #define O3D_VERTEX_H -#include "math/vector.h" -#include "o3d/vertex_data.h" +#include "math/vector.hpp" +#include "o3d/vertex_data.hpp" namespace engine::o3d { diff --git a/src/o3d/vertex_data.h b/src/o3d/vertex_data.hpp index 22fa76b..0ebc6c9 100644 --- a/src/o3d/vertex_data.h +++ b/src/o3d/vertex_data.hpp @@ -1,7 +1,7 @@ #ifndef O3D_VERTEX_DATA_H #define O3D_VERTEX_DATA_H -#include "math/vector.h" +#include "math/vector.hpp" using engine::math::Vector3; diff --git a/src/obj_parser.cpp b/src/obj_parser.cpp index f765f5c..196261e 100644 --- a/src/obj_parser.cpp +++ b/src/obj_parser.cpp @@ -1,4 +1,4 @@ -#include "obj_parser.h" +#include "obj_parser.hpp" #include <iostream> #include <fstream> @@ -6,9 +6,9 @@ #include <vector> #include <cstddef> #include <array> -#include "math/vector.h" -#include "o3d/mesh.h" -#include "o3d/vertex_data.h" +#include "math/vector.hpp" +#include "o3d/mesh.hpp" +#include "o3d/vertex_data.hpp" namespace engine { diff --git a/src/obj_parser.h b/src/obj_parser.hpp index 2a6d791..f6e8ca1 100644 --- a/src/obj_parser.h +++ b/src/obj_parser.hpp @@ -1,7 +1,7 @@ #ifndef OBJ_PARSER_H #define OBJ_PARSER_H -#include "o3d/mesh.h" +#include "o3d/mesh.hpp" namespace engine { diff --git a/src/renderer.cpp b/src/renderer.cpp index 7e868b4..5321a88 100644 --- a/src/renderer.cpp +++ b/src/renderer.cpp @@ -1,11 +1,11 @@ -#include "renderer.h" +#include "renderer.hpp" #include <memory> #include <array> -#include "math/vector.h" -#include "o3d/tri.h" -#include "o3d/tri_deriv.h" -#include "fb/chfb.h" -#include "fb/pixfb.h" +#include "math/vector.hpp" +#include "o3d/tri.hpp" +#include "o3d/tri_deriv.hpp" +#include "fb/chfb.hpp" +#include "fb/pixfb.hpp" using namespace engine; using diff --git a/src/renderer.h b/src/renderer.hpp index b7a3a7e..9093c2e 100644 --- a/src/renderer.h +++ b/src/renderer.hpp @@ -2,9 +2,9 @@ #define RENDERER_H #include <memory> -#include "math/vector.h" -#include "o3d/tri.h" -#include "o3d/tri_deriv.h" +#include "math/vector.hpp" +#include "o3d/tri.hpp" +#include "o3d/tri_deriv.hpp" namespace engine { |
