Merge pull request #2 from Sommos/revert-1-master

Revert "Directory Fix / Visual Studio Conversion"

Author: Sommos

.gitignore

@@ -1,32 +1,46 @@
-#include "Application.h"
-
-Application::Application()
-{
-    // push an instance of the "Playing" state onto the stack of game states
-    pushState(std::make_unique<State::Playing>(*this)); 
-}
-
-void Application::runMainGameLoop()
-{
-    while (Display::isOpen()) 
-    {
-        Display::clear(); 
-        m_states.top()->input(); 
-        m_states.top()->update(); 
-        m_states.top()->draw(); 
-        Display::update();
-        Display::checkForClose(); 
-    }
-}
-
-void Application::pushState(std::unique_ptr<State::Game_State> state)
-{
-    // move the ownership of the state object into the stack of game states
-    m_states.push(std::move(state)); 
-}
-
-void Application::popState()
-{
-    // remove the top game state from the stack
-    m_states.pop(); 
-}
+#include "Application.h"
+#include "Display.h"
+#include "States/Playing.h"
+
+Application::Application()
+{
+    // push an instance of the "Playing" state onto the stack of game states
+    pushState(std::make_unique<State::Playing>(*this)); 
+}
+
+// the main game loop
+void Application::runMainGameLoop()
+{
+    // loop until the display is closed
+    while (Display::isOpen()) 
+    {
+        // clear the display
+        Display::clear(); 
+
+        // handle input for the current state
+        m_states.top()->input(); 
+        // update the current state
+        m_states.top()->update(); 
+        // draw the current state
+        m_states.top()->draw(); 
+
+        // update the display
+        Display::update();
+        // check if the display should be closed
+        Display::checkForClose(); 
+    }
+}
+
+// push a new game state onto the stack
+void Application::pushState(std::unique_ptr<State::Game_State> state)
+{
+    // move the ownership of the state object into the stack of game states
+    m_states.push(std::move(state)); 
+}
+
+// pop the top game state from the stack
+void Application::popState()
+{
+    // remove the top game state from the stack
+    m_states.pop(); 
+}

cpp_openGL_graphics/Application.cpp Application.cppcpp_openGL_graphics/Application.cpp renamed to Application.cpp

@@ -1,20 +1,23 @@
-#ifndef APPLICATION_H_INCLUDED
-#define APPLICATION_H_INCLUDED
-
-#include <stack>
-#include <memory>
-#include "Display.h"
-#include "States/Playing.h"
-#include "States/Game_State.h"
-
-class Application
-{
-    public:
-        Application();
-        void runMainGameLoop();
-        void pushState(std::unique_ptr<State::Game_State> state);
-        void popState();
-    private:
-        std::stack<std::unique_ptr<State::Game_State>> m_states;
-};
-#endif
+#ifndef APPLICATION_H_INCLUDED
+#define APPLICATION_H_INCLUDED
+
+#include <stack>
+#include <memory>
+
+#include "States/Game_State.h"
+
+class Application
+{
+    public:
+        Application();
+
+        void runMainGameLoop();
+
+        void pushState(std::unique_ptr<State::Game_State> state);
+        void popState();
+
+    private:
+        std::stack<std::unique_ptr<State::Game_State>> m_states;
+};
+
+#endif // APPLICATION_H_INCLUDED

cpp_openGL_graphics/Application.h Application.hcpp_openGL_graphics/Application.h renamed to Application.h

@@ -0,0 +1,73 @@
+#include "Display.h"
+#include <memory>
+#include <SFML/Graphics.hpp>
+#include <GL/glew.h>
+
+namespace Display
+{
+    // width and height variables for the current window
+    constexpr static int WIDTH = 1280;
+    constexpr static int HEIGHT = 720;
+
+    // pointer for RenderWindow object
+    std::unique_ptr<sf::RenderWindow> window;
+
+    // initialize the display
+    void init()
+    {
+        // configure the context settings for OpenGL
+        sf::ContextSettings settings;
+        settings.depthBits = 24;
+        settings.majorVersion = 3;
+        settings.minorVersion = 3; // OpenGL 3.3
+
+        // create the SFML window with the specified width, height, title, style, and settings
+        window = std::make_unique<sf::RenderWindow>(sf::VideoMode(WIDTH, HEIGHT), "Window", sf::Style::Close, settings);
+
+        // initialize GLEW
+        glewInit();
+
+        // set the viewport to cover the entire window
+        glViewport(0, 0, WIDTH, HEIGHT);
+    }
+
+    // close the display window
+    void close()
+    {
+        window->close();
+    }
+
+    // clear the display window with a specified color
+    void clear()
+    {
+        // set the clear color to black
+        glClearColor(0.0, 0.0, 0.0, 1.0); 
+        // clear the depth and color buffers
+        glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT); 
+    }
+
+    // update the display window
+    void update()
+    {
+        window->display();
+    }
+
+    // check if the display window should be closed
+    void checkForClose()
+    {
+        sf::Event e;
+        while (window->pollEvent(e))
+        {
+            if (e.type == sf::Event::Closed)
+            {
+                close();
+            }
+        }
+    }
+
+    // check if the display window is open
+    bool isOpen()
+    {
+        return window->isOpen();
+    }
+}

