First commit

EnglishEducator.sln

@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2010
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "EnglishEducator", "EnglishEducator\EnglishEducator.vcxproj", "{7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}"
+EndProject
+Global
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|x64 = Debug|x64
+ Debug|x86 = Debug|x86
+ Release|x64 = Release|x64
+ Release|x86 = Release|x86
+ EndGlobalSection
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Debug|x64.ActiveCfg = Debug|x64
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Debug|x64.Build.0 = Debug|x64
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Debug|x86.ActiveCfg = Debug|Win32
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Debug|x86.Build.0 = Debug|Win32
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Release|x64.ActiveCfg = Release|x64
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Release|x64.Build.0 = Release|x64
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Release|x86.ActiveCfg = Release|Win32
+ {7E86CA02-8999-4B76-BD2D-2B5ED8CA008E}.Release|x86.Build.0 = Release|Win32
+ EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
+ GlobalSection(ExtensibilityGlobals) = postSolution
+ SolutionGuid = {E7A7EE05-632C-4CD3-8B81-6B22D76E83D5}
+ EndGlobalSection
+EndGlobal

EnglishEducator/AssetManager.cpp

@@ -0,0 +1,35 @@
+#include "stdafx.h"
+#include "AssetManager.h"
+
+namespace EnglishEducator
+{
+ void AssetManager::LoadTexture(std::string name, std::string fileName)
+ {
+ sf::Texture tex;
+
+ if (tex.loadFromFile(fileName))
+ {
+ this->_textures[name] = tex;
+ }
+ }
+
+ sf::Texture &AssetManager::GetTexture(std::string name)
+ {
+ return this->_textures.at(name);
+ }
+
+ void AssetManager::LoadFont(std::string name, std::string fileName)
+ {
+ sf::Font font;
+
+ if (font.loadFromFile(fileName))
+ {
+ this->_fonts[name] = font;
+ }
+ }
+
+ sf::Font &AssetManager::GetFont(std::string name)
+ {
+ return this->_fonts.at(name);
+ }
+}

EnglishEducator/AssetManager.h

@@ -0,0 +1,27 @@
+#pragma once
+
+#include <map>
+
+#include <SFML/Graphics.hpp>
+
+namespace EnglishEducator 
+{
+ class AssetManager
+ {
+ public:
+ AssetManager() {}
+ ~AssetManager() {}
+
+ void LoadTexture(std::string name, std::string fileName);
+ sf::Texture &GetTexture(std::string name);
+
+ void LoadFont(std::string name, std::string fileName);
+ sf::Font &GetFont(std::string name);
+
+ private:
+ std::map<std::string, sf::Texture> _textures;
+ std::map<std::string, sf::Font> _fonts;
+ };
+}
+
+

EnglishEducator/DEFINITIONS.h

