Small corrections to the 3d View

Author: BAndysc

Rendering/TheEngine/Interfaces/IRenderManager.cs

@@ -13,5 +13,6 @@ public interface IRenderManager
         void Render(IMesh mesh, Material material, int submesh, Matrix localToWorld, Matrix? worldToLocal = null);
         void Render(IMesh mesh, Material material, int submesh, Vector3 position);
         void RenderInstancedIndirect(IMesh mesh, Material material, int submesh, int count);
+        float ViewDistanceModifier { get; set; }
     }
 }

Rendering/TheEngine/Managers/RenderManager.cs

@@ -366,6 +366,8 @@ internal static WorldMeshBounds LocalToWorld(in MeshBounds local, in LocalToWorl
         Stopwatch materialtimer = new Stopwatch();
         Stopwatch buffertimer = new Stopwatch();
         Stopwatch draw = new Stopwatch();
+        private float viewDistanceModifier = 8;
+
         private void RenderEntities()
         {
             var cameraPosition = cameraManager.MainCamera.Transform.Position;
@@ -387,6 +389,7 @@ private void RenderEntities()
             engine.statsManager.Counters.BoundsCalc.Add(boundsUpdate.Elapsed.TotalMilliseconds);
 
             culler.Restart();
+            float mod = viewDistanceModifier * viewDistanceModifier;
             toRenderArchetype.ParallelForEach<LocalToWorld, RenderEnabledBit, WorldMeshBounds>((itr, start, end, l2w, bits, worldMeshBounds) =>
             {
                 for (int i = start; i < end; ++i)
@@ -395,8 +398,8 @@ private void RenderEntities()
                     var pos = l2w[i].Position;
                     var boundingBoxSize = boundingBox.Size;
                     var size = boundingBoxSize.X + boundingBoxSize.Y + boundingBoxSize.Z;
-                    size = Math.Max(size, 40);
-                    bool doRender = (pos - cameraPosition).LengthSquared() < (size) * (size) * 4 * 4;
+                    size = Math.Max(size, 60);
+                    bool doRender = (pos - cameraPosition).LengthSquared() < (size) * (size) * mod;
                     if (doRender)
                     {
                         bits[i] = (RenderEnabledBit)(frustum.Contains(ref boundingBox) != ContainmentType.Disjoint);
@@ -543,6 +546,16 @@ public void RenderInstancedIndirect(IMesh mesh, Material material, int submesh,
             engine.Device.DrawIndexedInstanced(count, instancesCount, start, 0, 0);
         }
 
+        public float ViewDistanceModifier
+        {
+            get => viewDistanceModifier;
+            set
+            {
+                if (value > 0)
+                    viewDistanceModifier = value;
+            }
+        }
+
         private void UpdateSceneBuffer()
         {
             var camera = cameraManager.MainCamera;

Rendering/TheEngine/TheEnginePanel.cs

@@ -154,7 +154,7 @@ protected override void OnOpenGlRender(GlInterface gl, int fb)
                 Tick(delta);
                 engine.statsManager.Counters.FrameTime.Add(delta);
                 sw.Restart();
-                RaisePropertyChanged(FrameRateProperty, Optional<float>.Empty, FrameRate);
+                Dispatcher.UIThread.Post(() => RaisePropertyChanged(FrameRateProperty, Optional<float>.Empty, FrameRate), DispatcherPriority.Render);
 
                 Update(delta);
 

WDE.MapRenderer/GameManager.cs

@@ -38,7 +38,7 @@ public void Initialize(Engine engine)
             TimeManager = new TimeManager(this);
             ScreenSpaceSelector = new ScreenSpaceSelector(this);
             DbcManager = new DbcManager(this, databaseClientFileOpener);
-            CurrentMap = DbcManager.MapStore.FirstOrDefault() ?? Map.Empty;
+            CurrentMap = DbcManager.MapStore.FirstOrDefault(m => m.Id == 1) ?? Map.Empty;
             TextureManager = new WoWTextureManager(this);
             MeshManager = new WoWMeshManager(this);
             MdxManager = new MdxManager(this);
@@ -51,13 +51,17 @@ public void Initialize(Engine engine)
 
             OnInitialized?.Invoke();
             IsInitialized = true;
+            waitForInitialized.SetResult();
         }
 
         public void StartCoroutine(IEnumerator coroutine)
         {
             coroutineManager.Start(coroutine);
         }
 
+        private TaskCompletionSource waitForInitialized = new();
+        public Task WaitForInitialized => waitForInitialized.Task;
+
         private Material? prevMaterial;
         public void Update(float delta)
         {
@@ -112,6 +116,7 @@ public void DisposeGame()
         {
             if (!IsInitialized)
                 return;
+            waitForInitialized = new();
             IsInitialized = false;
             ModuleManager.Dispose();
             LightingManager.Dispose();

WDE.MapRenderer/GameToolBar.axaml

@@ -21,13 +21,17 @@
                 <CheckBox Name="TimeFlow" IsChecked="{Binding DisableTimeFlow, Mode=TwoWay}">Disable time flow</CheckBox>
                 <DockPanel LastChildFill="True" IsEnabled="{Binding #TimeFlow.IsChecked, Converter={x:Static InverseBoolConverter.Instance}}">
                     <TextBlock VerticalAlignment="Center">Time speed: </TextBlock>
-                    <Slider Minimum="0" Maximum="6" SmallChange="1" LargeChange="1" Value="{Binding TimeSpeedMultiplier}" />
+                    <Slider Minimum="0" Maximum="6" IsSnapToTickEnabled="True" SmallChange="1" LargeChange="1" Value="{Binding TimeSpeedMultiplier}" />
                 </DockPanel>
                 <DockPanel LastChildFill="True">
                     <TextBlock VerticalAlignment="Center">Time: </TextBlock>
                     <Slider Minimum="0" Maximum="1439" Value="{Binding CurrentTime}" />
                 </DockPanel>
                 <CheckBox IsChecked="{Binding OverrideLighting, Mode=TwoWay}">Disable lightning</CheckBox>
+                <DockPanel LastChildFill="True">
+                    <TextBlock VerticalAlignment="Center">View distance: </TextBlock>
+                    <Slider Minimum="1" Maximum="32" SmallChange="1" LargeChange="1" Value="{Binding ViewDistance}" />
+                </DockPanel>
             </StackPanel>
         </DropDownButton>
     </ToolbarPanel>

WDE.MapRenderer/GameView.axaml

@@ -12,6 +12,7 @@
     </UserControl.Styles>
     <UserControl.KeyBindings>
         <KeyBinding Gesture="M" Command="{Binding ToggleMapVisibilityCommand}" />
+        <KeyBinding Gesture="R" Command="{Binding ToggleStatsVisibilityCommand}" />
     </UserControl.KeyBindings>
     <DockPanel LastChildFill="True">
         <mapRenderer:GameToolBar DockPanel.Dock="Top" />
@@ -24,8 +25,8 @@
                     <mapRenderer:MiniMapRenderer Context2="{Binding .}" PointerPressed="InputElement_OnPointerPressed"/>
                 </worldMap:WoWMapViewer>
             </Border>
-            <TextBlock Text="{Binding #TheEnginePanel.FrameRate, StringFormat={}{0:0.##}}" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="14" FontWeight="Bold" Background="Black" Foreground="White" FontFamily="Consolas,Menlo,Courier,Courier New" />
-            <TextBlock Text="{Binding Stats}" Padding="2" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="13" FontWeight="Bold" Background="Black" Foreground="White" FontFamily="Consolas,Menlo,Courier,Courier New" />
+            <TextBlock Text="{Binding #TheEnginePanel.FrameRate, StringFormat={}{0:0}}" HorizontalAlignment="Right" VerticalAlignment="Top" FontSize="14" FontWeight="Bold" Background="Black" Foreground="White" FontFamily="Consolas,Menlo,Courier,Courier New" />
+            <TextBlock IsVisible="{Binding DisplayStats}" Text="{Binding Stats}" Padding="2" HorizontalAlignment="Right" VerticalAlignment="Bottom" FontSize="13" FontWeight="Bold" Background="Black" Foreground="White" FontFamily="Consolas,Menlo,Courier,Courier New" />
         </Panel>
     </DockPanel>
 </UserControl>

WDE.MapRenderer/GameViewModel.cs

@@ -104,12 +104,14 @@ public GameViewModel(IMpqService mpqService,
                 Game.TimeManager.SetTime(Time.FromMinutes(settings.CurrentTime));
                 Game.TimeManager.TimeSpeedMultiplier = settings.TimeSpeedMultiplier;
                 Game.ChunkManager.RenderGrid = settings.ShowGrid;
+                Game.Engine.RenderManager.ViewDistanceModifier = settings.ViewDistanceModifier;
 
                 RaisePropertyChanged(nameof(OverrideLighting));
                 RaisePropertyChanged(nameof(DisableTimeFlow));
                 RaisePropertyChanged(nameof(TimeSpeedMultiplier));
                 RaisePropertyChanged(nameof(ShowGrid));
                 RaisePropertyChanged(nameof(CurrentTime));
+                RaisePropertyChanged(nameof(ViewDistance));
             };
             AutoDispose(new ActionDisposable(() =>
             {
@@ -137,7 +139,8 @@ public GameViewModel(IMpqService mpqService,
                 }));
 
             ToggleMapVisibilityCommand = new DelegateCommand(() => IsMapVisible = !IsMapVisible);
-
+            ToggleStatsVisibilityCommand = new DelegateCommand(() => DisplayStats = !DisplayStats);
+            
             cameraViewModel = new GameCameraViewModel(this);
             Items.Add(cameraViewModel);
 
@@ -149,6 +152,9 @@ public GameViewModel(IMpqService mpqService,
 
             Game.UpdateLoop.Register(d =>
             {
+                if (!DisplayStats)
+                    return;
+                
                 ref var counters = ref Game.Engine.StatsManager.Counters;
                 ref var stats = ref Game.Engine.StatsManager.RenderStats;
                 float w = Game.Engine.StatsManager.PixelSize.X;
@@ -235,6 +241,16 @@ public bool ShowGrid
             }
         }
 
+        public float ViewDistance
+        {
+            get => Game.Engine.RenderManager.ViewDistanceModifier;
+            set
+            {
+                Game.Engine.RenderManager.ViewDistanceModifier = value;
+                RaisePropertyChanged(nameof(ViewDistance));
+            }
+        }
+        
         public int CurrentTime
         {
             get => Game.TimeManager?.Time.TotalMinutes ?? 0;
@@ -245,13 +261,22 @@ public int CurrentTime
                 RaisePropertyChanged(nameof(CurrentTime));
             }
         }
-        
+
+        public bool DisplayStats
+        {
+            get => displayStats;
+            set => SetProperty(ref displayStats, value);
+        }
+
         public bool IsMapVisible
         {
             get => isMapVisible;
             set => SetProperty(ref isMapVisible, value);
         }
+        
         public ICommand ToggleMapVisibilityCommand { get; }
+        public ICommand ToggleStatsVisibilityCommand { get; }
+        
 
         public string UniqueId => "game_view";
 
@@ -282,6 +307,7 @@ public void Initialized()
 
         private GameCameraViewModel cameraViewModel;
         private bool visibility;
+        private bool displayStats;
         public ObservableCollection<GameCameraViewModel> Items { get; } = new();
         public IEnumerable<GameCameraViewModel> VisibleItems => Items;
         public GameCameraViewModel? SelectedItem { get; set; }

WDE.MapRenderer/GameViewSettings.cs

@@ -19,7 +19,8 @@ public GameViewSettings(IUserSettings settings)
                 DisableTimeFlow = false,
                 TimeSpeedMultiplier = 3,
                 ShowGrid = true,
-                CurrentTime = 360
+                CurrentTime = 360,
+                ViewDistanceModifier = 6
             });
         }
 
@@ -73,13 +74,24 @@ public bool ShowGrid
             }
         }
 
+        public float ViewDistanceModifier
+        {
+            get => current.ViewDistanceModifier;
+            set
+            {
+                current.ViewDistanceModifier = value;
+                settings.Update(current);
+            }
+        }
+        
         public struct Data : ISettings
         {
             public bool OverrideLighting;
             public bool DisableTimeFlow;
             public int TimeSpeedMultiplier;
             public bool ShowGrid;
             public int CurrentTime;
+            public float ViewDistanceModifier;
         }
     }
 }

WDE.MapRenderer/Managers/IGameContext.cs

@@ -28,5 +28,6 @@ public interface IGameContext
         Map CurrentMap { get; }
         void SetMap(int id);
         void StartCoroutine(IEnumerator coroutine);
+        Task WaitForInitialized { get; }
     }
 }

