Merge pull request #4 from avans-night-byte/develop

.github/pull_request_template.md

@@ -0,0 +1,32 @@
+# Merge Request Template
+
+## Description
+### What's new?
+...
+
+### What has changed?
+...
+
+### Extra information?
+...
+
+## Definition of Done
+### Code
+- [ ] Code voldoet aan alle genoemde eisen in de code conventions.
+- [ ] Code komt sterk overeen met gamedesign (User Story #1).
+- [ ] Code komt overeen met het technisch design, bij nodige afwijking wordt het diagram geupdate en de update gecommuniceerd met het hele team.
+- [ ] Code gedocumenteerd (comments).
+- [ ] Code gecontroleerd op (stilistische) fouten.
+- [ ] Unit tests geschreven en geslaagd voor nieuwe code.
+- [x] ~~Code is reviewed door minimaal één ander teamlid. Voor complexe danwel grote PR door minimaal 2 teamleden.~~ PR gerelateerd.
+- [ ] Aan alle in de story benoemde acceptatie criteria is voldaan.
+
+### Documentatie
+- [ ] Github wiki aangepast.
+
+### Testen
+- [ ] Alle (nieuwe) code runt lokaal op het systeem van de developer.
+- [ ] Alle gevonden bugs zijn onderkend en indien deze niet op korte termijn opgelost kunnen worden, als nieuw item opgenomen in de backlog.
+
+### Overige
+- [ ] User story in Taiga staat op Testing, wanneer getest op Done.

SDL-Research/.gitignore

@@ -1,3 +1,4 @@
 ./cmake-build-debug/
 .cmake/
+build/
 SDL2Test

SDL-Research/CMakeLists.txt

@@ -1,13 +1,20 @@
-cmake_minimum_required(VERSION 3.7)
-set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
-set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+cmake_minimum_required(VERSION 3.17)
+set(CMAKE_CXX_STANDARD 17)
+
+set(CMAKE_CURRENT_BINARY_DIR ./build)
+set(CMAKE_CURRENT_SOURCE_DIR ./)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
+
+set(SDL2_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../SDL)
 
-#SET(SDL2_DIR ./lib)
 
 project(SDL2Test)
 
-#find_package(SDL2 REQUIRED)
-#include_directories(SDL2Test ${SDL2_INCLUDE_DIRS})
+
+add_subdirectory(${SDL2_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR})
 
 add_executable(SDL2Test Main.cpp)
-#target_link_libraries(SDL2Test ${SDL2_LIBRARIES})
+
+target_include_directories(SDL2Test PUBLIC ${SDL2_SOURCE_DIR}/include)
+target_link_libraries(SDL2Test SDL2)

SDL-Research/Main.cpp

@@ -1,41 +1,42 @@
 //
 // Created by husey on 29-8-2020.
 //
+#define SDL_MAIN_HANDLED
 
 #include <iostream>
-//#include "SDL.h"
-
+#include "SDL.h"
 
 using namespace std;
 
 int main(int argc, char *argv[])
 {
-//    SDL_Init(SDL_INIT_VIDEO);
-//
-//    SDL_Window *window = SDL_CreateWindow(
-//            "SDL2Test",
-//            SDL_WINDOWPOS_UNDEFINED,
-//            SDL_WINDOWPOS_UNDEFINED,
-//            640,
-//            480,
-//            0
-//    );
-//
-//    SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
-//    SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
-//    SDL_RenderClear(renderer);
-//    SDL_RenderPresent(renderer);
-//
-//    SDL_Delay(3000);
-//
-//    SDL_DestroyWindow(window);
-//    SDL_Quit();
+    SDL_Init(SDL_INIT_VIDEO);
+
+    SDL_Window *window = SDL_CreateWindow(
+            "SDL2Test",
+            SDL_WINDOWPOS_UNDEFINED,
+            SDL_WINDOWPOS_UNDEFINED,
+            640,
+            480,
+            0
+    );
+
+    SDL_Renderer *renderer = SDL_CreateRenderer(window, -1, SDL_RENDERER_SOFTWARE);
+    SDL_SetRenderDrawColor(renderer, 0, 0, 0, SDL_ALPHA_OPAQUE);
+    SDL_RenderClear(renderer);
+    SDL_RenderPresent(renderer);
+
+
 
     std::string name;
 
     std::cout << "Please, enter your full name: ";
     std::getline (std::cin,name);
     std::cout << "Hello, " << name << "!\n";
 
+
+    SDL_DestroyWindow(window);
+    SDL_Quit();
+
     return 0;
 }