Fix #8

Empty-Whisper · Oct 25, 2019 · 1bbf255 · 1bbf255
1 parent 027ce1e
commit 1bbf255
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/WhispEngine/Game/imgui.ini b/WhispEngine/Game/imgui.ini
@@ -79,7 +79,8 @@ Size=32,35
 Collapsed=0
 
 [Window][About Whisp Engine]
-Pos=340,198
+ViewportPos=1176,253
+ViewportId=0x2CD33574
 Size=580,700
 Collapsed=0
 
@@ -235,7 +236,7 @@ Size=32,35
 Collapsed=0
 
 [Docking][Data]
-DockSpace         ID=0x81802EEE Window=0xF3A9BAEC Pos=320,47 Size=1280,1005 Split=X
+DockSpace         ID=0x81802EEE Window=0xF3A9BAEC Pos=320,107 Size=1280,1005 Split=X
   DockNode        ID=0x0000000A Parent=0x81802EEE SizeRef=932,1005 Split=X
     DockNode      ID=0x00000005 Parent=0x0000000A SizeRef=247,1005 Selected=0x788BAA0D
     DockNode      ID=0x00000006 Parent=0x0000000A SizeRef=683,1005 Split=Y

diff --git a/WhispEngine/WhispEngine/ModuleImport.cpp b/WhispEngine/WhispEngine/ModuleImport.cpp
@@ -44,6 +44,9 @@ bool ModuleImport::Start()
 
 	ilInit();
 
+	// Charge logo texture
+	logo_txt = ImportTexture("Assets/logo.png");
+
 	return true;
 }
 

diff --git a/WhispEngine/WhispEngine/ModuleImport.h b/WhispEngine/WhispEngine/ModuleImport.h
@@ -20,6 +20,9 @@ class ModuleImport :
 	bool ImportFbx(const char* path);
 	Texture* ImportTexture(const char* path);
 
+public:
+	Texture* logo_txt = nullptr;
+
 private:
 	void LoadNode(aiNode * node, GameObject * container, const aiScene * scene);
 };

diff --git a/WhispEngine/WhispEngine/PanelAbout.cpp b/WhispEngine/WhispEngine/PanelAbout.cpp
@@ -4,6 +4,7 @@
 PanelAbout::PanelAbout(const bool &start_active, const SDL_Scancode &shortcut1, const SDL_Scancode &shortcut2, const SDL_Scancode &shortcut3)
 	: Panel("Configuration", start_active, shortcut1, shortcut2, shortcut3)
 {
+
 }
 
 PanelAbout::~PanelAbout()
@@ -15,9 +16,9 @@ void PanelAbout::Update()
 	if (ImGui::Begin("About Whisp Engine", &active))
 	{
 		static ImVec2 logo_size(106, 163);
-		static Texture* logo_txt = App->importer->ImportTexture("Assets/logo.png");
+
 		ImGui::Text("Version"); ImGui::SameLine(); ImGui::Text(App->GetVersion());
-		ImGui::Image((ImTextureID)logo_txt->id, logo_size);
+		ImGui::Image((ImTextureID)App->importer->logo_txt->id, logo_size);
 
 		ImGui::Separator();
 		ImGui::NewLine();

diff --git a/WhispEngine/WhispEngine/WhispEngine.vcxproj b/WhispEngine/WhispEngine/WhispEngine.vcxproj
@@ -234,26 +234,26 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>