project

world map New Windows renderer stash stash Different maps Clean up stash
panhongfa · Nov 10, 2021 · c22a039 · c22a039
1 parent 62b0ee3
commit c22a039
Show file tree

Hide file tree

Showing 766 changed files with 91,246 additions and 21 deletions.
diff --git a/Avalonia.props b/Avalonia.props
@@ -4,7 +4,7 @@
         <PackageReference Include="Avalonia" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.ReactiveUI" Version="$(AvaloniaVersion)" />
         <PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
-        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="$(AvaloniaVersion)" />
+        <PackageReference Include="Avalonia.Xaml.Behaviors" Version="0.10.10" />
         <ProjectReference Include="$(MSBuildThisFileDirectory)\Prism.Avalonia\src\Prism.Avalonia\Prism.Avalonia.csproj" />
     </ItemGroup>
     <ItemGroup>

diff --git a/AvaloniaEdit b/AvaloniaEdit
diff --git a/AvaloniaStyles/Styles/BigSur/Button.xaml b/AvaloniaStyles/Styles/BigSur/Button.xaml
@@ -10,7 +10,7 @@
     </Style>
 
     <Style Selector=":is(Button):not(:is(CheckBox))">
-        <Setter Property="CornerRadius" Value="6" />
+        <!--<Setter Property="CornerRadius" Value="6" />-->
     </Style>
 
     <Style Selector=":is(Button):not(:is(CheckBox)) /template/ ContentPresenter#PART_ContentPresenter">

diff --git a/AvaloniaStyles/Styles/BigSur/TextBox.xaml b/AvaloniaStyles/Styles/BigSur/TextBox.xaml
@@ -2,7 +2,7 @@
         xmlns:controls1="clr-namespace:AvaloniaStyles.Controls"
         xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit">
     <Style Selector="TextBox">
-        <Setter Property="CornerRadius" Value="0"></Setter>
+        <!--<Setter Property="CornerRadius" Value="0"></Setter>-->
         <Setter Property="Padding" Value="4"/>
         <Setter Property="FontSize" Value="13"/>
         <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
@@ -26,7 +26,7 @@
     </Style>
 
     <Style Selector="controls1|ToolBar TextBox">
-        <Setter Property="CornerRadius" Value="5"></Setter>
+        <!--<Setter Property="CornerRadius" Value="5"></Setter>-->
     </Style>
 
     <Style Selector="TextBox /template/ TextBlock#watermark">

diff --git a/AvaloniaStyles/Styles/Catalina/Button.xaml b/AvaloniaStyles/Styles/Catalina/Button.xaml
@@ -8,7 +8,7 @@
     </Style>
 
     <Style Selector=":is(Button)">
-        <Setter Property="CornerRadius" Value="4" />
+        <!--<Setter Property="CornerRadius" Value="4" />-->
     </Style>
 
     <Style Selector=":is(Button):pointerover /template/ ContentPresenter">

diff --git a/AvaloniaStyles/Styles/Catalina/TextBox.xaml b/AvaloniaStyles/Styles/Catalina/TextBox.xaml
@@ -2,7 +2,7 @@
         xmlns:controls1="clr-namespace:AvaloniaStyles.Controls"
         xmlns:avaloniaEdit="https://github.com/avaloniaui/avaloniaedit">
     <Style Selector="TextBox">
-        <Setter Property="CornerRadius" Value="4" />
+        <!--<Setter Property="CornerRadius" Value="4" />-->
         <Setter Property="FontSize" Value="13"/>
         <Setter Property="Foreground" Value="{DynamicResource TextBoxForeground}" />
         <Setter Property="BorderThickness" Value="0.5" />

diff --git a/AvaloniaStyles/Styles/Windows10/TabControl.axaml b/AvaloniaStyles/Styles/Windows10/TabControl.axaml
@@ -11,10 +11,10 @@
   <Style Selector="TabControl">
     <Setter Property="Padding" Value="6"></Setter>
     <Setter Property="Template">
+      <!--      CornerRadius="{TemplateBinding CornerRadius}"-->
       <ControlTemplate>
         <Border BorderBrush="{TemplateBinding BorderBrush}"
                 BorderThickness="{TemplateBinding BorderThickness}"
-                CornerRadius="{TemplateBinding CornerRadius}"
                 Background="{TemplateBinding Background}"
                 HorizontalAlignment="{TemplateBinding HorizontalAlignment}"
                 VerticalAlignment="{TemplateBinding VerticalAlignment}">
@@ -61,11 +61,11 @@
     <Setter Property="VerticalContentAlignment" Value="Center" />
     <Setter Property="Template">
       <ControlTemplate>
+        <!--      CornerRadius="{TemplateBinding CornerRadius}"-->
         <Panel>
           <Border Name="PART_LayoutRoot"
                   BorderBrush="{TemplateBinding BorderBrush}"
                   BorderThickness="{TemplateBinding BorderThickness}"
