mirror of
https://git.neolegacy.dev/neoStudiosLCE/neoLegacy.git
synced 2026-11-21 17:23:56 +01:00
TU46 Test content and patches
TU46 Test content, added missing commits by amending commit and cherry-picking to new branch, ready for iggy guis and tu46 bug fixes
This commit is contained in:
1 parent
8d6b69f599
commit
ff562d1644
497 files changed
+11187
-771
No files matched your search
@@ -36,8 +36,17 @@ void EntityRenderer::bindTexture(shared_ptr<Entity> entity)
|
||||
bindTexture(getTextureLocation(entity));
|
||||
}
|
||||
|
||||
bool EntityRenderer::solidColourPass = false;
|
||||
bool EntityRenderer::skipPostRender = false;
|
||||
|
||||
void EntityRenderer::bindTexture(ResourceLocation *location)
|
||||
{
|
||||
if (solidColourPass)
|
||||
{
|
||||
glDisable(GL_TEXTURE_2D);
|
||||
entityRenderDispatcher->textures->clearLastBoundId();
|
||||
return;
|
||||
}
|
||||
entityRenderDispatcher->textures->bindTexture(location);
|
||||
}
|
||||
|
||||
@@ -50,6 +59,13 @@ bool EntityRenderer::bindTexture(const wstring& urlTexture, int backupTexture)
|
||||
//int id = t->loadHttpTexture(urlTexture, backupTexture);
|
||||
int id = t->loadMemTexture(urlTexture, backupTexture);
|
||||
|
||||
if (solidColourPass && id >= 0)
|
||||
{
|
||||
glDisable(GL_TEXTURE_2D);
|
||||
t->clearLastBoundId();
|
||||
return true;
|
||||
}
|
||||
|
||||
if (id >= 0)
|
||||
{
|
||||
glBindTexture(GL_TEXTURE_2D, id);
|
||||
@@ -384,6 +400,7 @@ void EntityRenderer::init(EntityRenderDispatcher *entityRenderDispatcher)
|
||||
|
||||
void EntityRenderer::postRender(shared_ptr<Entity> entity, double x, double y, double z, float rot, float a, bool bRenderPlayerShadow)
|
||||
{
|
||||
if (solidColourPass || skipPostRender) return;
|
||||
if( !entityRenderDispatcher->isGuiRender ) // 4J - added, don't render shadow in gui as it uses its own blending, and we have globally enabled blending for interface opacity
|
||||
{
|
||||
if (bRenderPlayerShadow && entityRenderDispatcher->options->fancyGraphics && shadowRadius > 0 && !entity->isInvisible())
|
||||
|
||||
Reference in new issue
Block a user