etc/BiomesOPlenty
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Attempted to fix fog distances

Browse source
This commit is contained in:
Adubbz 2014-08-01 18:20:02 +10:00
parent 8c240b3d5f
commit 1bd7e92f0a
4 changed files with 164 additions and 153 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
src/main/java/biomesoplenty/client/fog/FogEventHandler.java
View file

@ -1,150 +0,0 @@
package biomesoplenty.client.fog;
import net.minecraft.client.Minecraft;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.client.event.EntityViewRenderEvent.FogColors;
import net.minecraftforge.client.event.EntityViewRenderEvent.FogDensity;
import net.minecraftforge.common.ForgeModContainer;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class FogEventHandler
{
@SubscribeEvent
public void onGetFogDensity(FogDensity event)
{
if (event.entity instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer)event.entity;
World world = player.worldObj;
int x = MathHelper.floor_double(player.posX);
int y = MathHelper.floor_double(player.posY);
int z = MathHelper.floor_double(player.posZ);
event.density = getFogDensityBlend(world, x, y, z);
event.setCanceled(true);
}
}
@SubscribeEvent
public void onGetFogColour(FogColors event)
{
if (event.entity instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer)event.entity;
World world = player.worldObj;
int x = MathHelper.floor_double(player.posX);
int y = MathHelper.floor_double(player.posY);
int z = MathHelper.floor_double(player.posZ);
int oldColour = ((int)(event.red * 255) & 255) << 16 | ((int)(event.green * 255) & 255) << 8 | (int)(event.blue * 255) & 255;
int colour = getFogBlendColour(world, x, y, z, oldColour);
event.red = (colour >> 16 & 255) / 255.0F; event.green = (colour >> 8 & 255) / 255.0F; event.blue = (colour & 255) / 255.0F;
}
}
private static int prevDensityX, prevDensityZ;
private static boolean fogDensityInit;
private static float fogDensityMultiplier;
public static float getFogDensityBlend(World world, int playerX, int playerY, int playerZ)
{
if (playerX == prevDensityX && playerZ == prevDensityZ && fogDensityInit)
{
return fogDensityMultiplier;
}
fogDensityInit = true;
int distance = 26;
float fogDensity = 0;
int divider = 0;
for (int x = -distance; x <= distance; ++x)
{
for (int z = -distance; z <= distance; ++z)
{
BiomeGenBase biome = world.getBiomeGenForCoords(playerX + x, playerZ + z);
if (biome instanceof IBiomeFog) fogDensity += ((IBiomeFog)biome).getFogDensity(playerX + x, playerY, playerZ + z);
divider++;
}
}
float multiplier = fogDensity / divider;
prevDensityX = playerX;
prevDensityZ = playerZ;
fogDensityMultiplier = multiplier;
return fogDensityMultiplier;
}
private static int prevFogColourX, prevFogColourZ;
private static boolean fogColourInit;
private static int fogColourMultiplier;
public static int getFogBlendColour(World world, int playerX, int playerY, int playerZ, int defaultColour)
{
if (playerX == prevFogColourX && playerZ == prevFogColourZ && fogColourInit)
{
return fogColourMultiplier;
}
fogColourInit = true;
GameSettings settings = Minecraft.getMinecraft().gameSettings;
int[] ranges = ForgeModContainer.blendRanges;
int distance = 0;
if (settings.fancyGraphics && settings.renderDistanceChunks >= 0 && settings.renderDistanceChunks < ranges.length)
{
distance = ranges[settings.renderDistanceChunks];
}
int r = 0;
int g = 0;
int b = 0;
int divider = 0;
for (int x = -distance; x <= distance; ++x)
{
for (int z = -distance; z <= distance; ++z)
{
BiomeGenBase biome = world.getBiomeGenForCoords(playerX + x, playerZ + z);
if (biome instanceof IBiomeFog)
{
IBiomeFog biomeFog = (IBiomeFog)biome;
int fogColour = biomeFog.getFogColour(playerX + x, playerY, playerZ + z);
r += (fogColour & 0xFF0000) >> 16;
g += (fogColour & 0x00FF00) >> 8;
b += fogColour & 0x0000FF;
}
else
{
r += (defaultColour & 0xFF0000) >> 16;
g += (defaultColour & 0x00FF00) >> 8;
b += defaultColour & 0x0000FF;
}
divider++;
}
}
int multiplier = (r / divider & 255) << 16 | (g / divider & 255) << 8 | b / divider & 255;
prevFogColourX = playerX;
prevFogColourZ = playerZ;
fogColourMultiplier = multiplier;
return fogColourMultiplier;
}
}

161
src/main/java/biomesoplenty/client/fog/FogHandler.java Normal file
View file

