Cleared some errors
This commit is contained in:
@ -1,6 +1,5 @@
|
|||||||
#include "SpriteRenderer.h"
|
#include "SpriteRenderer.h"
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
#include <iostream>
|
|
||||||
#include <glm/gtc/type_ptr.hpp>
|
#include <glm/gtc/type_ptr.hpp>
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
|
||||||
|
@ -2,7 +2,6 @@
|
|||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
#include <glm/gtc/matrix_transform.hpp>
|
#include <glm/gtc/matrix_transform.hpp>
|
||||||
#include <glm/gtc/type_ptr.hpp>
|
#include <glm/gtc/type_ptr.hpp>
|
||||||
#include "deff.h"
|
|
||||||
|
|
||||||
Square::Square(glm::vec3 position, glm::vec3 scale, glm::vec4 color) {
|
Square::Square(glm::vec3 position, glm::vec3 scale, glm::vec4 color) {
|
||||||
//Initialize Member Variables
|
//Initialize Member Variables
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
#include "Window.h"
|
#include "Window.h"
|
||||||
#include <iostream>
|
|
||||||
#include "Log.h"
|
#include "Log.h"
|
||||||
|
|
||||||
Window::Window(int width, int height, const char* title) {
|
Window::Window(int width, int height, const char* title) {
|
||||||
@ -69,7 +68,7 @@ void Window::setFullscreen(int width, int height, int refreshRate, GLFWmonitor*
|
|||||||
|
|
||||||
void Window::setWindowed() {
|
void Window::setWindowed() {
|
||||||
is_fullscreen = false;
|
is_fullscreen = false;
|
||||||
glfwSetWindowMonitor(glfw_window, NULL, windowed_mode_x, windowed_mode_y, width, height, NULL);
|
glfwSetWindowMonitor(glfw_window, NULL, windowed_mode_x, windowed_mode_y, width, height, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Window::setWindowedFullscreen() {
|
void Window::setWindowedFullscreen() {
|
||||||
|
@ -1,5 +1,4 @@
|
|||||||
#define GLFW_INCLUDE_NONE
|
#define GLFW_INCLUDE_NONE
|
||||||
#include <iostream>
|
|
||||||
#include <GLFW/glfw3.h>
|
#include <GLFW/glfw3.h>
|
||||||
#include "Window.h"
|
#include "Window.h"
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
@ -9,8 +8,6 @@
|
|||||||
#include <spdlog/spdlog.h>
|
#include <spdlog/spdlog.h>
|
||||||
#include <spdlog/sinks/stdout_color_sinks.h>
|
#include <spdlog/sinks/stdout_color_sinks.h>
|
||||||
#include <spdlog/sinks/basic_file_sink.h>
|
#include <spdlog/sinks/basic_file_sink.h>
|
||||||
#include <memory>
|
|
||||||
#include <chrono>
|
|
||||||
#include "Square.h"
|
#include "Square.h"
|
||||||
#include "deff.h"
|
#include "deff.h"
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -4,6 +4,7 @@ file(GLOB 2dGameProject_SRC
|
|||||||
"2dGameProject/*.h"
|
"2dGameProject/*.h"
|
||||||
"2dGameProject/*.cpp"
|
"2dGameProject/*.cpp"
|
||||||
)
|
)
|
||||||
|
set(OpenGL_GL_PREFERENCE GLVND)
|
||||||
find_package(OpenGL REQUIRED)
|
find_package(OpenGL REQUIRED)
|
||||||
add_subdirectory(deps/glfw)
|
add_subdirectory(deps/glfw)
|
||||||
add_subdirectory(deps/glad)
|
add_subdirectory(deps/glad)
|
||||||
|
Reference in New Issue
Block a user