dexyfex · excelsi0r · May 30, 2019
diff --git a/Shaders/BasicPS.cso b/Shaders/BasicPS.cso
diff --git a/Shaders/BasicVS_Box.cso b/Shaders/BasicVS_Box.cso
diff --git a/Shaders/BasicVS_Capsule.cso b/Shaders/BasicVS_Capsule.cso
diff --git a/Shaders/BasicVS_Cylinder.cso b/Shaders/BasicVS_Cylinder.cso
diff --git a/Shaders/BasicVS_PNCCT.cso b/Shaders/BasicVS_PNCCT.cso
diff --git a/Shaders/BasicVS_PNCCTT.cso b/Shaders/BasicVS_PNCCTT.cso
diff --git a/Shaders/BasicVS_PNCCTTT.cso b/Shaders/BasicVS_PNCCTTT.cso
diff --git a/Shaders/BasicVS_PNCCTTTX.cso b/Shaders/BasicVS_PNCCTTTX.cso
diff --git a/Shaders/BasicVS_PNCCTTX.cso b/Shaders/BasicVS_PNCCTTX.cso
diff --git a/Shaders/BasicVS_PNCCTX.cso b/Shaders/BasicVS_PNCCTX.cso
diff --git a/Shaders/BasicVS_PNCT.cso b/Shaders/BasicVS_PNCT.cso
diff --git a/Shaders/BasicVS_PNCTT.cso b/Shaders/BasicVS_PNCTT.cso
diff --git a/Shaders/BasicVS_PNCTTTX.cso b/Shaders/BasicVS_PNCTTTX.cso
diff --git a/Shaders/BasicVS_PNCTTX.cso b/Shaders/BasicVS_PNCTTX.cso
diff --git a/Shaders/BasicVS_PNCTX.cso b/Shaders/BasicVS_PNCTX.cso
diff --git a/Shaders/BasicVS_Sphere.cso b/Shaders/BasicVS_Sphere.cso
diff --git a/Shaders/BoundingBoxVS.cso b/Shaders/BoundingBoxVS.cso
diff --git a/Shaders/BoundingSphereVS.cso b/Shaders/BoundingSphereVS.cso
diff --git a/Shaders/BoundsPS.cso b/Shaders/BoundsPS.cso
diff --git a/Shaders/CablePS.cso b/Shaders/CablePS.cso
diff --git a/Shaders/CableVS.cso b/Shaders/CableVS.cso
diff --git a/Shaders/CloudsPS.cso b/Shaders/CloudsPS.cso
diff --git a/Shaders/CloudsVS.cso b/Shaders/CloudsVS.cso
diff --git a/Shaders/DistantLightsPS.cso b/Shaders/DistantLightsPS.cso
diff --git a/Shaders/DistantLightsVS.cso b/Shaders/DistantLightsVS.cso
diff --git a/Shaders/MarkerPS.cso b/Shaders/MarkerPS.cso
diff --git a/Shaders/MarkerVS.cso b/Shaders/MarkerVS.cso
diff --git a/Shaders/PPBloomFilterBPHCS.cso b/Shaders/PPBloomFilterBPHCS.cso
diff --git a/Shaders/PPBloomFilterVCS.cso b/Shaders/PPBloomFilterVCS.cso
diff --git a/Shaders/PPCopyPixelsPS.cso b/Shaders/PPCopyPixelsPS.cso
diff --git a/Shaders/PPFinalPassPS.cso b/Shaders/PPFinalPassPS.cso
diff --git a/Shaders/PPFinalPassVS.cso b/Shaders/PPFinalPassVS.cso
diff --git a/Shaders/PPLumBlendCS.cso b/Shaders/PPLumBlendCS.cso
diff --git a/Shaders/PPReduceTo0DCS.cso b/Shaders/PPReduceTo0DCS.cso
diff --git a/Shaders/PPReduceTo1DCS.cso b/Shaders/PPReduceTo1DCS.cso
diff --git a/Shaders/PathBoxPS.cso b/Shaders/PathBoxPS.cso
diff --git a/Shaders/PathBoxVS.cso b/Shaders/PathBoxVS.cso
diff --git a/Shaders/PathDynVS.cso b/Shaders/PathDynVS.cso
diff --git a/Shaders/PathPS.cso b/Shaders/PathPS.cso
diff --git a/Shaders/PathVS.cso b/Shaders/PathVS.cso
diff --git a/Shaders/ShadowPS.cso b/Shaders/ShadowPS.cso
diff --git a/Shaders/ShadowVS.cso b/Shaders/ShadowVS.cso
diff --git a/Shaders/SkyMoonPS.cso b/Shaders/SkyMoonPS.cso
diff --git a/Shaders/SkyMoonVS.cso b/Shaders/SkyMoonVS.cso
diff --git a/Shaders/SkySunPS.cso b/Shaders/SkySunPS.cso
diff --git a/Shaders/SkySunVS.cso b/Shaders/SkySunVS.cso
diff --git a/Shaders/SkydomePS.cso b/Shaders/SkydomePS.cso
diff --git a/Shaders/SkydomeVS.cso b/Shaders/SkydomeVS.cso
diff --git a/Shaders/TerrainPS.cso b/Shaders/TerrainPS.cso
diff --git a/Shaders/TerrainVS_PNCCT.cso b/Shaders/TerrainVS_PNCCT.cso
diff --git a/Shaders/TerrainVS_PNCCTT.cso b/Shaders/TerrainVS_PNCCTT.cso
diff --git a/Shaders/TerrainVS_PNCCTTTX.cso b/Shaders/TerrainVS_PNCCTTTX.cso
diff --git a/Shaders/TerrainVS_PNCCTTX.cso b/Shaders/TerrainVS_PNCCTTX.cso
diff --git a/Shaders/TerrainVS_PNCCTX.cso b/Shaders/TerrainVS_PNCCTX.cso
diff --git a/Shaders/TerrainVS_PNCTTTX.cso b/Shaders/TerrainVS_PNCTTTX.cso
diff --git a/Shaders/TerrainVS_PNCTTX.cso b/Shaders/TerrainVS_PNCTTX.cso
diff --git a/Shaders/TreesLodPS.cso b/Shaders/TreesLodPS.cso
diff --git a/Shaders/TreesLodVS.cso b/Shaders/TreesLodVS.cso
diff --git a/Shaders/WaterPS.cso b/Shaders/WaterPS.cso
diff --git a/Shaders/WaterVS_PCT.cso b/Shaders/WaterVS_PCT.cso
diff --git a/Shaders/WaterVS_PNCT.cso b/Shaders/WaterVS_PNCT.cso
diff --git a/Shaders/WaterVS_PNCTX.cso b/Shaders/WaterVS_PNCTX.cso
diff --git a/Shaders/WaterVS_PT.cso b/Shaders/WaterVS_PT.cso
diff --git a/Shaders/WidgetPS.cso b/Shaders/WidgetPS.cso
diff --git a/Shaders/WidgetVS.cso b/Shaders/WidgetVS.cso
diff --git a/WorldForm.Designer.cs b/WorldForm.Designer.cs
diff --git a/WorldForm.cs b/WorldForm.cs
@@ -14,6 +14,7 @@
 using CodeWalker.Rendering;
 using CodeWalker.GameFiles;
 using CodeWalker.Properties;
