Update

Carsh fixes
exelix11 · Dec 5, 2016 · 0bf04ce · 0bf04ce
1 parent 0f01595
commit 0bf04ce
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 43 deletions.
diff --git a/ModelViewer/UserControl1.xaml.cs b/ModelViewer/UserControl1.xaml.cs
@@ -284,7 +284,11 @@ public void ChangeTransform(string Type, int index, Vector3D pos, Vector3D scale
             t.Children.Add(new TranslateTransform3D(pos));
             Positions[Type][index] = pos;
             Models[Type][index].Transform = t;
-            if (SelectedObj) ((BoundingBoxVisual3D)Models["SelectionLayer"][0]).BoundingBox = Models[Type][index].FindBounds(Transform3D.Identity);
+            if (SelectedObj)
+            {
+                if (Models["SelectionLayer"].Count == 0) return;
+                ((BoundingBoxVisual3D)Models["SelectionLayer"][0]).BoundingBox = Models[Type][index].FindBounds(Transform3D.Identity);
+            }
         }
 
         public void ChangeModel(string Type, int index, string path)

diff --git a/The4Dimension/Form1.Designer.cs b/The4Dimension/Form1.Designer.cs
diff --git a/The4Dimension/Form1.cs b/The4Dimension/Form1.cs
@@ -163,13 +163,6 @@ private void Form1_Load(object sender, EventArgs e)
                 foreach (string s in Directory.EnumerateFiles("CustomModels"))
                     if (s.EndsWith(".obj")) CustomModels.Add(Path.GetFileNameWithoutExtension(s));
             }
-            if (Properties.Settings.Default.FirstStartup)
-            {
-                Properties.Settings.Default.FirstStartup = false;
-                Properties.Settings.Default.Save();
-                FirstStartupPanel.Visible = true;
-                FirstStartupPanel.Focus();
-            }
         }
 
         void UnloadLevel()
@@ -872,6 +865,7 @@ void endDragging()
                 Action<object[]> act;
                 act = (object[] args) =>
                 {
+                    render.ClearSelection();
                     List<LevelObj> type = (List<LevelObj>)args[0];
                     int id = (int)args[1];
                     int idInList = (int)args[2];
@@ -881,7 +875,6 @@ void endDragging()
                     ((Node)((C0List)type[id].Prop["GenerateChildren"]).List[idInList].Prop["pos_x"]).StringValue = pos.X.ToString();
                     ((Node)((C0List)type[id].Prop["GenerateChildren"]).List[idInList].Prop["pos_y"]).StringValue = pos.Y.ToString();
                     ((Node)((C0List)type[id].Prop["GenerateChildren"]).List[idInList].Prop["pos_z"]).StringValue = pos.Z.ToString();
-                    if (type.GetHashCode() == CurrentAllInfosSection.GetHashCode())UpdateOBJPos(idInList, type, "TmpChildrenObjs", true);
                     propertyGrid1.Refresh();
                 };
                 Undo.Push(new UndoAction("Moved children object of: " + CurrentAllInfosSection[ObjectsListBox.SelectedIndex].ToString(), new object[] { CurrentAllInfosSection, ObjectsListBox.SelectedIndex, (int)DraggingArgs[1] , StartPos }, act));
@@ -2777,10 +2770,5 @@ private void guideToolStripMenuItem_Click(object sender, EventArgs e)
         {
             System.Diagnostics.Process.Start("https://github.com/exelix11/TheFourthDimension/blob/master/guide.md");
         }
-
-        private void FirstStartupPanelMouseMove(object sender, System.Windows.Forms.MouseEventArgs e)
-        {
-            FirstStartupPanel.Visible = false;
-        }
     }
 }
diff --git a/The4Dimension/The4Dimension.csproj b/The4Dimension/The4Dimension.csproj
@@ -58,6 +58,9 @@
     <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup />
+  <PropertyGroup>
+    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="3DS, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -366,6 +369,9 @@
     <Folder Include="EFEDlls\" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>copy $(SolutionDir)CollisionsMng\bin\Release\CollisionsMng.exe $(SolutionDir)$(TargetName)\$(OutDir)CollisionsMng.exe</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">