Compare commits
63 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 435cbde238 | |||
| d7040bad13 | |||
| a588070ce1 | |||
| d156772438 | |||
| de7ae41769 | |||
| 618ad1938b | |||
| 5b10263f82 | |||
| 34f914c52f | |||
| 67b766c674 | |||
| a3e7469203 | |||
| 4ecaa6a9a1 | |||
| 24f9dadc58 | |||
| b3ebaffa85 | |||
| b7ac1909d6 | |||
| 32c3118afa | |||
| 3a525f53f0 | |||
| f3947312c1 | |||
| 839ea1e778 | |||
| d2becd2c03 | |||
| 7d87347199 | |||
| f4117751c9 | |||
| a8a085f296 | |||
| 317319593e | |||
| 4633f90a03 | |||
| 5802bbb3f3 | |||
| e93d5b90f1 | |||
| 9be56607a5 | |||
| 91743bf742 | |||
| d40d293f54 | |||
| a075e60e3e | |||
| d72c7c3695 | |||
| 309fa07664 | |||
| 0a017567c4 | |||
| e01261da5c | |||
| a0879d07c5 | |||
| bbb15263f2 | |||
| 5ca3563c66 | |||
| 30256a2779 | |||
| 4b4f10f5e6 | |||
| ad995544f7 | |||
| d521e931f4 | |||
| dd30a8274a | |||
| 3ca5efadc9 | |||
| 09174c2d2a | |||
| e079b28e77 | |||
| 136124a703 | |||
| 3ed50e5134 | |||
| b5e3e6867c | |||
| 3e04342148 | |||
| 6699b568df | |||
| 53bee4ad42 | |||
| 5d5e462221 | |||
| d9b924cfed | |||
| 8bd70d593c | |||
| 5597044604 | |||
| 5d7c043d06 | |||
| 4aac61b37f | |||
| 22460fa1f5 | |||
| 2d127c7d98 | |||
| 91e17c420a | |||
| 93f5a85cb5 | |||
| b275971486 | |||
| 1234ff4d28 |
+1
-2
@@ -4,7 +4,6 @@
|
||||
|
||||
[*]
|
||||
charset = utf-8
|
||||
end_of_line = crlf
|
||||
indent_size = 4
|
||||
indent_style = space
|
||||
insert_final_newline = false
|
||||
@@ -537,7 +536,7 @@ ij_groovy_wrap_chain_calls_after_dot = false
|
||||
ij_groovy_wrap_long_lines = false
|
||||
|
||||
[{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}]
|
||||
indent_size = 2
|
||||
indent_size = 4
|
||||
ij_json_array_wrapping = split_into_lines
|
||||
ij_json_keep_blank_lines_in_code = 0
|
||||
ij_json_keep_indents_on_empty_lines = false
|
||||
|
||||
+17
-16
@@ -39,8 +39,8 @@ public enum EDhApiDataCompressionMode
|
||||
/**
|
||||
* Should only be used internally and for unit testing. <br><br>
|
||||
*
|
||||
* Read Speed: 1.64 MS / DTO <br>
|
||||
* Write Speed: 12.44 MS / DTO <br>
|
||||
* Read Speed: 6.09 MS / DTO <br>
|
||||
* Write Speed: 6.01 MS / DTO <br>
|
||||
* Compression ratio: 1.0 <br>
|
||||
*/
|
||||
@DisallowSelectingViaConfigGui
|
||||
@@ -49,28 +49,29 @@ public enum EDhApiDataCompressionMode
|
||||
/**
|
||||
* Extremely fast (often faster than uncompressed), but generally poor compression. <br><br>
|
||||
*
|
||||
* Read Speed: 1.85 MS / DTO <br>
|
||||
* Write Speed: 9.46 MS / DTO <br>
|
||||
* Compression ratio: 0.3638 <br>
|
||||
* Read Speed: 3.25 MS / DTO <br>
|
||||
* Write Speed: 5.99 MS / DTO <br>
|
||||
* Compression ratio: 0.4513 <br>
|
||||
*/
|
||||
LZ4(1),
|
||||
|
||||
/*
|
||||
* Decent speed and good compression. <br><br>
|
||||
*
|
||||
* Read Speed: 11.78 MS / DTO <br>
|
||||
* Write Speed: 16.76 MS / DTO <br>
|
||||
* Compression ratio: 0.2199 <br>
|
||||
*/
|
||||
//@Deprecated
|
||||
///**
|
||||
// * Decent speed and good compression. <br><br>
|
||||
// *
|
||||
// * Read Speed: 9.31 MS / DTO <br>
|
||||
// * Write Speed: 15.13 MS / DTO <br>
|
||||
// * Compression ratio: 0.2606 <br>
|
||||
// */
|
||||
////@DisallowSelectingViaConfigGui
|
||||
//Z_STD(2),
|
||||
|
||||
|
||||
/**
|
||||
* Extremely slow, but very good compression. <br><br>
|
||||
*
|
||||
* Read Speed: 12.25 MS / DTO <br>
|
||||
* Write Speed: 490.07 MS / DTO <br>
|
||||
* Compression ratio: 0.1242 <br>
|
||||
* Read Speed: 13.29 MS / DTO <br>
|
||||
* Write Speed: 70.95 MS / DTO <br>
|
||||
* Compression ratio: 0.2068 <br>
|
||||
*/
|
||||
LZMA2(3);
|
||||
|
||||
|
||||
+48
@@ -0,0 +1,48 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
|
||||
|
||||
/**
|
||||
* Called after Distant Horizons (re)creates
|
||||
* the color and depth textures it renders to. <br>
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2025-6-9
|
||||
* @since API 4.1.0
|
||||
*/
|
||||
public abstract class DhApiAfterColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
|
||||
{
|
||||
/** Fired before Distant Horizons creates. */
|
||||
public abstract void onResize(DhApiEventParam<DhApiTextureCreatedParam> event);
|
||||
|
||||
|
||||
//=========================//
|
||||
// internal DH API methods //
|
||||
//=========================//
|
||||
|
||||
@Override
|
||||
public final void fireEvent(DhApiEventParam<DhApiTextureCreatedParam> event) { this.onResize(event); }
|
||||
|
||||
|
||||
}
|
||||
+49
@@ -0,0 +1,49 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
|
||||
|
||||
/**
|
||||
* Called before Distant Horizons (re)creates
|
||||
* the color and depth textures it renders to. <br>
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2025-6-9
|
||||
* @since API 4.1.0
|
||||
*/
|
||||
public abstract class DhApiBeforeColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
|
||||
{
|
||||
/** Fired before Distant Horizons creates. */
|
||||
public abstract void onResize(DhApiEventParam<DhApiTextureCreatedParam> event);
|
||||
|
||||
|
||||
//=========================//
|
||||
// internal DH API methods //
|
||||
//=========================//
|
||||
|
||||
@Override
|
||||
public final void fireEvent(DhApiEventParam<DhApiTextureCreatedParam> event) { this.onResize(event); }
|
||||
|
||||
|
||||
}
|
||||
+13
-1
@@ -22,15 +22,18 @@ package com.seibel.distanthorizons.api.methods.events.abstractEvents;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
|
||||
|
||||
/**
|
||||
* Called whenever Distant Horizons (re)creates
|
||||
* Called before Distant Horizons (re)creates
|
||||
* the color and depth textures it renders to. <br>
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2024-3-2
|
||||
* @since API 2.0.0
|
||||
* @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
|
||||
*/
|
||||
@Deprecated
|
||||
public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>
|
||||
{
|
||||
/** Fired before Distant Horizons creates. */
|
||||
@@ -73,6 +76,15 @@ public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<
|
||||
this.newHeight = newHeight;
|
||||
|
||||
}
|
||||
public EventParam(DhApiTextureCreatedParam textureCreatedParam)
|
||||
{
|
||||
this.previousWidth = textureCreatedParam.previousWidth;
|
||||
this.previousHeight = textureCreatedParam.previousHeight;
|
||||
|
||||
this.newWidth = textureCreatedParam.newWidth;
|
||||
this.newHeight = textureCreatedParam.newHeight;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
|
||||
+68
@@ -0,0 +1,68 @@
|
||||
/*
|
||||
* This file is part of the Distant Horizons mod
|
||||
* licensed under the GNU LGPL v3 License.
|
||||
*
|
||||
* Copyright (C) 2020 James Seibel
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, version 3.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
|
||||
import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
|
||||
import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
|
||||
|
||||
/**
|
||||
* Contains information relevant to when Distant Horizons (re)creates
|
||||
* depth/color textures for rendering.
|
||||
*
|
||||
* @author James Seibel
|
||||
* @version 2025-6-9
|
||||
* @since API 4.1.0
|
||||
*/
|
||||
public class DhApiTextureCreatedParam implements IDhApiEventParam
|
||||
{
|
||||
/** Measured in pixels */
|
||||
public final int previousWidth;
|
||||
/** Measured in pixels */
|
||||
public final int previousHeight;
|
||||
|
||||
/** Measured in pixels */
|
||||
public final int newWidth;
|
||||
/** Measured in pixels */
|
||||
public final int newHeight;
|
||||
|
||||
|
||||
public DhApiTextureCreatedParam(
|
||||
int previousWidth, int previousHeight,
|
||||
int newWidth, int newHeight)
|
||||
{
|
||||
this.previousWidth = previousWidth;
|
||||
this.previousHeight = previousHeight;
|
||||
|
||||
this.newWidth = newWidth;
|
||||
this.newHeight = newHeight;
|
||||
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public DhApiTextureCreatedParam copy()
|
||||
{
|
||||
return new DhApiTextureCreatedParam(
|
||||
this.previousWidth, this.previousHeight,
|
||||
this.newWidth, this.newHeight
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -31,21 +31,21 @@ public final class ModInfo
|
||||
public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
|
||||
|
||||
/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
|
||||
public static final int PROTOCOL_VERSION = 10;
|
||||
public static final int PROTOCOL_VERSION = 11;
|
||||
public static final String WRAPPER_PACKET_PATH = "message";
|
||||
|
||||
/** The internal mod name */
|
||||
public static final String NAME = "DistantHorizons";
|
||||
/** Human-readable version of NAME */
|
||||
public static final String READABLE_NAME = "Distant Horizons";
|
||||
public static final String VERSION = "2.3.1-b";
|
||||
public static final String VERSION = "2.3.4-b";
|
||||
/** Returns true if the current build is an unstable developer build, false otherwise. */
|
||||
public static final boolean IS_DEV_BUILD = VERSION.toLowerCase().contains("dev");
|
||||
|
||||
/** This version should only be updated when breaking changes are introduced to the DH API */
|
||||
public static final int API_MAJOR_VERSION = 4;
|
||||
/** This version should be updated whenever new methods are added to the DH API */
|
||||
public static final int API_MINOR_VERSION = 0;
|
||||
public static final int API_MINOR_VERSION = 1;
|
||||
/** This version should be updated whenever non-breaking fixes are added to the DH API */
|
||||
public static final int API_PATCH_VERSION = 0;
|
||||
|
||||
|
||||
+6
-8
@@ -31,14 +31,12 @@ import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
|
||||
public class RenderModeEnabledConverter implements IConverter<EDhApiRendererMode, Boolean>
|
||||
{
|
||||
|
||||
@Override public EDhApiRendererMode convertToCoreType(Boolean renderingEnabled)
|
||||
{
|
||||
return renderingEnabled ? EDhApiRendererMode.DEFAULT : EDhApiRendererMode.DISABLED;
|
||||
}
|
||||
@Override
|
||||
public EDhApiRendererMode convertToCoreType(Boolean renderingEnabled)
|
||||
{ return renderingEnabled ? EDhApiRendererMode.DEFAULT : EDhApiRendererMode.DISABLED; }
|
||||
|
||||
@Override public Boolean convertToApiType(EDhApiRendererMode renderingMode)
|
||||
{
|
||||
return renderingMode == EDhApiRendererMode.DEFAULT;
|
||||
}
|
||||
@Override
|
||||
public Boolean convertToApiType(EDhApiRendererMode renderingMode)
|
||||
{ return renderingMode == EDhApiRendererMode.DEFAULT; }
|
||||
|
||||
}
|
||||
|
||||
+7
-1
@@ -60,4 +60,10 @@ shadowJar {
|
||||
def librariesLocation = "DistantHorizons.libraries"
|
||||
// relocate "it.unimi.dsi.fastutil", "${librariesLocation}.unimi.dsi.fastutil"
|
||||
mergeServiceFiles()
|
||||
}
|
||||
}
|
||||
|
||||
test {
|
||||
// this is necessary specifically for the Compression tests since those
|
||||
// need more than the default 512 MB of RAM
|
||||
jvmArgs '-Xmx4096m'
|
||||
}
|
||||
|
||||
+2
-1
@@ -26,6 +26,7 @@ import com.seibel.distanthorizons.api.interfaces.config.client.*;
|
||||
import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
|
||||
import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.coreapi.util.converters.RenderModeEnabledConverter;
|
||||
|
||||
public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||
{
|
||||
@@ -60,7 +61,7 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<Boolean> renderingEnabled()
|
||||
{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.quickEnableRendering); }
|
||||
{ return new DhApiConfigValue<EDhApiRendererMode, Boolean>(Config.Client.Advanced.Debugging.rendererMode, new RenderModeEnabledConverter()); }
|
||||
|
||||
@Override
|
||||
public IDhApiConfigValue<EDhApiRendererMode> renderingMode()
|
||||
|
||||
@@ -89,6 +89,15 @@ public class ClientApi
|
||||
/** this includes the is dev build message and low allocated memory warning */
|
||||
private static final int MS_BETWEEN_STATIC_STARTUP_MESSAGES = 4_000;
|
||||
|
||||
/**
|
||||
* This isn't the cleanest way of storing variables before passing them to the LOD renderer,
|
||||
* but due to how mixins work and the inconsistency between MC versions,
|
||||
* having a static object that stores a single frame's data
|
||||
* is often the easiest solution. <br><br>
|
||||
*
|
||||
* Only downside is making sure each variable is populated before rendering.
|
||||
*/
|
||||
public static final RenderState RENDER_STATE = new RenderState();
|
||||
|
||||
|
||||
private boolean isDevBuildMessagePrinted = false;
|
||||
@@ -389,7 +398,7 @@ public class ClientApi
|
||||
// rendering //
|
||||
//===========//
|
||||
|
||||
/** Should be called before {@link ClientApi#renderDeferredLods} */
|
||||
/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
|
||||
public void renderLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
|
||||
{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, false); }
|
||||
|
||||
@@ -397,9 +406,10 @@ public class ClientApi
|
||||
* Only necessary when Shaders are in use.
|
||||
* Should be called after {@link ClientApi#renderLods}
|
||||
*/
|
||||
public void renderDeferredLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
|
||||
public void renderDeferredLodsForShaders(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
|
||||
{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, true); }
|
||||
|
||||
|
||||
private void renderLodLayer(
|
||||
IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks,
|
||||
boolean renderingDeferredLayer)
|
||||
@@ -445,6 +455,25 @@ public class ClientApi
|
||||
|
||||
|
||||
|
||||
//Mat4f mcCombined = mcModelViewMatrix.copy();
|
||||
//mcCombined.multiply(mcProjectionMatrix);
|
||||
//
|
||||
//com.seibel.distanthorizons.api.objects.math.DhApiMat4f dhCombined = renderEventParam.dhModelViewMatrix.copy();
|
||||
//dhCombined.multiply(renderEventParam.dhProjectionMatrix);
|
||||
//
|
||||
//LOGGER.info("\n\n" +
|
||||
// "API\n" +
|
||||
// "Mc MVM: \n" + mcModelViewMatrix.toString() + "\n" +
|
||||
// "Mc Proj: \n" + mcProjectionMatrix + "\n" +
|
||||
// "Mc Combined:\n" + mcCombined.toString() + "\n" +
|
||||
// "\n" +
|
||||
// "DH MVM: \n" + renderEventParam.dhModelViewMatrix.toString() + "\n" +
|
||||
// "DH Proj: \n" + renderEventParam.dhProjectionMatrix + "\n" +
|
||||
// "DH Combined:\n" + mcCombined.toString()
|
||||
//);
|
||||
|
||||
|
||||
|
||||
// render validation //
|
||||
|
||||
try
|
||||
@@ -555,25 +584,26 @@ public class ClientApi
|
||||
public void renderFadeOpaque(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
|
||||
{
|
||||
// only fade when DH is rendering
|
||||
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
|
||||
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
|
||||
// only fade when requested
|
||||
&& Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
|
||||
// don't fade when Iris shaders are active, otherwise the rendering can get weird
|
||||
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
||||
{
|
||||
if (Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS)
|
||||
{
|
||||
FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
|
||||
}
|
||||
FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
|
||||
}
|
||||
}
|
||||
/** should be called after DH and MC finish rendering so we can smooth the transition between the two */
|
||||
public void renderFade(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
|
||||
{
|
||||
// only fade when DH is rendering
|
||||
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
|
||||
if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
|
||||
// only fade when requested
|
||||
&& Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE
|
||||
// don't fade when Iris shaders are active, otherwise the rendering can get weird
|
||||
&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
|
||||
{
|
||||
// fade if any level fading is active
|
||||
if (Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE)
|
||||
{
|
||||
FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
|
||||
}
|
||||
FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -652,7 +682,8 @@ public class ClientApi
|
||||
private void detectAndSendBootTimeWarnings()
|
||||
{
|
||||
// dev build
|
||||
if (ModInfo.IS_DEV_BUILD && !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
|
||||
if (ModInfo.IS_DEV_BUILD
|
||||
&& !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
|
||||
{
|
||||
this.isDevBuildMessagePrinted = true;
|
||||
this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
|
||||
@@ -669,7 +700,8 @@ public class ClientApi
|
||||
|
||||
// memory
|
||||
if (this.staticStartupMessageSentRecently()) return;
|
||||
if (!this.lowMemoryWarningPrinted && Config.Common.Logging.Warning.showLowMemoryWarningOnStartup.get())
|
||||
if (!this.lowMemoryWarningPrinted
|
||||
&& Config.Common.Logging.Warning.showLowMemoryWarningOnStartup.get())
|
||||
{
|
||||
this.lowMemoryWarningPrinted = true;
|
||||
this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
|
||||
@@ -694,7 +726,8 @@ public class ClientApi
|
||||
|
||||
// high vanilla render distance
|
||||
if (this.staticStartupMessageSentRecently()) return;
|
||||
if (!this.highVanillaRenderDistanceWarningPrinted && Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
|
||||
if (!this.highVanillaRenderDistanceWarningPrinted
|
||||
&& Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
|
||||
{
|
||||
// DH generally doesn't need a vanilla render distance above 12
|
||||
if (MC_RENDER.getRenderDistance() > 12)
|
||||
@@ -721,7 +754,8 @@ public class ClientApi
|
||||
{
|
||||
if (this.lastStaticWarningMessageSentMsTime == 0)
|
||||
{
|
||||
return true;
|
||||
// no static message has ever been sent
|
||||
return false;
|
||||
}
|
||||
|
||||
long timeSinceLastMessage = System.currentTimeMillis() - this.lastStaticWarningMessageSentMsTime;
|
||||
@@ -740,4 +774,47 @@ public class ClientApi
|
||||
*/
|
||||
public void showOverlayMessageNextFrame(String message) { this.overlayMessageQueueForNextFrame.add(message); }
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// helper classes //
|
||||
//================//
|
||||
|
||||
public static class RenderState
|
||||
{
|
||||
public Mat4f mcModelViewMatrix = null;
|
||||
public Mat4f mcProjectionMatrix = null;
|
||||
public float frameTime = -1;
|
||||
|
||||
|
||||
public void canRenderOrThrow() throws IllegalStateException
|
||||
{
|
||||
String errorReasons = "";
|
||||
|
||||
if (this.mcModelViewMatrix == null)
|
||||
{
|
||||
errorReasons += "no MVM Matrix, ";
|
||||
}
|
||||
|
||||
if (this.mcProjectionMatrix == null)
|
||||
{
|
||||
errorReasons += "no Projection Matrix, ";
|
||||
}
|
||||
|
||||
if (this.frameTime == -1)
|
||||
{
|
||||
errorReasons += "no Frame Time, ";
|
||||
}
|
||||
|
||||
|
||||
if (!errorReasons.isEmpty())
|
||||
{
|
||||
throw new IllegalStateException(errorReasons);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -99,6 +99,11 @@ public class SharedApi
|
||||
|
||||
public static void setDhWorld(AbstractDhWorld newWorld)
|
||||
{
|
||||
AbstractDhWorld oldWorld = currentWorld;
|
||||
if (oldWorld != null)
|
||||
{
|
||||
oldWorld.close();
|
||||
}
|
||||
currentWorld = newWorld;
|
||||
|
||||
// starting and stopping the DataRenderTransformer is necessary to prevent attempting to
|
||||
|
||||
@@ -1342,20 +1342,20 @@ public class Config
|
||||
+ EDhApiDataCompressionMode.UNCOMPRESSED + " \n"
|
||||
+ "Should only be used for testing, is worse in every way vs ["+EDhApiDataCompressionMode.LZ4+"].\n"
|
||||
+ "Expected Compression Ratio: 1.0\n"
|
||||
+ "Estimated average DTO read speed: 1.64 milliseconds\n"
|
||||
+ "Estimated average DTO write speed: 12.44 milliseconds\n"
|
||||
+ "Estimated average DTO read speed: 3.25 milliseconds\n"
|
||||
+ "Estimated average DTO write speed: 5.99 milliseconds\n"
|
||||
+ "\n"
|
||||
+ EDhApiDataCompressionMode.LZ4 + " \n"
|
||||
+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
|
||||
+ "Expected Compression Ratio: 0.36\n"
|
||||
+ "Expected Compression Ratio: 0.26\n"
|
||||
+ "Estimated average DTO read speed: 1.85 ms\n"
|
||||
+ "Estimated average DTO write speed: 9.46 ms\n"
|
||||
+ "\n"
|
||||
+ EDhApiDataCompressionMode.LZMA2 + " \n"
|
||||
+ "Slow but very good compression.\n"
|
||||
+ "Expected Compression Ratio: 0.14\n"
|
||||
+ "Estimated average DTO read speed: 11.89 ms\n"
|
||||
+ "Estimated average DTO write speed: 192.01 ms\n"
|
||||
+ "Expected Compression Ratio: 0.2\n"
|
||||
+ "Estimated average DTO read speed: 13.29 ms\n"
|
||||
+ "Estimated average DTO write speed: 70.95 ms\n"
|
||||
+ "")
|
||||
.build();
|
||||
|
||||
@@ -1713,6 +1713,15 @@ public class Config
|
||||
+ "Value of 0 disables the limit."
|
||||
+ "")
|
||||
.build();
|
||||
public static ConfigEntry<Boolean> enableAdaptiveTransferSpeed = new ConfigEntry.Builder<Boolean>()
|
||||
.set(false)
|
||||
.comment(""
|
||||
+ "Enables adaptive transfer speed based on client performance.\n"
|
||||
+ "If true, DH will automatically adjust transfer rate to minimize connection lag.\n"
|
||||
+ "If false, transfer speed will remain fixed.\n"
|
||||
+ "")
|
||||
.build();
|
||||
|
||||
|
||||
public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
|
||||
|
||||
|
||||
+10
@@ -105,6 +105,15 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
||||
this.put(EDhApiQualityPreset.HIGH, true);
|
||||
this.put(EDhApiQualityPreset.EXTREME, true);
|
||||
}});
|
||||
private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> caveCulling = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Culling.enableCaveCulling,
|
||||
new HashMap<EDhApiQualityPreset, Boolean>()
|
||||
{{
|
||||
this.put(EDhApiQualityPreset.MINIMUM, true);
|
||||
this.put(EDhApiQualityPreset.LOW, true);
|
||||
this.put(EDhApiQualityPreset.MEDIUM, true);
|
||||
this.put(EDhApiQualityPreset.HIGH, false);
|
||||
this.put(EDhApiQualityPreset.EXTREME, false);
|
||||
}});
|
||||
|
||||
|
||||
|
||||
@@ -123,6 +132,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
|
||||
this.configList.add(this.ssaoEnabled);
|
||||
this.configList.add(this.vanillaFade);
|
||||
this.configList.add(this.dhDither);
|
||||
this.configList.add(this.caveCulling);
|
||||
|
||||
|
||||
for (ConfigEntryWithPresetOptions<EDhApiQualityPreset, ?> config : this.configList)
|
||||
|
||||
+8
-6
@@ -70,7 +70,12 @@ public class ConfigFileHandling
|
||||
this.configBase = configBase;
|
||||
this.configPath = configPath;
|
||||
|
||||
this.nightConfig = CommentedFileConfig.builder(this.configPath.toFile()).build();
|
||||
this.nightConfig = CommentedFileConfig
|
||||
.builder(this.configPath.toFile())
|
||||
// sync is needed so file reading/writing only happens during locked sections,
|
||||
// otherwise some GUI changes may be lost when changing screens
|
||||
.sync()
|
||||
.build();
|
||||
}
|
||||
|
||||
|
||||
@@ -321,10 +326,7 @@ public class ConfigFileHandling
|
||||
*
|
||||
* @apiNote This overwrites any value currently stored in the config
|
||||
*/
|
||||
public void loadNightConfig()
|
||||
{
|
||||
loadNightConfig(this.nightConfig);
|
||||
}
|
||||
public void loadNightConfig() { this.loadNightConfig(this.nightConfig); }
|
||||
/**
|
||||
* Does {@link CommentedFileConfig#load()} but with error checking
|
||||
*
|
||||
@@ -353,7 +355,7 @@ public class ConfigFileHandling
|
||||
{
|
||||
System.out.println("Creating file failed");
|
||||
this.logger.error(ex);
|
||||
SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + configPath + "]. Please check the file is ok and you have the permissions", ex);
|
||||
SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + this.configPath + "]. Please check the file is ok and you have the permissions", ex);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+27
-24
@@ -29,14 +29,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrappe
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.io.*;
|
||||
import java.util.*;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
|
||||
/**
|
||||
* WARNING: This is not THREAD-SAFE! <br><br>
|
||||
@@ -47,7 +45,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||
* since it stringifies every block and biome name, which is quite bulky.
|
||||
* It might be worth while to have a biome and block ID that then both get mapped
|
||||
* to the data point ID to reduce file size.
|
||||
* And/or it would be good to dynamically remove IDs that aren't currently in use.
|
||||
* And/or it would be good to dynamically remove IDs that aren't currently in use.
|
||||
*
|
||||
* @author Leetom
|
||||
*/
|
||||
@@ -352,14 +350,14 @@ public class FullDataPointIdMap
|
||||
{
|
||||
private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
|
||||
|
||||
private static final ConcurrentHashMap<Integer, Entry> ENTRY_BY_HASH = new ConcurrentHashMap<>();
|
||||
/** lock is necessary since {@link Int2ReferenceOpenHashMap} isn't concurrent and concurrent threads can cause infinite loops */
|
||||
private static final ReentrantReadWriteLock ENTRY_POOL_LOCK = new ReentrantReadWriteLock();
|
||||
/** two levels are present so we don't need to use a key object */
|
||||
private static final ConcurrentHashMap<IBiomeWrapper, ConcurrentHashMap<IBlockStateWrapper, Entry>> ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER = new ConcurrentHashMap<>();
|
||||
|
||||
public final IBiomeWrapper biome;
|
||||
public final IBlockStateWrapper blockState;
|
||||
|
||||
private Integer hashCode = null;
|
||||
private int hashCode = 0;
|
||||
private boolean hashGenerated = false;
|
||||
private String serialString = null;
|
||||
|
||||
|
||||
@@ -370,25 +368,21 @@ public class FullDataPointIdMap
|
||||
|
||||
public static Entry getEntry(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
||||
{
|
||||
int entryHash = generateHashCode(biome, blockState);
|
||||
|
||||
// try getting the existing Entry
|
||||
Entry entry = ENTRY_BY_HASH.get(entryHash);
|
||||
if (entry != null)
|
||||
// check for existing entry
|
||||
ConcurrentHashMap<IBlockStateWrapper, Entry> entryByBlockState = ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER.get(biome);
|
||||
if (entryByBlockState != null)
|
||||
{
|
||||
return entry;
|
||||
Entry entry = entryByBlockState.get(blockState);
|
||||
if (entry != null)
|
||||
{
|
||||
return entry;
|
||||
}
|
||||
}
|
||||
|
||||
// create the missing entry
|
||||
return ENTRY_BY_HASH.compute(entryHash, (Integer newHash, Entry currentEntry) ->
|
||||
{
|
||||
if (currentEntry != null)
|
||||
{
|
||||
return currentEntry;
|
||||
}
|
||||
|
||||
return new Entry(biome, blockState);
|
||||
});
|
||||
// Lazily create the inner map and new Entry
|
||||
return ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER
|
||||
.computeIfAbsent(biome, newBiome -> new ConcurrentHashMap<>())
|
||||
.computeIfAbsent(blockState, newBlockState -> new Entry(biome, blockState));
|
||||
}
|
||||
private Entry(IBiomeWrapper biome, IBlockStateWrapper blockState)
|
||||
{
|
||||
@@ -402,13 +396,18 @@ public class FullDataPointIdMap
|
||||
// overrides //
|
||||
//===========//
|
||||
|
||||
/**
|
||||
* Reminder: this hash code won't always be unique, collisions can occur;
|
||||
* because of that this hash shouldn't be the only unique identifier for this object.
|
||||
*/
|
||||
@Override
|
||||
public int hashCode()
|
||||
{
|
||||
// cache the hash code to improve speed
|
||||
if (this.hashCode == null)
|
||||
if (!this.hashGenerated)
|
||||
{
|
||||
this.hashCode = generateHashCode(this);
|
||||
this.hashGenerated = true;
|
||||
}
|
||||
|
||||
return this.hashCode;
|
||||
@@ -430,10 +429,14 @@ public class FullDataPointIdMap
|
||||
public boolean equals(Object otherObj)
|
||||
{
|
||||
if (otherObj == this)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
if (!(otherObj instanceof Entry))
|
||||
{
|
||||
return false;
|
||||
}
|
||||
|
||||
Entry other = (Entry) otherObj;
|
||||
return other.biome.getSerialString().equals(this.biome.getSerialString())
|
||||
|
||||
+1
-1
@@ -139,7 +139,7 @@ public class FullDataToRenderDataTransformer
|
||||
}
|
||||
|
||||
columnSource.fillDebugFlag(0, 0, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.DebugSourceFlag.FULL);
|
||||
|
||||
|
||||
return columnSource;
|
||||
}
|
||||
|
||||
|
||||
+104
-122
@@ -65,8 +65,6 @@ public class LodDataBuilder
|
||||
// only block lighting is needed here, sky lighting is populated at the data source stage
|
||||
LodUtil.assertTrue(chunkWrapper.isDhBlockLightingCorrect());
|
||||
|
||||
|
||||
|
||||
int sectionPosX = getXOrZSectionPosFromChunkPos(chunkWrapper.getChunkPos().getX());
|
||||
int sectionPosZ = getXOrZSectionPosFromChunkPos(chunkWrapper.getChunkPos().getZ());
|
||||
long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
|
||||
@@ -80,47 +78,31 @@ public class LodDataBuilder
|
||||
|
||||
// compute the chunk dataSource offset
|
||||
// this offset is used to determine where in the dataSource this chunk's data should go
|
||||
int chunkOffsetX = chunkWrapper.getChunkPos().getX();
|
||||
if (chunkWrapper.getChunkPos().getX() < 0)
|
||||
{
|
||||
// expected offset positions:
|
||||
// chunkPos -> offset
|
||||
// 5 -> 1
|
||||
// 4 -> 0 ---
|
||||
// 3 -> 3
|
||||
// 2 -> 2
|
||||
// 1 -> 1
|
||||
// 0 -> 0 ===
|
||||
// -1 -> 3
|
||||
// -2 -> 2
|
||||
// -3 -> 1
|
||||
// -4 -> 0 ---
|
||||
// -5 -> 3
|
||||
chunkOffsetX = ((chunkOffsetX) % FullDataSourceV2.NUMB_OF_CHUNKS_WIDE);
|
||||
if (chunkOffsetX != 0)
|
||||
{
|
||||
chunkOffsetX += FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
chunkOffsetX %= FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
|
||||
}
|
||||
chunkOffsetX *= LodUtil.CHUNK_WIDTH;
|
||||
|
||||
int chunkOffsetZ = chunkWrapper.getChunkPos().getZ();
|
||||
if (chunkWrapper.getChunkPos().getZ() < 0)
|
||||
{
|
||||
chunkOffsetZ = ((chunkOffsetZ) % FullDataSourceV2.NUMB_OF_CHUNKS_WIDE);
|
||||
if (chunkOffsetZ != 0)
|
||||
{
|
||||
chunkOffsetZ += FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
chunkOffsetZ %= FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
|
||||
}
|
||||
// expected offset positions:
|
||||
// chunkPos -> offset
|
||||
// 5 -> 1
|
||||
// 4 -> 0 ---
|
||||
// 3 -> 3
|
||||
// 2 -> 2
|
||||
// 1 -> 1
|
||||
// 0 -> 0 ===
|
||||
// -1 -> 3
|
||||
// -2 -> 2
|
||||
// -3 -> 1
|
||||
// -4 -> 0 ---
|
||||
// -5 -> 3
|
||||
|
||||
// Fast modulo calculation using bitwise AND since NUMB_OF_CHUNKS_WIDE is a power of 2 (4)
|
||||
// For any number n: n & (2^k - 1) is equivalent to Math.floorMod(n, 2^k)
|
||||
// Original: Math.floorMod(x, 4) - Handles negative numbers, gives non-negative result in range [0,3]
|
||||
// Bitwise: x & (4-1) - Also gives non-negative result in range [0,3]
|
||||
// Example: -5 & 3 = 3, which equals Math.floorMod(-5, 4) = 3
|
||||
int chunkOffsetX = chunkWrapper.getChunkPos().getX() & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1);
|
||||
int chunkOffsetZ = chunkWrapper.getChunkPos().getZ() & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1);
|
||||
|
||||
// Convert from chunk coordinates to block coordinates
|
||||
chunkOffsetX *= LodUtil.CHUNK_WIDTH;
|
||||
chunkOffsetZ *= LodUtil.CHUNK_WIDTH;
|
||||
|
||||
|
||||
@@ -138,54 +120,49 @@ public class LodDataBuilder
|
||||
IBlockStateWrapper previousBlockState = null;
|
||||
|
||||
int minBuildHeight = chunkWrapper.getMinNonEmptyHeight();
|
||||
int exclusiveMaxBuildHeight = chunkWrapper.getExclusiveMaxBuildHeight();
|
||||
int inclusiveMinBuildHeight = chunkWrapper.getInclusiveMinBuildHeight();
|
||||
int dataCapacity = chunkWrapper.getHeight() / 4;
|
||||
|
||||
for (int relBlockX = 0; relBlockX < LodUtil.CHUNK_WIDTH; relBlockX++)
|
||||
{
|
||||
for (int relBlockZ = 0; relBlockZ < LodUtil.CHUNK_WIDTH; relBlockZ++)
|
||||
{
|
||||
LongArrayList longs = dataSource.get(
|
||||
relBlockX + chunkOffsetX,
|
||||
relBlockZ + chunkOffsetZ);
|
||||
// Calculate column position
|
||||
int columnX = relBlockX + chunkOffsetX;
|
||||
int columnZ = relBlockZ + chunkOffsetZ;
|
||||
|
||||
// Get column data
|
||||
LongArrayList longs = dataSource.get(columnX, columnZ);
|
||||
if (longs == null)
|
||||
{
|
||||
longs = new LongArrayList(chunkWrapper.getHeight() / 4);
|
||||
longs = new LongArrayList(dataCapacity);
|
||||
}
|
||||
else
|
||||
{
|
||||
longs.clear();
|
||||
}
|
||||
|
||||
int lastY = chunkWrapper.getExclusiveMaxBuildHeight();
|
||||
int lastY = exclusiveMaxBuildHeight;
|
||||
IBiomeWrapper biome = chunkWrapper.getBiome(relBlockX, lastY, relBlockZ);
|
||||
IBlockStateWrapper blockState = AIR;
|
||||
int mappedId = dataSource.mapping.addIfNotPresentAndGetId(biome, blockState);
|
||||
|
||||
// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.) // TODO: Per face lighting someday?
|
||||
byte blockLight = LodUtil.MIN_MC_LIGHT;
|
||||
byte skyLight = LodUtil.MAX_MC_LIGHT;
|
||||
|
||||
byte blockLight;
|
||||
byte skyLight;
|
||||
if (lastY < chunkWrapper.getExclusiveMaxBuildHeight())
|
||||
{
|
||||
// FIXME: The lastY +1 offset is to reproduce the old behavior. Remove this when we get per-face lighting
|
||||
blockLight = (byte) chunkWrapper.getDhBlockLight(relBlockX, lastY + 1, relBlockZ);
|
||||
skyLight = (byte) chunkWrapper.getDhSkyLight(relBlockX, lastY + 1, relBlockZ);
|
||||
}
|
||||
else
|
||||
{
|
||||
//we are at the height limit. There are no torches here, and sky is not obscured.
|
||||
blockLight = LodUtil.MIN_MC_LIGHT;
|
||||
skyLight = LodUtil.MAX_MC_LIGHT;
|
||||
}
|
||||
|
||||
|
||||
// determine the starting Y Pos
|
||||
// Get the maximum height from both heightmaps
|
||||
int y = Math.max(
|
||||
// max between both heightmaps to account for solid invisible blocks (glass)
|
||||
// and non-solid opaque blocks (at one point this was stairs, not sure what would fit this now)
|
||||
chunkWrapper.getLightBlockingHeightMapValue(relBlockX, relBlockZ),
|
||||
chunkWrapper.getSolidHeightMapValue(relBlockX, relBlockZ)
|
||||
);
|
||||
// go up until we reach open air or the world limit
|
||||
);
|
||||
|
||||
// Go up until we reach open air or the world limit
|
||||
IBlockStateWrapper topBlockState = previousBlockState = chunkWrapper.getBlockState(relBlockX, y, relBlockZ, mcBlockPos, previousBlockState);
|
||||
while (!topBlockState.isAir() && y < chunkWrapper.getExclusiveMaxBuildHeight())
|
||||
while (!topBlockState.isAir() && y < exclusiveMaxBuildHeight)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -198,7 +175,7 @@ public class LodDataBuilder
|
||||
{
|
||||
if (!getTopErrorLogged)
|
||||
{
|
||||
LOGGER.warn("Unexpected issue in LodDataBuilder, future errors won't be logged. Chunk [" + chunkWrapper.getChunkPos() + "] with max height: [" + chunkWrapper.getExclusiveMaxBuildHeight() + "] had issue getting block at pos [" + relBlockX + "," + y + "," + relBlockZ + "] error: " + e.getMessage(), e);
|
||||
LOGGER.warn("Unexpected issue in LodDataBuilder, future errors won't be logged. Chunk [" + chunkWrapper.getChunkPos() + "] with max height: [" + exclusiveMaxBuildHeight + "] had issue getting block at pos [" + relBlockX + "," + y + "," + relBlockZ + "] error: " + e.getMessage(), e);
|
||||
getTopErrorLogged = true;
|
||||
}
|
||||
|
||||
@@ -207,7 +184,7 @@ public class LodDataBuilder
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Process blocks from top to bottom
|
||||
for (; y >= minBuildHeight; y--)
|
||||
{
|
||||
IBiomeWrapper newBiome = chunkWrapper.getBiome(relBlockX, y, relBlockZ);
|
||||
@@ -215,10 +192,10 @@ public class LodDataBuilder
|
||||
byte newBlockLight = (byte) chunkWrapper.getDhBlockLight(relBlockX, y + 1, relBlockZ);
|
||||
byte newSkyLight = (byte) chunkWrapper.getDhSkyLight(relBlockX, y + 1, relBlockZ);
|
||||
|
||||
// save the biome/block change
|
||||
// Save the biome/block change if different from previous
|
||||
if (!newBiome.equals(biome) || !newBlockState.equals(blockState))
|
||||
{
|
||||
longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - chunkWrapper.getInclusiveMinBuildHeight(), blockLight, skyLight));
|
||||
longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - inclusiveMinBuildHeight, blockLight, skyLight));
|
||||
biome = newBiome;
|
||||
blockState = newBlockState;
|
||||
|
||||
@@ -228,17 +205,16 @@ public class LodDataBuilder
|
||||
lastY = y;
|
||||
}
|
||||
}
|
||||
longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - chunkWrapper.getInclusiveMinBuildHeight(), blockLight, skyLight));
|
||||
|
||||
dataSource.setSingleColumn(longs,
|
||||
relBlockX + chunkOffsetX,
|
||||
relBlockZ + chunkOffsetZ,
|
||||
EDhApiWorldGenerationStep.LIGHT,
|
||||
worldCompressionMode);
|
||||
// Add the final data point
|
||||
longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - inclusiveMinBuildHeight, blockLight, skyLight));
|
||||
|
||||
// Set the column in the data source
|
||||
dataSource.setSingleColumn(longs, columnX, columnZ, EDhApiWorldGenerationStep.LIGHT, worldCompressionMode);
|
||||
}
|
||||
}
|
||||
|
||||
if (ignoreHiddenBlocks)
|
||||
if (ignoreHiddenBlocks)
|
||||
{
|
||||
cullHiddenBlocks(dataSource, chunkOffsetX, chunkOffsetZ);
|
||||
}
|
||||
@@ -275,16 +251,16 @@ public class LodDataBuilder
|
||||
{
|
||||
long currentPoint = centerColumn.getLong(centerIndex);
|
||||
|
||||
// translucent data points are not eligible to be culled.
|
||||
// Translucent data points are not eligible to be culled.
|
||||
if (isTranslucent(dataSource, currentPoint))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
// the top segment should never be culled.
|
||||
if (centerIndex == 0
|
||||
|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1))
|
||||
)
|
||||
if (centerIndex == 0
|
||||
|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1))
|
||||
)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -292,9 +268,9 @@ public class LodDataBuilder
|
||||
// the bottom segment can sometimes be culled.
|
||||
// assume it will not be seen from below,
|
||||
// because this would imply the player is in the void.
|
||||
if (centerIndex + 1 < centerColumn.size()
|
||||
&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1))
|
||||
)
|
||||
if (centerIndex + 1 < centerColumn.size()
|
||||
&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1))
|
||||
)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -327,9 +303,11 @@ public class LodDataBuilder
|
||||
continue;
|
||||
}
|
||||
|
||||
// current point is fully surrounded. remove it.
|
||||
// Current point is fully surrounded. remove it.
|
||||
centerColumn.removeLong(centerIndex);
|
||||
// make the above data point cover the area that the current point used to occupy.
|
||||
|
||||
// Make the above data point cover the area that the current point used to occupy.
|
||||
// The element that was at `centerIndex - 1` is still at that position even after removal of centerIndex.
|
||||
long above = centerColumn.getLong(centerIndex - 1);
|
||||
above = FullDataPointUtil.setBottomY(above, FullDataPointUtil.getBottomY(currentPoint));
|
||||
above = FullDataPointUtil.setHeight(above, FullDataPointUtil.getHeight(currentPoint) + FullDataPointUtil.getHeight(above));
|
||||
@@ -338,31 +316,31 @@ public class LodDataBuilder
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
checks if centerPoint is "covered" by opaque data points in adjacentColumn.
|
||||
centerPoint counts as covered if, and only if, for all Y levels in its height range,
|
||||
there exists an opaque data point in adjacentColumn which overlaps with that Y level.
|
||||
|
||||
@param source used to lookup blocks (and their opacities) based on their IDs.
|
||||
@param centerPoint the point being checked to see if it's fully covered.
|
||||
@param adjacentColumn the data points which might cover centerPoint.
|
||||
@param adjacentIndex the starting index in adjacentColumn to start scanning at.
|
||||
indices greater than adjacentIndex have already been checked and confirmed to
|
||||
not overlap or only overlap partially with centerPoint's Y range.
|
||||
|
||||
@return if centerPoint is covered, returns the index of the segment which finishes covering it.
|
||||
the start of the covering may be a smaller index. in this case, the returned index may be used
|
||||
as the adjacentIndex provided to this method on the next iteration which yields a new centerPoint.
|
||||
|
||||
if centerPoint is NOT covered, returns the bitwise negation of the index of the
|
||||
segment which did not cover it. this guarantees that the returned value is negative.
|
||||
the caller should check for negative return values and manually un-negate them to proceed with the loop.
|
||||
|
||||
in other words, this function returns the index of the next adjacent data
|
||||
point to use in the loop, AND a boolean indicating whether or not the
|
||||
centerPoint is covered; both are packed into the same int, and returned.
|
||||
*/
|
||||
checks if centerPoint is "covered" by opaque data points in adjacentColumn.
|
||||
centerPoint counts as covered if, and only if, for all Y levels in its height range,
|
||||
there exists an opaque data point in adjacentColumn which overlaps with that Y level.
|
||||
|
||||
@param source used to lookup blocks (and their opacities) based on their IDs.
|
||||
@param centerPoint the point being checked to see if it's fully covered.
|
||||
@param adjacentColumn the data points which might cover centerPoint.
|
||||
@param adjacentIndex the starting index in adjacentColumn to start scanning at.
|
||||
indices greater than adjacentIndex have already been checked and confirmed to
|
||||
not overlap or only overlap partially with centerPoint's Y range.
|
||||
|
||||
@return if centerPoint is covered, returns the index of the segment which finishes covering it.
|
||||
the start of the covering may be a smaller index. in this case, the returned index may be used
|
||||
as the adjacentIndex provided to this method on the next iteration which yields a new centerPoint.
|
||||
|
||||
if centerPoint is NOT covered, returns the bitwise negation of the index of the
|
||||
segment which did not cover it. this guarantees that the returned value is negative.
|
||||
the caller should check for negative return values and manually un-negate them to proceed with the loop.
|
||||
|
||||
in other words, this function returns the index of the next adjacent data
|
||||
point to use in the loop, AND a boolean indicating whether or not the
|
||||
centerPoint is covered; both are packed into the same int, and returned.
|
||||
*/
|
||||
private static int checkOcclusion(FullDataSourceV2 source, long centerPoint, LongArrayList adjacentColumn, int adjacentIndex)
|
||||
{
|
||||
int bottomOfCenter = FullDataPointUtil.getBottomY(centerPoint);
|
||||
@@ -387,12 +365,12 @@ public class LodDataBuilder
|
||||
|
||||
throw new LodUtil.AssertFailureException("Adjacent column ends before center column does.");
|
||||
}
|
||||
|
||||
|
||||
private static boolean isTranslucent(FullDataSourceV2 source, long point) {
|
||||
return source.mapping.getBlockStateWrapper(FullDataPointUtil.getId(point)).getOpacity() < LodUtil.BLOCK_FULLY_OPAQUE;
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
/** @throws ClassCastException if an API user returns the wrong object type(s) */
|
||||
public static FullDataSourceV2 createFromApiChunkData(DhApiChunk apiChunk, boolean runAdditionalValidation) throws ClassCastException, DataCorruptedException, IllegalArgumentException
|
||||
@@ -402,9 +380,13 @@ public class LodDataBuilder
|
||||
int sectionPosZ = getXOrZSectionPosFromChunkPos(apiChunk.chunkPosZ);
|
||||
long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
|
||||
|
||||
// chunk relative block position in the data source
|
||||
int relSourceBlockX = Math.floorMod(apiChunk.chunkPosX, 4) * LodUtil.CHUNK_WIDTH;
|
||||
int relSourceBlockZ = Math.floorMod(apiChunk.chunkPosZ, 4) * LodUtil.CHUNK_WIDTH;
|
||||
// Fast modulo calculation using bitwise AND since NUMB_OF_CHUNKS_WIDE is a power of 2 (4)
|
||||
// For any number n: n & (2^k - 1) is equivalent to Math.floorMod(n, 2^k)
|
||||
// Original: Math.floorMod(x, 4) - Handles negative numbers, gives non-negative result in range [0,3]
|
||||
// Bitwise: x & (4-1) - Also gives non-negative result in range [0,3]
|
||||
// Example: -5 & 3 = 3, which equals Math.floorMod(-5, 4) = 3
|
||||
int relSourceBlockX = (apiChunk.chunkPosX & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1)) * LodUtil.CHUNK_WIDTH;
|
||||
int relSourceBlockZ = (apiChunk.chunkPosZ & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1)) * LodUtil.CHUNK_WIDTH;
|
||||
|
||||
FullDataSourceV2 dataSource = FullDataSourceV2.createEmpty(pos);
|
||||
for (int relBlockZ = 0; relBlockZ < LodUtil.CHUNK_WIDTH; relBlockZ++)
|
||||
@@ -423,8 +405,8 @@ public class LodDataBuilder
|
||||
// TODO add the ability for API users to define a different compression mode
|
||||
// or add a "unkown" compression mode
|
||||
dataSource.setSingleColumn(
|
||||
packedDataPoints,
|
||||
relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,
|
||||
packedDataPoints,
|
||||
relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,
|
||||
EDhApiWorldGenerationStep.LIGHT, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
|
||||
dataSource.isEmpty = false;
|
||||
}
|
||||
@@ -440,7 +422,7 @@ public class LodDataBuilder
|
||||
|
||||
/** @see FullDataPointUtil */
|
||||
public static LongArrayList convertApiDataPointListToPackedLongArray(
|
||||
@Nullable List<DhApiTerrainDataPoint> columnDataPoints, FullDataSourceV2 dataSource,
|
||||
@Nullable List<DhApiTerrainDataPoint> columnDataPoints, FullDataSourceV2 dataSource,
|
||||
int bottomYBlockPos) throws DataCorruptedException
|
||||
{
|
||||
// this null check does 2 nice things at the same time:
|
||||
@@ -533,13 +515,13 @@ public class LodDataBuilder
|
||||
}
|
||||
// is there a gap between the last datapoint?
|
||||
if (topYPos != lastBottomYPos
|
||||
&& lastBottomYPos != Integer.MIN_VALUE)
|
||||
&& lastBottomYPos != Integer.MIN_VALUE)
|
||||
{
|
||||
throw new IllegalArgumentException("DhApiTerrainDataPoint ["+i+"] has a gap between it and index ["+(i-1)+"]. Empty spaces should be filled by air, otherwise DH's downsampling won't calculate lighting correctly.");
|
||||
}
|
||||
|
||||
|
||||
lastBottomYPos = bottomYPos;
|
||||
lastBottomYPos = bottomYPos;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -328,7 +328,8 @@ public class DhLightingEngine
|
||||
continue;
|
||||
}
|
||||
|
||||
if (relNeighbourBlockPos.getY() < neighbourChunk.getMinNonEmptyHeight() || relNeighbourBlockPos.getY() > neighbourChunk.getExclusiveMaxBuildHeight())
|
||||
if (relNeighbourBlockPos.getY() < neighbourChunk.getMinNonEmptyHeight()
|
||||
|| relNeighbourBlockPos.getY() >= neighbourChunk.getExclusiveMaxBuildHeight())
|
||||
{
|
||||
// the light pos is outside the chunk's min/max height,
|
||||
// this can happen if given a chunk that hasn't finished generating
|
||||
|
||||
+2
-2
@@ -113,8 +113,8 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue
|
||||
if (this.networkState.sessionConfig.getGenerationBoundsRadius() > 0)
|
||||
{
|
||||
if (DhSectionPos.getChebyshevSignedBlockDistance(sectionPos, new DhBlockPos2D(
|
||||
(int) (this.networkState.sessionConfig.getGenerationBoundsX() / this.level.levelWrapper.getDimensionType().getCoordinateScale()),
|
||||
(int) (this.networkState.sessionConfig.getGenerationBoundsZ() / this.level.levelWrapper.getDimensionType().getCoordinateScale())
|
||||
this.networkState.sessionConfig.getGenerationBoundsX(),
|
||||
this.networkState.sessionConfig.getGenerationBoundsZ()
|
||||
)) > this.networkState.sessionConfig.getGenerationBoundsRadius())
|
||||
{
|
||||
return false;
|
||||
|
||||
@@ -277,7 +277,7 @@ public abstract class AbstractDhLevel implements IDhLevel
|
||||
|
||||
|
||||
// locked to prevent two threads from updating the same section at the same time
|
||||
ReentrantLock lock = this.beaconUpdateLockContainer.getLockForPos(sectionPosForLock);
|
||||
ReentrantLock lock = this.beaconUpdateLockContainer.getLockForPos(sectionPosForLock); // TODO this can cause a lot of slow-downs
|
||||
try
|
||||
{
|
||||
lock.lock();
|
||||
|
||||
@@ -151,10 +151,9 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
|
||||
|
||||
if (Config.Server.generationBoundsRadius.get() > 0)
|
||||
{
|
||||
double coordinateScale = this.serverLevelWrapper.getDimensionType().getCoordinateScale();
|
||||
if (DhSectionPos.getChebyshevSignedBlockDistance(message.sectionPos, new DhBlockPos2D(
|
||||
(int) (Config.Server.generationBoundsX.get() / coordinateScale),
|
||||
(int) (Config.Server.generationBoundsZ.get() / coordinateScale)
|
||||
serverPlayerState.sessionConfig.getGenerationBoundsX(),
|
||||
serverPlayerState.sessionConfig.getGenerationBoundsZ()
|
||||
)) > Config.Server.generationBoundsRadius.get())
|
||||
{
|
||||
message.sendResponse(new RequestOutOfRangeException("Section out of allowed bounds"));
|
||||
|
||||
@@ -42,6 +42,7 @@ import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRend
|
||||
import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
|
||||
import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
|
||||
import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
|
||||
import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
|
||||
@@ -58,7 +59,7 @@ import java.io.File;
|
||||
import java.util.*;
|
||||
import java.util.List;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.Executor;
|
||||
import java.util.concurrent.TimeUnit;
|
||||
|
||||
/** The level used when connected to a server */
|
||||
@@ -162,7 +163,8 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
|
||||
return;
|
||||
}
|
||||
|
||||
try (FullDataSourceV2DTO dataSourceDto = this.networkState.fullDataPayloadReceiver.decodeDataSourceAndReleaseBuffer(message.payload))
|
||||
|
||||
try(FullDataSourceV2DTO dataSourceDto = this.networkState.fullDataPayloadReceiver.decodeDataSourceAndReleaseBuffer(message.payload))
|
||||
{
|
||||
boolean isSameLevel = message.isSameLevelAs(this.levelWrapper);
|
||||
NETWORK_LOGGER.debug("Buffer {} isSameLevel: {}", message.payload.dtoBufferId, isSameLevel);
|
||||
@@ -171,10 +173,28 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
|
||||
return;
|
||||
}
|
||||
|
||||
this.updateBeaconBeamsForSectionPos(dataSourceDto.pos, message.payload.beaconBeams);
|
||||
|
||||
Executor executor = ThreadPoolUtil.getFileHandlerExecutor();
|
||||
if (executor != null)
|
||||
{
|
||||
executor.execute(() ->
|
||||
{
|
||||
try
|
||||
{
|
||||
// TODO this has a lock which can cause stuttering/lag issues
|
||||
this.updateBeaconBeamsForSectionPos(dataSourceDto.pos, message.payload.beaconBeams);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unexpected erorr while updating full data source, error: ["+e.getMessage()+"].", e);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
FullDataSourceV2 fullDataSource = dataSourceDto.createDataSource(this.levelWrapper);
|
||||
this.updateDataSourcesAsync(fullDataSource).whenComplete((result, e) -> fullDataSource.close());
|
||||
this.updateDataSourcesAsync(fullDataSource)
|
||||
.whenComplete((result, e) -> fullDataSource.close());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
|
||||
@@ -290,7 +290,7 @@ public class WorldGenModule implements Closeable
|
||||
remainingChunkCount += this.worldGenerationQueue.getQueuedChunkCount();
|
||||
String remainingChunkCountStr = F3Screen.NUMBER_FORMAT.format(remainingChunkCount);
|
||||
|
||||
String message = "DH Gen/Import: " + remainingChunkCountStr + " chunks left.";
|
||||
String message = "DH is loading chunks. " + remainingChunkCountStr + " left.";
|
||||
|
||||
// show a message about how to disable progress logging if requested
|
||||
int msToShowDisableInstructions = Config.Common.WorldGenerator.generationProgressDisableMessageDisplayTimeInSeconds.get() * 1_000;
|
||||
|
||||
+71
@@ -0,0 +1,71 @@
|
||||
package com.seibel.distanthorizons.core.multiplayer.client;
|
||||
|
||||
import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSplitMessage;
|
||||
|
||||
import java.util.concurrent.atomic.AtomicLong;
|
||||
import java.util.function.BooleanSupplier;
|
||||
import java.util.function.IntConsumer;
|
||||
import java.util.function.IntSupplier;
|
||||
|
||||
public class ClientCongestionControl
|
||||
{
|
||||
private static final double ADDITIVE_INCREASE = 50000;
|
||||
private static final long INTERVAL_MS = 1000;
|
||||
|
||||
private final Runnable rateUpdateHandler;
|
||||
|
||||
private final AtomicLong bytesReceived = new AtomicLong(0);
|
||||
|
||||
private double desiredRate;
|
||||
private long lastAdjustTime;
|
||||
|
||||
|
||||
public ClientCongestionControl(
|
||||
Runnable rateUpdateHandler
|
||||
)
|
||||
{
|
||||
this.rateUpdateHandler = rateUpdateHandler;
|
||||
this.reset();
|
||||
}
|
||||
|
||||
public void reset()
|
||||
{
|
||||
this.desiredRate = ADDITIVE_INCREASE;
|
||||
this.lastAdjustTime = System.currentTimeMillis();
|
||||
this.bytesReceived.set(0);
|
||||
}
|
||||
|
||||
|
||||
public void onPayloadReceived(FullDataSplitMessage message)
|
||||
{
|
||||
long now = System.currentTimeMillis();
|
||||
if (now - this.lastAdjustTime >= INTERVAL_MS)
|
||||
{
|
||||
this.adjustRate(now);
|
||||
}
|
||||
|
||||
this.bytesReceived.addAndGet(message.buffer.readableBytes());
|
||||
}
|
||||
|
||||
private void adjustRate(long now)
|
||||
{
|
||||
double throughput = this.bytesReceived.getAndSet(0);
|
||||
if (throughput >= this.desiredRate)
|
||||
{
|
||||
this.desiredRate += ADDITIVE_INCREASE;
|
||||
}
|
||||
else
|
||||
{
|
||||
this.desiredRate = Math.max(throughput - ADDITIVE_INCREASE / 2, 1000);
|
||||
}
|
||||
|
||||
this.lastAdjustTime = now;
|
||||
this.rateUpdateHandler.run();
|
||||
}
|
||||
|
||||
public int getDesiredRate()
|
||||
{
|
||||
return (int) (this.desiredRate / 1000);
|
||||
}
|
||||
|
||||
}
|
||||
+35
-3
@@ -1,6 +1,7 @@
|
||||
package com.seibel.distanthorizons.core.multiplayer.client;
|
||||
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
|
||||
import com.seibel.distanthorizons.core.multiplayer.config.SessionConfig;
|
||||
@@ -56,6 +57,23 @@ public class ClientNetworkState implements Closeable
|
||||
private long serverTimeOffset = 0;
|
||||
public long getServerTimeOffset() { return this.serverTimeOffset; }
|
||||
|
||||
private final ClientCongestionControl congestionControl = new ClientCongestionControl(
|
||||
() -> {
|
||||
if (Config.Server.enableAdaptiveTransferSpeed.get())
|
||||
{
|
||||
this.sendConfigMessage(false);
|
||||
}
|
||||
}
|
||||
);
|
||||
private final ConfigChangeListener<Boolean> adaptiveTransferSpeedListener = new ConfigChangeListener<>(Config.Server.enableAdaptiveTransferSpeed, isEnabled -> {
|
||||
if (isEnabled)
|
||||
{
|
||||
this.congestionControl.reset();
|
||||
}
|
||||
|
||||
this.sendConfigMessage();
|
||||
});
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
@@ -116,6 +134,7 @@ public class ClientNetworkState implements Closeable
|
||||
});
|
||||
|
||||
this.networkSession.registerHandler(FullDataSplitMessage.class, this.fullDataPayloadReceiver::receiveChunk);
|
||||
this.networkSession.registerHandler(FullDataSplitMessage.class, this.congestionControl::onPayloadReceived);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -127,10 +146,22 @@ public class ClientNetworkState implements Closeable
|
||||
|
||||
|
||||
|
||||
public void sendConfigMessage()
|
||||
public void sendConfigMessage() { this.sendConfigMessage(true); }
|
||||
public void sendConfigMessage(boolean blocking)
|
||||
{
|
||||
this.configReceived = false;
|
||||
this.getSession().sendMessage(new SessionConfigMessage(new SessionConfig()));
|
||||
SessionConfig sessionConfig = new SessionConfig();
|
||||
|
||||
if (Config.Server.enableAdaptiveTransferSpeed.get())
|
||||
{
|
||||
sessionConfig.constrainValue(Config.Server.maxDataTransferSpeed, this.congestionControl.getDesiredRate());
|
||||
}
|
||||
|
||||
if (blocking)
|
||||
{
|
||||
this.configReceived = false;
|
||||
}
|
||||
|
||||
this.getSession().sendMessage(new SessionConfigMessage(sessionConfig));
|
||||
}
|
||||
|
||||
|
||||
@@ -166,6 +197,7 @@ public class ClientNetworkState implements Closeable
|
||||
public void close()
|
||||
{
|
||||
this.fullDataPayloadReceiver.close();
|
||||
this.adaptiveTransferSpeedListener.close();
|
||||
this.configAnyChangeListener.close();
|
||||
this.networkSession.close();
|
||||
}
|
||||
|
||||
+12
-5
@@ -18,7 +18,7 @@ public class SessionConfig implements INetworkObject
|
||||
private static final LinkedHashMap<String, Entry> CONFIG_ENTRIES = new LinkedHashMap<>();
|
||||
|
||||
|
||||
private final LinkedHashMap<String, Object> values = new LinkedHashMap<>();
|
||||
private final HashMap<String, Object> values = new HashMap<>();
|
||||
public SessionConfig constrainingConfig;
|
||||
|
||||
|
||||
@@ -33,9 +33,9 @@ public class SessionConfig implements INetworkObject
|
||||
|
||||
registerConfigEntry(Config.Common.WorldGenerator.enableDistantGeneration, Boolean::logicalAnd);
|
||||
registerConfigEntry(Config.Server.maxGenerationRequestDistance, Math::min);
|
||||
registerConfigEntry(Config.Server.generationBoundsX, (x, y) -> x);
|
||||
registerConfigEntry(Config.Server.generationBoundsZ, (x, y) -> x);
|
||||
registerConfigEntry(Config.Server.generationBoundsRadius, (x, y) -> x);
|
||||
registerConfigEntry(Config.Server.generationBoundsX, (x, y) -> y);
|
||||
registerConfigEntry(Config.Server.generationBoundsZ, (x, y) -> y);
|
||||
registerConfigEntry(Config.Server.generationBoundsRadius, (x, y) -> y);
|
||||
registerConfigEntry(Config.Server.generationRequestRateLimit, Math::min);
|
||||
|
||||
registerConfigEntry(Config.Server.enableRealTimeUpdates, Boolean::logicalAnd);
|
||||
@@ -119,10 +119,17 @@ public class SessionConfig implements INetworkObject
|
||||
}
|
||||
|
||||
return (this.constrainingConfig != null
|
||||
? (T) entry.valueConstrainer.apply(value, this.constrainingConfig.getValue(name))
|
||||
? (T) entry.valueConstrainer.apply(this.constrainingConfig.getValue(name), value)
|
||||
: value);
|
||||
}
|
||||
|
||||
public <T> void constrainValue(ConfigEntry<T> configEntry, T value) { this.constrainValue(configEntry.getChatCommandName(), value); }
|
||||
private void constrainValue(String name, Object value)
|
||||
{
|
||||
Entry entry = CONFIG_ENTRIES.get(name);
|
||||
this.values.put(name, entry.valueConstrainer.apply(this.getValue(name), value));
|
||||
}
|
||||
|
||||
private Map<String, ?> getValues()
|
||||
{
|
||||
return CONFIG_ENTRIES.keySet().stream().collect(Collectors.toMap(
|
||||
|
||||
-2
@@ -34,8 +34,6 @@ public class FullDataPayloadReceiver implements AutoCloseable
|
||||
})
|
||||
.build().asMap();
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void close()
|
||||
{
|
||||
|
||||
+1
-1
@@ -13,7 +13,7 @@ import java.util.function.*;
|
||||
|
||||
public class FullDataPayloadSender implements AutoCloseable
|
||||
{
|
||||
private static final int TICK_RATE = 4;
|
||||
private static final int TICK_RATE = 20;
|
||||
|
||||
/** 1 Mebibyte minus 576 bytes for other info */
|
||||
public static final int FULL_DATA_SPLIT_SIZE_IN_BYTES = 1_048_000;
|
||||
|
||||
+64
-26
@@ -2,6 +2,7 @@ package com.seibel.distanthorizons.core.multiplayer.server;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
|
||||
import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataSourceProvider;
|
||||
import com.seibel.distanthorizons.core.level.AbstractDhServerLevel;
|
||||
import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
|
||||
@@ -59,45 +60,82 @@ public class FullDataSourceRequestHandler
|
||||
}
|
||||
|
||||
|
||||
// the client timestamp will be null if we want to retrieve the LOD regardless of when it was last updated
|
||||
long clientTimestamp = (message.clientTimestamp != null) ? message.clientTimestamp : -1;
|
||||
// the server timestamp will be null if no LOD data exists for this position
|
||||
Long serverTimestamp = this.fullDataSourceProvider().getTimestampForPos(message.sectionPos);
|
||||
if (serverTimestamp == null
|
||||
|| serverTimestamp <= clientTimestamp)
|
||||
|
||||
AbstractExecutorService fileHandlerExecutor = ThreadPoolUtil.getFileHandlerExecutor();
|
||||
if (fileHandlerExecutor == null)
|
||||
{
|
||||
// either no data exists to sync, or the client is already up to date
|
||||
rateLimiterSet.syncOnLoginRateLimiter.release();
|
||||
message.sendResponse(new FullDataSourceResponseMessage(null));
|
||||
// shouldn't normally happen, but just in case
|
||||
LOGGER.warn("Unable to send FullDataSourceResponseMessage - getFileHandlerExecutor() is null");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
AbstractExecutorService executor = ThreadPoolUtil.getNetworkCompressionExecutor();
|
||||
if (executor == null)
|
||||
AbstractExecutorService networkCompressionExecutor = ThreadPoolUtil.getNetworkCompressionExecutor();
|
||||
if (networkCompressionExecutor == null)
|
||||
{
|
||||
// shouldn't normally happen, but just in case
|
||||
LOGGER.warn("Unable to send FullDataSourceResponseMessage - getNetworkCompressionExecutor() is null");
|
||||
return;
|
||||
}
|
||||
|
||||
this.fullDataSourceProvider().getAsync(message.sectionPos).thenAcceptAsync(fullDataSource ->
|
||||
{
|
||||
try (FullDataPayload payload = new FullDataPayload(fullDataSource, this.getAllBeamsForPos(message.sectionPos)))
|
||||
|
||||
// get the data requested by the client
|
||||
CompletableFuture<FullDataSourceV2> getServerDatasourceFuture = CompletableFuture.supplyAsync(() ->
|
||||
{
|
||||
fullDataSource.close();
|
||||
|
||||
serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () ->
|
||||
try
|
||||
{
|
||||
message.sendResponse(new FullDataSourceResponseMessage(payload));
|
||||
rateLimiterSet.syncOnLoginRateLimiter.release();
|
||||
});
|
||||
}
|
||||
catch (Exception e)
|
||||
// the client timestamp will be null if we want to retrieve the LOD regardless of when it was last updated
|
||||
long clientTimestamp = (message.clientTimestamp != null) ? message.clientTimestamp : -1;
|
||||
|
||||
// the server timestamp will be null if no LOD data exists for this position
|
||||
Long serverTimestamp = this.fullDataSourceProvider().getTimestampForPos(message.sectionPos);
|
||||
if (serverTimestamp == null
|
||||
|| serverTimestamp <= clientTimestamp)
|
||||
{
|
||||
// either no data exists to sync, or the client is already up to date
|
||||
rateLimiterSet.syncOnLoginRateLimiter.release();
|
||||
message.sendResponse(new FullDataSourceResponseMessage(null));
|
||||
return null;
|
||||
}
|
||||
|
||||
// get the server's datasource
|
||||
return this.fullDataSourceProvider().get(message.sectionPos);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unexpected issue getting server-side LOD for request at pos [" + DhSectionPos.toString(message.sectionPos) + "], error: [" + e.getMessage() + "].", e);
|
||||
return null;
|
||||
}
|
||||
}, fileHandlerExecutor);
|
||||
|
||||
// send the found data
|
||||
getServerDatasourceFuture.thenAcceptAsync(fullDataSource ->
|
||||
{
|
||||
LOGGER.error("Unexpected issue getting request for pos ["+DhSectionPos.toString(message.sectionPos)+"], error: ["+e.getMessage()+"].", e);
|
||||
}
|
||||
}, executor);
|
||||
try
|
||||
{
|
||||
// no server data source found
|
||||
if (fullDataSource == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
// send the found data source to client
|
||||
try (FullDataPayload payload = new FullDataPayload(fullDataSource, this.getAllBeamsForPos(message.sectionPos)))
|
||||
{
|
||||
fullDataSource.close();
|
||||
|
||||
serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () ->
|
||||
{
|
||||
message.sendResponse(new FullDataSourceResponseMessage(payload));
|
||||
rateLimiterSet.syncOnLoginRateLimiter.release();
|
||||
});
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
LOGGER.error("Unexpected issue sending request for pos [" + DhSectionPos.toString(message.sectionPos) + "], error: [" + e.getMessage() + "].", e);
|
||||
}
|
||||
}, networkCompressionExecutor);
|
||||
|
||||
}
|
||||
|
||||
public void queueWorldGenForRequestMessage(ServerPlayerState serverPlayerState, FullDataSourceRequestMessage message, ServerPlayerState.RateLimiterSet rateLimiterSet)
|
||||
|
||||
+11
-3
@@ -24,7 +24,7 @@ public class ServerPlayerState implements Closeable
|
||||
{
|
||||
private final ConfigChangeListener<String> levelKeyPrefixChangeListener
|
||||
= new ConfigChangeListener<>(Config.Server.levelKeyPrefix, this::onLevelKeyPrefixConfigChanged);
|
||||
private final SessionConfig.AnyChangeListener configAnyChangeListener = new SessionConfig.AnyChangeListener(this::onSessionConfigChanged);
|
||||
private final SessionConfig.AnyChangeListener configAnyChangeListener = new SessionConfig.AnyChangeListener(this::sendConfigMessage);
|
||||
|
||||
|
||||
private String lastLevelKey = "";
|
||||
@@ -56,8 +56,9 @@ public class ServerPlayerState implements Closeable
|
||||
this.networkSession.registerHandler(SessionConfigMessage.class, (sessionConfigMessage) ->
|
||||
{
|
||||
this.sessionConfig.constrainingConfig = sessionConfigMessage.config;
|
||||
|
||||
this.sendLevelKey();
|
||||
this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig));
|
||||
this.sendConfigMessage();
|
||||
});
|
||||
|
||||
this.networkSession.registerHandler(CloseInternalEvent.class, event -> {
|
||||
@@ -93,7 +94,14 @@ public class ServerPlayerState implements Closeable
|
||||
}
|
||||
}
|
||||
|
||||
private void onSessionConfigChanged() { this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig)); }
|
||||
private void sendConfigMessage()
|
||||
{
|
||||
double coordinateScale = this.getServerPlayer().getLevel().getDimensionType().getCoordinateScale();
|
||||
this.sessionConfig.constrainValue(Config.Server.generationBoundsX, (int) (Config.Server.generationBoundsX.get() / coordinateScale));
|
||||
this.sessionConfig.constrainValue(Config.Server.generationBoundsZ, (int) (Config.Server.generationBoundsZ.get() / coordinateScale));
|
||||
|
||||
this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
+7
@@ -46,6 +46,13 @@ public class ServerPlayerStateManager
|
||||
|
||||
public void handlePluginMessage(IServerPlayerWrapper player, AbstractNetworkMessage message)
|
||||
{
|
||||
// done to prevent a rare null-pointer on Neo/Forge
|
||||
if (player == null || message == null)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
MessageQueueState messageQueue = this.messageQueueByPlayerWrapper.computeIfAbsent(player, k -> new MessageQueueState());
|
||||
messageQueue.messageQueue.add(message);
|
||||
|
||||
|
||||
+3
-3
@@ -306,9 +306,9 @@ public class PhantomArrayListPool
|
||||
{
|
||||
// we only want to log when something has been returned
|
||||
if (checkoutCount != 0
|
||||
|| returnedByteArrayCount != 0
|
||||
|| returnedShortArrayCount != 0
|
||||
|| returnedLongArrayCount != 0)
|
||||
|| returnedByteArrayCount != 0
|
||||
|| returnedShortArrayCount != 0
|
||||
|| returnedLongArrayCount != 0)
|
||||
{
|
||||
LOGGER.warn("Pool: ["+ pool.name+"] phantom recovery. Returned checkouts:["+F3Screen.NUMBER_FORMAT.format(checkoutCount)+"], byte:["+F3Screen.NUMBER_FORMAT.format(returnedByteArrayCount)+"], short:["+F3Screen.NUMBER_FORMAT.format(returnedShortArrayCount)+"], long:["+F3Screen.NUMBER_FORMAT.format(returnedLongArrayCount)+"].");
|
||||
|
||||
|
||||
@@ -399,9 +399,11 @@ public class LodQuadTree extends QuadTree<LodRenderSection> implements IDebugRen
|
||||
// prepare this section for rendering
|
||||
if (!renderSection.gpuUploadInProgress()
|
||||
&& renderSection.renderBuffer == null
|
||||
// TODO this is commented out since some users reported LODs refusing to
|
||||
// load at their expected higher-detail levels
|
||||
// this check is specifically for N-sized world generators where the higher quality
|
||||
// data source may not exist yet, this is done to prevent holes while waiting for said generator
|
||||
&& renderSection.getFullDataSourceExists()
|
||||
//&& renderSection.getFullDataSourceExists()
|
||||
)
|
||||
{
|
||||
nodesNeedingLoading.add(renderSection);
|
||||
|
||||
@@ -510,10 +510,13 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
|
||||
{
|
||||
// TODO memoization is needed for multiplayer, otherwise
|
||||
// new retrieval requests won't be submitted.
|
||||
// TODO why is that the case? Shouldn't the missing positions be un-changing?
|
||||
// TODO why is that the case? Shouldn't the missing positions be un-changing?
|
||||
// TODO setting this value to low can cause world gen to slow down significantly
|
||||
// due to a race condition where the world gen thinks it is finished, but the results
|
||||
// haven't been saved to file yet, causing the gen to fire again
|
||||
this.missingGenerationPosFunc = Suppliers.memoizeWithExpiration(
|
||||
() -> this.fullDataSourceProvider.getPositionsToRetrieve(this.pos),
|
||||
15, TimeUnit.SECONDS);
|
||||
10, TimeUnit.MINUTES);
|
||||
}
|
||||
|
||||
LongArrayList missingGenerationPos = this.getMissingGenerationPos();
|
||||
|
||||
@@ -359,6 +359,7 @@ public class RenderBufferHandler implements AutoCloseable
|
||||
// debug wireframe setup //
|
||||
//=======================//
|
||||
|
||||
// TODO move this logic into LodRenderer so all the GL states can be handled there
|
||||
boolean renderWireframe = Config.Client.Advanced.Debugging.renderWireframe.get();
|
||||
if (renderWireframe)
|
||||
{
|
||||
|
||||
@@ -57,10 +57,10 @@ public class GLState
|
||||
public boolean depth;
|
||||
public boolean writeToDepthBuffer;
|
||||
public int depthFunc;
|
||||
//public boolean stencil;
|
||||
//public int stencilFunc;
|
||||
//public int stencilRef;
|
||||
//public int stencilMask;
|
||||
public boolean stencil;
|
||||
public int stencilFunc;
|
||||
public int stencilRef;
|
||||
public int stencilMask;
|
||||
public int[] view;
|
||||
public boolean cull;
|
||||
public int cullMode;
|
||||
@@ -121,10 +121,10 @@ public class GLState
|
||||
this.depth = GL32.glIsEnabled(GL32.GL_DEPTH_TEST);
|
||||
this.writeToDepthBuffer = GL32.glGetInteger(GL32.GL_DEPTH_WRITEMASK) == GL32.GL_TRUE;
|
||||
this.depthFunc = GL32.glGetInteger(GL32.GL_DEPTH_FUNC);
|
||||
//this.stencil = GL32.glIsEnabled(GL32.GL_STENCIL_TEST);
|
||||
//this.stencilFunc = GL32.glGetInteger(GL32.GL_STENCIL_FUNC);
|
||||
//this.stencilRef = GL32.glGetInteger(GL32.GL_STENCIL_REF);
|
||||
//this.stencilMask = GL32.glGetInteger(GL32.GL_STENCIL_VALUE_MASK);
|
||||
this.stencil = GL32.glIsEnabled(GL32.GL_STENCIL_TEST);
|
||||
this.stencilFunc = GL32.glGetInteger(GL32.GL_STENCIL_FUNC);
|
||||
this.stencilRef = GL32.glGetInteger(GL32.GL_STENCIL_REF);
|
||||
this.stencilMask = GL32.glGetInteger(GL32.GL_STENCIL_VALUE_MASK);
|
||||
this.view = new int[4];
|
||||
GL32.glGetIntegerv(GL32.GL_VIEWPORT, this.view);
|
||||
this.cull = GL32.glIsEnabled(GL32.GL_CULL_FACE);
|
||||
@@ -143,11 +143,11 @@ public class GLState
|
||||
", FB depth=" + this.frameBufferDepthTexture +
|
||||
", blend=" + this.blend + ", scissor=" + this.scissor + ", blendMode=" + GLEnums.getString(this.blendSrcColor) + "," + GLEnums.getString(this.blendDstColor) +
|
||||
", depth=" + this.depth +
|
||||
//", depthFunc=" + GLEnums.getString(this.depthFunc) + ", stencil=" + this.stencil + ", stencilFunc=" +
|
||||
//GLEnums.getString(this.stencilFunc) + ", stencilRef=" + this.stencilRef + ", stencilMask=" + this.stencilMask +
|
||||
", depthFunc=" + GLEnums.getString(this.depthFunc) + ", stencil=" + this.stencil +
|
||||
", stencilFunc=" + GLEnums.getString(this.stencilFunc) + ", stencilRef=" + this.stencilRef + ", stencilMask=" + this.stencilMask +
|
||||
", view={x:" + this.view[0] + ", y:" + this.view[1] +
|
||||
", w:" + this.view[2] + ", h:" + this.view[3] + "}" + ", cull=" + this.cull + ", cullMode="
|
||||
+ GLEnums.getString(this.cullMode) + ", polyMode=" + GLEnums.getString(this.polyMode) +
|
||||
", w:" + this.view[2] + ", h:" + this.view[3] + "}" + ", cull=" + this.cull +
|
||||
", cullMode=" + GLEnums.getString(this.cullMode) + ", polyMode=" + GLEnums.getString(this.polyMode) +
|
||||
'}';
|
||||
}
|
||||
|
||||
@@ -233,15 +233,15 @@ public class GLState
|
||||
}
|
||||
GLMC.glDepthFunc(this.depthFunc);
|
||||
|
||||
//if (this.stencil)
|
||||
//{
|
||||
// GL32.glEnable(GL32.GL_STENCIL_TEST);
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// GL32.glDisable(GL32.GL_STENCIL_TEST);
|
||||
//}
|
||||
//GL32.glStencilFunc(this.stencilFunc, this.stencilRef, this.stencilMask);
|
||||
if (this.stencil)
|
||||
{
|
||||
GL32.glEnable(GL32.GL_STENCIL_TEST);
|
||||
}
|
||||
else
|
||||
{
|
||||
GL32.glDisable(GL32.GL_STENCIL_TEST);
|
||||
}
|
||||
GL32.glStencilFunc(this.stencilFunc, this.stencilRef, this.stencilMask);
|
||||
|
||||
GL32.glViewport(this.view[0], this.view[1], this.view[2], this.view[3]);
|
||||
if (this.cull)
|
||||
|
||||
+41
-2
@@ -25,9 +25,15 @@ import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.InputStream;
|
||||
import java.io.InputStreamReader;
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
import com.seibel.distanthorizons.core.render.glObject.GLProxy;
|
||||
import org.lwjgl.PointerBuffer;
|
||||
import org.lwjgl.opengl.GL32;
|
||||
import org.lwjgl.opengl.GL32C;
|
||||
import org.lwjgl.system.MemoryStack;
|
||||
import org.lwjgl.system.MemoryUtil;
|
||||
import org.lwjgl.system.NativeType;
|
||||
|
||||
/**
|
||||
* This object holds a OpenGL reference to a shader
|
||||
@@ -63,7 +69,7 @@ public class Shader
|
||||
}
|
||||
|
||||
StringBuilder source = loadFile(path, absoluteFilePath, new StringBuilder());
|
||||
GL32.glShaderSource(this.id, source);
|
||||
safeShaderSource(this.id, source);
|
||||
|
||||
GL32.glCompileShader(this.id);
|
||||
// check if the shader compiled
|
||||
@@ -93,7 +99,7 @@ public class Shader
|
||||
throw new IllegalArgumentException("Failed to create shader with type ["+type+"] and Source: \n["+sourceString+"].");
|
||||
}
|
||||
|
||||
GL32.glShaderSource(this.id, sourceString);
|
||||
safeShaderSource(this.id, sourceString);
|
||||
GL32.glCompileShader(this.id);
|
||||
// check if the shader compiled
|
||||
int status = GL32.glGetShaderi(this.id, GL32.GL_COMPILE_STATUS);
|
||||
@@ -114,6 +120,37 @@ public class Shader
|
||||
// helpers //
|
||||
//=========//
|
||||
|
||||
/**
|
||||
* Identical in function to {@link GL32C#glShaderSource(int, CharSequence)} but
|
||||
* passes a null pointer for string length to force the driver to rely on the null
|
||||
* terminator for string length. This is a workaround for an apparent flaw with some
|
||||
* AMD drivers that don't receive or interpret the length correctly, resulting in
|
||||
* an access violation when the driver tries to read past the string memory.
|
||||
*
|
||||
* <p>Hat tip to fewizz for the find and the fix.
|
||||
*
|
||||
* <p>Source: https://github.com/vram-guild/canvas/commit/820bf754092ccaf8d0c169620c2ff575722d7d96
|
||||
*/
|
||||
private static void safeShaderSource(@NativeType("GLuint") int glId, @NativeType("GLchar const **") CharSequence source)
|
||||
{
|
||||
final MemoryStack stack = MemoryStack.stackGet();
|
||||
final int stackPointer = stack.getPointer();
|
||||
|
||||
try
|
||||
{
|
||||
final ByteBuffer sourceBuffer = MemoryUtil.memUTF8(source, true);
|
||||
final PointerBuffer pointers = stack.mallocPointer(1);
|
||||
pointers.put(sourceBuffer);
|
||||
|
||||
GL32.nglShaderSource(glId, 1, pointers.address0(), 0);
|
||||
org.lwjgl.system.APIUtil.apiArrayFree(pointers.address0(), 1);
|
||||
}
|
||||
finally
|
||||
{
|
||||
stack.setPointer(stackPointer);
|
||||
}
|
||||
}
|
||||
|
||||
public void free() { GL32.glDeleteShader(this.id); }
|
||||
|
||||
public static StringBuilder loadFile(String path, boolean absoluteFilePath, StringBuilder stringBuilder)
|
||||
@@ -151,4 +188,6 @@ public class Shader
|
||||
return stringBuilder;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+17
-8
@@ -1,5 +1,7 @@
|
||||
package com.seibel.distanthorizons.core.render.glObject.texture;
|
||||
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
|
||||
import org.lwjgl.opengl.GL11C;
|
||||
import org.lwjgl.opengl.GL13C;
|
||||
import org.lwjgl.opengl.GL43C;
|
||||
@@ -8,12 +10,15 @@ import java.nio.ByteBuffer;
|
||||
|
||||
public class DHDepthTexture
|
||||
{
|
||||
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
|
||||
|
||||
|
||||
private int id;
|
||||
public DHDepthTexture(int width, int height, EDhDepthBufferFormat format)
|
||||
{
|
||||
this.id = GL43C.glGenTextures();
|
||||
|
||||
resize(width, height, format);
|
||||
this.resize(width, height, format);
|
||||
|
||||
GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MIN_FILTER, GL11C.GL_NEAREST);
|
||||
GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MAG_FILTER, GL11C.GL_NEAREST);
|
||||
@@ -24,27 +29,31 @@ public class DHDepthTexture
|
||||
}
|
||||
|
||||
// For internal use by Iris for copying data. Do not use this in DH.
|
||||
public DHDepthTexture(int id) {
|
||||
this.id = id;
|
||||
}
|
||||
public DHDepthTexture(int id) { this.id = id; }
|
||||
|
||||
public void resize(int width, int height, EDhDepthBufferFormat format)
|
||||
{
|
||||
GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, getTextureId());
|
||||
GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, this.getTextureId());
|
||||
GL43C.glTexImage2D(GL11C.GL_TEXTURE_2D, 0, format.getGlInternalFormat(), width, height, 0,
|
||||
format.getGlType(), format.getGlFormat(), (ByteBuffer) null);
|
||||
}
|
||||
|
||||
public int getTextureId()
|
||||
{
|
||||
if (id == -1) throw new IllegalStateException("Depth texture does not exist!");
|
||||
return id;
|
||||
if (this.id == -1)
|
||||
{
|
||||
throw new IllegalStateException("Depth texture does not exist!");
|
||||
}
|
||||
|
||||
return this.id;
|
||||
}
|
||||
|
||||
public void destroy()
|
||||
{
|
||||
GL43C.glDeleteTextures(getTextureId());
|
||||
GLMC.glDeleteTextures(this.getTextureId());
|
||||
this.id = -1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+6
-1
@@ -1,5 +1,7 @@
|
||||
package com.seibel.distanthorizons.core.render.glObject.texture;
|
||||
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
|
||||
import org.joml.Vector2i;
|
||||
import org.lwjgl.opengl.GL11C;
|
||||
import org.lwjgl.opengl.GL13C;
|
||||
@@ -9,6 +11,9 @@ import java.nio.ByteBuffer;
|
||||
|
||||
public class DhColorTexture
|
||||
{
|
||||
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
|
||||
|
||||
|
||||
private final EDhInternalTextureFormat internalFormat;
|
||||
private final EDhPixelFormat format;
|
||||
private final EDhPixelType type;
|
||||
@@ -100,7 +105,7 @@ public class DhColorTexture
|
||||
this.throwIfInvalid();
|
||||
this.isValid = false;
|
||||
|
||||
GL43C.glDeleteTextures(this.id);
|
||||
GLMC.glDeleteTextures(this.id);
|
||||
}
|
||||
|
||||
/** @throws IllegalStateException if the texture isn't valid */
|
||||
|
||||
+28
-14
@@ -86,22 +86,31 @@ public class FadeRenderer
|
||||
this.fadeFramebuffer = -1;
|
||||
}
|
||||
|
||||
if (this.fadeTexture != -1)
|
||||
{
|
||||
GLMC.glDeleteTextures(this.fadeTexture);
|
||||
this.fadeTexture = -1;
|
||||
}
|
||||
|
||||
this.fadeFramebuffer = GL32.glGenFramebuffers();
|
||||
GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, this.fadeFramebuffer);
|
||||
|
||||
this.fadeTexture = GL32.glGenTextures();
|
||||
GLMC.glBindTexture(this.fadeTexture);
|
||||
GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
|
||||
GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
|
||||
GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
|
||||
GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fadeTexture, 0);
|
||||
|
||||
// Applying the fade texture is only needed if MC is drawing to their own frame buffer,
|
||||
// otherwise we can directly render to their texture
|
||||
if (MC_RENDER.mcRendersToFrameBuffer())
|
||||
{
|
||||
if (this.fadeTexture != -1)
|
||||
{
|
||||
GLMC.glDeleteTextures(this.fadeTexture);
|
||||
this.fadeTexture = -1;
|
||||
}
|
||||
|
||||
this.fadeTexture = GL32.glGenTextures();
|
||||
GLMC.glBindTexture(this.fadeTexture);
|
||||
GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
|
||||
GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
|
||||
GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
|
||||
GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fadeTexture, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, MC_RENDER.getColorTextureId(), 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -146,8 +155,13 @@ public class FadeRenderer
|
||||
|
||||
profiler.popPush("Fade Apply");
|
||||
|
||||
FadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
|
||||
FadeApplyShader.INSTANCE.render(partialTicks);
|
||||
// Applying the fade texture is only needed if MC is drawing to their own frame buffer,
|
||||
// otherwise we can directly render to their texture
|
||||
if (MC_RENDER.mcRendersToFrameBuffer())
|
||||
{
|
||||
FadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
|
||||
FadeApplyShader.INSTANCE.render(partialTicks);
|
||||
}
|
||||
|
||||
profiler.pop();
|
||||
}
|
||||
|
||||
+54
-43
@@ -23,6 +23,7 @@ import com.seibel.distanthorizons.api.interfaces.override.rendering.IDhApiFrameb
|
||||
import com.seibel.distanthorizons.api.interfaces.override.rendering.IDhApiShaderProgram;
|
||||
import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
|
||||
import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
|
||||
import com.seibel.distanthorizons.core.config.Config;
|
||||
import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.ColumnRenderBuffer;
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
|
||||
@@ -557,34 +558,24 @@ public class LodRenderer
|
||||
activeFrameBuffer.bind();
|
||||
|
||||
|
||||
boolean clearTextures = !ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeTextureClearEvent.class, renderEventParam);
|
||||
if (clearTextures)
|
||||
{
|
||||
if (this.usingMcFrameBuffer && framebufferOverride == null)
|
||||
{
|
||||
// Due to using MC/Optifine's framebuffer we need to re-bind the depth texture,
|
||||
// otherwise we'll be writing to MC/Optifine's depth texture which causes rendering issues
|
||||
activeFrameBuffer.addDepthAttachment(this.depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F.isCombinedStencil());
|
||||
|
||||
|
||||
// don't clear the color texture, that removes the sky
|
||||
GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
|
||||
}
|
||||
else if (firstPass)
|
||||
{
|
||||
GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
|
||||
}
|
||||
}
|
||||
|
||||
// by default draw everything as triangles
|
||||
GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
|
||||
GLMC.enableFaceCulling();
|
||||
|
||||
GLMC.glBlendFunc(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA);
|
||||
GLMC.glBlendFuncSeparate(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA, GL32.GL_ONE, GL32.GL_ZERO);
|
||||
|
||||
GL32.glDisable(GL32.GL_SCISSOR_TEST);
|
||||
|
||||
// Enable depth test and depth mask
|
||||
GLMC.enableDepthTest();
|
||||
GLMC.glDepthFunc(GL32.GL_LESS);
|
||||
GLMC.enableDepthMask();
|
||||
|
||||
// This is required for MC versions 1.21.5+
|
||||
// due to MC updating the lightmap by changing the viewport size
|
||||
GL32.glViewport(0, 0, this.cachedWidth, this.cachedHeight);
|
||||
|
||||
/*---------Bind required objects--------*/
|
||||
// Setup LodRenderProgram and the LightmapTexture if it has not yet been done
|
||||
// also binds LightmapTexture, VAO, and ShaderProgram
|
||||
@@ -605,6 +596,33 @@ public class LodRenderer
|
||||
}
|
||||
|
||||
this.lodRenderProgram.fillUniformData(renderEventParam);
|
||||
|
||||
|
||||
// needs to be fired after all the textures have been created/bound
|
||||
boolean clearTextures = !ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeTextureClearEvent.class, renderEventParam);
|
||||
if (clearTextures)
|
||||
{
|
||||
GL32.glClearDepth(1.0);
|
||||
|
||||
float[] clearColorValues = new float[4];
|
||||
GL32.glGetFloatv(GL32.GL_COLOR_CLEAR_VALUE, clearColorValues);
|
||||
GL32.glClearColor(clearColorValues[0], clearColorValues[1], clearColorValues[2], 1.0f);
|
||||
|
||||
if (this.usingMcFrameBuffer && framebufferOverride == null)
|
||||
{
|
||||
// Due to using MC/Optifine's framebuffer we need to re-bind the depth texture,
|
||||
// otherwise we'll be writing to MC/Optifine's depth texture which causes rendering issues
|
||||
activeFrameBuffer.addDepthAttachment(this.depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F.isCombinedStencil());
|
||||
|
||||
|
||||
// don't clear the color texture, that removes the sky
|
||||
GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
|
||||
}
|
||||
else if (firstPass)
|
||||
{
|
||||
GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/** Setup all render objects - MUST be called on the render thread */
|
||||
@@ -656,7 +674,7 @@ public class LodRenderer
|
||||
if(this.framebuffer.getStatus() != GL32.GL_FRAMEBUFFER_COMPLETE)
|
||||
{
|
||||
// This generally means something wasn't bound, IE missing either the color or depth texture
|
||||
SPAM_LOGGER.warn("FrameBuffer ["+this.framebuffer.getId()+"] isn't complete.");
|
||||
EVENT_LOGGER.warn("FrameBuffer ["+this.framebuffer.getId()+"] isn't complete.");
|
||||
}
|
||||
|
||||
|
||||
@@ -675,12 +693,15 @@ public class LodRenderer
|
||||
this.cachedWidth = MC_RENDER.getTargetFrameBufferViewportWidth();
|
||||
this.cachedHeight = MC_RENDER.getTargetFrameBufferViewportHeight();
|
||||
|
||||
DhApiTextureCreatedParam textureCreatedParam = new DhApiTextureCreatedParam(
|
||||
oldWidth, oldHeight,
|
||||
this.cachedWidth, this.cachedHeight
|
||||
);
|
||||
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiColorDepthTextureCreatedEvent.class,
|
||||
new DhApiColorDepthTextureCreatedEvent.EventParam(
|
||||
oldWidth, oldHeight,
|
||||
this.cachedWidth, this.cachedHeight
|
||||
));
|
||||
|
||||
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiColorDepthTextureCreatedEvent.class, new DhApiColorDepthTextureCreatedEvent.EventParam(textureCreatedParam));
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeColorDepthTextureCreatedEvent.class, textureCreatedParam);
|
||||
|
||||
|
||||
// also update the override if present
|
||||
@@ -712,26 +733,10 @@ public class LodRenderer
|
||||
{
|
||||
this.nullableColorTexture = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
private Color getFogColor(float partialTicks)
|
||||
{
|
||||
Color fogColor;
|
||||
|
||||
if (Config.Client.Advanced.Graphics.Fog.colorMode.get() == EDhApiFogColorMode.USE_SKY_COLOR)
|
||||
{
|
||||
fogColor = MC_RENDER.getSkyColor();
|
||||
}
|
||||
else
|
||||
{
|
||||
fogColor = MC_RENDER.getFogColor(partialTicks);
|
||||
}
|
||||
|
||||
return fogColor;
|
||||
ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterColorDepthTextureCreatedEvent.class, textureCreatedParam);
|
||||
}
|
||||
private Color getSpecialFogColor(float partialTicks) { return MC_RENDER.getSpecialFogColor(partialTicks); }
|
||||
|
||||
|
||||
|
||||
@@ -748,7 +753,10 @@ public class LodRenderer
|
||||
public static int getActiveColorTextureId() { return activeColorTextureId; }
|
||||
|
||||
private void setActiveDepthTextureId(int depthTextureId) { activeDepthTextureId = depthTextureId; }
|
||||
/** Returns -1 if no texture has been bound yet */
|
||||
/**
|
||||
* FIXME it's possible for this to return an invalid texture ID if the renderer is being re-built at the same time
|
||||
* Returns -1 if no texture has been bound yet
|
||||
*/
|
||||
public static int getActiveDepthTextureId() { return activeDepthTextureId; }
|
||||
|
||||
|
||||
@@ -796,6 +804,9 @@ public class LodRenderer
|
||||
if (this.depthTexture != null)
|
||||
this.depthTexture.destroy();
|
||||
|
||||
this.setActiveDepthTextureId(-1);
|
||||
this.setActiveColorTextureId(-1);
|
||||
|
||||
EVENT_LOGGER.info("Renderer Cleanup Complete");
|
||||
});
|
||||
}
|
||||
|
||||
+82
-3
@@ -75,6 +75,18 @@ public class DhApplyShader extends AbstractShaderRenderer
|
||||
|
||||
@Override
|
||||
protected void onRender()
|
||||
{
|
||||
if (MC_RENDER.mcRendersToFrameBuffer())
|
||||
{
|
||||
this.renderToFrameBuffer();
|
||||
}
|
||||
else
|
||||
{
|
||||
this.renderToMcTexture();
|
||||
}
|
||||
}
|
||||
// TODO merge duplicate code between these to render methods
|
||||
private void renderToFrameBuffer()
|
||||
{
|
||||
int targetFrameBuffer = MC_RENDER.getTargetFrameBuffer();
|
||||
if (targetFrameBuffer == -1)
|
||||
@@ -87,9 +99,15 @@ public class DhApplyShader extends AbstractShaderRenderer
|
||||
|
||||
GLMC.disableDepthTest();
|
||||
|
||||
GLMC.enableBlend();
|
||||
GL32.glBlendEquation(GL32.GL_FUNC_ADD);
|
||||
GLMC.glBlendFunc(GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
|
||||
// blending isn't needed, we're manually merging the MC and DH textures
|
||||
// Note: this prevents the sun/moon and stars from rendering through transparent LODs,
|
||||
// however this also fixes transparent LODs from glowing when rendered against the sky during the day
|
||||
GLMC.disableBlend();
|
||||
|
||||
// old blending logic in case it's ever needed:
|
||||
//GLMC.enableBlend();
|
||||
//GL32.glBlendEquation(GL32.GL_FUNC_ADD);
|
||||
//GLMC.glBlendFunc(GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE0);
|
||||
GLMC.glBindTexture(LodRenderer.getActiveColorTextureId());
|
||||
@@ -110,5 +128,66 @@ public class DhApplyShader extends AbstractShaderRenderer
|
||||
GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, targetFrameBuffer);
|
||||
|
||||
}
|
||||
private void renderToMcTexture()
|
||||
{
|
||||
int targetColorTextureId = MC_RENDER.getColorTextureId();
|
||||
if (targetColorTextureId == -1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int dhFrameBufferId = LodRenderer.getActiveFramebufferId();
|
||||
if (dhFrameBufferId == -1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
int mcFrameBufferId = MC_RENDER.getTargetFrameBuffer();
|
||||
if (mcFrameBufferId == -1)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
GLState state = new GLState();
|
||||
|
||||
GLMC.disableDepthTest();
|
||||
|
||||
// blending isn't needed, we're just directly merging the MC and DH textures
|
||||
// Note: this prevents the sun/moon and stars from rendering through transparent LODs,
|
||||
// however this also fixes
|
||||
GLMC.disableBlend();
|
||||
|
||||
// old blending logic in case it's ever needed:
|
||||
//GLMC.enableBlend();
|
||||
//GL32.glBlendEquation(GL32.GL_FUNC_ADD);
|
||||
//GLMC.glBlendFunc(GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE0);
|
||||
GLMC.glBindTexture(LodRenderer.getActiveColorTextureId());
|
||||
GL32.glUniform1i(this.gDhColorTextureUniform, 0);
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE1);
|
||||
GLMC.glBindTexture(LodRenderer.getActiveDepthTextureId());
|
||||
GL32.glUniform1i(this.gDepthMapUniform, 1);
|
||||
|
||||
|
||||
|
||||
GL32.glFramebufferTexture(GL32.GL_DRAW_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, targetColorTextureId, 0);
|
||||
|
||||
// Copy to MC's texture via MC's framebuffer
|
||||
GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, dhFrameBufferId);
|
||||
|
||||
ScreenQuad.INSTANCE.render();
|
||||
|
||||
|
||||
// restore everything, except at this point the MC framebuffer should now be used instead
|
||||
state.restore();
|
||||
GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, mcFrameBufferId);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+10
@@ -20,6 +20,7 @@
|
||||
package com.seibel.distanthorizons.core.render.renderer.shaders;
|
||||
|
||||
import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
|
||||
import com.seibel.distanthorizons.core.render.glObject.GLState;
|
||||
import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
|
||||
import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
|
||||
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
|
||||
@@ -104,6 +105,12 @@ public class FadeApplyShader extends AbstractShaderRenderer
|
||||
@Override
|
||||
protected void onRender()
|
||||
{
|
||||
if (!MC_RENDER.mcRendersToFrameBuffer())
|
||||
{
|
||||
throw new IllegalStateException("If Minecraft is directly rendering to a texture the apply shader isn't needed, just draw the fade directly to the MC color texture.");
|
||||
}
|
||||
|
||||
|
||||
GLMC.disableBlend();
|
||||
|
||||
// Depth testing must be disabled otherwise this application shader won't apply anything.
|
||||
@@ -119,6 +126,9 @@ public class FadeApplyShader extends AbstractShaderRenderer
|
||||
ScreenQuad.INSTANCE.render();
|
||||
|
||||
GLMC.enableDepthTest();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
+15
-2
@@ -155,6 +155,19 @@ public class FadeShader extends AbstractShaderRenderer
|
||||
@Override
|
||||
protected void onRender()
|
||||
{
|
||||
int depthTextureId = LodRenderer.getActiveDepthTextureId();
|
||||
int colorTextureId = LodRenderer.getActiveColorTextureId();
|
||||
|
||||
if (depthTextureId == -1
|
||||
|| colorTextureId == -1)
|
||||
{
|
||||
// the renderer is currently being re-built and/or inactive,
|
||||
// we don't need to/can't render fading
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
|
||||
GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, this.frameBuffer);
|
||||
GLMC.disableScissorTest();
|
||||
GLMC.disableDepthTest();
|
||||
@@ -165,7 +178,7 @@ public class FadeShader extends AbstractShaderRenderer
|
||||
GL32.glUniform1i(this.uMcDepthTexture, 0);
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE1);
|
||||
GLMC.glBindTexture(LodRenderer.getActiveDepthTextureId());
|
||||
GLMC.glBindTexture(depthTextureId);
|
||||
GL32.glUniform1i(this.uDhDepthTexture, 1);
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE2);
|
||||
@@ -173,7 +186,7 @@ public class FadeShader extends AbstractShaderRenderer
|
||||
GL32.glUniform1i(this.uCombinedMcDhColorTexture, 2);
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE3);
|
||||
GLMC.glBindTexture(LodRenderer.getActiveColorTextureId());
|
||||
GLMC.glBindTexture(colorTextureId);
|
||||
GL32.glUniform1i(this.uDhColorTexture, 3);
|
||||
|
||||
|
||||
|
||||
+1
@@ -84,6 +84,7 @@ public class FogApplyShader extends AbstractShaderRenderer
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE1);
|
||||
GLMC.glBindTexture(LodRenderer.getActiveDepthTextureId());
|
||||
GL32.glUniform1i(this.depthTextureUniform, 1);
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
+15
-2
@@ -28,9 +28,11 @@ import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
|
||||
import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
|
||||
import com.seibel.distanthorizons.core.render.renderer.ScreenQuad;
|
||||
import com.seibel.distanthorizons.core.util.LodUtil;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
|
||||
import com.seibel.distanthorizons.core.util.math.Mat4f;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
|
||||
import org.lwjgl.opengl.GL32;
|
||||
|
||||
import java.awt.*;
|
||||
@@ -41,11 +43,14 @@ public class FogShader extends AbstractShaderRenderer
|
||||
|
||||
private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
|
||||
private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
|
||||
private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
|
||||
|
||||
|
||||
|
||||
public int frameBuffer;
|
||||
|
||||
private Mat4f inverseMvmProjMatrix;
|
||||
private Mat4f inverseMvmProjMatrix;
|
||||
|
||||
|
||||
|
||||
//==========//
|
||||
@@ -253,7 +258,15 @@ public class FogShader extends AbstractShaderRenderer
|
||||
|
||||
// this is necessary for MC 1.16 (IE Legacy OpenGL)
|
||||
// otherwise the framebuffer isn't cleared correctly and the fog smears across the screen
|
||||
GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
|
||||
if (MC_RENDER.runningLegacyOpenGL())
|
||||
{
|
||||
// in another part of the DH code we set the fog color to opaque, here it needs to be transparent
|
||||
float[] clearColorValues = new float[4];
|
||||
GL32.glGetFloatv(GL32.GL_COLOR_CLEAR_VALUE, clearColorValues);
|
||||
GL32.glClearColor(clearColorValues[0], clearColorValues[1], clearColorValues[2], 0.0f);
|
||||
|
||||
GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
|
||||
}
|
||||
|
||||
|
||||
ScreenQuad.INSTANCE.render();
|
||||
|
||||
-3
@@ -134,9 +134,6 @@ public class SSAOApplyShader extends AbstractShaderRenderer
|
||||
// it should be automatically restored after rendering is complete.
|
||||
GLMC.disableDepthTest();
|
||||
|
||||
GLMC.glActiveTexture(GL32.GL_TEXTURE0);
|
||||
GLMC.glBindTexture(0);
|
||||
|
||||
// apply the rendered SSAO to the LODs
|
||||
GLMC.glBindFramebuffer(GL32.GL_READ_FRAMEBUFFER, SSAOShader.INSTANCE.frameBuffer);
|
||||
GLMC.glBindFramebuffer(GL32.GL_DRAW_FRAMEBUFFER, LodRenderer.getActiveFramebufferId());
|
||||
|
||||
+10
-1
@@ -142,7 +142,16 @@ public class FullDataSourceV2DTO
|
||||
public FullDataSourceV2 createDataSource(@NotNull ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
|
||||
{
|
||||
FullDataSourceV2 dataSource = FullDataSourceV2.createEmpty(this.pos);
|
||||
this.internalPopulateDataSource(dataSource, levelWrapper, false);
|
||||
try
|
||||
{
|
||||
this.internalPopulateDataSource(dataSource, levelWrapper, false);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
dataSource.close();
|
||||
throw e;
|
||||
}
|
||||
|
||||
return dataSource;
|
||||
}
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ import com.seibel.distanthorizons.core.sql.DbConnectionClosedException;
|
||||
import com.seibel.distanthorizons.core.sql.dto.IBaseDTO;
|
||||
import com.seibel.distanthorizons.core.sql.repo.phantoms.AutoClosableTrackingWrapper;
|
||||
import com.seibel.distanthorizons.core.util.KeyedLockContainer;
|
||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.jetbrains.annotations.Nullable;
|
||||
|
||||
@@ -501,7 +502,12 @@ public abstract class AbstractDhRepo<TKey, TDTO extends IBaseDTO<TKey>> implemen
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.warn("Attempting to close already closed database connection: [" + connectionString + "]");
|
||||
// these warnings can be ignored in release builds, as long as the connection is closed it doesn't really matter
|
||||
// TODO fix duplicate closes
|
||||
if (ModInfo.IS_DEV_BUILD)
|
||||
{
|
||||
LOGGER.warn("Attempting to close already closed database connection: [" + connectionString + "]");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -562,7 +568,12 @@ public abstract class AbstractDhRepo<TKey, TDTO extends IBaseDTO<TKey>> implemen
|
||||
}
|
||||
else
|
||||
{
|
||||
LOGGER.warn("Attempting to close already closed database connection: [" + this.connectionString + "]");
|
||||
// these warnings can be ignored in release builds, as long as the connection is closed it doesn't really matter
|
||||
// TODO fix duplicate closes
|
||||
if (ModInfo.IS_DEV_BUILD)
|
||||
{
|
||||
LOGGER.warn("Attempting to close already closed database connection: [" + this.connectionString + "]");
|
||||
}
|
||||
}
|
||||
}
|
||||
ACTIVE_CONNECTION_STRINGS_BY_REPO.remove(this);
|
||||
|
||||
@@ -73,7 +73,10 @@ public class RenderDataPointUtil
|
||||
|
||||
|
||||
public final static int EMPTY_DATA = 0;
|
||||
public final static int MAX_WORLD_Y_SIZE = 4096;
|
||||
|
||||
// the maximum valid Y value is the maximum min y + world height.
|
||||
// min y is [-2032, 2031], height is < 4064.
|
||||
public final static int MAX_WORLD_Y_SIZE = 2031 + 4064;
|
||||
|
||||
public final static int ALPHA_DOWNSIZE_SHIFT = 4;
|
||||
|
||||
|
||||
+4
-3
@@ -20,10 +20,8 @@
|
||||
package com.seibel.distanthorizons.core.util.objects.dataStreams;
|
||||
|
||||
import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
|
||||
import com.seibel.distanthorizons.core.Initializer;
|
||||
import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
|
||||
import com.seibel.distanthorizons.coreapi.ModInfo;
|
||||
import net.jpountz.lz4.LZ4FrameInputStream;
|
||||
//import org.apache.commons.compress.compressors.zstandard.ZstdCompressorInputStream;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.tukaani.xz.ResettableArrayCache;
|
||||
@@ -44,6 +42,7 @@ import java.io.*;
|
||||
public class DhDataInputStream extends DataInputStream
|
||||
{
|
||||
private static final ThreadLocal<ResettableArrayCache> LZMA_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ResettableArrayCache(new LzmaArrayCache()));
|
||||
//private static final ThreadLocal<ZstdArrayCache> ZSTD_RESETTABLE_ARRAY_CACHE_GETTER = ThreadLocal.withInitial(() -> new ZstdArrayCache());
|
||||
|
||||
private static final Logger LOGGER = LogManager.getLogger();
|
||||
|
||||
@@ -62,6 +61,8 @@ public class DhDataInputStream extends DataInputStream
|
||||
return stream;
|
||||
case LZ4:
|
||||
return new LZ4FrameInputStream(stream);
|
||||
//case Z_STD:
|
||||
// return new ZstdCompressorInputStream(stream, ZSTD_RESETTABLE_ARRAY_CACHE_GETTER.get());
|
||||
case LZMA2:
|
||||
// using an array cache significantly reduces GC pressure
|
||||
ResettableArrayCache arrayCache = LZMA_RESETTABLE_ARRAY_CACHE_GETTER.get();
|
||||
|
||||
+5
-1
@@ -23,6 +23,7 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
|
||||
import net.jpountz.lz4.LZ4Factory;
|
||||
import net.jpountz.lz4.LZ4FrameOutputStream;
|
||||
import net.jpountz.xxhash.XXHashFactory;
|
||||
//import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.tukaani.xz.*;
|
||||
@@ -53,6 +54,9 @@ public class DhDataOutputStream extends DataOutputStream
|
||||
{
|
||||
case UNCOMPRESSED:
|
||||
return stream;
|
||||
|
||||
//case Z_STD:
|
||||
// return new ZstdCompressorOutputStream(stream, 3, true, true);
|
||||
case LZ4:
|
||||
return new LZ4FrameOutputStream(stream,
|
||||
LZ4FrameOutputStream.BLOCKSIZE.SIZE_64KB, -1L,
|
||||
@@ -69,7 +73,7 @@ public class DhDataOutputStream extends DataOutputStream
|
||||
arrayCache.reset();
|
||||
// Note: if the LZMA2Options are changed the array cache may need to be re-tested.
|
||||
// the array cache was specifically tested and tuned for LZMA preset 3/4
|
||||
return new XZOutputStream(stream, new LZMA2Options(3),
|
||||
return new XZOutputStream(stream, new LZMA2Options(3),
|
||||
XZ.CHECK_CRC64, arrayCache);
|
||||
|
||||
default:
|
||||
|
||||
+20
-4
@@ -63,8 +63,16 @@ public class LzmaArrayCache extends ArrayCache
|
||||
{
|
||||
return new byte[size];
|
||||
}
|
||||
// the array needs to be cleared to prevent accidentally sending dirty data
|
||||
Arrays.fill(array, (byte)0);
|
||||
|
||||
// the array only sometimes needs to be cleared,
|
||||
// clearing all the time results in unnecessary slowdowns
|
||||
if (fillWithZeros)
|
||||
{
|
||||
// TODO it appears that this can prevent the CPU from working on
|
||||
// other tasks, thus causing render thread lag even when run on a separate thread
|
||||
Arrays.fill(array, (byte) 0);
|
||||
}
|
||||
|
||||
return array;
|
||||
}
|
||||
|
||||
@@ -107,8 +115,16 @@ public class LzmaArrayCache extends ArrayCache
|
||||
{
|
||||
return new int[size];
|
||||
}
|
||||
// the array needs to be cleared to prevent accidentally sending dirty data
|
||||
Arrays.fill(array, (byte)0);
|
||||
|
||||
// the array only sometimes needs to be cleared,
|
||||
// clearing all the time results in unnecessary slowdowns
|
||||
if (fillWithZeros)
|
||||
{
|
||||
// TODO it appears that this can prevent the CPU from working on
|
||||
// other tasks, thus causing render thread lag even when run on a separate thread
|
||||
Arrays.fill(array, (byte) 0);
|
||||
}
|
||||
|
||||
return array;
|
||||
}
|
||||
|
||||
|
||||
+85
@@ -0,0 +1,85 @@
|
||||
package com.seibel.distanthorizons.core.util.objects.dataStreams;
|
||||
|
||||
//import com.github.luben.zstd.BufferPool;
|
||||
import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
|
||||
import it.unimi.dsi.fastutil.ints.Int2ReferenceArrayMap;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.concurrent.atomic.AtomicInteger;
|
||||
import java.util.function.IntUnaryOperator;
|
||||
|
||||
/**
|
||||
* LZMA requires a custom object to cache it's backend arrays.
|
||||
*/
|
||||
public class ZstdArrayCache //implements BufferPool
|
||||
{
|
||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
||||
|
||||
/**
|
||||
* In James' testing the byte and int caches only ever had to store 2 and 4 arrays respectively.
|
||||
* With the in mind we could take a few shortcuts, but if that changes then we need to be
|
||||
* notified as it might cause issues with the current logic.
|
||||
*/
|
||||
public static final int WARN_CACHE_LENGTH_EXCEEDED = 10;
|
||||
|
||||
public static final AtomicInteger MAX_BYTE_CACHE_LENGTH_REF = new AtomicInteger(WARN_CACHE_LENGTH_EXCEEDED);
|
||||
|
||||
public final IntUnaryOperator maxByteCacheSizeUnaryOperator = (x) -> Math.max(this.bufferCache.size(), x);
|
||||
|
||||
|
||||
/**
|
||||
* generally only 2 items long <br>
|
||||
* {@link Int2ReferenceArrayMap} can be used since the cache should only be a few items long.
|
||||
* If the array ends up being longer then this design will need to be changed.
|
||||
*/
|
||||
public final Int2ReferenceArrayMap<ArrayList<ByteBuffer>> bufferCache = new Int2ReferenceArrayMap<>();
|
||||
|
||||
|
||||
|
||||
//=============//
|
||||
// byte arrays //
|
||||
//=============//
|
||||
|
||||
//@Override
|
||||
public ByteBuffer get(int size)
|
||||
{
|
||||
ArrayList<ByteBuffer> cacheList = this.bufferCache.computeIfAbsent(size, (newSize) -> new ArrayList<>(4));
|
||||
if (cacheList.isEmpty())
|
||||
{
|
||||
return ByteBuffer.allocate(size);
|
||||
}
|
||||
|
||||
ByteBuffer array = cacheList.remove(cacheList.size()-1);
|
||||
if (array == null)
|
||||
{
|
||||
return ByteBuffer.allocate(size);
|
||||
}
|
||||
|
||||
return array;
|
||||
}
|
||||
|
||||
//@Override
|
||||
public void release(ByteBuffer buffer)
|
||||
{
|
||||
int size = buffer.array().length;
|
||||
this.bufferCache.computeIfAbsent(size, (newSize) -> new ArrayList<>());
|
||||
this.bufferCache.get(size).add(buffer);
|
||||
|
||||
|
||||
if (this.bufferCache.size() > WARN_CACHE_LENGTH_EXCEEDED)
|
||||
{
|
||||
int previousMax = MAX_BYTE_CACHE_LENGTH_REF.getAndUpdate(this.maxByteCacheSizeUnaryOperator);
|
||||
int newMax = MAX_BYTE_CACHE_LENGTH_REF.get();
|
||||
if (newMax > previousMax)
|
||||
{
|
||||
LOGGER.warn("LZMA byte array cache expected size exceeded. Expected max length ["+WARN_CACHE_LENGTH_EXCEEDED+"], actual length ["+this.bufferCache.size()+"].");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
+4
-2
@@ -78,9 +78,11 @@ public class RateLimitedThreadPoolExecutor extends ThreadPoolExecutor
|
||||
long runTime = System.nanoTime() - this.runStartTime.get();
|
||||
Thread.sleep(TimeUnit.NANOSECONDS.toMillis((long) (runTime / this.runTimeRatioConfig.get() - runTime)));
|
||||
}
|
||||
catch (InterruptedException e)
|
||||
catch (InterruptedException ignore)
|
||||
{
|
||||
throw new RuntimeException(e);
|
||||
// if this thread is interrupted that means the
|
||||
// thread pool is being shut down,
|
||||
// we don't need to log that.
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+23
-2
@@ -89,7 +89,14 @@ public class ThreadPoolUtil
|
||||
|
||||
public static void setupThreadPools()
|
||||
{
|
||||
// thread pools
|
||||
//==================//
|
||||
// main thread pool //
|
||||
//==================//
|
||||
|
||||
if (taskPicker != null)
|
||||
{
|
||||
taskPicker.shutdown();
|
||||
}
|
||||
taskPicker = new PriorityTaskPicker();
|
||||
|
||||
networkCompressionThreadPool = taskPicker.createExecutor();
|
||||
@@ -98,8 +105,22 @@ public class ThreadPoolUtil
|
||||
updatePropagatorThreadPool = taskPicker.createExecutor();
|
||||
worldGenThreadPool = taskPicker.createExecutor();
|
||||
|
||||
// single thread pools
|
||||
|
||||
|
||||
//=========================//
|
||||
// standalone thread pools //
|
||||
//=========================//
|
||||
|
||||
if (beaconCullingThreadPool != null)
|
||||
{
|
||||
beaconCullingThreadPool.shutdown();
|
||||
}
|
||||
beaconCullingThreadPool = ThreadUtil.makeSingleThreadPool(BEACON_CULLING_THREAD_NAME);
|
||||
|
||||
if (fullDataMigrationThreadPool != null)
|
||||
{
|
||||
fullDataMigrationThreadPool.shutdown();
|
||||
}
|
||||
fullDataMigrationThreadPool = ThreadUtil.makeSingleThreadPool(FULL_DATA_MIGRATION_THREAD_NAME);
|
||||
|
||||
}
|
||||
|
||||
@@ -52,7 +52,7 @@ public abstract class AbstractDhServerWorld<TDhServerLevel extends AbstractDhSer
|
||||
public void addPlayer(IServerPlayerWrapper serverPlayer)
|
||||
{
|
||||
ServerPlayerState playerState = this.serverPlayerStateManager.registerJoinedPlayer(serverPlayer);
|
||||
this.getLevel(serverPlayer.getLevel()).addPlayer(serverPlayer);
|
||||
((TDhServerLevel) this.getOrLoadServerLevel(serverPlayer.getLevel())).addPlayer(serverPlayer);
|
||||
|
||||
Iterator<TDhServerLevel> it = this.dhLevelByLevelWrapper.values().stream().distinct().iterator();
|
||||
while (it.hasNext())
|
||||
|
||||
@@ -39,8 +39,8 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
|
||||
public final ClientOnlySaveStructure saveStructure;
|
||||
public final ClientNetworkState networkState = new ClientNetworkState();
|
||||
|
||||
public ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("Client World Ticker Thread");
|
||||
public EventLoop eventLoop = new EventLoop(this.dhTickerThread, this::_clientTick);
|
||||
public final ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("Client World Ticker Thread");
|
||||
public final EventLoop eventLoop = new EventLoop(this.dhTickerThread, this::_clientTick);
|
||||
|
||||
|
||||
|
||||
@@ -128,6 +128,8 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
|
||||
{
|
||||
this.networkState.close();
|
||||
|
||||
this.dhTickerThread.shutdownNow();
|
||||
|
||||
|
||||
for (DhClientLevel dhClientLevel : this.levels.values())
|
||||
{
|
||||
|
||||
@@ -37,6 +37,7 @@ public class DhServerWorld extends AbstractDhServerWorld<DhServerLevel>
|
||||
}
|
||||
|
||||
|
||||
|
||||
//================//
|
||||
// level handling //
|
||||
//================//
|
||||
|
||||
@@ -23,9 +23,11 @@ import com.seibel.distanthorizons.core.level.IDhLevel;
|
||||
import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.util.concurrent.CompletableFuture;
|
||||
|
||||
public interface IDhWorld
|
||||
// TODO why is this exist alongside AbstractDhWorld?
|
||||
public interface IDhWorld extends Closeable
|
||||
{
|
||||
|
||||
IDhLevel getOrLoadLevel(@NotNull ILevelWrapper levelWrapper);
|
||||
|
||||
+5
@@ -49,6 +49,11 @@ public interface IBlockStateWrapper extends IDhApiBlockStateWrapper
|
||||
boolean isBeaconBlock();
|
||||
/** IE a glass block that can affect the beacon beam color */
|
||||
boolean isBeaconTintBlock();
|
||||
/**
|
||||
* Returns true for any blocks that allow beacon beams to go through.
|
||||
* IE: glass, stairs, bedrock, chests, end portal frames, carpet, cake
|
||||
*/
|
||||
boolean allowsBeaconBeamPassage();
|
||||
/**
|
||||
* The blocks used by a beacon's base
|
||||
* IE Iron, diamond, gold, etc.
|
||||
|
||||
+2
-1
@@ -381,8 +381,9 @@ public interface IChunkWrapper extends IBindable
|
||||
for (int y = beaconRelPos.getY() +1; y <= maxY; y++)
|
||||
{
|
||||
IBlockStateWrapper block = centerChunk.getBlockState(beaconRelPos.getX(), y, beaconRelPos.getZ());
|
||||
if (!block.isAir() && block.getOpacity() == LodUtil.BLOCK_FULLY_OPAQUE)
|
||||
if (!block.allowsBeaconBeamPassage())
|
||||
{
|
||||
// beam is blocked by this block
|
||||
return null;
|
||||
}
|
||||
|
||||
|
||||
+3
@@ -60,6 +60,9 @@ public interface IMinecraftRenderWrapper extends IBindable
|
||||
int getScreenWidth();
|
||||
int getScreenHeight();
|
||||
|
||||
boolean mcRendersToFrameBuffer();
|
||||
boolean runningLegacyOpenGL();
|
||||
|
||||
/** @return -1 if no valid framebuffer is available yet */
|
||||
int getTargetFrameBuffer(); // Note: Iris is now hooking onto this for DH + Iris compat, try not to change (unless we wanna deal with some annoyances)
|
||||
// Iris commit: https://github.com/IrisShaders/Iris/commit/a76a240527e93780bbcba57c09bef377419d47a7#diff-7b9ded0c79bbcdb130010373387756a28ee8d3640d522c0a5b7acd0abbfc20aeR16
|
||||
|
||||
@@ -746,6 +746,10 @@
|
||||
"Maximum Data Transfer Speed, KB/s",
|
||||
"distanthorizons.config.server.maxDataTransferSpeed.@tooltip":
|
||||
"Maximum speed for uploading LODs to the clients, in KB/s.\nValue of 0 disables the limit.",
|
||||
"distanthorizons.config.server.enableAdaptiveTransferSpeed":
|
||||
"Enable Adaptive Transfer Speed",
|
||||
"distanthorizons.config.server.enableAdaptiveTransferSpeed.@tooltip":
|
||||
"Enables adaptive transfer speed based on client performance.\nIf true, DH will automatically adjust transfer rate to minimize connection lag.\nIf false, transfer speed will remain fixed.",
|
||||
|
||||
|
||||
"distanthorizons.config.server.experimental":
|
||||
@@ -917,7 +921,7 @@
|
||||
"distanthorizons.config.enum.EDhApiDistantGeneratorMode.FEATURES":
|
||||
"Features",
|
||||
"distanthorizons.config.enum.EDhApiDistantGeneratorMode.INTERNAL_SERVER":
|
||||
"Internal Server",
|
||||
"Full - Save Chunks",
|
||||
|
||||
"distanthorizons.config.enum.EDhApiDistantGeneratorProgressDisplayLocation.OVERLAY":
|
||||
"Overlay",
|
||||
@@ -931,9 +935,11 @@
|
||||
"distanthorizons.config.enum.EDhApiDataCompressionMode.UNCOMPRESSED":
|
||||
"Uncompressed",
|
||||
"distanthorizons.config.enum.EDhApiDataCompressionMode.LZ4":
|
||||
"Fast/Big - LZ4",
|
||||
"Fastest/Big - LZ4",
|
||||
"distanthorizons.config.enum.EDhApiDataCompressionMode.Z_STD":
|
||||
"Fast/Small - Z_STD",
|
||||
"distanthorizons.config.enum.EDhApiDataCompressionMode.LZMA2":
|
||||
"Slow/Small - LZMA2",
|
||||
"Slow/Smallest - LZMA2",
|
||||
|
||||
"distanthorizons.config.enum.EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS":
|
||||
"1. Merge Same Blocks",
|
||||
|
||||
@@ -8,17 +8,26 @@ uniform sampler2D gDhColorTexture;
|
||||
uniform sampler2D gDhDepthTexture;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* LOD application shader
|
||||
*
|
||||
* This merges the rendered LODs into Minecraft's texture/FBO
|
||||
*/
|
||||
void main()
|
||||
{
|
||||
fragColor = vec4(0.0);
|
||||
|
||||
float fragmentDepth = texture(gDhDepthTexture, TexCoord).r;
|
||||
|
||||
// a fragment depth of "1" means the fragment wasn't drawn to,
|
||||
// only update fragments that were drawn to
|
||||
if (fragmentDepth != 1)
|
||||
float fragmentDepth = texture(gDhDepthTexture, TexCoord).r;
|
||||
if (fragmentDepth != 1)
|
||||
{
|
||||
fragColor = texture(gDhColorTexture, TexCoord);
|
||||
}
|
||||
else
|
||||
{
|
||||
// use the original MC texture if no LODs were drawn to this fragment
|
||||
discard;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,16 +8,19 @@ uniform sampler2D uColorTexture;
|
||||
uniform sampler2D uDepthTexture;
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Fog application shader
|
||||
*
|
||||
* This merges the rendered fog onto DH's rendered LODs
|
||||
*/
|
||||
void main()
|
||||
{
|
||||
fragColor = vec4(1.0);
|
||||
|
||||
float fragmentDepth = textureLod(uDepthTexture, TexCoord, 0).r;
|
||||
fragColor = vec4(0.0);
|
||||
|
||||
// a fragment depth of "1" means the fragment wasn't drawn to,
|
||||
// only update fragments that were drawn to
|
||||
if (fragmentDepth != 1)
|
||||
float fragmentDepth = textureLod(uDepthTexture, TexCoord, 0).r;
|
||||
if (fragmentDepth != 1)
|
||||
{
|
||||
fragColor = texture(uColorTexture, TexCoord);
|
||||
}
|
||||
|
||||
@@ -25,11 +25,11 @@ import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
|
||||
import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV2Repo;
|
||||
import com.seibel.distanthorizons.coreapi.util.StringUtil;
|
||||
import it.unimi.dsi.fastutil.longs.LongArrayList;
|
||||
//import org.apache.commons.compress.compressors.zstandard.ZstdCompressorOutputStream;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.*;
|
||||
import java.text.CharacterIterator;
|
||||
import java.text.StringCharacterIterator;
|
||||
|
||||
/**
|
||||
* <strong>Note:</strong>
|
||||
@@ -47,22 +47,14 @@ import java.text.StringCharacterIterator;
|
||||
*/
|
||||
public class CompressionTest
|
||||
{
|
||||
public static String TEST_DIR = "C:\\DistantHorizonsWorkspace\\distant-horizons\\run\\saves\\Arcapelago\\data";
|
||||
public static String TEST_DIR = "C:\\DistantHorizonsWorkspace\\distant-horizons\\run\\client\\saves\\Archipelego\\data";
|
||||
public static String DB_FILE_NAME_PREFIX = "DistantHorizons";
|
||||
public static String UNCOMPRESSED_DB_FILE_NAME = "DistantHorizons.sqlite";
|
||||
public static String UNCOMPRESSED_DB_FILE_NAME = "DistantHorizons_uncompressed.sqlite";
|
||||
|
||||
/** -1 will test all of them */
|
||||
public static int MAX_DTO_TEST_COUNT = -1;
|
||||
|
||||
|
||||
|
||||
//@Test
|
||||
public void NoCompression()
|
||||
{
|
||||
String compressorName = "Uncompressed";
|
||||
this.testCompressor(compressorName, EDhApiDataCompressionMode.UNCOMPRESSED);
|
||||
}
|
||||
|
||||
// collapse the following commented out code when looking at tests
|
||||
|
||||
//@Test
|
||||
@@ -132,17 +124,6 @@ public class CompressionTest
|
||||
//}
|
||||
|
||||
|
||||
//@Test
|
||||
//public void Zstd()
|
||||
//{
|
||||
// String compressorName = "Zstd";
|
||||
//
|
||||
// DhDataInputStream.CreateInputStreamFunc createInputStreamFunc = (inputStream) -> new ZstdInputStream(inputStream);
|
||||
// DhDataOutputStream.CreateOutputStreamFunc createOutputStreamFunc = (outputStream) -> new ZstdOutputStream(outputStream);
|
||||
//
|
||||
// this.testCompressor(compressorName, createInputStreamFunc, createOutputStreamFunc);
|
||||
//}
|
||||
|
||||
////@Test
|
||||
//public void ZstdDictionary() throws SQLException // isn't any better than normal Zstd
|
||||
//{
|
||||
@@ -205,6 +186,13 @@ public class CompressionTest
|
||||
// this.testCompressor(compressorName, createInputStreamFunc, createOutputStreamFunc);
|
||||
//}
|
||||
|
||||
//@Test
|
||||
public void NoCompression()
|
||||
{
|
||||
String compressorName = "Uncompressed";
|
||||
this.testCompressor(compressorName, EDhApiDataCompressionMode.UNCOMPRESSED);
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void Lz4() // fast, poor compression
|
||||
{
|
||||
@@ -213,11 +201,11 @@ public class CompressionTest
|
||||
}
|
||||
|
||||
//@Test
|
||||
//public void Zstd() // middle of the road
|
||||
//{
|
||||
// String compressorName = "Zstd";
|
||||
// this.testCompressor(compressorName, EDhApiDataCompressionMode.Z_STD);
|
||||
//}
|
||||
public void Zstd() // middle of the road
|
||||
{
|
||||
//String compressorName = "Zstd";
|
||||
//this.testCompressor(compressorName, EDhApiDataCompressionMode.Z_STD);
|
||||
}
|
||||
|
||||
//@Test
|
||||
public void LZMA2() // very slow, very good compression though
|
||||
@@ -254,13 +242,15 @@ public class CompressionTest
|
||||
long totalCompressedFileSizeInBytes;
|
||||
|
||||
|
||||
FullDataSourceV2Repo uncompressedRepo = null;
|
||||
FullDataSourceV2Repo compressedRepo = null;
|
||||
try
|
||||
{
|
||||
String uncompressedDatabaseFilePath = TEST_DIR + "/" + UNCOMPRESSED_DB_FILE_NAME;
|
||||
File uncompressedDatabaseFile = new File(uncompressedDatabaseFilePath);
|
||||
Assert.assertTrue(uncompressedDatabaseFile.exists());
|
||||
|
||||
FullDataSourceV2Repo uncompressedRepo = new FullDataSourceV2Repo("jdbc:sqlite", uncompressedDatabaseFile);
|
||||
uncompressedRepo = new FullDataSourceV2Repo("jdbc:sqlite", uncompressedDatabaseFile);
|
||||
|
||||
|
||||
String compressedDatabaseFilePath = TEST_DIR + "/output/" + DB_FILE_NAME_PREFIX + "_" + compressorName + ".sqlite";
|
||||
@@ -268,7 +258,7 @@ public class CompressionTest
|
||||
compressedDatabaseFile.mkdirs();
|
||||
compressedDatabaseFile.delete();
|
||||
Assert.assertTrue(!compressedDatabaseFile.exists());
|
||||
FullDataSourceV2Repo compressedRepo = new FullDataSourceV2Repo("jdbc:sqlite", uncompressedDatabaseFile);
|
||||
compressedRepo = new FullDataSourceV2Repo("jdbc:sqlite", compressedDatabaseFile);
|
||||
|
||||
|
||||
|
||||
@@ -292,47 +282,47 @@ public class CompressionTest
|
||||
|
||||
// uncompressed input //
|
||||
|
||||
FullDataSourceV2DTO uncompressedDto = uncompressedRepo.getByKey(pos);
|
||||
Assert.assertEquals(uncompressedDto.compressionModeValue, EDhApiDataCompressionMode.UNCOMPRESSED.value);
|
||||
FullDataSourceV2 uncompressedDataSource = uncompressedDto.createUnitTestDataSource();
|
||||
|
||||
long uncompressedDtoSize = uncompressedRepo.getDataSizeInBytes(pos);
|
||||
minUncompressedDtoSizeInBytes = Math.min(uncompressedDtoSize, minUncompressedDtoSizeInBytes);
|
||||
maxUncompressedDtoSizeInBytes = Math.max(uncompressedDtoSize, maxUncompressedDtoSizeInBytes);
|
||||
avgUncompressedDtoSizeInBytes += uncompressedDtoSize;
|
||||
|
||||
|
||||
|
||||
// compress file //
|
||||
|
||||
long startWriteNanoTime = System.nanoTime();
|
||||
|
||||
FullDataSourceV2DTO compressedDto = FullDataSourceV2DTO.CreateFromDataSource(uncompressedDataSource, compressionMode);
|
||||
compressedRepo.save(compressedDto);
|
||||
|
||||
long endWriteNanoTime = System.nanoTime();
|
||||
totalWriteTimeInNano += (endWriteNanoTime - startWriteNanoTime);
|
||||
|
||||
|
||||
long compressedDtoSize = compressedRepo.getDataSizeInBytes(pos);
|
||||
minCompressedDtoSizeInBytes = Math.min(compressedDtoSize, minCompressedDtoSizeInBytes);
|
||||
maxCompressedDtoSizeInBytes = Math.max(compressedDtoSize, maxCompressedDtoSizeInBytes);
|
||||
avgCompressedDtoSizeInBytes += compressedDtoSize;
|
||||
|
||||
|
||||
|
||||
// read compressed file //
|
||||
|
||||
long startReadNanoTime = System.nanoTime();
|
||||
|
||||
compressedDto = compressedRepo.getByKey(pos);
|
||||
FullDataSourceV2 compressedDataSource = compressedDto.createUnitTestDataSource();
|
||||
|
||||
long endReadMsTime = System.nanoTime();
|
||||
totalReadTimeInNano += (endReadMsTime - startReadNanoTime);
|
||||
|
||||
|
||||
processedDtoCount++;
|
||||
try (FullDataSourceV2DTO uncompressedDto = uncompressedRepo.getByKey(pos))
|
||||
{
|
||||
Assert.assertEquals(uncompressedDto.compressionModeValue, EDhApiDataCompressionMode.UNCOMPRESSED.value);
|
||||
FullDataSourceV2 uncompressedDataSource = uncompressedDto.createUnitTestDataSource();
|
||||
|
||||
long uncompressedDtoSize = uncompressedRepo.getDataSizeInBytes(pos);
|
||||
minUncompressedDtoSizeInBytes = Math.min(uncompressedDtoSize, minUncompressedDtoSizeInBytes);
|
||||
maxUncompressedDtoSizeInBytes = Math.max(uncompressedDtoSize, maxUncompressedDtoSizeInBytes);
|
||||
avgUncompressedDtoSizeInBytes += uncompressedDtoSize;
|
||||
|
||||
|
||||
// compress file //
|
||||
|
||||
long startWriteNanoTime = System.nanoTime();
|
||||
|
||||
FullDataSourceV2DTO compressedDto = FullDataSourceV2DTO.CreateFromDataSource(uncompressedDataSource, compressionMode);
|
||||
compressedRepo.save(compressedDto);
|
||||
|
||||
long endWriteNanoTime = System.nanoTime();
|
||||
totalWriteTimeInNano += (endWriteNanoTime - startWriteNanoTime);
|
||||
|
||||
|
||||
long compressedDtoSize = compressedRepo.getDataSizeInBytes(pos);
|
||||
minCompressedDtoSizeInBytes = Math.min(compressedDtoSize, minCompressedDtoSizeInBytes);
|
||||
maxCompressedDtoSizeInBytes = Math.max(compressedDtoSize, maxCompressedDtoSizeInBytes);
|
||||
avgCompressedDtoSizeInBytes += compressedDtoSize;
|
||||
|
||||
|
||||
// read compressed file //
|
||||
|
||||
long startReadNanoTime = System.nanoTime();
|
||||
|
||||
compressedDto = compressedRepo.getByKey(pos);
|
||||
FullDataSourceV2 compressedDataSource = compressedDto.createUnitTestDataSource();
|
||||
|
||||
long endReadMsTime = System.nanoTime();
|
||||
totalReadTimeInNano += (endReadMsTime - startReadNanoTime);
|
||||
|
||||
|
||||
processedDtoCount++;
|
||||
}
|
||||
}
|
||||
catch (Exception | Error e)
|
||||
{
|
||||
@@ -371,6 +361,18 @@ public class CompressionTest
|
||||
e.printStackTrace();
|
||||
Assert.fail(e.getMessage());
|
||||
}
|
||||
finally
|
||||
{
|
||||
if(uncompressedRepo != null)
|
||||
{
|
||||
uncompressedRepo.close();
|
||||
}
|
||||
|
||||
if(compressedRepo != null)
|
||||
{
|
||||
compressedRepo.close();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -27,6 +27,7 @@ import org.apache.logging.log4j.core.config.Configurator;
|
||||
import org.junit.Assert;
|
||||
import org.junit.Test;
|
||||
|
||||
@Deprecated
|
||||
public class SquareIntersectTest
|
||||
{
|
||||
private static final Logger LOGGER = DhLoggerBuilder.getLogger();
|
||||
|
||||
Reference in New Issue
Block a user