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:
@@ -1,6 +1,7 @@
|
||||
#include "stdafx.h"
|
||||
#include "ItemSpriteRenderer.h"
|
||||
#include "EntityRenderDispatcher.h"
|
||||
#include "TextureAtlas.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.entity.projectile.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.item.alchemy.h"
|
||||
#include "..\Minecraft.World\net.minecraft.world.item.h"
|
||||
@@ -31,7 +32,7 @@ void ItemSpriteRenderer::render(shared_ptr<Entity> e, double x, double y, double
|
||||
glTranslatef((float) x, (float) y, (float) z);
|
||||
glEnable(GL_RESCALE_NORMAL);
|
||||
glScalef(1 / 2.0f, 1 / 2.0f, 1 / 2.0f);
|
||||
bindTexture(TN_GUI_ITEMS); // 4J - was L"/gui/items.png"
|
||||
bindTexture(e);
|
||||
Tesselator *t = Tesselator::getInstance();
|
||||
|
||||
if (icon == PotionItem::getTexture(PotionItem::THROWABLE_ICON) )
|
||||
@@ -76,4 +77,9 @@ void ItemSpriteRenderer::renderIcon(Tesselator *t, Icon *icon)
|
||||
t->vertexUV((float)(r - xo), (float)( r - yo), (float)( 0), (float)( u1), (float)( v0));
|
||||
t->vertexUV((float)(0 - xo), (float)( r - yo), (float)( 0), (float)( u0), (float)( v0));
|
||||
t->end();
|
||||
}
|
||||
|
||||
ResourceLocation *ItemSpriteRenderer::getTextureLocation(shared_ptr<Entity> mob)
|
||||
{
|
||||
return &TextureAtlas::LOCATION_ITEMS;
|
||||
}
|
||||
Reference in New Issue
Block a user