backups/MinecraftConsoles
2
0
Fork 1
mirror of https://github.com/smartcmd/MinecraftConsoles.git synced 2026-08-20 09:57:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Vignette restored

Browse source
This commit is contained in:
NSDeathman 2026-03-11 14:02:40 +03:00
parent 9d88cc51cc
commit c92023d843
4 changed files with 7 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Minecraft.Client/Gui.cpp
View file

@ -308,7 +308,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
RenderManager.StateSetBlendFactor(0xffffff |(((unsigned int)fVal)<<24)); RenderManager.StateSetBlendFactor(0xffffff |(((unsigned int)fVal)<<24));
currentGuiBlendFactor = fVal / 255.0f; currentGuiBlendFactor = fVal / 255.0f;
// RenderManager.StateSetBlendFactor(0x40ffffff); // RenderManager.StateSetBlendFactor(0x40ffffff);
glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
blitOffset = -90; blitOffset = -90;
@ -346,7 +346,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
MemSect(0); MemSect(0);
glEnable(GL_BLEND); glEnable(GL_BLEND);
RenderManager.StateSetBlendFactor(0xffffff |(((unsigned int)fVal)<<24)); RenderManager.StateSetBlendFactor(0xffffff |(((unsigned int)fVal)<<24));
glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
//glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR); //glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
// 4J Stu - We don't want to adjust the cursor by the safezone, we want it centred // 4J Stu - We don't want to adjust the cursor by the safezone, we want it centred
if(bTwoPlayerSplitscreen) if(bTwoPlayerSplitscreen)
@ -389,7 +389,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
{ {
// 4J - added blend for fading gui // 4J - added blend for fading gui
glEnable(GL_BLEND); glEnable(GL_BLEND);
glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);
if (minecraft->gameMode->canHurtPlayer()) if (minecraft->gameMode->canHurtPlayer())
{ {
@ -1052,7 +1052,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
lastTickA = a; lastTickA = a;
// 4J Stu - This is now displayed in a xui scene // 4J Stu - This is now displayed in a xui scene
#if 0
// Jukebox CD message // Jukebox CD message
if (overlayMessageTime > 0) if (overlayMessageTime > 0)
{ {
@ -1085,7 +1085,6 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse)
glPopMatrix(); glPopMatrix();
} }
} }
#endif
unsigned int max = 10; unsigned int max = 10;
bool isChatting = false; bool isChatting = false;
@ -1275,7 +1274,6 @@ void Gui::renderVignette(float br, int w, int h)
if (br > 1) br = 1; if (br > 1) br = 1;
tbr += (br - tbr) * 0.01f; tbr += (br - tbr) * 0.01f;
#if 0 // 4J - removed - TODO put back when we have blend functions implemented
glDisable(GL_DEPTH_TEST); glDisable(GL_DEPTH_TEST);
glDepthMask(false); glDepthMask(false);
glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR); glBlendFunc(GL_ZERO, GL_ONE_MINUS_SRC_COLOR);
@ -1292,7 +1290,6 @@ void Gui::renderVignette(float br, int w, int h)
glEnable(GL_DEPTH_TEST); glEnable(GL_DEPTH_TEST);
glColor4f(1, 1, 1, 1); glColor4f(1, 1, 1, 1);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
#endif
} }
void Gui::renderTp(float br, int w, int h) void Gui::renderTp(float br, int w, int h)

2
Minecraft.Client/ItemRenderer.cpp
View file

@ -528,7 +528,7 @@ void ItemRenderer::renderAndDecorateItem(Font *font, Textures *textures, const s
glEnable(GL_LIGHTING); glEnable(GL_LIGHTING);
glDepthFunc(GL_LEQUAL); glDepthFunc(GL_LEQUAL);
if( isConstantBlended ) glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA); if( isConstantBlended ) glBlendFunc(GL_ONE_MINUS_DST_COLOR, GL_ONE_MINUS_SRC_COLOR);;
} }
} }

2
Minecraft.Client/Textures.cpp
View file

@ -27,7 +27,7 @@ int Textures::preLoadedIdx[TN_COUNT];
const wchar_t *Textures::preLoaded[TN_COUNT] = const wchar_t *Textures::preLoaded[TN_COUNT] =
{ {
L"%blur%misc/pumpkinblur", L"%blur%misc/pumpkinblur",
// L"%blur%/misc/vignette", // Not currently used L"%blur%/misc/vignette", // Not currently used
L"%clamp%misc/shadow", L"%clamp%misc/shadow",
// L"/achievement/bg", // Not currently used // L"/achievement/bg", // Not currently used
L"art/kz", L"art/kz",

2
Minecraft.Client/Textures.h
View file

@ -18,7 +18,7 @@ class ResourceLocation;
typedef enum _TEXTURE_NAME typedef enum _TEXTURE_NAME
{ {
TN__BLUR__MISC_PUMPKINBLUR, TN__BLUR__MISC_PUMPKINBLUR,
// TN__BLUR__MISC_VIGNETTE, // Not currently used TN__BLUR__MISC_VIGNETTE, // Not currently used
TN__CLAMP__MISC_SHADOW, TN__CLAMP__MISC_SHADOW,
// TN_ACHIEVEMENT_BG, // Not currently used // TN_ACHIEVEMENT_BG, // Not currently used
TN_ART_KZ, TN_ART_KZ,