wisplite/distant-horizons-core-sharded
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed transparency and added some boolean to disable it

Browse Source
This commit is contained in:
Morippi
2022-08-24 13:35:51 +02:00
parent 22f9d20aae
commit 9575429296
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/seibel/lod/core/a7/datatype/column/render/ColumnBox.java
+18 -5
View File
@@ -41,9 +41,23 @@ public class ColumnBox
byte skyLightBot = DataPointUtil.doesItExist(botData) ? DataPointUtil.getLightSky(botData) : 0;
boolean isTransparent = ColorUtil.getAlpha(color)<255;
boolean isTopTransparent = DataPointUtil.getAlpha(topData)<255;
boolean isBotTransparent = DataPointUtil.getAlpha(botData)<255;
boolean transparencyEnabled = true;
boolean fakeOceanFloor = true;
boolean isTopTransparent = DataPointUtil.getAlpha(topData)<255 && transparencyEnabled;
boolean isBotTransparent = DataPointUtil.getAlpha(botData)<255 && transparencyEnabled;
if(fakeOceanFloor && transparencyEnabled)
{
if(!isTransparent && isTopTransparent)
{
ySize += DataPointUtil.getHeight(botData) - (y + ySize) - 1;
}
else if(isTransparent && !isBotTransparent)
{
y += ySize - 1;
}
}
// Up direction case
boolean skipTop = DataPointUtil.doesItExist(topData) && (
@@ -168,14 +182,13 @@ public class ColumnBox
short previousDepth = -1;
byte nextSkyLight = upSkyLight;
boolean isTransparent = ColorUtil.getAlpha(color) < 255;
// TODO transparency ocean floor fix
// boolean isOpaque = ((colorMap[0] >> 24) & 0xFF) == 255;
for (i = 0; i < dataPoint.size() && DataPointUtil.doesItExist(adjData.get(i))
&& !DataPointUtil.isVoid(adjData.get(i)); i++)
{
long adjPoint = adjData.get(i);
boolean isAdjTransparent = DataPointUtil.getAlpha(adjPoint) < 255;
// TODO transparency ocean floor fix
/**TODO disable this when disabling transparency */
if (!isTransparent && isAdjTransparent)
continue;
src/main/java/com/seibel/lod/core/objects/opengl/LodBox.java
+1 -1
View File
@@ -40,7 +40,7 @@ public class LodBox
short maxZ = (short) (z + zSize);
byte skyLightTop = skyLight;
byte skyLightBot = DataPointUtil.doesItExist(botData) ? DataPointUtil.getLightSky(botData) : 0;
// Up direction case
boolean skipTop = DataPointUtil.doesItExist(topData) && DataPointUtil.getDepth(topData) == maxY;// &&
// DataPointUtil.getAlpha(singleAdjDataPoint)
src/main/resources/shaders/flat_shaded.frag
+1 -1
View File
@@ -70,7 +70,7 @@ void main()
}
//fragColor = vec4(0.7,0.6,0.5,1.0);
fragColor = vec4(returnColor.rgb,1.0);
fragColor = returnColor;
}
float linearFog(float x, float fogStart, float fogLength, float fogMin, float fogRange) {