summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--application/display.cpp47
-rw-r--r--application/main.cpp99
-rw-r--r--gfx/window.cpp30
-rw-r--r--gfx/window.h (renamed from application/display.h)10
4 files changed, 99 insertions, 87 deletions
diff --git a/application/display.cpp b/application/display.cpp
deleted file mode 100644
index b4a42d7..0000000
--- a/application/display.cpp
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "display.h"
-#include <GL/glew.h>
-#include <stdexcept>
-
-Display::Display(int width, int height, const std::string & title)
-{
- SDL_Init(SDL_INIT_EVERYTHING);
-
- SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
- SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 32);
- SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
- SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
-
- m_window = m_window.create(SDL_CreateWindow, SDL_DestroyWindow, title.c_str(), SDL_WINDOWPOS_CENTERED,
- SDL_WINDOWPOS_CENTERED, width, height, SDL_WINDOW_OPENGL);
- m_glContext = m_glContext.create(SDL_GL_CreateContext, SDL_GL_DeleteContext, m_window);
-
- if (glewInit() != GLEW_OK) {
- throw std::runtime_error {"Glew failed to initialize!"};
- }
-
- glEnable(GL_DEPTH_TEST);
-
- glEnable(GL_CULL_FACE);
- glCullFace(GL_BACK);
-}
-
-Display::~Display()
-{
- SDL_Quit();
-}
-
-void
-Display::Clear(float r, float g, float b, float a) const
-{
- glClearColor(r, g, b, a);
- glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-}
-
-void
-Display::SwapBuffers() const
-{
- SDL_GL_SwapWindow(m_window);
-}
diff --git a/application/main.cpp b/application/main.cpp
index a5a09e5..acf3c95 100644
--- a/application/main.cpp
+++ b/application/main.cpp
@@ -1,4 +1,4 @@
-#include "display.h"
+#include "gfx/window.h"
#include <SDL2/SDL.h>
#include <cmath>
#include <gfx/gl/camera.h>
@@ -9,51 +9,80 @@
#include <glm/glm.hpp>
#include <memory>
#include <numbers>
+#include <special_members.hpp>
static const int DISPLAY_WIDTH = 800;
static const int DISPLAY_HEIGHT = 600;
-int
-main(int, char **)
-{
- Display display(DISPLAY_WIDTH, DISPLAY_HEIGHT, "OpenGL");
-
- Mesh monkey("./res/monkey3.obj");
- Shader shader("./res/basicShader");
- Texture texture("./res/bricks.jpg");
- Transform transform;
- Camera camera(glm::vec3(0.0F, 0.0F, -5.0F), 70.0F, (float)DISPLAY_WIDTH / (float)DISPLAY_HEIGHT, 0.1F, 100.0F);
-
- SDL_Event e;
- bool isRunning = true;
- float counter = 0.0F;
- while (isRunning) {
- while (SDL_PollEvent(&e)) {
- if (e.type == SDL_QUIT) {
- isRunning = false;
+class SDL_Application {
+public:
+ SDL_Application()
+ {
+ SDL_Init(SDL_INIT_EVERYTHING);
+
+ SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+ SDL_GL_SetAttribute(SDL_GL_BUFFER_SIZE, 32);
+ SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, 16);
+ SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
+ }
+ ~SDL_Application()
+ {
+ SDL_Quit();
+ }
+ NO_COPY(SDL_Application);
+ NO_MOVE(SDL_Application);
+
+ void
+ run()
+ {
+ Window main_window(DISPLAY_WIDTH, DISPLAY_HEIGHT, "OpenGL");
+
+ Mesh monkey("./res/monkey3.obj");
+ Shader shader("./res/basicShader");
+ Texture texture("./res/bricks.jpg");
+ Transform transform;
+ Camera camera(glm::vec3(0.0F, 0.0F, -5.0F), 70.0F, (float)DISPLAY_WIDTH / (float)DISPLAY_HEIGHT, 0.1F, 100.0F);
+
+ SDL_Event e;
+ bool isRunning = true;
+ float counter = 0.0F;
+ while (isRunning) {
+ while (SDL_PollEvent(&e)) {
+ if (e.type == SDL_QUIT) {
+ isRunning = false;
+ }
}
- }
- display.Clear(0.0F, 0.0F, 0.0F, 1.0F);
+ main_window.Clear(0.0F, 0.0F, 0.0F, 1.0F);
- // float sinCounter = sinf(counter);
- // float absSinCounter = abs(sinCounter);
+ // float sinCounter = sinf(counter);
+ // float absSinCounter = abs(sinCounter);
- // transform.GetPos()->x = sinCounter;
- transform.GetRot().y = std::numbers::pi_v<double> + sin(counter);
- transform.GetRot().z = 0.3 * cos(counter * 10);
- // transform.GetScale()->x = absSinCounter;
- // transform.GetScale()->y = absSinCounter;
+ // transform.GetPos()->x = sinCounter;
+ transform.GetRot().y = std::numbers::pi_v<double> + sin(counter);
+ transform.GetRot().z = 0.3 * cos(counter * 10);
+ // transform.GetScale()->x = absSinCounter;
+ // transform.GetScale()->y = absSinCounter;
- shader.Bind();
- texture.Bind();
- shader.Update(transform, camera);
- monkey.Draw();
+ shader.Bind();
+ texture.Bind();
+ shader.Update(transform, camera);
+ monkey.Draw();
- display.SwapBuffers();
- SDL_Delay(1);
- counter += 0.01F;
+ main_window.SwapBuffers();
+ SDL_Delay(1);
+ counter += 0.01F;
+ }
}
+};
+
+int
+main(int, char **)
+{
+ SDL_Application().run();
return 0;
}
diff --git a/gfx/window.cpp b/gfx/window.cpp
new file mode 100644
index 0000000..2f94d1a
--- /dev/null
+++ b/gfx/window.cpp
@@ -0,0 +1,30 @@
+#include "window.h"
+#include <GL/glew.h>
+#include <stdexcept>
+
+Window::Window(int width, int height, const std::string & title) :
+ m_window {m_window.create(SDL_CreateWindow, SDL_DestroyWindow, title.c_str(), SDL_WINDOWPOS_CENTERED,
+ SDL_WINDOWPOS_CENTERED, width, height, SDL_WINDOW_OPENGL)},
+ m_glContext {m_glContext.create(SDL_GL_CreateContext, SDL_GL_DeleteContext, m_window)}
+{
+ if (glewInit() != GLEW_OK) {
+ throw std::runtime_error {"Glew failed to initialize!"};
+ }
+
+ glEnable(GL_DEPTH_TEST);
+ glEnable(GL_CULL_FACE);
+ glCullFace(GL_BACK);
+}
+
+void
+Window::Clear(float r, float g, float b, float a) const
+{
+ glClearColor(r, g, b, a);
+ glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+}
+
+void
+Window::SwapBuffers() const
+{
+ SDL_GL_SwapWindow(m_window);
+}
diff --git a/application/display.h b/gfx/window.h
index b561d77..3ac583f 100644
--- a/application/display.h
+++ b/gfx/window.h
@@ -7,13 +7,13 @@
#include <string>
#include <type_traits>
-class Display {
+class Window {
public:
- Display(int width, int height, const std::string & title);
- virtual ~Display();
+ Window(int width, int height, const std::string & title);
+ ~Window() = default;
- NO_COPY(Display);
- NO_MOVE(Display);
+ NO_COPY(Window);
+ NO_MOVE(Window);
void Clear(float r, float g, float b, float a) const;
void SwapBuffers() const;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 12:37:31 +0000