-                  CornerRadius="{TemplateBinding CornerRadius}"
                   Padding="{TemplateBinding Padding}">
             <ContentPresenter Name="PART_ContentPresenter"
                               ContentTemplate="{TemplateBinding HeaderTemplate}"

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project>
     <PropertyGroup>
+        <RestoreAdditionalProjectSources>
+            https://nuget.avaloniaui.net/repository/avalonia-all/index.json
+        </RestoreAdditionalProjectSources>
         <NoWarn>CS0067,CS3021,CS1998,CA1416</NoWarn>
-        <AvaloniaVersion>0.10.8</AvaloniaVersion>
+        <AvaloniaVersion>0.10.999-cibuild0015264-beta</AvaloniaVersion>
         <LangVersion>preview</LangVersion>
     </PropertyGroup>
 </Project>
diff --git a/Dock b/Dock
diff --git a/LoaderAvalonia/LoaderAvalonia.csproj b/LoaderAvalonia/LoaderAvalonia.csproj
@@ -40,6 +40,7 @@
       <ProjectReference Include="..\WoWDatabaseEditor.Common\WDE.TrinityMySqlDatabase\WDE.TrinityMySqlDatabase.csproj" />
       <ProjectReference Include="..\WoWDatabaseEditorCore.Avalonia\WoWDatabaseEditorCore.Avalonia.csproj" SkipGetTargetFrameworkProperties="true" />
       <ProjectReference Include="..\WoWDatabaseEditor\WoWDatabaseEditorCore.csproj" />
+      <ProjectReference Include="..\WoWDatabaseEditor\WDE.MapRenderer\WDE.MapRenderer.csproj" />
 
       <ProjectReference Include="..\WowPacketParser\WowPacketParserModule.BattleNet.V37165\WowPacketParserModule.BattleNet.V37165.csproj" />
       <ProjectReference Include="..\WowPacketParser\WowPacketParserModule.Substructures\WowPacketParserModule.Substructures.csproj" />

