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 97a43994725008e35fceb984d5549df9c8cea470. * 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:
@@ -2,16 +2,16 @@
|
||||
#include "TileEntityRenderer.h"
|
||||
#include "TileEntityRenderDispatcher.h"
|
||||
|
||||
void TileEntityRenderer::bindTexture(int resourceName)
|
||||
void TileEntityRenderer::bindTexture(ResourceLocation *location)
|
||||
{
|
||||
Textures *t = tileEntityRenderDispatcher->textures;
|
||||
if(t != NULL) t->bind(t->loadTexture(resourceName));
|
||||
if(t != NULL) t->bind(t->loadTexture(location->getTexture()));
|
||||
}
|
||||
|
||||
void TileEntityRenderer::bindTexture(const wstring& urlTexture, int backupTexture)
|
||||
void TileEntityRenderer::bindTexture(const wstring& urlTexture, ResourceLocation *location)
|
||||
{
|
||||
Textures *t = tileEntityRenderDispatcher->textures;
|
||||
if(t != NULL) t->bind(t->loadHttpTexture(urlTexture, backupTexture));
|
||||
if(t != NULL) t->bind(t->loadHttpTexture(urlTexture, location->getTexture()));
|
||||
}
|
||||
|
||||
Level *TileEntityRenderer::getLevel()
|
||||
|
||||
Reference in New Issue
Block a user