@ -0,0 +1,161 @@
package biomesoplenty.client.fog;
import net.minecraft.block.Block;
import net.minecraft.block.material.Material;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.EntityRenderer;
import net.minecraft.client.settings.GameSettings;
import net.minecraft.enchantment.EnchantmentHelper;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.potion.Potion;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.biome.BiomeGenBase;
import net.minecraftforge.client.event.EntityViewRenderEvent.FogColors;
import net.minecraftforge.client.event.EntityViewRenderEvent.FogDensity;
import net.minecraftforge.client.event.EntityViewRenderEvent.RenderFogEvent;
import net.minecraftforge.common.ForgeModContainer;
import org.lwjgl.opengl.GL11;
import org.lwjgl.opengl.GLContext;
import cpw.mods.fml.common.eventhandler.SubscribeEvent;
public class FogHandler
{
/*@SubscribeEvent
public void onGetFogColour(FogColors event)
{
if (event.entity instanceof EntityPlayer)
{
EntityPlayer player = (EntityPlayer)event.entity;
World world = player.worldObj;
int x = MathHelper.floor_double(player.posX);
int y = MathHelper.floor_double(player.posY);
int z = MathHelper.floor_double(player.posZ);
int oldColour = ((int)(event.red * 255) & 255) << 16 | ((int)(event.green * 255) & 255) << 8 | (int)(event.blue * 255) & 255;
int colour = getFogBlendColour(world, x, y, z, oldColour);
event.red = (colour >> 16 & 255) / 255.0F; event.green = (colour >> 8 & 255) / 255.0F; event.blue = (colour & 255) / 255.0F;
}
}*/
private static double fogX, fogZ;
private static boolean fogInit;
private static float fogFarPlaneDistance;
@SubscribeEvent
public void onRenderFog(RenderFogEvent event)
{
Entity entity = event.entity;
World world = entity.worldObj;
int playerX = MathHelper.floor_double(entity.posX);
int playerY = MathHelper.floor_double(entity.posY);
int playerZ = MathHelper.floor_double(entity.posZ);
if (playerX == fogX && playerZ == fogZ && fogInit)
{
renderFog(event.fogMode, fogFarPlaneDistance);
return;
}
fogInit = true;
int distance = 30;
int divider = 0;
float farPlaneDistance = 0F;
for (int x = -distance; x <= distance; ++x)
{
for (int z = -distance; z <= distance; ++z)
{
BiomeGenBase biome = world.getBiomeGenForCoords(playerX + x, playerZ + z);
if (biome instanceof IBiomeFog)
{
farPlaneDistance += ((IBiomeFog)biome).getFogDensity(playerX + x, playerY, playerZ + z);
}
else
{
farPlaneDistance += 256F;
}
divider++;
}
}
fogX = entity.posX;
fogZ = entity.posZ;
fogFarPlaneDistance = Math.min(farPlaneDistance / divider, event.farPlaneDistance);
renderFog(event.fogMode, fogFarPlaneDistance);
}
private static void renderFog(int fogMode, float farPlaneDistance)
{
if (fogMode < 0)
{
GL11.glFogf(GL11.GL_FOG_START, 0.0F);
GL11.glFogf(GL11.GL_FOG_END, farPlaneDistance);
}
else
{
GL11.glFogf(GL11.GL_FOG_START, farPlaneDistance * 0.8F);
GL11.glFogf(GL11.GL_FOG_END, farPlaneDistance);
}
}
/*public static int getFogBlendColour(World world, int playerX, int playerY, int playerZ, int defaultColour)
{
GameSettings settings = Minecraft.getMinecraft().gameSettings;
int[] ranges = ForgeModContainer.blendRanges;
int distance = 0;
if (settings.fancyGraphics && settings.renderDistanceChunks >= 0 && settings.renderDistanceChunks < ranges.length)
{
distance = ranges[settings.renderDistanceChunks];
}
int r = 0;
int g = 0;
int b = 0;
int divider = 0;
for (int x = -distance; x <= distance; ++x)
{
for (int z = -distance; z <= distance; ++z)
{
BiomeGenBase biome = world.getBiomeGenForCoords(playerX + x, playerZ + z);
if (biome instanceof IBiomeFog)
{
IBiomeFog biomeFog = (IBiomeFog)biome;
int fogColour = biomeFog.getFogColour(playerX + x, playerY, playerZ + z);
r += (fogColour & 0xFF0000) >> 16;
g += (fogColour & 0x00FF00) >> 8;
b += fogColour & 0x0000FF;
}
else
{
r += (defaultColour & 0xFF0000) >> 16;
g += (defaultColour & 0x00FF00) >> 8;
b += defaultColour & 0x0000FF;
}
divider++;
}
}
int multiplier = (r / divider & 255) << 16 | (g / divider & 255) << 8 | b / divider & 255;
return multiplier;
}*/
}

2
src/main/java/biomesoplenty/common/biome/overworld/BiomeGenOminousWoods.java
View file

@ -125,6 +125,6 @@ public class BiomeGenOminousWoods extends BOPOverworldBiome implements IBiomeFog
@Override
public float getFogDensity(int x, int y, int z)
{
return 0.1F;
return 10F;
}
}

4
src/main/java/biomesoplenty/common/eventhandler/BOPEventHandlers.java
View file

@ -1,7 +1,7 @@
package biomesoplenty.common.eventhandler;
import net.minecraftforge.common.MinecraftForge;
import biomesoplenty.client.fog.FogEventHandler;
import biomesoplenty.client.fog.FogHandler;
import biomesoplenty.client.utils.ParticleRegistry;
import biomesoplenty.common.eventhandler.client.FlowerScatterEventHandler;
import biomesoplenty.common.eventhandler.client.gui.MainMenuEventHandler;
@ -71,7 +71,7 @@ public class BOPEventHandlers
private static void registerClientEventHandlers()
{
MinecraftForge.EVENT_BUS.register(new FogEventHandler());
MinecraftForge.EVENT_BUS.register(new FogHandler());
MinecraftForge.EVENT_BUS.register(new ParticleRegistry());
FMLCommonHandler.instance().bus().register(new FlowerScatterEventHandler());
}