diff --git a/aStar.sln b/aStar.sln deleted file mode 100644 index c525e8c..0000000 --- a/aStar.sln +++ /dev/null @@ -1,22 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.23107.0 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aStar", "aStar\aStar.vcxproj", "{9035B83C-F117-480E-9DEB-435AA0EBEA3F}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9035B83C-F117-480E-9DEB-435AA0EBEA3F}.Debug|x64.ActiveCfg = Debug|x64 - {9035B83C-F117-480E-9DEB-435AA0EBEA3F}.Debug|x64.Build.0 = Debug|x64 - {9035B83C-F117-480E-9DEB-435AA0EBEA3F}.Release|x64.ActiveCfg = Release|x64 - {9035B83C-F117-480E-9DEB-435AA0EBEA3F}.Release|x64.Build.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/aStar/App.cpp b/aStar/App.cpp deleted file mode 100644 index 8e21ca9..0000000 --- a/aStar/App.cpp +++ /dev/null @@ -1,168 +0,0 @@ -#include "App.h" -#include -#include -#include "Map.h" - - -// ========== Constructors ============= -App::App() { - window = new sf::RenderWindow(sf::VideoMode(WINDOW_WIDTH, WINDOW_HEIGHT), "SFML works!"); -} -App::~App() { } - -// ========== Mutes ============= -void App::Init() { - - // Set up the background texture - background_texture = new sf::Texture(); - background_texture->loadFromFile("background.png"); - - backgroundSprite.setTexture(*background_texture); - - _pixelArray = new sf::Uint8[WINDOW_WIDTH * WINDOW_HEIGHT * 4]; - pixel_array_texture.create(WINDOW_WIDTH, WINDOW_HEIGHT); - - explorer = new Explorer(&map); -} - -void App::Input() { - while (window->pollEvent(event)) { - if (event.type == sf::Event::Closed) - window->close(); - if (event.type == sf::Event::KeyPressed) { - if (event.key.code == sf::Keyboard::Space) { - - } - } - } -} - -void App::Update(double step_size) { - Input(); -} - -void App::Render() { - - - // HOUSEKEEPING - // Get the physics fps for the last render cycle - physics_fps = physics_frame_count * render_fps; - - // Frame time in seconds - frame_time = delta_time * 1000; - - // And the render fps - render_fps = 1000 / frame_time; - - - - // RENDERING - - window->clear(sf::Color::Blue); - window->draw(backgroundSprite); - - sf::Vector2i pos; - for (int i = 0; i < WINDOW_WIDTH * WINDOW_HEIGHT * 4; i++) { - _pixelArray[i] = 0; - } - - // Draw the tiles - for (int x = 0; x < Map::CELLS_WIDTH; x++) { - for (int y = 0; y < Map::CELLS_HEIGHT; y++) { - - pos.x = x; - pos.y = y; - sf::Color thing = map.getTile(pos)->getColor(); - - - for (int x2 = 1; x2 < 5; x2++) { - for (int y2 = 1; y2 < 5; y2++) { - - int pixel_x = (x * 5) + x2; - int pixel_y = (y * 5) + y2; - - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4] = thing.r; // Red - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4 + 1] = thing.g; // Green - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4 + 2] = thing.b; // Blue - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4 + 3] = thing.a; // Alpha - - } - } - } - } - - // Draw the player - - for (int x2 = 1; x2 < 5; x2++) { - for (int y2 = 1; y2 < 5; y2++) { - - int pixel_x = (explorer->getPosition().x * 5) + x2; - int pixel_y = (explorer->getPosition().y * 5) + y2; - - sf::Color color = explorer->getColor(); - - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4] = color.r; // Red - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4 + 1] = color.g; // Green - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4 + 2] = color.b; // Blue - _pixelArray[(pixel_y * WINDOW_WIDTH + pixel_x) * 4 + 3] = color.a; // Alpha - - } - } - - pixel_array_texture.update(_pixelArray); - - pixel_array_sprite.setTexture(pixel_array_texture); - window->draw(pixel_array_sprite); - - window->display(); -} - - -void App::Run() { - Init(); - - while (window->isOpen()) { - // Time since app start - elapsed_time = time(); - - // Time between last frame start and this frame - // 2 seconds = 30 seconds - 28 seconds - delta_time = elapsed_time - current_time; - current_time = elapsed_time; - - // Make sure we aren't taking too big of steps when lagging - if (delta_time > 0.02f) - delta_time = 0.02f; - - // Add the delta time to the leftover time from the last frame - accumulator_time += delta_time; - - // While there is time left - while ((accumulator_time - step_size) >= step_size) { - // Take away the time we will be simulating - accumulator_time -= step_size; - - // Update the game for the timestep - Update(step_size); - - physics_frame_count++; - } - - Render(); - } -} - -float App::time() { - static __int64 start = 0; - static __int64 frequency = 0; - - if (start == 0) { - QueryPerformanceCounter((LARGE_INTEGER*)&start); - QueryPerformanceFrequency((LARGE_INTEGER*)&frequency); - return 0.0f; - } - - __int64 counter = 0; - QueryPerformanceCounter((LARGE_INTEGER*)&counter); - return (float)((counter - start) / double(frequency)); -} diff --git a/aStar/Map.cpp b/aStar/Map.cpp deleted file mode 100644 index 236535c..0000000 --- a/aStar/Map.cpp +++ /dev/null @@ -1,56 +0,0 @@ -#include "Map.h" -#include - - -Map::Map() { - Init(); -} - - -Map::~Map() { -} - - - -Tile* Map::getTile(sf::Vector2i position_) { - if (position_.x > CELLS_WIDTH || position_.x < 0 - || position_.y > CELLS_HEIGHT || position_.y < 0) { - return nullptr; - } - - return tileArray[position_.x][position_.y]; -} - -bool Map::isTileSolid(sf::Vector2i position_) { - if (position_.x > CELLS_WIDTH || position_.x < 0 - || position_.y > CELLS_HEIGHT || position_.y < 0) { - return true; - } - else - return tileArray[position_.x][position_.y]->isSolid(); -} -Tile* Map::getTile(int x_, int y_) { - return tileArray[x_][y_]; -} - -void Map::setTile(sf::Vector2i position, Tile* data) { - delete tileArray[position.x][position.y]; - tileArray[position.x][position.y] = data; -} - -void Map::Init() { - int q; - - for (int x = 0; x < CELLS_WIDTH; x++) { - for (int y = 0; y < CELLS_HEIGHT; y++) { - q = rand() % 100; - if (q > 70) { - tileArray[x][y] = new Tile(true, 100.0, sf::Color::Cyan); - } - else { - tileArray[x][y] = new Tile(false, 0.0, sf::Color::Red); - } - - } - } -} diff --git a/aStar/Map.h b/aStar/Map.h deleted file mode 100644 index 4364cfc..0000000 --- a/aStar/Map.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once -#include "Tile.h" -#include - -class Map { -public: - static const int CELLS_HEIGHT = 153; - static const int CELLS_WIDTH = 319; - - Map(); - ~Map(); - - - Tile* getTile(sf::Vector2i position); - Tile* getTile(int x_, int y_); - bool isTileSolid(sf::Vector2i); - void setTile(sf::Vector2i position, Tile* data); - -private: - void Init(); - - Tile* tileArray[319][153]; -}; - diff --git a/aStar/Tile.cpp b/aStar/Tile.cpp deleted file mode 100644 index 14813e9..0000000 --- a/aStar/Tile.cpp +++ /dev/null @@ -1,37 +0,0 @@ -#include "Tile.h" - - - -Tile::Tile(bool solid_, double movement_penalty_, sf::Color color_) { - solid = solid_; - movement_penalty = movement_penalty_; - color = color_; -} - - -Tile::Tile() { - solid = false; - movement_penalty = 0.0; - color = sf::Color::Red; -} - -Tile::~Tile() { -} - -bool Tile::isSolid() { - return solid; -} - -double Tile::getPenalty() { - return movement_penalty; -} - -sf::Color Tile::getColor() { - return color; -} - -void Tile::Rewrite(bool solid_, double movement_penalty_, sf::Color color_) { - solid = solid_; - movement_penalty = movement_penalty_; - color = color_; -} diff --git a/aStar/Tile.h b/aStar/Tile.h deleted file mode 100644 index 7b07e76..0000000 --- a/aStar/Tile.h +++ /dev/null @@ -1,22 +0,0 @@ -#pragma once -#include - -class Tile { -public: - Tile(bool solid_, double movement_penalty_, sf::Color color_); - Tile(); - ~Tile(); - - bool isSolid(); - double getPenalty(); - sf::Color getColor(); - void Rewrite(bool solid_, double movement_penalty_, sf::Color color_); - -private: - - - bool solid = false; - double movement_penalty = 0.0; - sf::Color color; -}; - diff --git a/aStar/aStar.vcxproj b/aStar/aStar.vcxproj deleted file mode 100644 index 779db3f..0000000 --- a/aStar/aStar.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {9035B83C-F117-480E-9DEB-435AA0EBEA3F} - Win32Proj - aStar - 8.1 - - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;$(IncludePath) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;$(LibraryPath) - - - false - - - false - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;$(IncludePath) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;$(LibraryPath) - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;%(AdditionalIncludeDirectories) - - - Console - true - sfml-graphics-d.lib;sfml-audio-d.lib;sfml-network-d.lib;sfml-system-d.lib;sfml-window-d.lib;%(AdditionalDependencies) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;%(AdditionalLibraryDirectories) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - sfml-graphics.lib;sfml-audio.lib;sfml-network.lib;sfml-system.lib;sfml-window.lib;%(AdditionalDependencies) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/aStar/aStar.vcxproj.filters b/aStar/aStar.vcxproj.filters deleted file mode 100644 index 0e28dba..0000000 --- a/aStar/aStar.vcxproj.filters +++ /dev/null @@ -1,54 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/aStar/background.png b/aStar/background.png deleted file mode 100644 index f34dad7..0000000 Binary files a/aStar/background.png and /dev/null differ diff --git a/aStar/~AutoRecover.aStar.vcxproj b/aStar/~AutoRecover.aStar.vcxproj deleted file mode 100644 index 779db3f..0000000 --- a/aStar/~AutoRecover.aStar.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - {9035B83C-F117-480E-9DEB-435AA0EBEA3F} - Win32Proj - aStar - 8.1 - - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - Application - true - v140 - Unicode - - - Application - false - v140 - true - Unicode - - - - - - - - - - - - - - - - - - - - - true - - - true - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;$(IncludePath) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;$(LibraryPath) - - - false - - - false - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;$(IncludePath) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;$(LibraryPath) - - - - - - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - - - - - - - Level3 - Disabled - _DEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;%(AdditionalIncludeDirectories) - - - Console - true - sfml-graphics-d.lib;sfml-audio-d.lib;sfml-network-d.lib;sfml-system-d.lib;sfml-window-d.lib;%(AdditionalDependencies) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;%(AdditionalLibraryDirectories) - - - - - Level3 - - - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - - - Console - true - true - true - - - - - Level3 - - - MaxSpeed - true - true - NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - true - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\include;%(AdditionalIncludeDirectories) - - - Console - true - true - true - sfml-graphics.lib;sfml-audio.lib;sfml-network.lib;sfml-system.lib;sfml-window.lib;%(AdditionalDependencies) - Z:\Cpp_Libs\SFML-Visual_Studio2015RCx64\lib;%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file