Changeset 140

Timestamp:

Aug 28, 2014, 1:38:06 AM (10 years ago)

Author:

alloc

Message:

Fixes

Location:

binary-improvements

Files:

• 7dtd-server-fixes/7dtd-server-fixes.csproj (modified) (1 diff)
• 7dtd-server-fixes/src/CommandExtensions.cs (modified) (1 diff)
• 7dtd-server-fixes/src/MapRendering/MapRendering.cs (modified) (5 diffs)
• 7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs (modified) (2 diffs)
• bin/Release/7dtd-server-fixes.dll (modified) ( previous)

binary-improvements/7dtd-server-fixes/7dtd-server-fixes.csproj

@@ -79 +79 @@
     <Compile Include="src\NetConnections\Servers\Web\SimpleRedirectHandler.cs" />
     <Compile Include="src\NetConnections\Servers\Web\MimeType.cs" />
+    <Compile Include="src\CustomCommands\EnableRendering.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />

binary-improvements/7dtd-server-fixes/src/CommandExtensions.cs

@@ -11 +11 @@
                         try {
                                 manager.m_GUIConsole.AddCommand (new CreativeMenu (manager.m_GUIConsole));
+                                manager.m_GUIConsole.AddCommand (new EnableRendering (manager.m_GUIConsole));
                                 manager.m_GUIConsole.AddCommand (new GetGamePrefs (manager.m_GUIConsole));
                                 manager.m_GUIConsole.AddCommand (new GetTime (manager.m_GUIConsole));

binary-improvements/7dtd-server-fixes/src/MapRendering/MapRendering.cs

@@ -26 +26 @@
                 private System.Timers.Timer chunkSaveTimer = new System.Timers.Timer (500);
                 private bool renderingFullMap = false;
+                public static bool renderingEnabled = true;
 
                 private MapRendering ()
@@ -41 +42 @@
                 public static void RenderSingleChunk (Chunk chunk)
                 {
-                        ThreadPool.QueueUserWorkItem ((o) =>
-                        {
-                                try {
-                                        if (!Instance.renderingFullMap) {
-                                                Chunk c = (Chunk)o;
-                                                Vector3i cPos = c.GetWorldPos ();
-                                                Vector2i cPos2 = new Vector2i (cPos.x / Constants.MAP_CHUNK_SIZE, cPos.z / Constants.MAP_CHUNK_SIZE);
-                                                Instance.RenderChunk (c, cPos2);
-                                                Instance.chunkSaveTimer.Stop ();
-                                                Instance.chunkSaveTimer.Start ();
+                        if (renderingEnabled) {
+                                ThreadPool.QueueUserWorkItem ((o) =>
+                                {
+                                        try {
+                                                if (!Instance.renderingFullMap) {
+                                                        Chunk c = (Chunk)o;
+                                                        Vector3i cPos = c.GetWorldPos ();
+                                                        Vector2i cPos2 = new Vector2i (cPos.x / Constants.MAP_CHUNK_SIZE, cPos.z / Constants.MAP_CHUNK_SIZE);
+                                                        Instance.RenderChunk (c, cPos2);
+                                                        Instance.chunkSaveTimer.Stop ();
+                                                        Instance.chunkSaveTimer.Start ();
+                                                }
+                                        } catch (Exception e) {
+                                                Log.Out ("Exception in MapRendering.RenderSingleChunk(): " + e);
                                         }
-                                } catch (Exception e) {
-                                        Log.Out ("Exception in MapRendering.RenderSingleChunk(): " + e);
-                                }
-                        }, chunk);
+                                }, chunk);
+                        }
                 }
 
@@ -114 +117 @@
 
                 private int saveCount = 0;
+                private long renderCount = 0;
 
                 private void SaveAllBlockMaps (object source, System.Timers.ElapsedEventArgs e)
@@ -119 +123 @@
                         Monitor.Enter (zoomLevelBuffers);
                         try {
-                                Log.Out ("------- SaveAllBlockMaps " + ++saveCount);
+                                Log.Out ("------- SaveAllBlockMaps " + ++saveCount + " - " + renderCount);
                                 for (int i = 0; i < Constants.ZOOMLEVELS; i++) {
                                         zoomLevelBuffers [i].SaveBlock ();
@@ -142 +146 @@
                         Monitor.Enter (zoomLevelBuffers);
                         try {
+                                renderCount++;
                                 ushort[] mapColors = chunk.GetMapColors ();
                                 if (mapColors != null) {

binary-improvements/7dtd-server-fixes/src/NetConnections/Servers/Web/Web.cs

@@ -24 +24 @@
 
                                 _listener.Prefixes.Add (String.Format ("http://*:{0}/", port));
-                                _listener.AuthenticationSchemes = AuthenticationSchemes.Basic;
+                                //_listener.AuthenticationSchemes = AuthenticationSchemes.Basic;
                                 _listener.Start ();
 
@@ -89 +89 @@
                 private bool Authorize (HttpListenerContext ctx, out HttpListenerBasicIdentity user)
                 {
+                        user = null;
+                        return true;
                         try {
                                 user = (HttpListenerBasicIdentity)ctx.User.Identity;