diff --git a/CLEditor.AssetEngine/AssetBuilder.cs b/CLEditor.AssetEngine/AssetBuilder.cs new file mode 100644 index 0000000000000000000000000000000000000000..73bd1325610e456fb31c362329b716526784d581 --- /dev/null +++ b/CLEditor.AssetEngine/AssetBuilder.cs @@ -0,0 +1,17 @@ +using System.Collections.Generic; + +namespace CLEditor.AssetEngine +{ + /// + /// 资源编译 + /// + public class AssetBuilder + { + private List _preBuildList; + + public AssetBuilder() + { + _preBuildList = new List(); + } + } +} \ No newline at end of file diff --git a/CLEditor.AssetEngine/CLEditor.AssetEngine.csproj b/CLEditor.AssetEngine/CLEditor.AssetEngine.csproj index 3828d6614c515bea2a3dbec3c3c6ca028162af27..4daa12914775105b7d89c1a0b8ccadb2330e5488 100644 --- a/CLEditor.AssetEngine/CLEditor.AssetEngine.csproj +++ b/CLEditor.AssetEngine/CLEditor.AssetEngine.csproj @@ -40,7 +40,94 @@ + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + \ No newline at end of file diff --git a/CLEditor.AssetEngine/MGCB/2MGFX.exe b/CLEditor.AssetEngine/MGCB/2MGFX.exe new file mode 100644 index 0000000000000000000000000000000000000000..be51044afce9c58f0dce7dc1a5a7a919d081439a Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/2MGFX.exe differ diff --git a/CLEditor.AssetEngine/MGCB/ATI.TextureConverter.dll b/CLEditor.AssetEngine/MGCB/ATI.TextureConverter.dll new file mode 100644 index 0000000000000000000000000000000000000000..5b817be623a515a754841c130c1d9975a1402a30 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/ATI.TextureConverter.dll differ diff --git a/CLEditor.AssetEngine/MGCB/Assimp64.dll b/CLEditor.AssetEngine/MGCB/Assimp64.dll new file mode 100644 index 0000000000000000000000000000000000000000..2bb461a9dafd0b28dba33264a099130eb55d82b0 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/Assimp64.dll differ diff --git a/CLEditor.AssetEngine/MGCB/AssimpNet.dll b/CLEditor.AssetEngine/MGCB/AssimpNet.dll new file mode 100644 index 0000000000000000000000000000000000000000..ded93ea55f896cefec0360176f8388a50b1d195d Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/AssimpNet.dll differ diff --git a/CLEditor.AssetEngine/MGCB/CppNet.dll b/CLEditor.AssetEngine/MGCB/CppNet.dll new file mode 100644 index 0000000000000000000000000000000000000000..e10a4bb38144a15a1cc44f70a15a621af5582aa9 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/CppNet.dll differ diff --git a/CLEditor/SceneEditor/Qt5Widgets.dll b/CLEditor.AssetEngine/MGCB/FreeImage.dll similarity index 38% rename from CLEditor/SceneEditor/Qt5Widgets.dll rename to CLEditor.AssetEngine/MGCB/FreeImage.dll index 1c79918f53d2e90daed4d506925b53d7fe8c70a2..092db1140b7befee0e33a2df835a5f731a6ccd95 100644 Binary files a/CLEditor/SceneEditor/Qt5Widgets.dll and b/CLEditor.AssetEngine/MGCB/FreeImage.dll differ diff --git a/CLEditor.AssetEngine/MGCB/FreeImageNET.dll b/CLEditor.AssetEngine/MGCB/FreeImageNET.dll new file mode 100644 index 0000000000000000000000000000000000000000..69d68223fff85b57bfbc92dd78eaac0c76befc32 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/FreeImageNET.dll differ diff --git a/CLEditor.AssetEngine/MGCB/MGCB.exe b/CLEditor.AssetEngine/MGCB/MGCB.exe new file mode 100644 index 0000000000000000000000000000000000000000..f7b95eaeb7b3a33c1b3cbcb96065779e489bcd1f Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/MGCB.exe differ diff --git a/CLEditor.AssetEngine/MGCB/MonoGame.Framework.Content.Pipeline.dll b/CLEditor.AssetEngine/MGCB/MonoGame.Framework.Content.Pipeline.dll new file mode 100644 index 0000000000000000000000000000000000000000..c55d16212921fccd176ced33c2f2e0b0e8544543 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/MonoGame.Framework.Content.Pipeline.dll differ diff --git a/CLEditor.AssetEngine/MGCB/MonoGame.Framework.dll b/CLEditor.AssetEngine/MGCB/MonoGame.Framework.dll new file mode 100644 index 0000000000000000000000000000000000000000..20e9f1b27cb75dbd61dc8547fd440f06f4e1ca7d Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/MonoGame.Framework.dll differ diff --git a/CLEditor.AssetEngine/MGCB/Nvidia.TextureTools.dll b/CLEditor.AssetEngine/MGCB/Nvidia.TextureTools.dll new file mode 100644 index 0000000000000000000000000000000000000000..862e6af91881399ef4235676d6633267c69a96c7 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/Nvidia.TextureTools.dll differ diff --git a/CLEditor.AssetEngine/MGCB/PVRTexLibNET.dll b/CLEditor.AssetEngine/MGCB/PVRTexLibNET.dll new file mode 100644 index 0000000000000000000000000000000000000000..dc9bfda4f2af9b6eeeb3640dd2c87058cfb661b6 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/PVRTexLibNET.dll differ diff --git a/CLEditor.AssetEngine/MGCB/PVRTexLibWrapper.dll b/CLEditor.AssetEngine/MGCB/PVRTexLibWrapper.dll new file mode 100644 index 0000000000000000000000000000000000000000..f684ddf28c78ac09c6ef05e988c4ef9fba20a69f Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/PVRTexLibWrapper.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.D3DCompiler.dll b/CLEditor.AssetEngine/MGCB/SharpDX.D3DCompiler.dll new file mode 100644 index 0000000000000000000000000000000000000000..2430da8babc1ab53ae9f623a714f40baf1442f2a Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.D3DCompiler.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.DXGI.dll b/CLEditor.AssetEngine/MGCB/SharpDX.DXGI.dll new file mode 100644 index 0000000000000000000000000000000000000000..b390e581d7a2d561d39c885d825c62a14946afda Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.DXGI.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.Direct2D1.dll b/CLEditor.AssetEngine/MGCB/SharpDX.Direct2D1.dll new file mode 100644 index 0000000000000000000000000000000000000000..8ec6665957a62d2d5f4890d5750b168f611baabe Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.Direct2D1.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.Direct3D11.dll b/CLEditor.AssetEngine/MGCB/SharpDX.Direct3D11.dll new file mode 100644 index 0000000000000000000000000000000000000000..a07984f64c8da2cf60382b9b7c6624cf24edf426 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.Direct3D11.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.Direct3D9.dll b/CLEditor.AssetEngine/MGCB/SharpDX.Direct3D9.dll new file mode 100644 index 0000000000000000000000000000000000000000..6fda0fd038b7ae6225af48c9a6ec33cba89028c8 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.Direct3D9.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.MediaFoundation.dll b/CLEditor.AssetEngine/MGCB/SharpDX.MediaFoundation.dll new file mode 100644 index 0000000000000000000000000000000000000000..69b78ab30a82f7793777f219867824b6e81b131a Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.MediaFoundation.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.XAudio2.dll b/CLEditor.AssetEngine/MGCB/SharpDX.XAudio2.dll new file mode 100644 index 0000000000000000000000000000000000000000..6cfc2ff7138a5bef0bf8dfd217c485f7a6bb0758 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.XAudio2.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.XInput.dll b/CLEditor.AssetEngine/MGCB/SharpDX.XInput.dll new file mode 100644 index 0000000000000000000000000000000000000000..c62b1922c4252fda9f0e9cf6158a60e63ce0dbc6 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.XInput.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpDX.dll b/CLEditor.AssetEngine/MGCB/SharpDX.dll new file mode 100644 index 0000000000000000000000000000000000000000..0899027726958dafb683a6763ee20f4984a7bc25 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpDX.dll differ diff --git a/CLEditor.AssetEngine/MGCB/SharpFont.dll b/CLEditor.AssetEngine/MGCB/SharpFont.dll new file mode 100644 index 0000000000000000000000000000000000000000..714f50e0c585833de7c04fcc879e79ec2116b8ec Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/SharpFont.dll differ diff --git a/CLEditor.AssetEngine/MGCB/ffmpeg.exe b/CLEditor.AssetEngine/MGCB/ffmpeg.exe new file mode 100644 index 0000000000000000000000000000000000000000..7610ffe56750cdee4dc2426627315202de489e16 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/ffmpeg.exe differ diff --git a/CLEditor.AssetEngine/MGCB/ffprobe.exe b/CLEditor.AssetEngine/MGCB/ffprobe.exe new file mode 100644 index 0000000000000000000000000000000000000000..0f69409819d604251160a0c529b21ad163c39d98 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/ffprobe.exe differ diff --git a/CLEditor.AssetEngine/MGCB/freetype6.dll b/CLEditor.AssetEngine/MGCB/freetype6.dll new file mode 100644 index 0000000000000000000000000000000000000000..b30dab61ade6cf480fbad6af67694a2c52162929 Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/freetype6.dll differ diff --git a/CLEditor.AssetEngine/MGCB/libmojoshader_64.dll b/CLEditor.AssetEngine/MGCB/libmojoshader_64.dll new file mode 100644 index 0000000000000000000000000000000000000000..9fac320f6fe19cd65b57e343de9c2b49700c93ab Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/libmojoshader_64.dll differ diff --git a/CLEditor.AssetEngine/MGCB/nvtt.dll b/CLEditor.AssetEngine/MGCB/nvtt.dll new file mode 100644 index 0000000000000000000000000000000000000000..853a471074dc0331da71ab0d46c1d65258a1a61b Binary files /dev/null and b/CLEditor.AssetEngine/MGCB/nvtt.dll differ diff --git a/CLEditor.Core/Diagnostics/LogMessage.cs b/CLEditor.Core/Diagnostics/LogMessage.cs index 9b6850d2b74c2caeabbd0581aff40390f65bc69d..25578e0e215f84048d859758ffd2c727b637d568 100644 --- a/CLEditor.Core/Diagnostics/LogMessage.cs +++ b/CLEditor.Core/Diagnostics/LogMessage.cs @@ -28,10 +28,10 @@ namespace CLEditor.Core.Diagnostics public ExceptionInfo ExceptionInfo => Exception != null ? new ExceptionInfo(Exception) : null; - public LogMessage(string module, LogMessageType type, string text, Exception exception, CallerInfo callerInfo) { + public LogMessage(string module, LogMessageType type, object text, Exception exception, CallerInfo callerInfo) { Module = module; Type = type; - Text = text; + Text = text.ToString(); Exception = exception; CallerInfo = callerInfo; } diff --git a/CLEditor.Core/Diagnostics/Logger.Extension.cs b/CLEditor.Core/Diagnostics/Logger.Extension.cs index a5c0af9526544279b14ab3fbe845e581fbe7f52a..555777d840300cccf803dafdb9f850a8164ecf90 100644 --- a/CLEditor.Core/Diagnostics/Logger.Extension.cs +++ b/CLEditor.Core/Diagnostics/Logger.Extension.cs @@ -67,6 +67,15 @@ namespace CLEditor.Core.Diagnostics Info(message, null, callerInfo); } + /// + /// 记录指定的信息消息 + /// + /// + public void Info(object message) + { + Log(new LogMessage(Module, LogMessageType.Info, message, null, null)); + } + /// /// 记录指定的警告消息并发生异常 /// diff --git a/CLEditor.Core/packages.config b/CLEditor.Core/packages.config index e9cc1d56386ce0ae5a25dda09071990df3ac4005..891df58a9183425a3f72331ad860b482a97c6fc5 100644 --- a/CLEditor.Core/packages.config +++ b/CLEditor.Core/packages.config @@ -1,6 +1,7 @@  + diff --git a/CLEditor/CLEditor.csproj b/CLEditor/CLEditor.csproj index 6a0d1afd6134123547c45ddd58657ef94b362f4a..0f8b8d4523b85a10172c0a3f4deee22ec8da550b 100644 --- a/CLEditor/CLEditor.csproj +++ b/CLEditor/CLEditor.csproj @@ -333,178 +333,7 @@ SettingsSingleFileGenerator Settings.Designer.cs - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - + PreserveNewest @@ -538,6 +367,10 @@ + + {fe171bf2-9210-4a24-bce4-bdb95e6202f5} + CLEditor.AssetEngine + {a9459a99-39d8-480b-bf14-a7687ece7db1} CLEditor.Core @@ -570,375 +403,6 @@ - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - PreserveNewest @@ -950,14 +414,8 @@ - - PreserveNewest - - - PreserveNewest - + - diff --git a/CLEditor/CreateScriptView.xaml b/CLEditor/CreateScriptView.xaml index f1a9725d8c955ad79fd9361156a80f5e1ede2eae..5ae13549d554363e957bfec9ccc4f7aafbf20a1b 100644 --- a/CLEditor/CreateScriptView.xaml +++ b/CLEditor/CreateScriptView.xaml @@ -19,11 +19,6 @@ MinWidth="200" x:Name="ScriptName" Margin="5 0 0 0"> - - CSharp - Lua -