@@ -0,0 +1,85 @@
+#pragma once
+
+#define SCREEN_WIDTH 1200
+#define SCREEN_HEIGHT 800
+
+#define SPLASH_STATE_SHOW_TIME 7.5
+#define TEXT_APPEARANCE_TIME 100
+#define BACKGROUND_CHANGE_TIME 100
+
+#define SPLASH_SCENE_BACKGROUND_FILEPATH "Resources/res/Splash Background.png"
+#define MAIN_MENU_BACKGROUND_FILEPATH "Resources/res/Menu/Main Menu Background.png"
+#define GAME_BACKGROUND_FILEPATH "Resources/res/Menu/Gameplay_Background.png"
+
+// Main Menu Buttons
+#define GAME_TITLE_FILEPATH "Resources/res/title.png"
+#define PLAY_BUTTON_FILEPATH "Resources/res/Menu/Play.png"
+#define QUIT_BUTTON_FILEPATH "Resources/res/Menu/Quit.png"
+
+// Start Menu Background and Buttons
+#define START_MENU_BUTTON_BACKGROUND_FILEPATH "Resources/res/Menu/Main Menu Sprite Background.png"
+#define START_MENU_GRAMMAR_BUTTON_FILEPATH "Resources/res/Menu/Start Menu/GrammarExercises.png"
+#define START_MENU_VOCABULARY_BUTTON_FILEPATH "Resources/res/Menu/Start Menu/VocabularyExercises.png"
+#define START_MENU_OLYMPIAD_BUTTON_FILEPATH "Resources/res/Menu/Start Menu/Olympiad.png"
+
+#define LAND_FILEPATH "Resources/res/Land.png"
+
+#define STICK_FRAME_1_FILEPATH "Resources/res/Characters/Main-1.png"
+#define STICK_FRAME_2_FILEPATH "Resources/res/Characters/Main-2.png"
+#define STICK_FRAME_3_FILEPATH "Resources/res/Characters/Main-3.png"
+#define STICK_FRAME_4_FILEPATH "Resources/res/Characters/Main-4.png"
+
+// Teacher Frames
+#define TEACHER_FRAME_1_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker1.png"
+#define TEACHER_FRAME_2_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker2.png"
+#define TEACHER_FRAME_3_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker3.png"
+#define TEACHER_FRAME_4_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker4.png"
+#define TEACHER_FRAME_5_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker5.png"
+#define TEACHER_FRAME_6_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker6.png"
+#define TEACHER_FRAME_7_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker7.png"
+#define TEACHER_FRAME_8_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker8.png"
+#define TEACHER_FRAME_9_FILEPATH "Resources/res/Characters/EllenBaker/EllenBaker9.png"
+#define TEXT_BOX_FILEPATH "Resources/res/Characters/EllenBaker/Text Box.png"
+
+// Topic Sprites
+#define SIMPLE_PRESENT_FILEPATH "Resources/res/Characters/EllenBaker/Topics/Simple Present.png"
+#define SIMPLE_PRESENT_2_FILEPATH "Resources/res/Characters/EllenBaker/Topics/Simple Present 2.png"
+#define SIMPLE_PAST_FILEPATH "Resources/res/Characters/EllenBaker/Topics/Simple Past.png"
+#define SIMPLE_PAST_2_FILEPATH "Resources/res/Characters/EllenBaker/Topics/Simple Past 2.png"
+#define SIMPLE_FUTURE_FILEPATH "Resources/res/Characters/EllenBaker/Topics/Simple Future.png"
+#define FUTURE_CONTINUOUS_FILEPATH "Resources/res/Characters/EllenBaker/Topics/Future Continuous.png"
+
+// Random Sprites
+#define ANSWER_TEXTURE_FILEPATH "Resources/res/QandA/Answer.png"
+
+#define TEACHER_ANIMATION_DURATION 0.20
+
+// Fonts
+#define FLAPPY_FONT_FILEPATH "Resources/fonts/FlappyFont.ttf"
+#define KGHAPPY_FONT_FILEPATH "Resources/fonts/KGHAPPY.ttf"
+#define WUNDERLAND_FONT_FILEPATH "Resources/fonts/Im Wunderland Italic.otf"
+#define SUGAR_FONT_FILEPATH "Resources/fonts/No Added Sugar.otf"
+
+#define ANSWER_CHARACTER_SIZE 24
+
+#define MAIN_CHARACTER_STATE_STILL 1
+#define MAIN_CHARACTER_STATE_WALKING 2
+#define MAIN_CHARACTER_STATE_RUNNING 3
+
+enum GrammarStates
+{
+ eNone,
+ eSimplePresent,
+ eSimplePresent2,
+ eSimplePast,
+ eSimplePast2,
+ eSimpleFuture,
+ eFutureContinuous
+};
+
+enum GameStates
+{
+ eReady,
+ ePlaying,
+ eGameOver
+};

EnglishEducator/Debug/EnglishEducator.Build.CppClean.log

@@ -0,0 +1,42 @@
+c:\users\dell\source\repos\sonar\sonar\debug\vc141.pdb
+c:\users\dell\source\repos\sonar\sonar\debug\vc141.idb
+c:\users\dell\source\repos\sonar\sonar\debug\land.obj
+c:\users\dell\source\repos\sonar\sonar\debug\pipe.obj
+c:\users\dell\source\repos\sonar\sonar\debug\collision.obj
+c:\users\dell\source\repos\game\sonar\debug\sonar.pch
+c:\users\dell\source\repos\game\sonar\debug\vc141.pdb
+c:\users\dell\source\repos\game\sonar\debug\vc141.idb
+c:\users\dell\source\repos\game\sonar\debug\stdafx.obj
+c:\users\dell\source\repos\game\sonar\debug\assetmanager.obj
+c:\users\dell\source\repos\game\sonar\debug\ellenbaker.obj
+c:\users\dell\source\repos\game\sonar\debug\game.obj
+c:\users\dell\source\repos\game\sonar\debug\gameplaystartmenu.obj
+c:\users\dell\source\repos\game\sonar\debug\gamestate.obj
+c:\users\dell\source\repos\game\sonar\debug\grammarstate.obj
+c:\users\dell\source\repos\game\sonar\debug\inputmanager.obj
+c:\users\dell\source\repos\game\sonar\debug\mainmenustate.obj
+c:\users\dell\source\repos\game\sonar\debug\qanda.obj
+c:\users\dell\source\repos\game\sonar\debug\englisheducator.obj
+c:\users\dell\source\repos\game\sonar\debug\splashstate.obj
+c:\users\dell\source\repos\game\sonar\debug\statemachine.obj
+c:\users\dell\source\repos\sonar\debug\sonar.exe
+c:\users\dell\source\repos\sonar\debug\sonar.ilk
+c:\users\dell\source\repos\sonar\debug\sonar.pdb
+c:\users\dell\source\repos\game\debug\sonar.exe
+c:\users\dell\source\repos\game\debug\sonar.ilk
+c:\users\dell\source\repos\game\debug\sonar.pdb
+c:\users\dell\source\repos\game\sonar\debug\bird.obj
+c:\users\dell\source\repos\game\sonar\debug\collision.obj
+c:\users\dell\source\repos\game\sonar\debug\flash.obj
+c:\users\dell\source\repos\game\sonar\debug\gameoverstate.obj
+c:\users\dell\source\repos\game\sonar\debug\hud.obj
+c:\users\dell\source\repos\game\sonar\debug\land.obj
+c:\users\dell\source\repos\game\sonar\debug\maincharacter.obj
+c:\users\dell\source\repos\game\sonar\debug\pipe.obj
+c:\users\dell\source\repos\game\sonar\debug\sonar.obj
+c:\users\dell\source\repos\game\sonar\debug\sonar.tlog\cl.command.1.tlog
+c:\users\dell\source\repos\game\sonar\debug\sonar.tlog\cl.read.1.tlog
+c:\users\dell\source\repos\game\sonar\debug\sonar.tlog\cl.write.1.tlog
+c:\users\dell\source\repos\game\sonar\debug\sonar.tlog\link.command.1.tlog
+c:\users\dell\source\repos\game\sonar\debug\sonar.tlog\link.read.1.tlog
+c:\users\dell\source\repos\game\sonar\debug\sonar.tlog\link.write.1.tlog