+using System.Linq;
 
 namespace CodeWalker
 {
@@ -211,11 +212,14 @@ public partial class WorldForm : Form, DXForm
 
         bool initedOk = false;
 
+        string[] objectCompleteList;
 
         public WorldForm()
         {
             InitializeComponent();
 
+            InitializeModelCombo();
+
             Renderer = new Renderer(this, gameFileCache);
             camera = Renderer.camera;
             timecycle = Renderer.timecycle;
@@ -7832,6 +7836,40 @@ private void StatsLabel_DoubleClick(object sender, EventArgs e)
             var statsForm = new StatisticsForm(this);
             statsForm.Show(this);
         }
+
+        private void InitializeModelCombo()
+        {
+            string[] objects = System.IO.File.ReadAllLines("entities\\ObjectList.ini");
+            string[] vehicles = System.IO.File.ReadAllLines("entities\\VehicleList.ini");
+            //string[] ped = System.IO.File.ReadAllLines("entities\\PedList.ini");
+
+
+            this.objectCompleteList = objects.Concat(vehicles).ToArray();
+            //this.objectCompleteList = this.objectCompleteList.Concat(ped).ToArray();
+            this.ModelComboBox.Items.AddRange(this.objectCompleteList);
+        }
+
+        private void textBox1_TextChanged(object sender, EventArgs e)
+        {
+            List<string> temp = new List<string>();
+            string[] keys = ModelFilterTextBox.Text.Split(' ');
+
+            ModelComboBox.Items.Clear();
+
+            foreach (string prop in this.objectCompleteList)
+            {
+                if (keys.All(prop.Contains))
+                {
+                    temp.Add(prop);
+                }
+            }
+
+            this.ModelComboBox.Items.AddRange(temp.ToArray());
+            if (temp.Count > 0)
+                this.ModelComboBox.Text = temp[0];
+            else
+                this.ModelComboBox.Text = "";
+        }   
     }
 
     public enum WorldControlMode

