all but drop command

src/GameOver.cpp

@@ -0,0 +1,28 @@
+#include "GameOver.h"
+
+GameOver::GameOver() {
+}
+
+void GameOver::setup() {
+
+}
+
+void GameOver::update() {
+
+}
+
+void GameOver::draw() {
+	ofApp::game.draw();
+	ofPushStyle();
+	ofSetColor(0, 255, 0);
+	ofDrawBitmapString("Restart: F1", 210, ofGetHeight() - 50);
+	ofPopStyle();
+}
+
+void GameOver::inputKey(int key) {
+	if (key == OF_KEY_F1) {
+		State::setState(&ofApp::game);
+		State::getState()->setup();
+		return;
+	}
+};

src/GameOver.h

@@ -1,33 +1,23 @@
 #pragma once
 
-#include "State.h"
-#include "game.h"
 
+//#include "game.h"
+#include "ofApp.h"
+#include "State.h"
 
 class GameOver : public State {
 
-
 public:
-
-
-	GameOver() {
-
-	}
-
 
-	void setup() {
+	GameOver();
 
-	}
+	void setup();
 
-	void update() {
+	void update();
 
-	}
+	void draw();
 
-	void draw() {
-		ofSetColor(255);
-		ofDrawBitmapString("game over: ENTER to restart", 6, 12);
-	}
+	void inputKey(int key);
 
-	void inputKey(int key) {};
+};
 
-};

src/GamePause.cpp

@@ -0,0 +1,27 @@
+#include "GamePause.h"
+
+GamePause::GamePause() {
+}
+
+void GamePause::setup() {
+
+}
+
+void GamePause::update() {
+
+}
+
+void GamePause::draw() {
+	ofApp::game.draw();
+	ofPushStyle();
+	ofSetColor(255, 0, 0);
+	ofDrawBitmapString("Resume: 'p'", 210, ofGetHeight()-50);
+	ofPopStyle();
+}
+
+void GamePause::inputKey(int key) {
+	if (key == 'p') {
+		State::setState(&ofApp::game);
+		return;
+	}
+};

src/GamePause.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include "State.h"
+#include "ofApp.h"
+
+
+// the start screen
+class GamePause : public State {
+
+public:
+
+	GamePause();
+
+	void setup();
+
+	void update();
+
+	void draw();
+
+	void inputKey(int key);
+};

src/GameStart.cpp

@@ -0,0 +1,39 @@
+#include "GameStart.h"
+
+ GameStart::GameStart() {
+
+}
+
+void GameStart::setup() {
+	ofBackground(255);
+}
+
+void GameStart::update() {
+
+}
+
+void GameStart::draw() {
+
+	ofBackground(100,100,200);
+
+	ofSetColor(200, 200, 0);
+
+	ofDrawBitmapString("C++ Tetris Game", 40, 50);
+	ofSetColor(255, 255, 0);
+	ofDrawBitmapString("LEFT and RIGHT for horizontal movement.", 30, 100);
+	ofDrawBitmapString("DOWN to move down quickly,", 30, 120);
+	ofDrawBitmapString("UP arrow for rotations.", 30, 140);
+	ofDrawBitmapString("SPACE for dropping down.", 30, 160);
+	ofDrawBitmapString("Pressing 'q' quits the game.", 30, 180);
+	ofDrawBitmapString("Pressing 'p' pauses the game.", 30, 200);
+	ofDrawBitmapString("Enter to start the game", 30, 250);
+}
+
+void GameStart::inputKey(int key) {
+
+	if (key == OF_KEY_RETURN) {
+		State::setState(&ofApp::game);
+		State::getState()->setup();
+		return;
+	}
+}

src/GameStart.h

@@ -2,45 +2,21 @@
 
 
 #include "State.h"
-#include "game.h"
+#include "ofApp.h"
+
 
 // the start screen
 class GameStart : public State {
 
-private:
-
-
 public:
 
+	GameStart();
 
-	GameStart() {
-
-	}
-
-	void setup() {
-		ofBackground(255);
-	}
-
-	void update() {
-
-	}
-
-	void draw() {
-		ofSetColor(0);
-		ofDrawBitmapString("start: click to begin", 6, 12);
+	void setup();
 
-		//game.displayGrid();
-		//game.displaySideBoard();
-		ofSetColor(255, 100, 100);
+	void update();
 
-		ofDrawBitmapString("LEFT and RIGHT for horizontal movement.", 30, 100);
-		ofDrawBitmapString("DOWN to move down quickly,", 30, 120);
-		ofDrawBitmapString("UP arrow for rotations.", 30, 140);
-		ofDrawBitmapString("SPACE for dropping down.", 30, 160);
-		ofDrawBitmapString("Pressing 'q' quits the game.", 30, 180);
-		ofDrawBitmapString("Pressing 'p' pauses the game.", 30, 200);
-		ofDrawBitmapString("Enter to start the game", 30, 250);
-	}
+	void draw();
 
-	void inputKey(int key) {};
+	void inputKey(int key);
 };

