solved last folder delete issues

AitorSimona · Jun 16, 2020 · c63a64a · c63a64a
1 parent 173e917
commit c63a64a
Show file tree

Hide file tree

Showing 15 changed files with 10 additions and 94 deletions.
diff --git a/CENTRAL 3D/Game/Assets/New Folder 3.meta b/CENTRAL 3D/Game/Assets/New Folder 3.meta
diff --git a/CENTRAL 3D/Game/Assets/New Folder 4.meta b/CENTRAL 3D/Game/Assets/New Folder 4.meta
diff --git a/CENTRAL 3D/Game/Assets/New Folder 5.meta b/CENTRAL 3D/Game/Assets/New Folder 5.meta
diff --git a/CENTRAL 3D/Game/Assets/Shaders/LinePoint.glsl.meta b/CENTRAL 3D/Game/Assets/Shaders/LinePoint.glsl.meta
@@ -1,5 +1,5 @@
 {
-    "DATE": 1592338820,
+    "DATE": 1592344668,
     "ResourceData": {
         "FORMAT": 36385
     },

diff --git a/CENTRAL 3D/Game/Assets/Shaders/OutlineShader.glsl.meta b/CENTRAL 3D/Game/Assets/Shaders/OutlineShader.glsl.meta
@@ -1,5 +1,5 @@
 {
-    "DATE": 1592338820,
+    "DATE": 1592344668,
     "ResourceData": {
         "FORMAT": 36385
     },

diff --git a/CENTRAL 3D/Game/Assets/Shaders/Standard.glsl.meta b/CENTRAL 3D/Game/Assets/Shaders/Standard.glsl.meta
@@ -1,5 +1,5 @@
 {
-    "DATE": 1592338820,
+    "DATE": 1592344668,
     "ResourceData": {
         "FORMAT": 36385
     },

diff --git a/CENTRAL 3D/Game/Assets/Shaders/ZDrawer.glsl.meta b/CENTRAL 3D/Game/Assets/Shaders/ZDrawer.glsl.meta
@@ -1,5 +1,5 @@
 {
-    "DATE": 1592338820,
+    "DATE": 1592344668,
     "ResourceData": {
         "FORMAT": 36385
     },

diff --git a/CENTRAL 3D/Game/Assets/TestFolder.meta b/CENTRAL 3D/Game/Assets/TestFolder.meta
diff --git a/CENTRAL 3D/Game/Assets/TestFolder/.meta b/CENTRAL 3D/Game/Assets/TestFolder/.meta
diff --git a/CENTRAL 3D/Game/Assets/TestFolder/TestShader.glsl b/CENTRAL 3D/Game/Assets/TestFolder/TestShader.glsl
diff --git a/CENTRAL 3D/Game/Assets/TestFolder/TestShader.glsl.meta b/CENTRAL 3D/Game/Assets/TestFolder/TestShader.glsl.meta
diff --git a/CENTRAL 3D/Game/Assets/TestFolder/sceeeene.scene.meta b/CENTRAL 3D/Game/Assets/TestFolder/sceeeene.scene.meta
diff --git a/CENTRAL 3D/Game/Assets/TestFolder/testmat2.mat.meta b/CENTRAL 3D/Game/Assets/TestFolder/testmat2.mat.meta
diff --git a/CENTRAL 3D/Source/PanelProject.cpp b/CENTRAL 3D/Source/PanelProject.cpp
@@ -323,14 +323,18 @@ void PanelProject::CreateResourceHandlingPopup()
 			//EngineApp->resources->AddResourceToFolder(new_folder);
 
 			// --- Create meta ---
+			std::string meta_path = new_folder->GetResourceFile();
+			meta_path.pop_back();
 			ImporterMeta* IMeta = App->resources->GetImporter<ImporterMeta>();
-			ResourceMeta* meta = (ResourceMeta*)App->resources->CreateResourceGivenUID(Resource::ResourceType::META, new_folder->GetResourceFile(), new_folder->GetUID());
+			ResourceMeta* meta = (ResourceMeta*)App->resources->CreateResourceGivenUID(Resource::ResourceType::META, meta_path, new_folder->GetUID());
 
 			if (meta)
 				IMeta->Save(meta);
 
 			IFolder->Save((ResourceFolder*)new_folder);
 
+			App->resources->AddResourceToFolder(new_folder);
+
 			ImGui::CloseCurrentPopup();
 		}
 

diff --git a/CENTRAL 3D/Source/ResourceShader.cpp b/CENTRAL 3D/Source/ResourceShader.cpp
@@ -514,6 +514,7 @@ void ResourceShader::OnDelete()
 
 	FreeMemory();
 	App->fs->Remove(resource_file.c_str());
+	App->fs->Remove(original_file.c_str());
 
 	App->resources->RemoveResourceFromFolder(this);
 	App->resources->ONResourceDestroyed(this);