Added Foliage and Grass Color tinting, Started Basic Work on restoring ravines, New Option to Toggle Tinting.
This commit is contained in:
@@ -1,6 +1,11 @@
|
||||
#include "GrassTile.h"
|
||||
#include "../material/Material.h"
|
||||
#include "../../entity/item/ItemEntity.h"
|
||||
#include "../GrassColor.h"
|
||||
#include "../Level.h"
|
||||
#include "../LevelSource.h"
|
||||
#include "../biome/BiomeSource.h"
|
||||
#include "../../../client/Minecraft.h"
|
||||
|
||||
GrassTile::GrassTile(int id)
|
||||
: super(id, Material::dirt)
|
||||
@@ -24,11 +29,18 @@ int GrassTile::getTexture( int face, int data ) {
|
||||
}
|
||||
|
||||
int GrassTile::getColor( LevelSource* level, int x, int y, int z ) {
|
||||
//level.getBiomeSource().getBiomeBlock(x, z, 1, 1);
|
||||
//float temp = level.getBiomeSource().temperatures[0];
|
||||
//float rain = level.getBiomeSource().downfalls[0];
|
||||
|
||||
return 0x339933;//GrassColor.get(temp, rain);
|
||||
if(!GrassColor::useTint){
|
||||
return 0x339933;
|
||||
}
|
||||
|
||||
level->getBiomeSource()->getBiomeBlock(x, z, 1, 1);
|
||||
float temp = level->getBiomeSource()->temperatures[0];
|
||||
float rain = level->getBiomeSource()->downfalls[0];
|
||||
|
||||
// return 0x339933;//GrassColor.get(temp, rain); // we need to hook this up with OPTION_FOLIAGE_TINT
|
||||
|
||||
return GrassColor::get(temp, rain);
|
||||
}
|
||||
|
||||
void GrassTile::tick( Level* level, int x, int y, int z, Random* random ) {
|
||||
|
||||
@@ -14,6 +14,7 @@ class GrassTile: public Tile
|
||||
{
|
||||
typedef Tile super;
|
||||
public:
|
||||
|
||||
static const int MIN_BRIGHTNESS = 4;
|
||||
|
||||
GrassTile(int id);
|
||||
|
||||
@@ -9,6 +9,8 @@
|
||||
#include "../../item/Item.h"
|
||||
#include "../../item/ItemInstance.h"
|
||||
#include "../FoliageColor.h"
|
||||
#include "../LevelSource.h"
|
||||
#include "../biome/BiomeSource.h"
|
||||
|
||||
class Entity;
|
||||
|
||||
@@ -54,8 +56,16 @@ public:
|
||||
if (data == BIRCH_LEAF) {
|
||||
return FoliageColor::getBirchColor();
|
||||
}
|
||||
if (!FoliageColor::useTint){
|
||||
return FoliageColor::getDefaultColor();
|
||||
}
|
||||
|
||||
return FoliageColor::getDefaultColor();
|
||||
// return FoliageColor::getDefaultColor(); we need to hook this up with OPTION_FOLIAGE_TINT
|
||||
level->getBiomeSource()->getBiomeBlock(x, z, 1, 1);
|
||||
float temperature = level->getBiomeSource()->temperatures[0];
|
||||
float rainfall = level->getBiomeSource()->downfalls[0];
|
||||
return FoliageColor::get(temperature, rainfall);
|
||||
|
||||
}
|
||||
|
||||
void onRemove(Level* level, int x, int y, int z) {
|
||||
|
||||
Reference in New Issue
Block a user