feat: TU19 (Dec 2014) Features & Content (#155)
* try to resolve merge conflict
* feat: TU19 (Dec 2014) Features & Content (#32)
* December 2014 files
* Working release build
* Fix compilation issues
* Add sound to Windows64Media
* Add DLC content and force Tutorial DLC
* Revert "Add DLC content and force Tutorial DLC"
This reverts commit 97a4399472.
* Disable broken light packing
* Disable breakpoint during DLC texture map load
Allows DLC loading but the DLC textures are still broken
* Fix post build not working
* ...
* fix vs2022 build
* fix cmake build
---------
Co-authored-by: Loki <lokirautio@gmail.com>
This commit is contained in:
@@ -4,6 +4,7 @@
|
||||
#include "entityRenderDispatcher.h"
|
||||
//#include "ItemFrame"
|
||||
#include "ItemFrameRenderer.h"
|
||||
#include "TextureAtlas.h"
|
||||
|
||||
#include "..\Minecraft.World\JavaMath.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.entity.Item.h"
|
||||
@@ -18,6 +19,8 @@
|
||||
#include "CompassTexture.h"
|
||||
#include "Minimap.h"
|
||||
|
||||
ResourceLocation ItemFrameRenderer::MAP_BACKGROUND_LOCATION = ResourceLocation(TN_MISC_MAPBG);
|
||||
|
||||
void ItemFrameRenderer::registerTerrainTextures(IconRegister *iconRegister)
|
||||
{
|
||||
backTexture = iconRegister->registerIcon(L"itemframe_back");
|
||||
@@ -52,7 +55,7 @@ void ItemFrameRenderer::drawFrame(shared_ptr<ItemFrame> itemFrame)
|
||||
Minecraft *pMinecraft=Minecraft::GetInstance();
|
||||
|
||||
glPushMatrix();
|
||||
entityRenderDispatcher->textures->bindTexture(TN_TERRAIN);
|
||||
entityRenderDispatcher->textures->bindTexture(&TextureAtlas::LOCATION_BLOCKS);
|
||||
glRotatef(itemFrame->yRot, 0, 1, 0);
|
||||
|
||||
Tile *wood = Tile::wood;
|
||||
@@ -134,7 +137,7 @@ void ItemFrameRenderer::drawItem(shared_ptr<ItemFrame> entity)
|
||||
|
||||
if (itemEntity->getItem()->getItem() == Item::map)
|
||||
{
|
||||
entityRenderDispatcher->textures->bindTexture(TN_MISC_MAPBG);
|
||||
entityRenderDispatcher->textures->bindTexture(&MAP_BACKGROUND_LOCATION);
|
||||
Tesselator *t = Tesselator::getInstance();
|
||||
|
||||
glRotatef(180, 0, 1, 0);
|
||||
|
||||
Reference in New Issue
Block a user