texture fix

ArgoreOfficial · Jan 28, 2023 · 88e6148 · 88e6148
1 parent dd670f9
commit 88e6148
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 22 deletions.
diff --git a/.vs/SPETS/v16/.suo b/.vs/SPETS/v16/.suo
diff --git a/bin/Debug/netcoreapp3.1/SPETS.dll b/bin/Debug/netcoreapp3.1/SPETS.dll
diff --git a/bin/Debug/netcoreapp3.1/SPETS.pdb b/bin/Debug/netcoreapp3.1/SPETS.pdb
diff --git a/bin/Debug/netcoreapp3.1/heightmaptemp.png b/bin/Debug/netcoreapp3.1/heightmaptemp.png
diff --git a/forms/AdvancedEditorForm.cs b/forms/AdvancedEditorForm.cs
@@ -436,38 +436,27 @@ private void UpdateGLCamera()
 
         private void DeleteItemButton_Click(object sender, EventArgs e)
         {
-
-            for (int i = ImportListView.SelectedIndices.Count - 1; i >= 0; i--)
-            {
-                ImportObjects.RemoveAt(ImportListView.SelectedIndices[i]);
-            }
 
+            // remove mesh from scene 
             for (int i = 0; i < GLMeshPreview.Scene.SceneContainer.Children.Count; i++)
             {
                 if (GLMeshPreview.Scene.SceneContainer.Children[i].Name == ImportObjects[lastSelected].ModelName)
                 {
-                    for (int p = 0; p < GLMeshPreview.Scene.SceneContainer.Children[i].Children.Count; p++)
-                    {
-                        // unfreeze
-                        ((Polygon)GLMeshPreview.Scene.SceneContainer.Children[i].Children[p]).Unfreeze(GLMeshPreview.OpenGL);
-
-                        // create and set material
-                        Material m = new Material();
-                        m.Diffuse = Color.FromArgb(128, 255, 0, 0);
-                        ((Polygon)GLMeshPreview.Scene.SceneContainer.Children[i].Children[p]).Material = m;
-
-                        // freeze
-                        ((Polygon)GLMeshPreview.Scene.SceneContainer.Children[i].Children[p]).Freeze(GLMeshPreview.OpenGL);
-                    }
-
-                    // move to last in list, that way it'll be drawn on top of everything else
-                    var scenelement = GLMeshPreview.Scene.SceneContainer.Children[i];
                     GLMeshPreview.Scene.SceneContainer.RemoveChild(GLMeshPreview.Scene.SceneContainer.Children[i]);
-                    GLMeshPreview.Scene.SceneContainer.AddChild(scenelement);
                     break;
                 }
             }
 
+            // remove from list
+            for (int i = ImportListView.SelectedIndices.Count - 1; i >= 0; i--)
+            {
+                ImportObjects.RemoveAt(ImportListView.SelectedIndices[i]);
+            }
+
+            lastSelected = 0;
+            ImportListView.SelectedIndices.Clear();
+
+            // refresh stuff
             RefreshObjectList();
             RefreshMeshPreview();
         }
@@ -514,6 +503,7 @@ private void ImportListView_SelectedIndexChanged(object sender, EventArgs e)
             }
 
             RefreshMeshPreview(ImportListView.SelectedIndices.Count == 0);
+            RefreshTexturePreview();
         }
 
         private void DecalDistanceNumeric_ValueChanged(object sender, EventArgs e)

diff --git a/obj/Debug/netcoreapp3.1/SPETS.csproj.AssemblyReference.cache b/obj/Debug/netcoreapp3.1/SPETS.csproj.AssemblyReference.cache
diff --git a/obj/Debug/netcoreapp3.1/SPETS.csproj.GenerateResource.cache b/obj/Debug/netcoreapp3.1/SPETS.csproj.GenerateResource.cache
diff --git a/obj/Debug/netcoreapp3.1/SPETS.dll b/obj/Debug/netcoreapp3.1/SPETS.dll
diff --git a/obj/Debug/netcoreapp3.1/SPETS.pdb b/obj/Debug/netcoreapp3.1/SPETS.pdb