diff --git a/Space-Invaders/main.cpp b/Space-Invaders/main.cpp index 7d5f90dff..fee09194b 100644 --- a/Space-Invaders/main.cpp +++ b/Space-Invaders/main.cpp @@ -1,5 +1,50 @@ +#include + +int main() { + + // Define the video mode (dimensions) + sf::VideoMode videoMode = *(new sf::VideoMode(800, 600)); + + // Create a window object with specific dimensions and a title + sf::RenderWindow* window = new sf::RenderWindow(videoMode, "SFML Window"); + + // Game loop to keep the window open + while (window->isOpen()) { + sf::Event event; + while (window->pollEvent(event)) { + // Check for window closure + if (event.type == sf::Event::Closed) + window->close(); + } + + // Clear the window + window->clear(sf::Color::Blue); + + + // Draw + + sf::Texture outscal_texture; + outscal_texture.loadFromFile("assets/textures/outscal_logo.png"); + + sf::Sprite outscal_sprite; + outscal_sprite.setTexture(outscal_texture); + + outscal_sprite.setPosition(300, 200); // Position + outscal_sprite.setRotation(45); // Rotation in degrees + outscal_sprite.setScale(0.3, 0.3); // Scale factor + + window->draw(outscal_sprite); + + sf::Font font; + font.loadFromFile("assets/fonts/OpenSans.ttf"); + sf::Text text("Hello SFML!", font, 30); + text.setFillColor(sf::Color::Red); + window->draw(text); + + + // Display what was drawn + window->display(); + } -int main() -{ return 0; } \ No newline at end of file diff --git a/Space-Invaders/sfml/include/SFML/Config.hpp b/Space-Invaders/sfml/include/SFML/Config.hpp index f4ea4ef3e..3093a7a51 100644 --- a/Space-Invaders/sfml/include/SFML/Config.hpp +++ b/Space-Invaders/sfml/include/SFML/Config.hpp @@ -31,7 +31,7 @@ //////////////////////////////////////////////////////////// #define SFML_VERSION_MAJOR 2 #define SFML_VERSION_MINOR 6 -#define SFML_VERSION_PATCH 0 +#define SFML_VERSION_PATCH 1 //////////////////////////////////////////////////////////// diff --git a/Space-Invaders/sfml/lib/Debug/sfml-audio-s-d.pdb b/Space-Invaders/sfml/lib/Debug/sfml-audio-s-d.pdb index 9371818c4..bbd97a4b6 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-audio-s-d.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-audio-s-d.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-audio-s.pdb b/Space-Invaders/sfml/lib/Debug/sfml-audio-s.pdb index 9371818c4..bbd97a4b6 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-audio-s.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-audio-s.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-audio.pdb b/Space-Invaders/sfml/lib/Debug/sfml-audio.pdb index eec00db20..e0cd93576 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-audio.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-audio.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-graphics-s-d.pdb b/Space-Invaders/sfml/lib/Debug/sfml-graphics-s-d.pdb index c0bed6ba8..d187d9728 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-graphics-s-d.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-graphics-s-d.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-graphics-s.pdb b/Space-Invaders/sfml/lib/Debug/sfml-graphics-s.pdb index c0bed6ba8..d187d9728 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-graphics-s.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-graphics-s.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-graphics.pdb b/Space-Invaders/sfml/lib/Debug/sfml-graphics.pdb index c516163a0..310a084ae 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-graphics.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-graphics.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-main-d.pdb b/Space-Invaders/sfml/lib/Debug/sfml-main-d.pdb index 3e17d4a22..432660dd8 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-main-d.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-main-d.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-main-s.pdb b/Space-Invaders/sfml/lib/Debug/sfml-main-s.pdb index 3e17d4a22..432660dd8 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-main-s.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-main-s.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-network-s-d.pdb b/Space-Invaders/sfml/lib/Debug/sfml-network-s-d.pdb index 7afce5265..446f1fb80 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-network-s-d.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-network-s-d.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-network-s.pdb b/Space-Invaders/sfml/lib/Debug/sfml-network-s.pdb index 7afce5265..446f1fb80 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-network-s.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-network-s.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-network.pdb b/Space-Invaders/sfml/lib/Debug/sfml-network.pdb index 93ec6553c..fa073311f 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-network.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-network.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-system-s-d.pdb b/Space-Invaders/sfml/lib/Debug/sfml-system-s-d.pdb index 2ba28522a..aa448263a 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-system-s-d.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-system-s-d.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-system-s.pdb b/Space-Invaders/sfml/lib/Debug/sfml-system-s.pdb index 2ba28522a..aa448263a 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-system-s.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-system-s.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-system.pdb b/Space-Invaders/sfml/lib/Debug/sfml-system.pdb index 59b5195a4..ea487f4f0 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-system.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-system.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-window-s-d.pdb b/Space-Invaders/sfml/lib/Debug/sfml-window-s-d.pdb index 4a11994b0..98a4c966e 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-window-s-d.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-window-s-d.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-window-s.pdb b/Space-Invaders/sfml/lib/Debug/sfml-window-s.pdb index 4a11994b0..98a4c966e 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-window-s.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-window-s.pdb differ diff --git a/Space-Invaders/sfml/lib/Debug/sfml-window.pdb b/Space-Invaders/sfml/lib/Debug/sfml-window.pdb index 332a83ca4..1e2442bd4 100644 Binary files a/Space-Invaders/sfml/lib/Debug/sfml-window.pdb and b/Space-Invaders/sfml/lib/Debug/sfml-window.pdb differ diff --git a/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfig.cmake b/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfig.cmake index f8b915b60..f28497b6c 100644 --- a/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfig.cmake +++ b/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfig.cmake @@ -144,5 +144,5 @@ if (NOT SFML_FOUND) endif() if (SFML_FOUND AND NOT SFML_FIND_QUIETLY) - message(STATUS "Found SFML 2.6.0 in ${CMAKE_CURRENT_LIST_DIR}") + message(STATUS "Found SFML 2.6.1 in ${CMAKE_CURRENT_LIST_DIR}") endif() diff --git a/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfigVersion.cmake b/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfigVersion.cmake index b2208ca9f..25db87605 100644 --- a/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfigVersion.cmake +++ b/Space-Invaders/sfml/lib/cmake/SFML/SFMLConfigVersion.cmake @@ -9,19 +9,19 @@ # The variable CVF_VERSION must be set before calling configure_file(). -set(PACKAGE_VERSION "2.6.0") +set(PACKAGE_VERSION "2.6.1") if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION) set(PACKAGE_VERSION_COMPATIBLE FALSE) else() - if("2.6.0" MATCHES "^([0-9]+)\\.") + if("2.6.1" MATCHES "^([0-9]+)\\.") set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}") if(NOT CVF_VERSION_MAJOR VERSION_EQUAL 0) string(REGEX REPLACE "^0+" "" CVF_VERSION_MAJOR "${CVF_VERSION_MAJOR}") endif() else() - set(CVF_VERSION_MAJOR "2.6.0") + set(CVF_VERSION_MAJOR "2.6.1") endif() if(PACKAGE_FIND_VERSION_RANGE) diff --git a/Space-Invaders/sfml/lib/cmake/SFML/SFMLSharedTargets.cmake b/Space-Invaders/sfml/lib/cmake/SFML/SFMLSharedTargets.cmake index 1c1c3c062..852e1a8d4 100644 --- a/Space-Invaders/sfml/lib/cmake/SFML/SFMLSharedTargets.cmake +++ b/Space-Invaders/sfml/lib/cmake/SFML/SFMLSharedTargets.cmake @@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3") message(FATAL_ERROR "CMake >= 2.8.3 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.8.3...3.24) +cmake_policy(VERSION 2.8.3...3.25) #---------------------------------------------------------------- # Generated CMake target import file. #---------------------------------------------------------------- diff --git a/Space-Invaders/sfml/lib/cmake/SFML/SFMLStaticTargets.cmake b/Space-Invaders/sfml/lib/cmake/SFML/SFMLStaticTargets.cmake index 7257de655..419bb1b85 100644 --- a/Space-Invaders/sfml/lib/cmake/SFML/SFMLStaticTargets.cmake +++ b/Space-Invaders/sfml/lib/cmake/SFML/SFMLStaticTargets.cmake @@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3") message(FATAL_ERROR "CMake >= 2.8.3 required") endif() cmake_policy(PUSH) -cmake_policy(VERSION 2.8.3...3.24) +cmake_policy(VERSION 2.8.3...3.25) #---------------------------------------------------------------- # Generated CMake target import file. #----------------------------------------------------------------