diff --git a/Rendering/OpenGLBindings/AccumOp.cs b/Rendering/OpenGLBindings/AccumOp.cs
@@ -0,0 +1,12 @@
+namespace OpenGLBindings
+{
+    /// <summary>
+    /// Not used directly.
+    /// </summary>
+    public enum AccumOp
+    {
+
+    }
+}
+
+// Warning: Some assembly references could not be resolved automatically. This might lead to incorrect decompilation of some parts,\n// for ex. property getter/setter access. To get optimal decompilation results, please manually add the missing references to the list of loaded assemblies.\n// OpenTK.Graphics.OpenGL4..*
diff --git a/Rendering/OpenGLBindings/ActiveAttribType.cs b/Rendering/OpenGLBindings/ActiveAttribType.cs
@@ -0,0 +1,149 @@
+namespace OpenGLBindings
+{
+    /// <summary>
+    /// Used in GL.GetActiveAttrib
+    /// </summary>
+    public enum ActiveAttribType
+    {
+        /// <summary>
+        /// Original was GL_NONE = 0
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Original was GL_INT = 0x1404
+        /// </summary>
+        Int = 5124,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT = 0x1405
+        /// </summary>
+        UnsignedInt = 5125,
+        /// <summary>
+        /// Original was GL_FLOAT = 0x1406
+        /// </summary>
+        Float = 5126,
+        /// <summary>
+        /// Original was GL_DOUBLE = 0x140A
+        /// </summary>
+        Double = 5130,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC2 = 0x8B50
+        /// </summary>
+        FloatVec2 = 35664,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC3 = 0x8B51
+        /// </summary>
+        FloatVec3 = 35665,
+        /// <summary>
+        /// Original was GL_FLOAT_VEC4 = 0x8B52
+        /// </summary>
+        FloatVec4 = 35666,
+        /// <summary>
+        /// Original was GL_INT_VEC2 = 0x8B53
+        /// </summary>
+        IntVec2 = 35667,
+        /// <summary>
+        /// Original was GL_INT_VEC3 = 0x8B54
+        /// </summary>
+        IntVec3 = 35668,
+        /// <summary>
+        /// Original was GL_INT_VEC4 = 0x8B55
+        /// </summary>
+        IntVec4 = 35669,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2 = 0x8B5A
+        /// </summary>
+        FloatMat2 = 35674,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3 = 0x8B5B
+        /// </summary>
+        FloatMat3 = 35675,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4 = 0x8B5C
+        /// </summary>
+        FloatMat4 = 35676,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x3 = 0x8B65
+        /// </summary>
+        FloatMat2x3 = 35685,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT2x4 = 0x8B66
+        /// </summary>
+        FloatMat2x4 = 35686,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x2 = 0x8B67
+        /// </summary>
+        FloatMat3x2 = 35687,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT3x4 = 0x8B68
+        /// </summary>
+        FloatMat3x4 = 35688,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x2 = 0x8B69
+        /// </summary>
+        FloatMat4x2 = 35689,
+        /// <summary>
+        /// Original was GL_FLOAT_MAT4x3 = 0x8B6A
+        /// </summary>
+        FloatMat4x3 = 35690,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC2 = 0x8DC6
+        /// </summary>
+        UnsignedIntVec2 = 36294,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC3 = 0x8DC7
+        /// </summary>
+        UnsignedIntVec3 = 36295,
+        /// <summary>
+        /// Original was GL_UNSIGNED_INT_VEC4 = 0x8DC8
+        /// </summary>
+        UnsignedIntVec4 = 36296,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2 = 0x8F46
+        /// </summary>
+        DoubleMat2 = 36678,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3 = 0x8F47
+        /// </summary>
+        DoubleMat3 = 36679,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4 = 0x8F48
+        /// </summary>
+        DoubleMat4 = 36680,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2x3 = 0x8F49
+        /// </summary>
+        DoubleMat2x3 = 36681,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT2x4 = 0x8F4A
+        /// </summary>
+        DoubleMat2x4 = 36682,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3x2 = 0x8F4B
+        /// </summary>
+        DoubleMat3x2 = 36683,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT3x4 = 0x8F4C
+        /// </summary>
+        DoubleMat3x4 = 36684,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4x2 = 0x8F4D
+        /// </summary>
+        DoubleMat4x2 = 36685,
+        /// <summary>
+        /// Original was GL_DOUBLE_MAT4x3 = 0x8F4E
+        /// </summary>
+        DoubleMat4x3 = 36686,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC2 = 0x8FFC
+        /// </summary>
+        DoubleVec2 = 36860,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC3 = 0x8FFD
+        /// </summary>
+        DoubleVec3 = 36861,
+        /// <summary>
+        /// Original was GL_DOUBLE_VEC4 = 0x8FFE
+        /// </summary>
+        DoubleVec4 = 36862
+    }
+}
diff --git a/Rendering/OpenGLBindings/ActiveSubroutineUniformParameter.cs b/Rendering/OpenGLBindings/ActiveSubroutineUniformParameter.cs
@@ -0,0 +1,25 @@
+namespace OpenGLBindings
+{
+    /// <summary>
+    /// Used in GL.GetActiveSubroutineUniform
+    /// </summary>
+    public enum ActiveSubroutineUniformParameter
+    {
+        /// <summary>
+        /// Original was GL_UNIFORM_SIZE = 0x8A38
+        /// </summary>
+        UniformSize = 35384,
+        /// <summary>
+        /// Original was GL_UNIFORM_NAME_LENGTH = 0x8A39
+        /// </summary>
+        UniformNameLength = 35385,
+        /// <summary>
+        /// Original was GL_NUM_COMPATIBLE_SUBROUTINES = 0x8E4A
+        /// </summary>
+        NumCompatibleSubroutines = 36426,
+        /// <summary>
+        /// Original was GL_COMPATIBLE_SUBROUTINES = 0x8E4B
+        /// </summary>
+        CompatibleSubroutines = 36427
+    }
+}
diff --git a/Rendering/OpenGLBindings/ActiveUniformBlockParameter.cs b/Rendering/OpenGLBindings/ActiveUniformBlockParameter.cs
@@ -0,0 +1,53 @@
+namespace OpenGLBindings
+{
+    /// <summary>
+    /// Used in GL.GetActiveUniformBlock
+    /// </summary>
+    public enum ActiveUniformBlockParameter
+    {
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_CONTROL_SHADER = 0x84F0
+        /// </summary>
+        UniformBlockReferencedByTessControlShader = 34032,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_TESS_EVALUATION_SHADER = 0x84F1
+        /// </summary>
+        UniformBlockReferencedByTessEvaluationShader = 34033,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_BINDING = 0x8A3F
+        /// </summary>
+        UniformBlockBinding = 35391,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_DATA_SIZE = 0x8A40
+        /// </summary>
+        UniformBlockDataSize = 35392,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_NAME_LENGTH = 0x8A41
+        /// </summary>
+        UniformBlockNameLength = 35393,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_ACTIVE_UNIFORMS = 0x8A42
+        /// </summary>
+        UniformBlockActiveUniforms = 35394,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_ACTIVE_UNIFORM_INDICES = 0x8A43
+        /// </summary>
+        UniformBlockActiveUniformIndices = 35395,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_VERTEX_SHADER = 0x8A44
+        /// </summary>
+        UniformBlockReferencedByVertexShader = 35396,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_GEOMETRY_SHADER = 0x8A45
+        /// </summary>
+        UniformBlockReferencedByGeometryShader = 35397,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_FRAGMENT_SHADER = 0x8A46
+        /// </summary>
+        UniformBlockReferencedByFragmentShader = 35398,
+        /// <summary>
+        /// Original was GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER = 0x90EC
+        /// </summary>
+        UniformBlockReferencedByComputeShader = 37100
+    }
+}
+6 −1		build/Avalonia.Desktop.props
+6 −1		build/Avalonia.Diagnostics.props
+6 −1		build/Avalonia.props