Display.cpp

@@ -0,0 +1,16 @@
+#ifndef DISPLAY_H_INCLUDED
+#define DISPLAY_H_INCLUDED
+
+namespace Display
+{
+    void init();
+    void close();
+
+    void clear();
+    void update();
+
+    void checkForClose();
+
+    bool isOpen();
+}
+#endif // DISPLAY_H_INCLUDED

Display.h

@@ -1,38 +1,57 @@
-#include "Model.h"
-
-Model::Model(const std::vector<GLfloat>& vertexPositions)
-{
-    glGenVertexArrays(1, &m_vao);
-    glBindVertexArray(m_vao); 
-    addVBO(2, vertexPositions); 
-
-    glBindVertexArray(0); 
-    glBindBuffer(GL_ARRAY_BUFFER, 0); 
-}
-
-Model::~Model()
-{
-    glDeleteVertexArrays(1, &m_vao); 
-    glDeleteBuffers(m_buffers.size(), m_buffers.data()); 
-}
-
-void Model::bind()
-{
-    glBindVertexArray(m_vao); 
-}
-
-void Model::unbind()
-{
-    glBindVertexArray(0); 
-}
-
-void Model::addVBO(int dim, const std::vector<GLfloat>& data)
-{
-    GLuint vbo;
-    glGenBuffers(1, &vbo); 
-    glBindBuffer(GL_ARRAY_BUFFER, vbo); 
-    glBufferData(GL_ARRAY_BUFFER, data.size() * sizeof(data[0]), data.data(), GL_STATIC_DRAW); 
-    glVertexAttribPointer(m_vboCount, dim, GL_FLOAT, GL_FALSE, 0, (GLvoid*) 0); 
-    glEnableVertexAttribArray(m_vboCount++); 
-    m_buffers.push_back(vbo); 
-}
+#include "Model.h"
+
+Model::Model(const std::vector<GLfloat>& vertexPositions)
+{
+    // generate a vertex array object (VAO)
+    glGenVertexArrays(1, &m_vao);
+    // bind the VAO
+    glBindVertexArray(m_vao); 
+    
+    // add a vertex buffer object (VBO) for the vertex positions
+    addVBO(2, vertexPositions); 
+
+    // unbind the VAO
+    glBindVertexArray(0); 
+    // unbind the buffer
+    glBindBuffer(GL_ARRAY_BUFFER, 0); 
+}
+
+Model::~Model()
+{
+    // delete the VAO
+    glDeleteVertexArrays(1, &m_vao); 
+
+    // delete the VBOs
+    glDeleteBuffers(m_buffers.size(), m_buffers.data()); 
+}
+
+void Model::bind()
+{
+    // bind the VAO for rendering
+    glBindVertexArray(m_vao); 
+}
+
+void Model::unbind()
+{
+    // unbind the VAO
+    glBindVertexArray(0); 
+}
+
+void Model::addVBO(int dim, const std::vector<GLfloat>& data)
+{
+    GLuint vbo;
+    // generate a VBO
+    glGenBuffers(1, &vbo); 
+    // bind the VBO
+    glBindBuffer(GL_ARRAY_BUFFER, vbo); 
+    // copy the data to the VBO
+    glBufferData(GL_ARRAY_BUFFER, data.size() * sizeof(data[0]), data.data(), GL_STATIC_DRAW); 
+
+    // specify the layout of the vertex attribute
+    glVertexAttribPointer(m_vboCount, dim, GL_FLOAT, GL_FALSE, 0, (GLvoid*) 0); 
+    // enable the vertex attribute
+    glEnableVertexAttribArray(m_vboCount++); 
+
+    // store the VBO in the list of buffers
+    m_buffers.push_back(vbo); 
+}

cpp_openGL_graphics/Model.cpp Model.cppcpp_openGL_graphics/Model.cpp renamed to Model.cpp

@@ -1,22 +1,25 @@
-#ifndef MODEL_H_INCLUDED
-#define MODEL_H_INCLUDED
-
-#include <GL/glew.h>
-#include <vector>
-
-class Model
-{
-    public:
-        Model(const std::vector<GLfloat>& vertexPositions);
-        ~Model();
-
-        void bind();
-        void unbind();
-
-    private:
-        void addVBO(int dim, const std::vector<GLfloat>& data);
-        std::vector<GLuint> m_buffers;
-        GLuint m_vao = 0;
-        GLuint m_vboCount = 0;
-};
-#endif
+#ifndef MODEL_H_INCLUDED
+#define MODEL_H_INCLUDED
+
+#include <GL/glew.h>
+
+#include <vector>
+
+class Model
+{
+    public:
+        Model(const std::vector<GLfloat>& vertexPositions);
+        ~Model();
+
+        void bind();
+        void unbind();
+    private:
+        void addVBO(int dim, const std::vector<GLfloat>& data);
+
+        std::vector<GLuint> m_buffers;
+        GLuint m_vao = 0;
+
+        GLuint m_vboCount = 0;
+};
+
+#endif // MODEL_H_INCLUDED