Removed unnecessary GameWorld
This commit is contained in:
parent
4b5662791f
commit
adc8813e0d
@ -48,8 +48,7 @@ set(SRCS
|
|||||||
"src/Main.cpp"
|
"src/Main.cpp"
|
||||||
"src/Model.cpp"
|
"src/Model.cpp"
|
||||||
"src/Shader.cpp"
|
"src/Shader.cpp"
|
||||||
"src/System.cpp"
|
"src/System.cpp")
|
||||||
"src/GameLogic.cpp")
|
|
||||||
|
|
||||||
# Define C++ compiler flags
|
# Define C++ compiler flags
|
||||||
set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -Wextra -Wpedantic -Wfatal-errors -Werror -pedantic-errors -fno-elide-constructors")
|
set(CMAKE_CXX_FLAGS "-std=c++14 -Wall -Wextra -Wpedantic -Wfatal-errors -Werror -pedantic-errors -fno-elide-constructors")
|
||||||
|
@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright (C) 2018 Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
|
|
||||||
* Author: Ortega Froysa, Nicolás <nortega@themusicinnoise.net>
|
|
||||||
*
|
|
||||||
* This program is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU Affero General Public License as
|
|
||||||
* published by the Free Software Foundation, either version 3 of the
|
|
||||||
* License, or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
* GNU Affero General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU Affero General Public License
|
|
||||||
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#pragma once
|
|
||||||
|
|
||||||
class GameWorld {
|
|
||||||
public:
|
|
||||||
GameWorld();
|
|
||||||
|
|
||||||
private:
|
|
||||||
};
|
|
@ -27,7 +27,6 @@
|
|||||||
#include <GL/glew.h>
|
#include <GL/glew.h>
|
||||||
#include <GL/gl.h>
|
#include <GL/gl.h>
|
||||||
#include "Camera.hpp"
|
#include "Camera.hpp"
|
||||||
#include "GameLogic.hpp"
|
|
||||||
class System {
|
class System {
|
||||||
public:
|
public:
|
||||||
System();
|
System();
|
||||||
@ -48,7 +47,6 @@ private:
|
|||||||
std::map<std::string, Shader> shaders;
|
std::map<std::string, Shader> shaders;
|
||||||
Camera cam;
|
Camera cam;
|
||||||
bool running;
|
bool running;
|
||||||
GameLogic board_ctrl;
|
|
||||||
int CheckWin();
|
int CheckWin();
|
||||||
void handleKey(SDL_Keysym key);
|
void handleKey(SDL_Keysym key);
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user