celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-09-17 20:10:23 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Resources: Describe every tile in terrain, use 0.2.0 resources

Browse Source
This commit is contained in:
Er2
2023-12-03 12:09:55 +03:00
parent 03e985b739
commit 0afea4428c
7 changed files with 190 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
source/client/renderer/TileRenderer.cpp
View File

@@ -586,7 +586,7 @@ bool TileRenderer::tesselateBlockInWorld(Tile* tile, int x, int y, int z, float
if (m_bFancyGrass && texture == TEXTURE_GRASS_SIDE && this->m_textureOverride < 0)
{
t.color(topR * 0.8f * fLight, topG * 0.8f * fLight, topB * 0.8f * fLight);
renderNorth(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderNorth(tile, float(x), float(y), float(z), TEXTURE_NONE38);
}
}
@@ -605,7 +605,7 @@ bool TileRenderer::tesselateBlockInWorld(Tile* tile, int x, int y, int z, float
if (m_bFancyGrass && texture == TEXTURE_GRASS_SIDE && this->m_textureOverride < 0)
{
t.color(topR * 0.8f * fLight, topG * 0.8f * fLight, topB * 0.8f * fLight);
renderSouth(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderSouth(tile, float(x), float(y), float(z), TEXTURE_NONE38);
}
}
@@ -624,7 +624,7 @@ bool TileRenderer::tesselateBlockInWorld(Tile* tile, int x, int y, int z, float
if (m_bFancyGrass && texture == TEXTURE_GRASS_SIDE && this->m_textureOverride < 0)
{
t.color(topR * 0.6f * fLight, topG * 0.6f * fLight, topB * 0.6f * fLight);
renderWest(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderWest(tile, float(x), float(y), float(z), TEXTURE_NONE38);
}
}
@@ -643,7 +643,7 @@ bool TileRenderer::tesselateBlockInWorld(Tile* tile, int x, int y, int z, float
if (m_bFancyGrass && texture == TEXTURE_GRASS_SIDE && this->m_textureOverride < 0)
{
t.color(topR * 0.6f * fLight, topG * 0.6f * fLight, topB * 0.6f * fLight);
renderEast(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderEast(tile, float(x), float(y), float(z), TEXTURE_NONE38);
}
}
@@ -2667,22 +2667,22 @@ bool TileRenderer::tesselateBlockInWorldWithAmbienceOcclusionV2(Tile* tile, int
switch (dir) {
case DIR_YNEG:
renderFaceUp(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderFaceUp(tile, float(x), float(y), float(z), TEXTURE_NONE38);
break;
case DIR_YPOS:
renderFaceDown(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderFaceDown(tile, float(x), float(y), float(z), TEXTURE_NONE38);
break;
case DIR_ZNEG:
renderNorth(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderNorth(tile, float(x), float(y), float(z), TEXTURE_NONE38);
break;
case DIR_ZPOS:
renderSouth(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderSouth(tile, float(x), float(y), float(z), TEXTURE_NONE38);
break;
case DIR_XNEG:
renderWest(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderWest(tile, float(x), float(y), float(z), TEXTURE_NONE38);
break;
case DIR_XPOS:
renderEast(tile, float(x), float(y), float(z), TEXTURE_NONE84);
renderEast(tile, float(x), float(y), float(z), TEXTURE_NONE38);
break;
}
}

217
source/common/Utils.hpp
View File

@@ -275,10 +275,8 @@ enum eTileID
TILE_CLOTH_51,
TILE_CLOTH_61,
TILE_INFO_UPDATEGAME1 = 248,
TILE_INFO_UPDATEGAME2 = 249,
TILE_OBSIDIAN_CRYING = 200, // custom stuff - ID of 200
TILE_UPDATE = 248,
TILE_ATEUPD = 249,
ITEM_SHOVEL_IRON = 256,
ITEM_PICKAXE_IRON,
@@ -389,7 +387,7 @@ enum eTileID
enum // Textures
{
TEXTURE_GRASS_TOP = 0,
TEXTURE_GRASS_TOP = 0, // unused in fact
TEXTURE_STONE,
TEXTURE_DIRT,
TEXTURE_GRASS_SIDE,
@@ -413,7 +411,7 @@ enum // Textures
TEXTURE_LOG_TOP,
TEXTURE_IRON,
TEXTURE_GOLD,
TEXTURE_EMERALD,
TEXTURE_EMERALD, // diamond
TEXTURE_CHEST_ONE_TOP,
TEXTURE_CHEST_ONE_SIDE,
TEXTURE_CHEST_ONE_FRONT,
@@ -427,9 +425,9 @@ enum // Textures
TEXTURE_BOOKSHELF,
TEXTURE_MOSSY_STONE,
TEXTURE_OBSIDIAN,
TEXTURE_OBSIDIAN_CRYING,
TEXTURE_NONE39,
TEXTURE_NONE40,
TEXTURE_NONE38, // grass block hat side without tint?
TEXTURE_NONE39, // grass without tint?
TEXTURE_NONE40, // grass block top without tint?
TEXTURE_CHEST_TWO_FRONT_LEFT,
TEXTURE_CHEST_TWO_FRONT_RIGHT,
TEXTURE_WORKBENCH_TOP,
@@ -439,21 +437,21 @@ enum // Textures
TEXTURE_FIRE2,
TEXTURE_SPONGE,
TEXTURE_GLASS,
TEXTURE_ORE_EMERALD,
TEXTURE_ORE_EMERALD, // diamond
TEXTURE_ORE_RED_STONE,
TEXTURE_LEAVES_TRANSPARENT,
TEXTURE_LEAVES_OPAQUE,
TEXTURE_NONE54,
TEXTURE_NONE55,
TEXTURE_NONE56,
TEXTURE_LEAVES_TRANSPARENT, // has tint
TEXTURE_LEAVES_OPAQUE, // has tint
TEXTURE_STONE_BRICK,
TEXTURE_DEAD_BUSH,
TEXTURE_GRASS_FERN,
TEXTURE_CHEST_TWO_BACK_LEFT,
TEXTURE_CHEST_TWO_BACK_RIGHT,
TEXTURE_WORKBENCH_SIDE_1,
TEXTURE_WORKBENCH_SIDE_2,
TEXTURE_FURNACE_LIT,
TEXTURE_FURNACE_TOP,
TEXTURE_NONE63,
TEXTURE_CLOTH_64,
TEXTURE_SPRUCE_SAPLING,
TEXTURE_WOOL,
TEXTURE_SPAWNER,
TEXTURE_SNOW,
TEXTURE_ICE,
@@ -465,16 +463,16 @@ enum // Textures
TEXTURE_REEDS,
TEXTURE_JUKEBOX_SIDE,
TEXTURE_JUKEBOX_TOP,
TEXTURE_NONE76,
TEXTURE_NONE77,
TEXTURE_NONE78,
TEXTURE_NONE79,
TEXTURE_LILY_PAD, // no tint
TEXTURE_MICELIUM_SIDE,
TEXTURE_MICELIUM_TOP,
TEXTURE_BIRCH_SAPLING,
TEXTURE_TORCH_LIT,
TEXTURE_DOOR_TOP,
TEXTURE_DOOR_IRON_TOP,
TEXTURE_LADDER,
TEXTURE_NONE84,
TEXTURE_NONE85,
TEXTURE_TRAPDOOR,
TEXTURE_IRON_BARS,
TEXTURE_FARMLAND,
TEXTURE_FARMLAND_DRY,
TEXTURE_WHEAT_0,
@@ -487,23 +485,23 @@ enum // Textures
TEXTURE_WHEAT_7,
TEXTURE_LEVER,
TEXTURE_DOOR_BOTTOM,
TEXTURE_DOOR_IRON_BOTTOM,
TEXTURE_DOOR_IRON_BOTTOM, // wth with new texture
TEXTURE_TORCH_RED_STONE,
TEXTURE_NONE100,
TEXTURE_NONE101,
TEXTURE_STONE_BRICK_MOSSY,
TEXTURE_STONE_BRICK_CRACKED,
TEXTURE_PUMPKIN_TOP,
TEXTURE_BLOODSTONE,
TEXTURE_NETHERRACK,
TEXTURE_SOULSAND,
TEXTURE_GLOWSTONE,
TEXTURE_NONE106,
TEXTURE_NONE107,
TEXTURE_NONE108,
TEXTURE_NONE109,
TEXTURE_NONE110,
TEXTURE_NONE111,
TEXTURE_STICKY_PISTON_HEAD,
TEXTURE_PISTON_HEAD,
TEXTURE_PISTON_SIDE,
TEXTURE_PISTON_BACK,
TEXTURE_PISTON_FRONT,
TEXTURE_NONE111, // stage of plant growing
TEXTURE_RAIL_CURVED,
TEXTURE_CLOTH_112,
TEXTURE_CLOTH_113,
TEXTURE_WOOL_BLACK,
TEXTURE_WOOL_GRAY,
TEXTURE_TORCH_RED_STONE_OFF,
TEXTURE_LOG_SPRUCE,
TEXTURE_LOG_BIRCH,
@@ -514,24 +512,137 @@ enum // Textures
TEXTURE_CAKE_SIDE,
TEXTURE_CAKE_SIDE_BIT,
TEXTURE_CAKE_BOTTOM,
TEXTURE_NONE125,
TEXTURE_NONE126,
TEXTURE_NONE127,
TEXTURE_LAPIS = 144,
TEXTURE_ORE_LAPIS = 160,
TEXTURE_SANDSTONE_TOP = 176,
TEXTURE_SANDSTONE_SIDE = 192,
TEXTURE_WATER = 205,
TEXTURE_SANDSTONE_BOTTOM = 208,
TEXTURE_LAVA = 237,
TEXTURE_INFO_UPDATEGAME1 = 252,
TEXTURE_INFO_UPDATEGAME2 = 253,
TEXTURE_LAVA_PLACEHOLDER = 255,
TEXTURE_MUSHROOM_BLOCK_RED,
TEXTURE_MUSHROOM_BLOCK_BROWN,
TEXTURE_PUMPKIN_CONNECTION, // FIXME: Is that correct?
TEXTURE_RAIL,
TEXTURE_WOOL_RED,
TEXTURE_WOOL_PINK,
TEXTURE_REPEATER,
TEXTURE_NONE132,
TEXTURE_NONE133,
TEXTURE_BED_LEFT,
TEXTURE_BED_RIGHT,
TEXTURE_WATERMELON_SIDE,
TEXTURE_WATERMELON_TOP,
TEXTURE_CAULDRON_TOP,
TEXTURE_CAULDRON_SIDE_INSIDE,
TEXTURE_CAKE_ITEM,
TEXTURE_MUSHROOM_STEM_SIDE,
TEXTURE_MUSHROOM_STEM,
TEXTURE_NONE143, // wth?
TEXTURE_LAPIS,
TEXTURE_WOOL_GREEN,
TEXTURE_WOOL_LIME,
TEXTURE_REPEATER_LIT,
TEXTURE_GLASS_PANE,
TEXTURE_BED_BACK,
TEXTURE_BED_SIDE_LEFT,
TEXTURE_BED_SIDE_RIGHT,
TEXTURE_BED_FRONT,
TEXTURE_NONE153,
TEXTURE_CAULDRON_SIDE_OUTSIDE,
TEXTURE_CAULDRON_BOTTOM,
TEXTURE_NONE156, // wth?
TEXTURE_BREW_STAND,
TEXTURE_END_FRAME_TOP,
TEXTURE_END_FRAME_SIDE,
TEXTURE_ORE_LAPIS,
TEXTURE_WOOL_BROWN,
TEXTURE_WOOL_YELLOW,
TEXTURE_GOLD_RAIL,
TEXTURE_REDSTONE_DUST_4SIDES, // no tint
TEXTURE_REDSTOE_DUST_1SIDE, // no tint
TEXTURE_ENCHANTING_TABLE_TOP,
TEXTURE_NONE167, //TEXTURE_ENCHANTING_TABLE_BOTTOM,
TEXTURE_NONE168,
TEXTURE_NONE169,
TEXTURE_NONE170,
TEXTURE_NONE171,
TEXTURE_NONE172,
TEXTURE_NONE173,
TEXTURE_ENDER_EYE,
TEXTURE_END_FRAME_BOTTOM,
TEXTURE_SANDSTONE_TOP,
TEXTURE_WOOL_BLUE,
TEXTURE_WOOL_LIGHT_BLUE,
TEXTURE_GOLD_RAIL_LIT,
TEXTURE_NONE180, // empty
TEXTURE_NONE181, // empty
TEXTURE_ENCHANTING_TABLE_SIDE,
TEXTURE_ENCHANTING_TABLE_BOTTOM,
TEXTURE_NONE184,
TEXTURE_NONE185,
TEXTURE_NONE186,
TEXTURE_NONE187,
TEXTURE_NONE188,
TEXTURE_NONE189,
TEXTURE_NONE190,
TEXTURE_NONE191,
TEXTURE_SANDSTONE_SIDE,
TEXTURE_WOOL_PURPLE,
TEXTURE_WOOL_MAGENTA,
TEXTURE_RAIL_DETECTOR,
TEXTURE_NONE196,
TEXTURE_NONE197,
TEXTURE_NONE198,
TEXTURE_NONE199,
TEXTURE_NONE200,
TEXTURE_NONE201,
TEXTURE_NONE202,
TEXTURE_NONE203,
TEXTURE_NONE204,
TEXTURE_WATER,
TEXTURE_WATER2,
TEXTURE_WATER3,
TEXTURE_SANDSTONE_BOTTOM,
TEXTURE_WOOL_CYAN,
TEXTURE_WOOL_ORANGE,
TEXTURE_NONE211,
TEXTURE_NONE212,
TEXTURE_NONE213,
TEXTURE_NONE214,
TEXTURE_NONE215,
TEXTURE_NONE216,
TEXTURE_NONE217,
TEXTURE_NONE218,
TEXTURE_NONE219,
TEXTURE_NONE220,
TEXTURE_MORE, // '...' button
TEXTURE_WATER4,
TEXTURE_WATER5,
TEXTURE_NETHER_BRICK,
TEXTURE_WOOL_SILVER,
TEXTURE_NETHER_WART_0,
TEXTURE_NETHER_WART_1,
TEXTURE_NETHER_WART_2,
TEXTURE_NONE229,
TEXTURE_NONE230,
TEXTURE_NONE231,
TEXTURE_NONE232,
TEXTURE_NONE233,
TEXTURE_NONE234,
TEXTURE_NONE235, // oak leaves transparent
TEXTURE_NONE236, // oak leaves
TEXTURE_LAVA,
TEXTURE_LAVA2,
TEXTURE_LAVA3,
TEXTURE_BLOCK_BREAK_0,
TEXTURE_BLOCK_BREAK_1,
TEXTURE_BLOCK_BREAK_2,
TEXTURE_BLOCK_BREAK_3,
TEXTURE_BLOCK_BREAK_4,
TEXTURE_BLOCK_BREAK_5,
TEXTURE_BLOCK_BREAK_6,
TEXTURE_BLOCK_BREAK_7,
TEXTURE_BLOCK_BREAK_8,
TEXTURE_BLOCK_BREAK_9,
TEXTURE_NONE250, // wth?
TEXTURE_NONE251, // wth?
TEXTURE_UPDATE,
TEXTURE_ATEUPD,
TEXTURE_LAVA4,
TEXTURE_LAVA5,
};
enum eRenderShape

2
source/world/item/Inventory.cpp
View File

@@ -65,7 +65,7 @@ void Inventory::prepareCreativeInventory()
addCreativeItem(Tile::lapisBlock->m_ID);
addCreativeItem(Tile::sponge->m_ID);
addCreativeItem(Tile::sapling->m_ID);
addCreativeItem(Tile::cryingObsidian->m_ID);
//addCreativeItem(Tile::cryingObsidian->m_ID);
// test stuff
addCreativeItem(Tile::water->m_ID);

2
source/world/tile/ClothTile.cpp
View File

@@ -9,7 +9,7 @@
#include "ClothTile.hpp"
#include "world/level/Level.hpp"
ClothTile::ClothTile(int id, int type) : Tile(id, TEXTURE_CLOTH_64, Material::cloth)
ClothTile::ClothTile(int id, int type) : Tile(id, TEXTURE_WOOL, Material::cloth)
{
field_6C = type;

1
source/world/tile/IceTile.cpp
View File

@@ -11,6 +11,7 @@
IceTile::IceTile(int a, int b, Material* c) : HalfTransparentTile(a, b, c)
{
// FIXME: It's lighter now
setTicking(true);
m_acceleration = 1;
}

22
source/world/tile/Tile.cpp
View File

@@ -644,17 +644,17 @@ void Tile::initTiles()
->setSoundType(Tile::SOUND_CLOTH)
->setDescriptionId("cloth");
Tile::info_updateGame1 = (new DirtTile(TILE_INFO_UPDATEGAME1, TEXTURE_INFO_UPDATEGAME1, Material::dirt))
Tile::info_updateGame1 = (new DirtTile(TILE_UPDATE, TEXTURE_UPDATE, Material::dirt))
->init()
->setDestroyTime(5.0f)
->setSoundType(Tile::SOUND_GRAVEL)
->setDescriptionId("info_update");
Tile::info_updateGame2 = (new DirtTile(TILE_INFO_UPDATEGAME2, TEXTURE_INFO_UPDATEGAME2, Material::dirt))
Tile::info_updateGame2 = (new DirtTile(TILE_ATEUPD, TEXTURE_ATEUPD, Material::dirt))
->init()
->setDestroyTime(5.0f)
->setSoundType(Tile::SOUND_GRAVEL)
->setDescriptionId("info_update");
->setDescriptionId("info_ateupd");
// custom additions here
@@ -690,12 +690,12 @@ void Tile::initTiles()
->setSoundType(Tile::SOUND_STONE)
->setDescriptionId("stoneMoss");
Tile::cryingObsidian = (new Tile(TILE_OBSIDIAN_CRYING, TEXTURE_OBSIDIAN_CRYING, Material::stone))
->init()
->setDestroyTime(10.0f)
->setExplodeable(2000.0f)
->setSoundType(Tile::SOUND_STONE)
->setDescriptionId("cryingObsidian");
//Tile::cryingObsidian = (new Tile(TILE_OBSIDIAN_CRYING, TEXTURE_OBSIDIAN_CRYING, Material::stone))
// ->init()
// ->setDestroyTime(10.0f)
// ->setExplodeable(2000.0f)
// ->setSoundType(Tile::SOUND_STONE)
// ->setDescriptionId("cryingObsidian");
for (int i = 0; i < C_MAX_TILES; i++)
{
@@ -1126,5 +1126,5 @@ Tile
*Tile::sponge,
*Tile::lapisBlock,
*Tile::bookshelf,
*Tile::mossStone,
*Tile::cryingObsidian;
*Tile::mossStone;
//*Tile::cryingObsidian;

4
source/world/tile/Tile.hpp
View File

@@ -212,8 +212,8 @@ public: // static variables
* sponge,
* lapisBlock,
* bookshelf,
* mossStone,
* cryingObsidian;
* mossStone;
//* cryingObsidian;
public:
int m_TextureFrame;