diff --git a/WorldForm.resx b/WorldForm.resx
@@ -240,6 +240,14 @@ ufo
         YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB4SURBVDhP3ZC7DcAgDEQZKTMwHOvSIFriS7BlEB+HMic9
         QJbvFThLUkpXzjkSpaeuzMPlEELx3jdsBauyCHBY6UWYPQI93KEljQD3jL6EGzN6x0bASyNYwkKU8Udm
         gd6TMnIikDJyIqjVNz8T7FgKrAwFX6lVinM3aJ05lWDPRRcAAAAASUVORK5CYII=
+</value>
+  </data>
+  <data name="ToolbarTransformSpaceButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB0SURBVDhP7ZNBCoAgEEXnSJ3BqxmetNpaMLhVv5DNRJS2
+        CxIeuvA9XSjtg5mHEILPxB6U7JyLxphmSkDK1o5x9dst87SUfTXwRsYsA+paT0BGDGsVOJ92hdz3Bz4f
+        wGPC48uu7w5IGd+gBlpRMgYCnRwyESUj3CsQkYNFDwAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="ToolbarObjectSpaceButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -261,12 +269,13 @@ ufo
         WBXYx9R1nV75RuyHKrrnzCcGjE1u9ZyD4BugoZigQ9xrngAAAABJRU5ErkJggg==
 </value>
   </data>
-  <data name="ToolbarTransformSpaceButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="ToolbarSnapButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAB0SURBVDhP7ZNBCoAgEEXnSJ3BqxmetNpaMLhVv5DNRJS2
-        CxIeuvA9XSjtg5mHEILPxB6U7JyLxphmSkDK1o5x9dst87SUfTXwRsYsA+paT0BGDGsVOJ92hdz3Bz4f
-        wGPC48uu7w5IGd+gBlpRMgYCnRwyESUj3CsQkYNFDwAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACtSURBVDhPrZBBEsIgEAR5Gy/wFV55T/wHr+KgHuCKNsVY
+        ZI2JiU7VVIVlp7OL+1mllIr7cb8Ie++PQwQYITnnM24NWxoBgsQYm/l+gk699bMsRA4h1JTSPsg0Xert
+        em/mGwh3vW1Z7MvIABSWqXG3+iZHAEw1m4wD49oVANgVOL/VeSgeDAiX1mpWeKy9BIQiI+OxWQF77tG5
+        2Fc729BmeElf/3lNhORe+oecewDObEqX49RqCgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="ToolbarSnapToGroundButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -295,15 +304,6 @@ ufo
         EcMw2DzPDMEke9AsYBrHs10vN4I1QqImwwDcFyMjQGaBHr5Bo8nEoYCnCQTGzVeI4oj6fIi+KHgoPBhC
         4knCjTww9vxfbIUQNDEyiGIZ8t6tW/k0vC/AOpuiueNOLwVkUeylvju9FJCg8E1vM/2PlTv5UoervVTJ
         uQAAAABJRU5ErkJggg==
