From b87943ca0ddd70780588ae326a4f71fc1655418d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julian=20Nie=C3=9Fner?= <julian.niessner@rismer.de>
Date: Sun, 6 May 2018 12:51:31 +0200
Subject: [PATCH] Renamed gamefiles

---
 src/{Reassembly2.cpp => DarkRP2D.cpp} | 29 ++++++++-------------------
 src/{Reassembly2.h => DarkRP2D.h}     |  9 +++------
 src/DesktopLauncher.cpp               |  4 ++--
 3 files changed, 13 insertions(+), 29 deletions(-)
 rename src/{Reassembly2.cpp => DarkRP2D.cpp} (69%)
 mode change 100755 => 100644
 rename src/{Reassembly2.h => DarkRP2D.h} (77%)
 mode change 100755 => 100644

diff --git a/src/Reassembly2.cpp b/src/DarkRP2D.cpp
old mode 100755
new mode 100644
similarity index 69%
rename from src/Reassembly2.cpp
rename to src/DarkRP2D.cpp
index c92c9f2..695d3aa
--- a/src/Reassembly2.cpp
+++ b/src/DarkRP2D.cpp
@@ -1,19 +1,16 @@
-#include "Reassembly2.h"
+#include "DarkRP2D.h"
 
 #include <GL/gl.h>
 #include <iostream>
 
-Reassembly2::~Reassembly2() {
+DarkRP2D::~DarkRP2D() {
 	std::cout << "Game got destroyed!" << std::endl;
 	delete assets;
 	delete obj;
 	delete inputHandler;
-	for(unsigned int i = 0; i<rainDrops.size();i++) {
-		delete rainDrops[i];
-	}
 }
 
-void Reassembly2::create () {
+void DarkRP2D::create () {
 	std::cout << "Hello World!" << std::endl;
 	assets = new Assets();
 	assets->loadTexture("bucket.png",false,"bucket");
@@ -26,10 +23,9 @@ void Reassembly2::create () {
 	font = new BitmapFont("arial.ttf");
 
 	glClearColor(1.f,1.f,1.f,1.f);
-	spawnRainDrop();
 }
 
-void Reassembly2::loop(SDL_Event *event, unsigned int delta) {
+void DarkRP2D::loop(SDL_Event *event, unsigned int delta) {
 	static unsigned int accumulator = 0, ups = 0, fps = 0, acc = 0;
 	accumulator += delta;
 	acc += delta;
@@ -50,11 +46,11 @@ void Reassembly2::loop(SDL_Event *event, unsigned int delta) {
 	fps++;
 }
 
-void Reassembly2::update(SDL_Event *event, unsigned int delta) {
+void DarkRP2D::update(SDL_Event *event, unsigned int delta) {
 	inputHandler->handleInput(event);
 }
 
-void Reassembly2::render(unsigned int delta) {
+void DarkRP2D::render(unsigned int delta) {
 	glClear(GL_COLOR_BUFFER_BIT);
 
 	//Drawing
@@ -70,14 +66,5 @@ void Reassembly2::render(unsigned int delta) {
 	SDL_GL_SwapWindow(gWindow);
 }
 
-void Reassembly2::resize(int width, int height){
-}
-
-void Reassembly2::spawnRainDrop() {
-	SDL_Rect *rainDrop = new SDL_Rect;
-	rainDrop->x = 100;
-	rainDrop->y = 100;
-	rainDrop->w = 64;
-	rainDrop->h= 64;
-	rainDrops.push_back(rainDrop);
-}
+void DarkRP2D::resize(int width, int height){
+}
\ No newline at end of file
diff --git a/src/Reassembly2.h b/src/DarkRP2D.h
old mode 100755
new mode 100644
similarity index 77%
rename from src/Reassembly2.h
rename to src/DarkRP2D.h
index 670294b..97c574c
--- a/src/Reassembly2.h
+++ b/src/DarkRP2D.h
@@ -9,21 +9,18 @@ class Reassembly2;
 #include "InputHandler.h"
 #include "BitmapFont.h"
 
-class Reassembly2 {
+class DarkRP2D {
 	private:
 	SDL_Window* gWindow;
-	std::vector<SDL_Rect*> rainDrops;
 	Assets *assets;
 	GameObject *obj;
 	InputHandler *inputHandler;
 	BitmapFont *font;
 
-	void spawnRainDrop();
-
 	public:
 
-	Reassembly2(SDL_Window *gWindow) : gWindow(gWindow) {}
-	~Reassembly2();
+	DarkRP2D(SDL_Window *gWindow) : gWindow(gWindow) {}
+	~DarkRP2D();
 	void create ();
 	void loop(SDL_Event *event, unsigned int delta);
 	void update(SDL_Event *event, unsigned int delta);
diff --git a/src/DesktopLauncher.cpp b/src/DesktopLauncher.cpp
index 3d3ee51..b7c4599 100755
--- a/src/DesktopLauncher.cpp
+++ b/src/DesktopLauncher.cpp
@@ -4,7 +4,7 @@
 #include <SDL_image.h>
 #include <GL/glew.h>
 
-#include "Reassembly2.h"
+#include "DarkRP2D.h"
 
 using namespace std;
 
@@ -26,7 +26,7 @@ int main(int argc, char *argv[]) {
 	//While application is running
 	bool quit = false;
 	SDL_Event e;
-	Reassembly2 resA(gWindow);
+	DarkRP2D resA(gWindow);
 	resA.create();
 	unsigned int lastTime = SDL_GetTicks(), currentTime, elapsedTime;
 	while( !quit ) {