diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 1703711c..696ba9ff 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index c47c2262..5d468634 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm index a9a5cedf..3f0aa89c 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index 9e25f2b2..18471a5b 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/GUI/BFRES/Materials/BfresMaterialEditor.cs b/Switch_FileFormatsMain/GUI/BFRES/Materials/BfresMaterialEditor.cs index f63e8c12..513cebad 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Materials/BfresMaterialEditor.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Materials/BfresMaterialEditor.cs @@ -290,7 +290,7 @@ namespace FirstPlugin.Forms if (editor.ShowDialog() == DialogResult.OK) { - material.shaderassign.attributes = editor.GetNewInputs(); + material.shaderassign.samplers = editor.GetNewInputs(); } } diff --git a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.Designer.cs b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.Designer.cs index 4c98af67..93f256ed 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.Designer.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.Designer.cs @@ -129,11 +129,12 @@ // stPropertyGrid1 // this.stPropertyGrid1.AutoScroll = true; - this.stPropertyGrid1.ShowHintDisplay = true; this.stPropertyGrid1.Location = new System.Drawing.Point(256, 60); this.stPropertyGrid1.Name = "stPropertyGrid1"; + this.stPropertyGrid1.ShowHintDisplay = true; this.stPropertyGrid1.Size = new System.Drawing.Size(210, 356); this.stPropertyGrid1.TabIndex = 16; + this.stPropertyGrid1.Load += new System.EventHandler(this.stPropertyGrid1_Load); // // stButton1 // diff --git a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.cs b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.cs index c399dfe2..9d55ef0a 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/Materials/ShaderAssign/SamplerInputListEdit.cs @@ -99,7 +99,15 @@ namespace FirstPlugin.Forms } } - public void OnPropertyChanged() { } + public void OnPropertyChanged() + { + if (listViewCustom1.SelectedIndices.Count > 0) + { + int index = listViewCustom1.SelectedIndices[0]; + var item = listViewCustom1.Items[index]; + item.Text = $"{SamplerInputs[index].ResourceInput} : {SamplerInputs[index].ShaderVariable}"; + } + } private void btnScrollDown_Click(object sender, EventArgs e) { @@ -145,5 +153,10 @@ namespace FirstPlugin.Forms } KeyCheck.Clear(); } + + private void stPropertyGrid1_Load(object sender, EventArgs e) + { + + } } } diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 36327991..4f7a0a83 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache index 7dc1c571..d3e7cd00 100644 Binary files a/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache and b/Switch_FileFormatsMain/obj/Release/Switch_FileFormatsMain.csproj.GenerateResource.cache differ