EnglishEducator/Debug/EnglishEducator.log

@@ -0,0 +1,39 @@
+ stdafx.cpp
+ StateMachine.cpp
+ SplashState.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\englisheducator\splashstate.cpp(34): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\splashstate.cpp(33): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\splashstate.cpp(63): warning C4244: '+=': conversion from 'float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\splashstate.cpp(78): warning C4244: '-=': conversion from 'float' to 'int', possible loss of data
+ EnglishEducator.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ QandA.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ MainMenuState.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ InputManager.cpp
+c:\users\dell\source\repos\game\englisheducator\inputmanager.cpp(15): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\inputmanager.cpp(14): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\inputmanager.cpp(13): warning C4244: 'argument': conversion from 'const float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\inputmanager.cpp(12): warning C4244: 'argument': conversion from 'const float' to 'int', possible loss of data
+ GrammarState.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ GameState.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ GamePlayStartMenu.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\englisheducator\gameplaystartmenu.cpp(23): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\gameplaystartmenu.cpp(29): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
+ Game.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\englisheducator\game.cpp(10): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
+ EllenBaker.cpp
+c:\users\dell\source\repos\game\englisheducator\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\englisheducator\ellenbaker.cpp(54): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\ellenbaker.cpp(53): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\ellenbaker.cpp(63): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\englisheducator\ellenbaker.cpp(62): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+ AssetManager.cpp
+ Generating Code...
+ EnglishEducator.vcxproj -> C:\Users\Dell\source\repos\Game\Debug\EnglishEducator.exe

EnglishEducator/Debug/EnglishEducator.tlog/EnglishEducator.lastbuildstate

@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v141:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0.16299.0
+Debug|Win32|C:\Users\Dell\source\repos\Game\|

EnglishEducator/Debug/Sonar.log

@@ -0,0 +1,39 @@
+ stdafx.cpp
+ StateMachine.cpp
+ SplashState.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\sonar\splashstate.cpp(34): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\sonar\splashstate.cpp(33): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\sonar\splashstate.cpp(63): warning C4244: '+=': conversion from 'float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\sonar\splashstate.cpp(78): warning C4244: '-=': conversion from 'float' to 'int', possible loss of data
+ EnglishEducator.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ QandA.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ MainMenuState.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ InputManager.cpp
+c:\users\dell\source\repos\game\sonar\inputmanager.cpp(15): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\sonar\inputmanager.cpp(14): warning C4244: 'argument': conversion from 'float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\sonar\inputmanager.cpp(13): warning C4244: 'argument': conversion from 'const float' to 'int', possible loss of data
+c:\users\dell\source\repos\game\sonar\inputmanager.cpp(12): warning C4244: 'argument': conversion from 'const float' to 'int', possible loss of data
+ GrammarState.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ GameState.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+ GamePlayStartMenu.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\sonar\gameplaystartmenu.cpp(23): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
+c:\users\dell\source\repos\game\sonar\gameplaystartmenu.cpp(29): warning C4244: 'argument': conversion from 'double' to 'float', possible loss of data
+ Game.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\sonar\game.cpp(10): warning C4244: 'argument': conversion from 'time_t' to 'unsigned int', possible loss of data
+ EllenBaker.cpp
+c:\users\dell\source\repos\game\sonar\game.h(28): warning C4305: 'initializing': truncation from 'double' to 'const float'
+c:\users\dell\source\repos\game\sonar\ellenbaker.cpp(54): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\sonar\ellenbaker.cpp(53): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\sonar\ellenbaker.cpp(63): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+c:\users\dell\source\repos\game\sonar\ellenbaker.cpp(62): warning C4244: 'argument': conversion from 'unsigned int' to 'float', possible loss of data
+ AssetManager.cpp
+ Generating Code...
+ Sonar.vcxproj -> C:\Users\Dell\source\repos\Game\Debug\EnglishEducator.exe