WoWDatabaseEditorCore.Avalonia/Docking/PersistentDockDataTemplate.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Reactive.Linq;
 using Avalonia.Collections;
 using Avalonia.Controls;
@@ -57,16 +58,6 @@ public IControl Build(object data, IControl? existing)
                     return view;
                 }
 
-                System.IDisposable? disposable = null;
-                disposable = toolDockWrapper.ViewModel.ToObservable(i => i.Visibility)
-                    .SubscribeAction(toolVisibility =>
-                    {
-                        if (!toolVisibility)
-                            tools.Remove(toolDockWrapper.ViewModel);
-                        disposable?.Dispose();
-                        disposable = null;
-                    });
-                
                 if (ViewBind.TryResolve(toolDockWrapper.ViewModel, out var documentView) && documentView is IControl control)
                 {
                     tools[toolDockWrapper.ViewModel] = control;
@@ -94,6 +85,15 @@ private void Bind()
                     {
                         documents.Remove(item.Item);
                     });
+                foreach (var tool in DocumentManager.AllTools)
+                {
+                    tool.ToObservable(i => i.Visibility)
+                        .SubscribeAction(toolVisibility =>
+                        {
+                            if (!toolVisibility)
+                                tools.Remove(tool);
+                        });
+                }
             }
         }
     }