-</value>
-  </data>
-  <data name="ToolbarSnapButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAACtSURBVDhPrZBBEsIgEAR5Gy/wFV55T/wHr+KgHuCKNsVY
-        ZI2JiU7VVIVlp7OL+1mllIr7cb8Ie++PQwQYITnnM24NWxoBgsQYm/l+gk699bMsRA4h1JTSPsg0Xert
-        em/mGwh3vW1Z7MvIABSWqXG3+iZHAEw1m4wD49oVANgVOL/VeSgeDAiX1mpWeKy9BIQiI+OxWQF77tG5
-        2Fc729BmeElf/3lNhORe+oecewDObEqX49RqCgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="ToolbarUndoButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -389,6 +389,17 @@ ufo
         4BJN+IjGo5O8ZJndGVhKxpjWWts551aih0fre+0BLaVchRAezPB2NXSSV/gVwXGYPJiVUt6ns1ghCDjn
         UQG86w3FToVgDcWCWS9Fvi/Ao0RVAcwUjwpyhzmf4n8BFApS5HZRwRuONGMbrIJ1JIN8O2QAAAAASUVO
         RK5CYII=
+</value>
+  </data>
+  <data name="ToolbarCameraModeButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEvSURBVDhP3dK/K0dRGMfxKxRJopCSEkLya/guUhQRmQwG
+        WfwIkYySgYUSKUKJlOK/MBoMFMofYLUIsfJ+f3NuF3+A8tRree5zP/fcc070f6oHT/jAPTqQj6WvXvCM
+        TZQgG3H58gFGcYVLtGIN15jBNDbwiGNUIg4pQx8GsQuHhrCDW8yjHyns4Q0DcCXpykM5bFzgHGPYxw1G
+        UIVMtMHfWUUj4nIg/KurGIYrSAZYOXDGlbhXcZlegUO8Yxzb+BlQAwNW0G0jVAYK0AwHtnCEOyQDZvGC
+        ObTbKIIvLMA9WIYDizhFMsDjfsAZptCA9JcdfoVBvryOSbgCe4HPTuCz+BQMKEUvJmCy96ET1ehCuAf2
+        5ZF+uwdZKEYtmuBGFSIXhtejBe5PHX7dxL+qKPoEppRHcXOtiDsAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ToolbarCameraPerspectiveButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -426,17 +437,9 @@ ufo
         QdQiTqrAWNICd7gPnUj+xBKaU9dxfhTkjwV/FxU+AbsiGnc46OYIAAAAAElFTkSuQmCC
 </value>
   </data>
-  <data name="ToolbarCameraModeButton.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEvSURBVDhP3dK/K0dRGMfxKxRJopCSEkLya/guUhQRmQwG
-        WfwIkYySgYUSKUKJlOK/MBoMFMofYLUIsfJ+f3NuF3+A8tRree5zP/fcc070f6oHT/jAPTqQj6WvXvCM
-        TZQgG3H58gFGcYVLtGIN15jBNDbwiGNUIg4pQx8GsQuHhrCDW8yjHyns4Q0DcCXpykM5bFzgHGPYxw1G
-        UIVMtMHfWUUj4nIg/KurGIYrSAZYOXDGlbhXcZlegUO8Yxzb+BlQAwNW0G0jVAYK0AwHtnCEOyQDZvGC
-        ObTbKIIvLMA9WIYDizhFMsDjfsAZptCA9JcdfoVBvryOSbgCe4HPTuCz+BQMKEUvJmCy96ET1ehCuAf2
-        5ZF+uwdZKEYtmuBGFSIXhtejBe5PHX7dxL+qKPoEppRHcXOtiDsAAAAASUVORK5CYII=
-</value>
-  </data>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>177</value>
+  </metadata>
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         AAABAAMAICAAAAAAGACoDAAANgAAABAQAAAAABgAaAMAAN4MAABAQAAAAAAYACgyAABGEAAAKAAAACAA