aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/Dimension.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Minecraft.World/Dimension.cpp')
-rw-r--r--Minecraft.World/Dimension.cpp145
1 files changed, 76 insertions, 69 deletions
diff --git a/Minecraft.World/Dimension.cpp b/Minecraft.World/Dimension.cpp
index 35e66698..697da010 100644
--- a/Minecraft.World/Dimension.cpp
+++ b/Minecraft.World/Dimension.cpp
@@ -1,4 +1,5 @@
#include "stdafx.h"
+#include "net.minecraft.world.level.levelgen.flat.h"
#include "net.minecraft.world.level.levelgen.h"
#include "net.minecraft.world.level.h"
#include "net.minecraft.world.level.storage.h"
@@ -13,42 +14,47 @@
#include "..\Minecraft.Client\Minecraft.h"
#include "..\Minecraft.Client\Common\Colours\ColourTable.h"
+const float Dimension::MOON_BRIGHTNESS_PER_PHASE[8] = {1.0f, 0.75f, 0.5f, 0.25f, 0, 0.25f, 0.5f, 0.75f};
+
void Dimension::init(Level *level)
{
- this->level = level;
- this->levelType = level->getLevelData()->getGenerator();
- init();
- updateLightRamp();
+ this->level = level;
+ levelType = level->getLevelData()->getGenerator();
+ levelTypeOptions = level->getLevelData()->getGeneratorOptions();
+ init();
+ updateLightRamp();
}
void Dimension::updateLightRamp()
{
- float ambientLight = 0.00f;
- for (int i = 0; i <= Level::MAX_BRIGHTNESS; i++)
+ float ambientLight = 0.00f;
+ for (int i = 0; i <= Level::MAX_BRIGHTNESS; i++)
{
- float v = (1 - i / (float) (Level::MAX_BRIGHTNESS));
- brightnessRamp[i] = ((1 - v) / (v * 3 + 1)) * (1 - ambientLight) + ambientLight;
- }
+ float v = (1 - i / (float) (Level::MAX_BRIGHTNESS));
+ brightnessRamp[i] = ((1 - v) / (v * 3 + 1)) * (1 - ambientLight) + ambientLight;
+ }
}
void Dimension::init()
{
#ifdef _OVERRIDE_HEIGHTMAP
// 4J Stu - Added to enable overriding the heightmap from a loaded in data file
- if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableHeightWaterBiomeOverride))
+ if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableBiomeOverride))
{
biomeSource = new BiomeSource(level);
}
else
#endif
- if (level->getLevelData()->getGenerator() == LevelType::lvl_flat)
- {
- biomeSource = new FixedBiomeSource(Biome::plains, 0.5f, 0.5f);
- }
- else
- {
- biomeSource = new BiomeSource(level);
- }
+ if (level->getLevelData()->getGenerator() == LevelType::lvl_flat)
+ {
+ FlatGeneratorInfo *generator = FlatGeneratorInfo::fromValue(level->getLevelData()->getGeneratorOptions());
+ biomeSource = new FixedBiomeSource(Biome::biomes[generator->getBiome()], 0.5f, 0.5f);
+ delete generator;
+ }
+ else
+ {
+ biomeSource = new BiomeSource(level);
+ }
}
Dimension::Dimension()
@@ -57,6 +63,7 @@ Dimension::Dimension()
hasCeiling = false;
brightnessRamp = new float[Level::MAX_BRIGHTNESS + 1];
id = 0;
+ levelTypeOptions = L"";
}
Dimension::~Dimension()
@@ -71,20 +78,20 @@ ChunkSource *Dimension::createRandomLevelSource() const
{
#ifdef _OVERRIDE_HEIGHTMAP
// 4J Stu - Added to enable overriding the heightmap from a loaded in data file
- if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableHeightWaterBiomeOverride))
+ if(app.DebugSettingsOn() && app.GetGameSettingsDebugMask(ProfileManager.GetPrimaryPad())&(1L<<eDebugSetting_EnableHeightWaterOverride))
{
return new CustomLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
}
else
#endif
- if (levelType == LevelType::lvl_flat)
- {
- return new FlatLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
- }
- else
- {
- return new RandomLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
- }
+ if (levelType == LevelType::lvl_flat)
+ {
+ return new FlatLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
+ }
+ else
+ {
+ return new RandomLevelSource(level, level->getSeed(), level->getLevelData()->isGenerateMapFeatures());
+ }
}
ChunkSource *Dimension::createFlatLevelSource() const
@@ -99,28 +106,28 @@ ChunkStorage *Dimension::createStorage(File dir)
bool Dimension::isValidSpawn(int x, int z) const
{
- int topTile = level->getTopTile(x, z);
+ int topTile = level->getTopTile(x, z);
- if (topTile != Tile::grass_Id) return false;
+ if (topTile != Tile::grass_Id) return false;
- return true;
+ return true;
}
float Dimension::getTimeOfDay(__int64 time, float a) const
{
- int dayStep = (int) (time % Level::TICKS_PER_DAY);
- float td = (dayStep + a) / Level::TICKS_PER_DAY - 0.25f;
- if (td < 0) td += 1;
- if (td > 1) td -= 1;
- float tdo = td;
- td = 1 - (float) ((cos(td * PI) + 1) / 2);
- td = tdo + (td - tdo) / 3.0f;
- return td;
+ int dayStep = (int) (time % Level::TICKS_PER_DAY);
+ float td = (dayStep + a) / Level::TICKS_PER_DAY - 0.25f;
+ if (td < 0) td += 1;
+ if (td > 1) td -= 1;
+ float tdo = td;
+ td = 1 - (float) ((cos(td * PI) + 1) / 2);
+ td = tdo + (td - tdo) / 3.0f;
+ return td;
}
-int Dimension::getMoonPhase(__int64 time, float a) const
+int Dimension::getMoonPhase(__int64 time) const
{
- return ((int) (time / Level::TICKS_PER_DAY)) % 8;
+ return ((int) (time / Level::TICKS_PER_DAY)) % 8;
}
bool Dimension::isNaturalDimension()
@@ -136,42 +143,42 @@ float *Dimension::getSunriseColor(float td, float a)
unsigned int clr2 = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Sky_Dawn_Bright ); // 0xFFE533
double r2 = ( (clr2>>16)&0xFF )/255.0f, g2 = ( (clr2>>8)&0xFF )/255.0, b2 = ( clr2&0xFF )/255.0;
- float span = 0.4f;
- float tt = Mth::cos(td * PI * 2) - 0.0f;
- float mid = -0.0f;
- if (tt >= mid - span && tt <= mid + span)
+ float span = 0.4f;
+ float tt = Mth::cos(td * PI * 2) - 0.0f;
+ float mid = -0.0f;
+ if (tt >= mid - span && tt <= mid + span)
{
- float aa = ((tt - mid) / span) * 0.5f + 0.5f;
- float mix = 1 - (((1 - sin(aa * PI))) * 0.99f);
- mix = mix * mix;
- //sunriseCol[0] = (aa * 0.3f + 0.7f);
- //sunriseCol[1] = (aa * aa * 0.7f + 0.2f);
- //sunriseCol[2] = (aa * aa * 0.0f + 0.2f);
+ float aa = ((tt - mid) / span) * 0.5f + 0.5f;
+ float mix = 1 - (((1 - sin(aa * PI))) * 0.99f);
+ mix = mix * mix;
+ //sunriseCol[0] = (aa * 0.3f + 0.7f);
+ //sunriseCol[1] = (aa * aa * 0.7f + 0.2f);
+ //sunriseCol[2] = (aa * aa * 0.0f + 0.2f);
sunriseCol[0] = (aa * (r2-r1) + r1);
sunriseCol[1] = (aa * (g2-g1) + g1);
sunriseCol[2] = (aa * (b2-b1) + b1);
- sunriseCol[3] = mix;
- return sunriseCol;
- }
+ sunriseCol[3] = mix;
+ return sunriseCol;
+ }
- return NULL;
+ return NULL;
}
Vec3 *Dimension::getFogColor(float td, float a) const
{
- float br = Mth::cos(td * PI * 2) * 2 + 0.5f;
- if (br < 0.0f) br = 0.0f;
- if (br > 1.0f) br = 1.0f;
-
+ float br = Mth::cos(td * PI * 2) * 2 + 0.5f;
+ if (br < 0.0f) br = 0.0f;
+ if (br > 1.0f) br = 1.0f;
+
unsigned int baseFogColour = Minecraft::GetInstance()->getColourTable()->getColor( eMinecraftColour_Default_Fog_Colour );
- float r = ((baseFogColour >> 16) & 0xff) / 255.0f;
- float g = ((baseFogColour >> 8) & 0xff) / 255.0f;
- float b = ((baseFogColour) & 0xff) / 255.0f;
- r *= br * 0.94f + 0.06f;
- g *= br * 0.94f + 0.06f;
- b *= br * 0.91f + 0.09f;
+ float r = ((baseFogColour >> 16) & 0xff) / 255.0f;
+ float g = ((baseFogColour >> 8) & 0xff) / 255.0f;
+ float b = ((baseFogColour) & 0xff) / 255.0f;
+ r *= br * 0.94f + 0.06f;
+ g *= br * 0.94f + 0.06f;
+ b *= br * 0.91f + 0.09f;
- return Vec3::newTemp(r, g, b);
+ return Vec3::newTemp(r, g, b);
}
bool Dimension::mayRespawn() const
@@ -181,11 +188,11 @@ bool Dimension::mayRespawn() const
Dimension *Dimension::getNew(int id)
{
- if (id == -1) return new HellDimension();
- if (id == 0) return new NormalDimension();
- if (id == 1) return new TheEndDimension();
+ if (id == -1) return new HellDimension();
+ if (id == 0) return new NormalDimension();
+ if (id == 1) return new TheEndDimension();
- return NULL;
+ return NULL;
}
float Dimension::getCloudHeight()
generated by cgit v1.2.3 (git 2.46.0) at 2026-03-22 06:27:53 +0000