diff --git a/CMakeLists.txt b/CMakeLists.txt index 7626617..bbe9a0b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,6 @@ set(BUILD_SHARED_LIBS OFF) set(SFML_USE_STATIC_STD_LIBS ON) set(SFML_BUILD_AUDIO ON) set(SFML_BUILD_GRAPHICS ON) -set(SFML_BUILD_WINDOW OFF) set(SFML_BUILD_NETWORK OFF) set(SFML_USE_SYSTEM_DEPS OFF) set(SFML_BUILD_EXAMPLES OFF) diff --git a/README.md b/README.md new file mode 100644 index 0000000..4b1e9ad --- /dev/null +++ b/README.md @@ -0,0 +1,16 @@ +# Candy Crush +## Наш ответ буржуйским игрушкам + +![image](./demo.png) + +## Установка зависимостей +``` +sudo apt-get install libX11-devel libudev-devel libGL-devel libopenal-devel libvorbis-devel libflac-devel libXrandr-devel libXcursor-devel libXi-devel libfreetype-devel +``` + +## Сборка +```bash +mkdir build && cd build +cmake .. +cmake --build . +``` diff --git a/fonts/Inter-Black.ttf b/assets/fonts/Inter-Black.ttf similarity index 100% rename from fonts/Inter-Black.ttf rename to assets/fonts/Inter-Black.ttf diff --git a/fonts/Inter-Regular.ttf b/assets/fonts/Inter-Regular.ttf similarity index 100% rename from fonts/Inter-Regular.ttf rename to assets/fonts/Inter-Regular.ttf diff --git a/images/background.png b/assets/images/background.png similarity index 100% rename from images/background.png rename to assets/images/background.png diff --git a/images/button_bg.png b/assets/images/button_bg.png similarity index 100% rename from images/button_bg.png rename to assets/images/button_bg.png diff --git a/images/candys.png b/assets/images/candys.png similarity index 100% rename from images/candys.png rename to assets/images/candys.png diff --git a/music/background.ogg b/assets/music/background.ogg similarity index 100% rename from music/background.ogg rename to assets/music/background.ogg diff --git a/demo.png b/demo.png new file mode 100644 index 0000000..455b809 Binary files /dev/null and b/demo.png differ diff --git a/src/main.cpp b/src/main.cpp index e078ab4..470672d 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,7 +17,7 @@ candy map[10][10]; void playMusic() { static sf::Music background_music; - if (!background_music.openFromFile("music/background.ogg")) + if (!background_music.openFromFile("assets/music/background.ogg")) { std::cerr << "Ошибка загрузки музыки" << std::endl; } @@ -39,9 +39,9 @@ int main() playMusic(); Texture bg_texture, candys_texture, button_texture; - if (!bg_texture.loadFromFile("images/background.png")) return -1; - if (!candys_texture.loadFromFile("images/candys.png")) return -1; - if (!button_texture.loadFromFile("images/button_bg.png")) return -1; + if (!bg_texture.loadFromFile("assets/images/background.png")) return -1; + if (!candys_texture.loadFromFile("assets/images/candys.png")) return -1; + if (!button_texture.loadFromFile("assets/images/button_bg.png")) return -1; candys_texture.setSmooth(false); @@ -49,8 +49,8 @@ int main() button_bg.setPosition({490, 150}); Font font_regular, font_black; - if (!font_regular.openFromFile("fonts/Inter-Regular.ttf")) return -1; - if (!font_black.openFromFile("fonts/Inter-Black.ttf")) return -1; + if (!font_regular.openFromFile("assets/fonts/Inter-Regular.ttf")) return -1; + if (!font_black.openFromFile("assets/fonts/Inter-Black.ttf")) return -1; Text points_text(font_regular, "0", 20); points_text.setPosition({10, 5});