diff --git a/Space-Invaders/Debug/Space-Invaders.pdb b/Space-Invaders/Debug/Space-Invaders.pdb new file mode 100644 index 000000000..38df74ea4 Binary files /dev/null and b/Space-Invaders/Debug/Space-Invaders.pdb differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.exe.recipe b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.exe.recipe new file mode 100644 index 000000000..a94599e66 --- /dev/null +++ b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.exe.recipe @@ -0,0 +1,11 @@ + + + + + D:\repos\Space-Invaders\Space-Invaders\Debug\Space-Invaders.exe + + + + + + \ No newline at end of file diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.ilk b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.ilk new file mode 100644 index 000000000..41b1a7e21 Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.ilk differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.log b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.log new file mode 100644 index 000000000..fc17e4351 --- /dev/null +++ b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.log @@ -0,0 +1,2 @@ + main.cpp + Space-Invaders.vcxproj -> D:\repos\Space-Invaders\Space-Invaders\Debug\Space-Invaders.exe diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.command.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.command.1.tlog new file mode 100644 index 000000000..612471d2d Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.command.1.tlog differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.read.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.read.1.tlog new file mode 100644 index 000000000..51b4dec9c Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.read.1.tlog differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.write.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.write.1.tlog new file mode 100644 index 000000000..36d7e8f86 Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/CL.write.1.tlog differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/Cl.items.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/Cl.items.tlog new file mode 100644 index 000000000..12e8c5728 --- /dev/null +++ b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/Cl.items.tlog @@ -0,0 +1 @@ +D:\repos\Space-Invaders\Space-Invaders\main.cpp;D:\repos\Space-Invaders\Space-Invaders\Space-Invaders\Debug\main.obj diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/Space-Invaders.lastbuildstate b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/Space-Invaders.lastbuildstate new file mode 100644 index 000000000..691307dae --- /dev/null +++ b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/Space-Invaders.lastbuildstate @@ -0,0 +1,2 @@ +PlatformToolSet=v143:VCToolArchitecture=Native32Bit:VCToolsVersion=14.40.33807:TargetPlatformVersion=10.0.22621.0: +Debug|Win32|D:\repos\Space-Invaders\Space-Invaders\| diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.command.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.command.1.tlog new file mode 100644 index 000000000..9ba61f79f Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.command.1.tlog differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.read.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.read.1.tlog new file mode 100644 index 000000000..340096746 Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.read.1.tlog differ diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.secondary.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.secondary.1.tlog new file mode 100644 index 000000000..91e5e31ba --- /dev/null +++ b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.secondary.1.tlog @@ -0,0 +1,2 @@ +^D:\REPOS\SPACE-INVADERS\SPACE-INVADERS\SPACE-INVADERS\DEBUG\MAIN.OBJ +D:\repos\Space-Invaders\Space-Invaders\Space-Invaders\Debug\Space-Invaders.ilk diff --git a/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.write.1.tlog b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.write.1.tlog new file mode 100644 index 000000000..c897dea6e Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/Space-Invaders.tlog/link.write.1.tlog differ diff --git a/Space-Invaders/Space-Invaders/Debug/vc143.idb b/Space-Invaders/Space-Invaders/Debug/vc143.idb new file mode 100644 index 000000000..0af71a737 Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/vc143.idb differ diff --git a/Space-Invaders/Space-Invaders/Debug/vc143.pdb b/Space-Invaders/Space-Invaders/Debug/vc143.pdb new file mode 100644 index 000000000..741b8b1f9 Binary files /dev/null and b/Space-Invaders/Space-Invaders/Debug/vc143.pdb differ diff --git a/Space-Invaders/main.cpp b/Space-Invaders/main.cpp index 7d5f90dff..0a71d6482 100644 --- a/Space-Invaders/main.cpp +++ b/Space-Invaders/main.cpp @@ -1,5 +1,66 @@ - +#include +#include +#include +using namespace std; int main() { + sf::VideoMode video = sf::VideoMode(800, 600); + sf::RenderWindow window(video, "SPACE INVADERS"); + + 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::Black); + + sf::CircleShape circle(50); + circle.setFillColor(sf::Color::Green); + circle.setPosition(400, 300); + + sf::RectangleShape square(sf::Vector2f(100,100)); + square.setFillColor(sf::Color::Red); + square.setPosition(1, 0); + + + sf::ConvexShape triangle; + triangle.setPointCount(3); + int size =100; + triangle.setPoint(0, sf::Vector2f(0, 0)); // Top vertex + triangle.setPoint(1, sf::Vector2f(size, 0)); // Bottom-right vertex + triangle.setPoint(2, sf::Vector2f(size / 2.f, std::sqrt(3.f) / 2.f * size)); + triangle.setFillColor(sf::Color::Blue); + triangle.setPosition(750-size/2,0); + + sf::Texture texture; + texture.loadFromFile("assets/textures/outscal_logo.png"); + sf::Sprite spirite; + spirite.setTexture(texture); + spirite.setScale(0.5,0.5); + spirite.setPosition(300,250); + + + sf::Font font; + font.loadFromFile("assets/fonts/OpenSans.ttf"); + + sf::Text text("SFML is Awesome",font,50); + text.setFillColor(sf::Color::White); + text.setPosition(1, 0); + + // Display whatever you draw + //window.draw(circle); + //window.draw(square); + //window.draw(triangle); + window.draw(spirite); + window.draw(text); + window.display(); + } + + 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. #----------------------------------------------------------------