From 3c716decdd7a286ed7a935c3adddf926c5c0548e Mon Sep 17 00:00:00 2001 From: Andreas Ortmann Date: Tue, 27 Sep 2016 19:01:21 +0200 Subject: [PATCH] renamed --- game/CMakeLists.txt | 9 +- game/config.cpp | 2 - game/config.h | 33 ------- game/{game_window.h => game_window.hpp} | 4 +- game/glclasses.cpp | 2 +- game/{glclasses.h => glclasses.hpp} | 0 game/main.cpp | 6 +- game/opengl.cpp | 2 +- game/{opengl.h => opengl.hpp} | 0 game/renderer.cpp | 2 +- game/{renderer.h => renderer.hpp} | 2 +- game/simulation.cpp | 2 - game/simulation.h | 50 ----------- ...{triangle_window.h => triangle_window.hpp} | 2 +- game/vector.h | 90 ------------------- 15 files changed, 13 insertions(+), 193 deletions(-) delete mode 100644 game/config.cpp delete mode 100644 game/config.h rename game/{game_window.h => game_window.hpp} (98%) rename game/{glclasses.h => glclasses.hpp} (100%) rename game/{opengl.h => opengl.hpp} (100%) rename game/{renderer.h => renderer.hpp} (93%) delete mode 100644 game/simulation.cpp delete mode 100644 game/simulation.h rename game/{triangle_window.h => triangle_window.hpp} (97%) delete mode 100644 game/vector.h diff --git a/game/CMakeLists.txt b/game/CMakeLists.txt index 05fc7d1..c157538 100644 --- a/game/CMakeLists.txt +++ b/game/CMakeLists.txt @@ -24,12 +24,9 @@ set(GAME_SRC ) set(GAME_HEADERS - opengl.h - glclasses.h - vector.h - config.h - simulation.h - renderer.h + opengl.hpp + glclasses.hpp + renderer.hpp ) include_directories(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/game/config.cpp b/game/config.cpp deleted file mode 100644 index 968f9d4..0000000 --- a/game/config.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "config.h" - diff --git a/game/config.h b/game/config.h deleted file mode 100644 index aacc673..0000000 --- a/game/config.h +++ /dev/null @@ -1,33 +0,0 @@ -#pragma once - -struct Config { - int maxPlayers; - int numPlanets; - int maxSegments; - int segmentSteps; - int numShots; - int fastmode; - int fullscreen; - int timeout; - int margintop; - int marginleft; - int marginright; - int marginbottom; - double playerSize; - int energy; - int realtime; - int debug; - double battlefieldW; - double battlefieldH; - int throttle; - char* ip; - char* message; - int pot; - int area; -}; - -class ConfigParser{ - private: - protected: - public: -}; diff --git a/game/game_window.h b/game/game_window.hpp similarity index 98% rename from game/game_window.h rename to game/game_window.hpp index a5659a5..b3072ce 100644 --- a/game/game_window.h +++ b/game/game_window.hpp @@ -1,7 +1,7 @@ #pragma once -#include "opengl.h" -#include "renderer.h" +#include "opengl.hpp" +#include "renderer.hpp" #include "game.hpp" diff --git a/game/glclasses.cpp b/game/glclasses.cpp index 4746bbd..2d6e618 100644 --- a/game/glclasses.cpp +++ b/game/glclasses.cpp @@ -1,4 +1,4 @@ -#include "glclasses.h" +#include "glclasses.hpp" endofthejedi::VAO::VAO() { glGenVertexArrays(1, &m_name); } diff --git a/game/glclasses.h b/game/glclasses.hpp similarity index 100% rename from game/glclasses.h rename to game/glclasses.hpp diff --git a/game/main.cpp b/game/main.cpp index a63380e..5714cc3 100644 --- a/game/main.cpp +++ b/game/main.cpp @@ -1,8 +1,8 @@ -#include "opengl.h" +#include "opengl.hpp" + #include -//#include "triangle_window.h" -#include "game_window.h" +#include "game_window.hpp" int main(int argc, const char *argv[]) { GameWindow window(500, 500); diff --git a/game/opengl.cpp b/game/opengl.cpp index ecf3336..7eecce7 100644 --- a/game/opengl.cpp +++ b/game/opengl.cpp @@ -1,4 +1,4 @@ -#include "opengl.h" +#include "opengl.hpp" #include #include diff --git a/game/opengl.h b/game/opengl.hpp similarity index 100% rename from game/opengl.h rename to game/opengl.hpp diff --git a/game/renderer.cpp b/game/renderer.cpp index 93b4dc0..862b9f3 100644 --- a/game/renderer.cpp +++ b/game/renderer.cpp @@ -1,4 +1,4 @@ -#include "renderer.h" +#include "renderer.hpp" endofthejedi::Renderer::Renderer() { diff --git a/game/renderer.h b/game/renderer.hpp similarity index 93% rename from game/renderer.h rename to game/renderer.hpp index 53a4058..387d606 100644 --- a/game/renderer.h +++ b/game/renderer.hpp @@ -5,7 +5,7 @@ #include #include -#include "glclasses.h" +#include "glclasses.hpp" namespace endofthejedi { diff --git a/game/simulation.cpp b/game/simulation.cpp deleted file mode 100644 index 54776d1..0000000 --- a/game/simulation.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "simulation.h" - diff --git a/game/simulation.h b/game/simulation.h deleted file mode 100644 index bba7992..0000000 --- a/game/simulation.h +++ /dev/null @@ -1,50 +0,0 @@ -#pragma once - -#include "vector.h" - -typedef struct -{ - Vec2d position; - Vec2d speed; - int live; - int leftSource; - int stale; -} SimMissile; - -typedef struct -{ - Vec2d* dot; - SimMissile missile; - int length; - int player; - double angle; - double velocity; -} SimShot; - -typedef struct -{ - SimShot* shot; - int currentShot; - Vec2d position; - double angle; - double velocity; - double energy; - double oldVelocity; - int watch; - int deaths; - int kills; - int shots; - int active; - int valid; - int didShoot; - int timeout; - int timeoutcnt; - char name[16]; -} SimPlayer; - -typedef struct -{ - Vec2d position; - double radius; - double mass; -} SimPlanet; diff --git a/game/triangle_window.h b/game/triangle_window.hpp similarity index 97% rename from game/triangle_window.h rename to game/triangle_window.hpp index 84a0636..e35d2e4 100644 --- a/game/triangle_window.h +++ b/game/triangle_window.hpp @@ -1,6 +1,6 @@ #pragma once -#include "opengl.h" +#include "opengl.hpp" class TriangleWindow : public endofthejedi::GLWindow { private: diff --git a/game/vector.h b/game/vector.h deleted file mode 100644 index 15a2e6c..0000000 --- a/game/vector.h +++ /dev/null @@ -1,90 +0,0 @@ -#pragma once - -#include - -struct Vec2d -{ - double x; - double y; - - double length() { - return sqrt(x*x + y*y); - } - double distance(Vec2d other) { - Vec2d tmp = (*this - other); - return tmp.length(); - } - - Vec2d & operator+=(const Vec2d& rhs) { - x+=rhs.x; - y+=rhs.y; - return *this; - } - Vec2d & operator-=(const Vec2d& rhs) { - x-=rhs.x; - y-=rhs.y; - return *this; - } - Vec2d & operator*=(const double& rhs) { - x*=rhs; - y*=rhs; - return *this; - } - Vec2d & operator/=(const double& rhs) { - x/=rhs; - y/=rhs; - return *this; - } - const Vec2d operator+(const Vec2d& rhs) const { - Vec2d result = *this; - result += rhs; - return result; - } - const Vec2d operator-(const Vec2d& rhs) const { - Vec2d result = *this; - result -= rhs; - return result; - } - const double operator*(const Vec2d& rhs) const { - return (this->x * rhs.x) + (this->y * rhs.y); - } - const Vec2d operator*(const double& rhs) const { - Vec2d result = *this; - result *= rhs; - return result; - } - const Vec2d operator/(const double& rhs) const { - Vec2d result = *this; - result /= rhs; - return result; - } -}; -/* -struct Mat4d { - std::array data; - - const Mat4d operator*(const Mat4d& rhs) const { - Mat4d result; - result[0] = result[0]*rhs[0] + result[1]*result[5] + result[2]*result[9] + result[3]*result[13]; - result[1] = result[0]*rhs[1] + result[1]*result[6] + result[2]*result[10] + result[3]*result[14]; - result[2] = result[0]*rhs[2] + result[1]*result[7] + result[2]*result[11] + result[3]*result[15]; - result[3] = result[0]*rhs[3] + result[1]*result[8] + result[2]*result[12] + result[3]*result[16]; - - result[4] = result[4]*rhs[0] + result[5]*result[5] + result[6]*result[9] + result[7]*result[13]; - result[5] = result[4]*rhs[1] + result[5]*result[6] + result[6]*result[10] + result[7]*result[14]; - result[6] = result[4]*rhs[2] + result[5]*result[7] + result[6]*result[11] + result[7]*result[15]; - result[7] = result[4]*rhs[3] + result[5]*result[8] + result[6]*result[12] + result[7]*result[16]; - - result[8] = result[8]*rhs[0] + result[9]*result[5] + result[10]*result[9] + result[11]*result[13]; - result[9] = result[8]*rhs[1] + result[9]*result[6] + result[10]*result[10] + result[11]*result[14]; - result[10] = result[8]*rhs[2] + result[9]*result[7] + result[10]*result[11] + result[11]*result[15]; - result[11] = result[8]*rhs[3] + result[9]*result[8] + result[10]*result[12] + result[11]*result[16]; - - result[12] = result[12]*rhs[0] + result[13]*result[5] + result[14]*result[9] + result[15]*result[13]; - result[13] = result[12]*rhs[1] + result[13]*result[6] + result[14]*result[10] + result[15]*result[14]; - result[14] = result[12]*rhs[2] + result[13]*result[7] + result[14]*result[11] + result[15]*result[15]; - result[15] = result[12]*rhs[3] + result[13]*result[8] + result[14]*result[12] + result[15]*result[16]; - return result; - } -}; -*/