LegacyConsole/GabsPuNs-MinecraftConsoles
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/GabsPuNs-MinecraftConsoles.git synced 2026-05-22 00:05:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove Extra graphics mode.

Browse Source 
Not needed anymore in TU25
This commit is contained in:
GabsPuNs
2026-03-29 01:21:16 -04:00
parent 7016a8553e
commit 168b38249c
5 changed files with 38 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Minecraft.Client/Common/Consoles_App.cpp
View File

@@ -1635,29 +1635,18 @@ void CMinecraftApp::ActionGameSettings(int iPad,eGameSetting eVal)
if (graphicsLevel == 0)
{
pMinecraft->options->set(Options::Option::GRAPHICS, false);
pMinecraft->options->set(Options::Option::BETTER_WATER, false);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, false);
pMinecraft->options->set(Options::Option::PARTICLES, 2);
}
else if (graphicsLevel == 1)
{
pMinecraft->options->set(Options::Option::GRAPHICS, false);
pMinecraft->options->set(Options::Option::BETTER_WATER, false);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, true);
pMinecraft->options->set(Options::Option::PARTICLES, 1);
}
else if (graphicsLevel == 2)
{
pMinecraft->options->set(Options::Option::GRAPHICS, true);
pMinecraft->options->set(Options::Option::BETTER_WATER, false);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, true);
pMinecraft->options->set(Options::Option::PARTICLES, 0);
pMinecraft->textures->reloadAll();
}
else
{
pMinecraft->options->set(Options::Option::GRAPHICS, true);
pMinecraft->options->set(Options::Option::BETTER_WATER, true);
pMinecraft->options->set(Options::Option::AMBIENT_OCCLUSION, true);
pMinecraft->options->set(Options::Option::PARTICLES, 0);
pMinecraft->textures->reloadAll();

6
Minecraft.Client/Common/UI/UIScene_SettingsGraphicsMenu.cpp
View File

@@ -85,11 +85,10 @@ UIScene_SettingsGraphicsMenu::UIScene_SettingsGraphicsMenu(int iPad, void *initD
const wchar_t* graphicsText = L"";
if (currentGraphics == 0) graphicsText = L"Graphics: Potato";
else if (currentGraphics == 1) graphicsText = L"Graphics: Fast";
else if (currentGraphics == 2) graphicsText = L"Graphics: Fancy";
else graphicsText = L"Graphics: Extra";
else graphicsText = L"Graphics: Fancy";
swprintf(TempString, 256, L"%ls", graphicsText);
m_sliderGraphicsMode.init(TempString, eControl_GraphicsMode, 0, 3, currentGraphics);
m_sliderGraphicsMode.init(TempString, eControl_GraphicsMode, 0, 2, currentGraphics);
doHorizontalResizeCheck();
@@ -256,7 +255,6 @@ void UIScene_SettingsGraphicsMenu::handleSliderMove(F64 sliderId, F64 currentVal
const wchar_t* modeName = L"Potato";
if (value == 1) modeName = L"Fast";
else if (value == 2) modeName = L"Fancy";
else if (value == 3) modeName = L"Extra";
swprintf(TempString, 256, L"Graphics: %ls", modeName);

25
Minecraft.Client/Options.cpp
View File

@@ -15,7 +15,7 @@
#include "..\Minecraft.World\StringHelpers.h"
// 4J - the Option sub-class used to be an java enumerated type, trying to emulate that functionality here
const Options::Option Options::Option::options[18] =
const Options::Option Options::Option::options[17] =
{
Options::Option(L"options.music", true, false),
Options::Option(L"options.sound", true, false),
@@ -29,7 +29,6 @@ const Options::Option Options::Option::options[18] =
Options::Option(L"options.difficulty", false, false),
Options::Option(L"options.graphics", false, false),
Options::Option(L"options.ao", false, true),
Options::Option(L"options.betterWater", false, false),
Options::Option(L"options.guiScale", false, false),
Options::Option(L"options.fov", true, false),
Options::Option(L"options.gamma", true, false),
@@ -49,12 +48,11 @@ const Options::Option *Options::Option::FRAMERATE_LIMIT = &Options::Option::opti
const Options::Option *Options::Option::DIFFICULTY = &Options::Option::options[9];
const Options::Option *Options::Option::GRAPHICS = &Options::Option::options[10];
const Options::Option *Options::Option::AMBIENT_OCCLUSION = &Options::Option::options[11];
const Options::Option *Options::Option::BETTER_WATER = &Options::Option::options[12];
const Options::Option *Options::Option::GUI_SCALE = &Options::Option::options[13];
const Options::Option *Options::Option::FOV = &Options::Option::options[14];
const Options::Option *Options::Option::GAMMA = &Options::Option::options[15];
const Options::Option *Options::Option::RENDER_CLOUDS = &Options::Option::options[16];
const Options::Option *Options::Option::PARTICLES = &Options::Option::options[17];
const Options::Option *Options::Option::GUI_SCALE = &Options::Option::options[12];
const Options::Option *Options::Option::FOV = &Options::Option::options[13];
const Options::Option *Options::Option::GAMMA = &Options::Option::options[14];
const Options::Option *Options::Option::RENDER_CLOUDS = &Options::Option::options[15];
const Options::Option *Options::Option::PARTICLES = &Options::Option::options[16];
const Options::Option *Options::Option::getItem(int id)
@@ -121,7 +119,6 @@ void Options::init()
advancedOpengl = false;
framerateLimit = 0;
fancyGraphics = true;
betterWater = false;
ambientOcclusion = true;
renderClouds = true;
skin = L"Default";
@@ -251,10 +248,6 @@ void Options::set(const Options::Option *item, float fVal)
{
fancyGraphics = fVal;
}
if (item == Option::BETTER_WATER)
{
betterWater = fVal;
}
if (item == Option::AMBIENT_OCCLUSION)
{
ambientOcclusion = fVal;
@@ -300,11 +293,6 @@ void Options::toggle(const Options::Option *option, int dir)
ambientOcclusion = !ambientOcclusion;
minecraft->levelRenderer->allChanged();
}
if (option == Option::BETTER_WATER)
{
betterWater = !betterWater;
minecraft->textures->reloadAll();
}
// 4J-PB - don't do the file save on the xbox
// save();
@@ -320,7 +308,6 @@ float Options::getProgressValue(const Options::Option *item)
if (item == Option::RENDER_DISTANCE) return viewDistance;
if (item == Option::GRAPHICS) return fancyGraphics;
if (item == Option::AMBIENT_OCCLUSION) return ambientOcclusion;
if (item == Option::BETTER_WATER) return betterWater;
return 0;
}

4
Minecraft.Client/Options.h
View File

@@ -15,7 +15,7 @@ public:
class Option
{
public:
static const Option options[18];
static const Option options[17];
static const Option *MUSIC;
static const Option *SOUND;
static const Option *INVERT_MOUSE;
@@ -28,7 +28,6 @@ public:
static const Option *DIFFICULTY;
static const Option *GRAPHICS;
static const Option *AMBIENT_OCCLUSION;
static const Option *BETTER_WATER;
static const Option *GUI_SCALE;
static const Option *FOV;
static const Option *GAMMA;
@@ -69,7 +68,6 @@ public:
int framerateLimit;
bool fancyGraphics;
bool ambientOcclusion;
bool betterWater;
bool renderClouds;
wstring skin;

66
Minecraft.Client/Texture.cpp
View File

@@ -717,47 +717,39 @@ int Texture::crispBlend(int c0, int c1)
int a0 = static_cast<int>(((c0 & 0xff000000) >> 24)) & 0xff;
int a1 = static_cast<int>(((c1 & 0xff000000) >> 24)) & 0xff;
// continue with crisp blend if it's likely to be an opaque/cutout tile in the atlas
if (a0 >= 0xfa || a1 >= 0xfa || !Minecraft::GetInstance()->options->betterWater)
int a = 255;
if (a0 + a1 < 255)
{
int a = 255;
if (a0 + a1 < 255)
{
a = 0;
a0 = 1;
a1 = 1;
}
else if (a0 > a1)
{
a0 = 255;
a1 = 1;
}
else
{
a0 = 1;
a1 = 255;
}
int r0 = ((c0 >> 16) & 0xff) * a0;
int g0 = ((c0 >> 8) & 0xff) * a0;
int b0 = ((c0) & 0xff) * a0;
int r1 = ((c1 >> 16) & 0xff) * a1;
int g1 = ((c1 >> 8) & 0xff) * a1;
int b1 = ((c1) & 0xff) * a1;
int r = (r0 + r1) / (a0 + a1);
int g = (g0 + g1) / (a0 + a1);
int b = (b0 + b1) / (a0 + a1);
return (a << 24) | (r << 16) | (g << 8) | b;
a = 0;
a0 = 1;
a1 = 1;
}
else // smoothblend if it's transparent
else if (a0 > a1)
{
return (((a0 + a1) >> 1) << 24) | (((c0 & 0xfefefe) + (c1 & 0xfefefe)) >> 1);
a0 = 255;
a1 = 1;
}
else
{
a0 = 1;
a1 = 255;
}
int r0 = ((c0 >> 16) & 0xff) * a0;
int g0 = ((c0 >> 8) & 0xff) * a0;
int b0 = ((c0) & 0xff) * a0;
int r1 = ((c1 >> 16) & 0xff) * a1;
int g1 = ((c1 >> 8) & 0xff) * a1;
int b1 = ((c1) & 0xff) * a1;
int r = (r0 + r1) / (a0 + a1);
int g = (g0 + g1) / (a0 + a1);
int b = (b0 + b1) / (a0 + a1);
return (a << 24) | (r << 16) | (g << 8) | b;
}
int Texture::getManagerId()