src/State.h

@@ -1,8 +1,7 @@
 #pragma once
-// credit  : https://github.com/danomatika/CreativeCodingExamples/blob/master/GameState/src/State.h
 #include "ofMain.h"
 
-
+// credit  : https://github.com/danomatika/CreativeCodingExamples/blob/master/GameState/src/State.h
 // a base game state class,
 // kind of like a mini Sketch
 //
@@ -11,7 +10,7 @@
 class State {
 
 public:
-	
+
 private:
 	static State* currentState;
 
@@ -28,5 +27,6 @@ class State {
 	virtual void update() = 0;
 
 	virtual void draw() = 0;
+
 	virtual void inputKey(int key) = 0;
 };

src/game.cpp

@@ -116,7 +116,7 @@ void Game::removeLine(float row) {
 void Game::checkGameOver() {
     for (const auto& obj : lines) {
         if (obj.y < 60) {
-            State::setState(ofApp::gameOver);
+            State::setState(&ofApp::gameOver);
             State::getState()->setup();
             return;
         }
@@ -160,6 +160,11 @@ void Game::inputKey(int key) {
 
     float x, y;
 
+    if (key == 'p') {
+        State::setState(&ofApp::gamePause);
+        return;
+    }
+
     if (key == OF_KEY_RIGHT) {
         x = shape.getXoffset();
         if (x < ofGetWidth() - 100 - 20 * shape.getNbX()) shape.move(20, 0);

src/game.h

@@ -3,7 +3,8 @@
 #include "State.h"
 #include "ofMain.h"
 #include "shape.h"
-#include "GameOver.h"
+//#include "GameOver.h"
+
 
 class Game : public State {
 

src/ofApp.cpp

@@ -1,12 +1,13 @@
 #include "ofApp.h"
 
+State& ofApp::gameStart=GameStart();
 
-/*State* ofApp::gameStart= new GameStart();
-State* ofApp::gameOver= new GameOver();
-State* ofApp::game = new Game();
-*/
+State& ofApp::game=Game();
+
+State& ofApp::gameOver = GameOver();
+
+State& ofApp::gamePause = GamePause();
 
-State* ofApp::gameOver = new GameOver();
 
 //--------------------------------------------------------------
 void ofApp::setup() {
@@ -19,7 +20,7 @@ void ofApp::setup() {
 
 	ofSetFrameRate(60);
 
-	State::setState(gameStart);
+	State::setState(&gameStart);
 
 	State::getState()->setup(); 
 }
@@ -32,22 +33,15 @@ void ofApp::draw() {
 //----------------------------------
 void ofApp::update() {		
 	State::getState()->update();
-
 }
 
 
 //--------------------------------------------------------------
-void ofApp::keyPressed(int key) {
+void ofApp::keyPressed(int key) {  
 
-	if (State::getState() == game) {
-		State::getState()->inputKey(key);
-		return;
-	}
+	if (key == 'q') ofExit();
 
-	if (key == OF_KEY_RETURN) {
-		State::setState(game); 
-		State::getState()->setup();
-	}
+	State::getState()->inputKey(key);
 }
 
 //--------------------------------------------------------------

src/ofApp.h

@@ -4,7 +4,7 @@
 #include "GameStart.h"
 #include "Game.h"
 #include "GameOver.h"
-//#include "GamePlaying.h"
+#include "GamePause.h"
 
 class ofApp : public ofBaseApp {
 
@@ -26,11 +26,9 @@ class ofApp : public ofBaseApp {
 	void dragEvent(ofDragInfo dragInfo);
 	void gotMessage(ofMessage msg);
 
-
-	State* gameStart=new GameStart();
-	static State* gameOver;
-	State* game=new Game();
-
-
+	static State& game;
+	static State& gameStart;
+	static State& gameOver;
+	static State& gamePause;
 
 };

tetris-game-v2.vcxproj

@@ -181,14 +181,19 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="src\game.cpp" />
+    <ClCompile Include="src\GameOver.cpp" />
+    <ClCompile Include="src\GamePause.cpp" />
+    <ClCompile Include="src\GameStart.cpp" />
     <ClCompile Include="src\main.cpp" />
     <ClCompile Include="src\ofApp.cpp" />
     <ClCompile Include="src\shape.cpp" />
     <ClCompile Include="src\State.cpp" />
   </ItemGroup>
   <ItemGroup>
+    <ClInclude Include="..\tetris-game-v2\src\ofApp.h" />
     <ClInclude Include="src\game.h" />
     <ClInclude Include="src\GameOver.h" />
+    <ClInclude Include="src\GamePause.h" />
     <ClInclude Include="src\GameStart.h" />
     <ClInclude Include="src\ofApp.h" />
     <ClInclude Include="src\shape.h" />