appveyor_build

Screenshots and gif paths changed
Project3CITM · May 2, 2018 · 3dd22d1 · 3dd22d1
1 parent 657f7d1
commit 3dd22d1
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 16 deletions.
diff --git a/Engine/ModuleFS.cpp b/Engine/ModuleFS.cpp
@@ -50,6 +50,12 @@ bool ModuleFS::Init(JSON_Object* node)
 	CreateFolder("Assets/Shaders/Materials");
 	CreateFolder("Assets/SceneBinary");
 
+	CreateFolder("Screenshots");
+	CreateFolder("Screenshots/ScreenFull");
+	CreateFolder("Screenshots/ScreenPortion");
+	CreateFolder("Screenshots/GifFull");
+	CreateFolder("Screenshots/GifPortion");
+
 	return true;
 }
 

diff --git a/Engine/ModuleRenderer3D.cpp b/Engine/ModuleRenderer3D.cpp
@@ -22,7 +22,6 @@
 #include "ModuleLightning.h"
 #include "ModuleGUI.h"
 
-
 #pragma comment (lib, "Devil/libx86/DevIL.lib")
 #pragma comment (lib, "Devil/libx86/ILU.lib")
 #pragma comment (lib, "Devil/libx86/ILUT.lib")
@@ -214,17 +213,6 @@ bool ModuleRenderer3D::Init(JSON_Object* node)
 	if (default_material->textures.size()>0)
 		default_material->textures[0].value = default_texture;
 
-	if (std::experimental::filesystem::create_directory("..//Game//Screenshots")) { LOG("Screenshots folder created"); }
-	else { LOG("Screenshots folder already exists"); }
-	if (std::experimental::filesystem::create_directory("..//Game//Screenshots//ScreenFull")) { LOG("ScreenFull folder created"); }
-	else { LOG("ScreenFull folder already exists"); }
-	if (std::experimental::filesystem::create_directory("..//Game//Screenshots//ScreenPortion")) { LOG("ScreenPortion folder created"); }
-	else { LOG("ScreenPortion folder already exists"); }
-	if (std::experimental::filesystem::create_directory("..//Game//Screenshots//GifFull")) { LOG("GifFull folder created"); }
-	else { LOG("GifFull folder already exists"); }
-	if (std::experimental::filesystem::create_directory("..//Game//Screenshots//GifPortion")) { LOG("GifPortion folder created"); }
-	else { LOG("GifPortion folder already exists"); }
-
 	Awake_t = perf_timer.ReadMs();
 	return ret;
 }

diff --git a/Engine/Screenshot_and_gif.h b/Engine/Screenshot_and_gif.h
@@ -16,8 +16,8 @@ enum Culverin_PartScreenshot_STATE
 
 struct Culverin_Screenshot
 {
-	SDL_Scancode FullScreenKey = SDL_Scancode::SDL_SCANCODE_F11;
-	SDL_Scancode PartScreenKey = SDL_Scancode::SDL_SCANCODE_F10;
+	SDL_Scancode FullScreenKey = SDL_Scancode::SDL_SCANCODE_F10;
+	SDL_Scancode PartScreenKey = SDL_Scancode::SDL_SCANCODE_F9;
 	Culverin_PartScreenshot_STATE Screen_State_part = Culverin_PartScreenshot_STATE::Culverin_PartScreenshot_STATE_WAITING_FOR_POINT1;
 
 	float2 Point1 = float2::zero;
@@ -43,8 +43,8 @@ enum Culverin_PartGif_STATE
 
 struct Culverin_Gif
 {
-	int FullScreenKey = SDL_Scancode::SDL_SCANCODE_F9;
-	int PartScreenKey = SDL_Scancode::SDL_SCANCODE_F8;
+	int FullScreenKey = SDL_Scancode::SDL_SCANCODE_F8;
+	int PartScreenKey = SDL_Scancode::SDL_SCANCODE_F7;
 	Culverin_FullGif_STATE Gif_State_full = Culverin_FullGif_STATE::Culverin_FullGif_STATE_CAN_START;
 	Culverin_PartGif_STATE Gif_State_part = Culverin_PartGif_STATE::Culverin_PartGif_STATE_WAITING_FOR_POINT1;
 	unsigned char* pixels_full = nullptr;