backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-05-16 00:32:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

attempt to clean up renderer

Browse source
This commit is contained in:
Tropical 2026-04-07 15:55:45 -05:00
parent 28931d5380
commit 8a1b3cc1c4
180 changed files with 988 additions and 1030 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
targets/app/common/DLC/DLCAudioFile.cpp
View file

@ -5,7 +5,7 @@
#include <cstring>
#include <unordered_map>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "DLCManager.h"
#include "app/common/DLC/DLCFile.h"
@ -123,7 +123,7 @@ void DLCAudioFile::addParameter(EAudioType type, EAudioParameterType ptype,
int maximumChars = 55;
bool bIsSDMode =
!RenderManager.IsHiDef() && !RenderManager.IsWidescreen();
!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen();
if (bIsSDMode) {
maximumChars = 45;

4
targets/app/common/DLC/DLCSkinFile.cpp
View file

@ -3,7 +3,7 @@
#include <string.h>
#include <wchar.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "DLCManager.h"
#include "app/common/DLC/DLCFile.h"
#include "app/linux/LinuxGame.h"
@ -57,7 +57,7 @@ void DLCSkinFile::addParameter(DLCManager::EDLCParameterType type,
int maximumChars = 55;
bool bIsSDMode =
!RenderManager.IsHiDef() && !RenderManager.IsWidescreen();
!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen();
if (bIsSDMode) {
maximumChars = 45;

4
targets/app/common/Game.cpp
View file

@ -3,7 +3,7 @@
#include "platform/PlatformTypes.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"
@ -627,7 +627,7 @@ bool Game::IsLocalMultiplayerAvailable() {
++connectedControllers;
}
bool available = RenderManager.IsHiDef() && connectedControllers > 1;
bool available = PlatformRenderer.IsHiDef() && connectedControllers > 1;
return available;

6
targets/app/common/GameSettingsManager.cpp
View file

@ -21,7 +21,7 @@
#include "minecraft/world/entity/player/Player.h"
#include "minecraft/world/level/tile/Tile.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "app/common/Audio/SoundEngine.h"
@ -265,7 +265,7 @@ void GameSettingsManager::actionGameSettings(int iPad, eGameSetting eVal) {
case eGameSetting_Gamma:
if (iPad == PlatformProfile.GetPrimaryPad()) {
float fVal = ((float)GameSettingsA[iPad]->ucGamma) * 327.68f;
RenderManager.UpdateGamma((unsigned short)fVal);
PlatformRenderer.UpdateGamma((unsigned short)fVal);
}
break;
case eGameSetting_Difficulty:
@ -371,7 +371,7 @@ void GameSettingsManager::actionGameSettings(int iPad, eGameSetting eVal) {
for (std::uint8_t idx = 0; idx < XUSER_MAX_COUNT; ++idx) {
if (pMinecraft->localplayers[idx] != nullptr) {
if (pMinecraft->localplayers[idx]->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_FULLSCREEN) {
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN) {
ui.DisplayGamertag(idx, false);
} else {
ui.DisplayGamertag(idx, true);

4
targets/app/common/LocalizationManager.cpp
View file

@ -17,7 +17,7 @@
#include "minecraft/client/skins/TexturePack.h"
#include "minecraft/client/skins/TexturePackRepository.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/XboxStubs.h"
#include "strings.h"
#include "util/StringHelpers.h"
@ -107,7 +107,7 @@ int LocalizationManager::TipsSortFunction(const void* a, const void* b) {
void LocalizationManager::initialiseTips() {
memset(m_TipIDA, 0, sizeof(m_TipIDA));
if (!RenderManager.IsHiDef()) {
if (!PlatformRenderer.IsHiDef()) {
m_GameTipA[0].uiStringID = IDS_TIPS_GAMETIP_0;
}

8
targets/app/common/Network/GameNetworkManager.cpp
View file

@ -11,7 +11,7 @@
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "minecraft/GameEnums.h"
#include "app/common/Game.h"
@ -1501,16 +1501,16 @@ void CGameNetworkManager::ServerStoppedWait() {
if (C4JThread::isMainThread()) {
int result = C4JThread::WaitResult::Timeout;
do {
RenderManager.StartFrame();
PlatformRenderer.StartFrame();
result = m_hServerStoppedEvent->waitForSignal(20);
// Tick some simple things
PlatformProfile.Tick();
PlatformStorage.Tick();
PlatformInput.Tick();
RenderManager.Tick();
PlatformRenderer.Tick();
ui.tick();
ui.render();
RenderManager.Present();
PlatformRenderer.Present();
} while (result == C4JThread::WaitResult::Timeout);
} else {
if (m_hServerStoppedEvent != nullptr) {

4
targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp
View file

@ -8,7 +8,7 @@
#include <vector>
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/Tutorial/TutorialMode.h"
@ -328,7 +328,7 @@ void IUIScene_AbstractContainerMenu::onMouseTick() {
// 4J Stu - The cursor moves too fast in SD mode
// The SD/splitscreen scenes are approximately 0.6 times the size of
// the fullscreen on
if (!RenderManager.IsHiDef() || app.GetLocalPlayerCount() > 1)
if (!PlatformRenderer.IsHiDef() || app.GetLocalPlayerCount() > 1)
fInputScale *= 0.6f;
fInputX *= fInputScale;

8
targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp
View file

@ -8,7 +8,7 @@
#include <vector>
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/Console_Debug_enum.h"
#include "app/common/Tutorial/Tutorial.h"
@ -480,7 +480,7 @@ bool IUIScene_CraftingMenu::handleKeyDown(int iPad, int iAction, bool bRepeat) {
// Vita)
bool bNoScrollSlots = false;
if (m_bSplitscreen ||
(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())) {
(!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen())) {
bNoScrollSlots = true;
}
@ -1034,7 +1034,7 @@ void IUIScene_CraftingMenu::UpdateVerticalSlots() {
// splits & Vita)
bool bNoScrollSlots = false;
if (m_bSplitscreen ||
(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())) {
(!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen())) {
bNoScrollSlots = true;
}
@ -1314,7 +1314,7 @@ void IUIScene_CraftingMenu::UpdateDescriptionText(bool bCanBeMade) {
// 12 for splitscreen, 14 for normal
EHTMLFontSize size = eHTMLSize_Normal;
if (m_bSplitscreen ||
(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())) {
(!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen())) {
size = eHTMLSize_Splitscreen;
}
wchar_t startTags[64];

2
targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp
View file

@ -878,7 +878,7 @@ void IUIScene_CreativeMenu::staticCtor() {
// Just use the text LT - the graphic doesn't fit in splitscreen either
// In 480p there's not enough room for the LT button, so use text instead
// if(!RenderManager.IsHiDef() && !RenderManager.IsWidescreen())
// if(!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen())
{
specs[eCreativeInventoryTab_Brewing] =
new TabSpec(L"Brewing", IDS_GROUPNAME_POTIONS_480, 5, brewingGroup);

4
targets/app/common/UI/All Platforms/IUIScene_HUD.cpp
View file

@ -4,7 +4,7 @@
#include <memory>
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/linux/LinuxGame.h"
#include "app/linux/Linux_UIController.h"
@ -70,7 +70,7 @@ void IUIScene_HUD::updateFrameTick() {
int iGuiScale;
if (pMinecraft->localplayers[iPad]->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_FULLSCREEN) {
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN) {
iGuiScale = app.GetGameSettings(iPad, eGameSetting_UISize);
} else {
iGuiScale = app.GetGameSettings(iPad, eGameSetting_UISizeSplitscreen);

48
targets/app/common/UI/Components/UIComponent_Chat.cpp
View file

@ -2,7 +2,7 @@
#include <memory>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Controls/UIControl_Label.h"
#include "app/common/UI/UILayer.h"
@ -32,18 +32,18 @@ UIComponent_Chat::UIComponent_Chat(int iPad, void* initData,
std::wstring UIComponent_Chat::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
m_bSplitscreen = true;
return L"ComponentChatSplit";
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
m_bSplitscreen = false;
return L"ComponentChat";
@ -89,20 +89,20 @@ void UIComponent_Chat::handleTimerComplete(int id) {
}
void UIComponent_Chat::render(S32 width, S32 height,
C4JRender::eViewportType viewport) {
IPlatformRenderer::eViewportType viewport) {
if (m_bSplitscreen) {
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
yPos = (S32)(ui.getScreenHeight() / 2);
break;
@ -117,22 +117,22 @@ void UIComponent_Chat::render(S32 width, S32 height,
S32 tileHeight = height;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
tileHeight = (S32)(ui.getScreenHeight());
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
tileYStart = (S32)(m_movieHeight / 2);
break;
default:

4
targets/app/common/UI/Components/UIComponent_Chat.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Controls/UIControl_Label.h"
@ -69,7 +69,7 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewport);
IPlatformRenderer::eViewportType viewport);
protected:
void handleTimerComplete(int id);

20
targets/app/common/UI/Components/UIComponent_Logo.cpp
View file

@ -1,6 +1,6 @@
#include "UIComponent_Logo.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"
@ -13,17 +13,17 @@ UIComponent_Logo::UIComponent_Logo(int iPad, void* initData,
std::wstring UIComponent_Logo::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
return L"ComponentLogoSplit";
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
return L"ComponentLogo";
break;

48
targets/app/common/UI/Components/UIComponent_MenuBackground.cpp
View file

@ -1,6 +1,6 @@
#include "UIComponent_MenuBackground.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/Iggy/include/iggy.h"
@ -20,17 +20,17 @@ UIComponent_MenuBackground::UIComponent_MenuBackground(int iPad, void* initData,
std::wstring UIComponent_MenuBackground::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
m_bSplitscreen = true;
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
m_bSplitscreen = false;
break;
@ -42,20 +42,20 @@ std::wstring UIComponent_MenuBackground::getMoviePath() {
}
void UIComponent_MenuBackground::render(S32 width, S32 height,
C4JRender::eViewportType viewport) {
IPlatformRenderer::eViewportType viewport) {
if (m_bSplitscreen) {
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
yPos = (S32)(ui.getScreenHeight() / 2);
break;
@ -70,22 +70,22 @@ void UIComponent_MenuBackground::render(S32 width, S32 height,
S32 tileHeight = height;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
tileHeight = (S32)(ui.getScreenHeight());
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
tileYStart = (S32)(m_movieHeight / 2);
break;
default:

4
targets/app/common/UI/Components/UIComponent_MenuBackground.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/Iggy/include/rrCore.h"
@ -35,5 +35,5 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewport);
IPlatformRenderer::eViewportType viewport);
};

38
targets/app/common/UI/Components/UIComponent_Panorama.cpp
View file

@ -4,7 +4,7 @@
#include <mutex>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/UILayer.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/Iggy/include/iggy.h"
@ -31,18 +31,18 @@ UIComponent_Panorama::UIComponent_Panorama(int iPad, void* initData,
std::wstring UIComponent_Panorama::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
m_bSplitscreen = true;
return L"PanoramaSplit";
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
m_bSplitscreen = false;
return L"Panorama";
@ -79,20 +79,20 @@ void UIComponent_Panorama::tick() {
}
void UIComponent_Panorama::render(S32 width, S32 height,
C4JRender::eViewportType viewport) {
IPlatformRenderer::eViewportType viewport) {
bool specialViewport =
(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_TOP) ||
(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM) ||
(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) ||
(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT);
(viewport == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP) ||
(viewport == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM) ||
(viewport == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT) ||
(viewport == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT);
if (m_bSplitscreen && specialViewport) {
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
break;
default:
@ -100,8 +100,8 @@ void UIComponent_Panorama::render(S32 width, S32 height,
}
ui.setupRenderPosition(xPos, yPos);
if ((viewport == C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) ||
(viewport == C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT)) {
if ((viewport == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT) ||
(viewport == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT)) {
// Need to render at full height, but only the left side of the
// scene
S32 tileXStart = 0;

4
targets/app/common/UI/Components/UIComponent_Panorama.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/UIScene.h"
#include "app/linux/Iggy/include/iggy.h"
@ -44,7 +44,7 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewport);
IPlatformRenderer::eViewportType viewport);
private:
void setPanorama(bool isDay);

68
targets/app/common/UI/Components/UIComponent_Tooltips.cpp
View file

@ -1,7 +1,7 @@
#include "UIComponent_Tooltips.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/UILayer.h"
@ -30,18 +30,18 @@ UIComponent_Tooltips::UIComponent_Tooltips(int iPad, void* initData,
std::wstring UIComponent_Tooltips::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
m_bSplitscreen = true;
return L"ToolTipsSplit";
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
m_bSplitscreen = false;
return L"ToolTips";
@ -55,7 +55,7 @@ F64 UIComponent_Tooltips::getSafeZoneHalfWidth() {
float safeWidth = 0.0f;
// 85% safezone for tooltips in either SD mode
if (!RenderManager.IsHiDef()) {
if (!PlatformRenderer.IsHiDef()) {
// 85% safezone
safeWidth = m_movieWidth * (0.15f / 2);
} else {
@ -73,39 +73,39 @@ void UIComponent_Tooltips::updateSafeZone() {
F64 safeRight = 0.0;
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
safeTop = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
safeBottom = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
safeLeft = getSafeZoneHalfWidth();
safeBottom = getSafeZoneHalfHeight();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
safeRight = getSafeZoneHalfWidth();
safeBottom = getSafeZoneHalfHeight();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
safeTop = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
safeTop = getSafeZoneHalfHeight();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
safeBottom = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
safeBottom = getSafeZoneHalfHeight();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
safeTop = getSafeZoneHalfHeight();
safeBottom = getSafeZoneHalfHeight();
@ -166,7 +166,7 @@ void UIComponent_Tooltips::tick() {
}
void UIComponent_Tooltips::render(S32 width, S32 height,
C4JRender::eViewportType viewport) {
IPlatformRenderer::eViewportType viewport) {
if ((PlatformProfile.GetLockedProfile() != -1) &&
!ui.GetMenuDisplayed(m_iPad) &&
(app.GetGameSettings(m_iPad, eGameSetting_Tooltips) == 0 ||
@ -178,15 +178,15 @@ void UIComponent_Tooltips::render(S32 width, S32 height,
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
yPos = (S32)(ui.getScreenHeight() / 2);
break;
@ -201,22 +201,22 @@ void UIComponent_Tooltips::render(S32 width, S32 height,
S32 tileHeight = height;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
tileHeight = (S32)(ui.getScreenHeight());
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
tileYStart = (S32)(m_movieHeight / 2);
break;
default:

4
targets/app/common/UI/Components/UIComponent_Tooltips.h
View file

@ -3,7 +3,7 @@
#include <string>
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/UIScene.h"
@ -70,7 +70,7 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewport);
IPlatformRenderer::eViewportType viewport);
virtual void SetTooltipText(unsigned int tooltip, int iTextID);
virtual void SetEnableTooltips(bool bVal);

60
targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp
View file

@ -46,17 +46,17 @@ UIComponent_TutorialPopup::UIComponent_TutorialPopup(int iPad, void* initData,
std::wstring UIComponent_TutorialPopup::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
return L"TutorialPopupSplit";
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
return L"TutorialPopup";
break;
@ -410,9 +410,9 @@ void UIComponent_TutorialPopup::UpdateInteractScenePosition(bool visible) {
bool isTradingScene =
(m_interactScene->getSceneType() == eUIScene_TradingMenu);
switch (Minecraft::GetInstance()->localplayers[m_iPad]->m_iScreenSection) {
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
bAllowAnim = true;
break;
default:
@ -443,24 +443,24 @@ void UIComponent_TutorialPopup::UpdateInteractScenePosition(bool visible) {
}
void UIComponent_TutorialPopup::render(S32 width, S32 height,
C4JRender::eViewportType viewport) {
if (viewport != C4JRender::VIEWPORT_TYPE_FULLSCREEN) {
IPlatformRenderer::eViewportType viewport) {
if (viewport != IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN) {
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
xPos = (S32)(ui.getScreenWidth() / 2);
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
yPos = (S32)(ui.getScreenHeight() / 2);
break;
@ -469,22 +469,22 @@ void UIComponent_TutorialPopup::render(S32 width, S32 height,
}
// Adjust for safezone
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
yPos += getSafeZoneHalfHeight();
break;
default:
break;
}
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos -= getSafeZoneHalfWidth();
break;
default:

4
targets/app/common/UI/Components/UIComponent_TutorialPopup.h
View file

@ -3,7 +3,7 @@
#include <memory>
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl.h"
@ -104,7 +104,7 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewport);
IPlatformRenderer::eViewportType viewport);
virtual void customDraw(IggyCustomDrawCallbackRegion* region);

74
targets/app/common/UI/Components/UIScene_HUD.cpp
View file

@ -44,18 +44,18 @@ UIScene_HUD::UIScene_HUD(int iPad, void* initData, UILayer* parentLayer)
std::wstring UIScene_HUD::getMoviePath() {
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
m_bSplitscreen = true;
return L"HUDSplit";
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
m_bSplitscreen = false;
return L"HUD";
@ -71,43 +71,43 @@ void UIScene_HUD::updateSafeZone() {
F64 safeRight = 0.0;
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
safeTop = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
safeBottom = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
safeLeft = getSafeZoneHalfWidth();
safeTop = getSafeZoneHalfHeight();
safeBottom = getSafeZoneHalfHeight();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
safeRight = getSafeZoneHalfWidth();
safeTop = getSafeZoneHalfHeight();
safeBottom = getSafeZoneHalfHeight();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
safeTop = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
safeTop = getSafeZoneHalfHeight();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
safeBottom = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
safeBottom = getSafeZoneHalfHeight();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
safeTop = getSafeZoneHalfHeight();
safeBottom = getSafeZoneHalfHeight();
@ -250,7 +250,7 @@ void UIScene_HUD::handleReload() {
Minecraft* pMinecraft = Minecraft::GetInstance();
if (pMinecraft->localplayers[m_iPad] == nullptr ||
pMinecraft->localplayers[m_iPad]->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_FULLSCREEN) {
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN) {
iGuiScale = app.GetGameSettings(m_iPad, eGameSetting_UISize);
} else {
iGuiScale = app.GetGameSettings(m_iPad, eGameSetting_UISizeSplitscreen);
@ -669,20 +669,20 @@ void UIScene_HUD::SetHealthAbsorb(int healthAbsorb) {
}
void UIScene_HUD::render(S32 width, S32 height,
C4JRender::eViewportType viewport) {
IPlatformRenderer::eViewportType viewport) {
if (m_bSplitscreen) {
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
yPos = (S32)(ui.getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos = (S32)(ui.getScreenWidth() / 2);
yPos = (S32)(ui.getScreenHeight() / 2);
break;
@ -697,22 +697,22 @@ void UIScene_HUD::render(S32 width, S32 height,
S32 tileHeight = height;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
tileHeight = (S32)(ui.getScreenHeight());
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
tileWidth = (S32)(ui.getScreenWidth());
tileYStart = (S32)(m_movieHeight / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
tileYStart = (S32)(m_movieHeight / 2);
break;
default:
@ -780,12 +780,12 @@ void UIScene_HUD::repositionHud() {
m_parentLayer->getRenderDimensions(width, height);
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
height = (S32)(ui.getScreenHeight());
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
width = (S32)(ui.getScreenWidth());
break;
default:

4
targets/app/common/UI/Components/UIScene_HUD.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/IUIScene_HUD.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/Controls/UIControl.h"
@ -186,7 +186,7 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewport);
IPlatformRenderer::eViewportType viewport);
protected:
void handleTimerComplete(int id);

2
targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp
View file

@ -2,7 +2,7 @@
#include <cmath>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_EnchantingMenu.h"
#include "app/linux/Iggy/include/iggy.h"

2
targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#include <sstream>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Controls/UIControl_Button.h"

2
targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp
View file

@ -5,7 +5,7 @@
#include <cmath>
#include <memory>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_HorseInventoryMenu.h"
#include "app/linux/Iggy/include/iggy.h"

2
targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp
View file

@ -5,7 +5,7 @@
#include <cmath>
#include <memory>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_InventoryMenu.h"
#include "app/linux/Iggy/include/iggy.h"

2
targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp
View file

@ -6,7 +6,7 @@
#include <numbers>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/linux/Iggy/include/iggy.h"

4
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp
View file

@ -4,7 +4,7 @@
#include <stdint.h>
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_DLCList.h"
#include "app/common/UI/Controls/UIControl_HTMLLabel.h"
@ -34,7 +34,7 @@ UIScene_DLCOffersMenu::UIScene_DLCOffersMenu(int iPad, void* initData,
// Alert the app the we want to be informed of ethernet connections
app.SetLiveLinkRequired(true);
m_bIsSD = !RenderManager.IsHiDef() && !RenderManager.IsWidescreen();
m_bIsSD = !PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen();
m_labelOffers.init(app.GetString(IDS_DOWNLOADABLE_CONTENT_OFFERS));
m_buttonListOffers.init(eControl_OffersList);

6
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp
View file

@ -6,7 +6,7 @@
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"
#include "app/common/UI/Controls/UIControl_CheckBox.h"
@ -210,7 +210,7 @@ UIScene_LaunchMoreOptionsMenu::UIScene_LaunchMoreOptionsMenu(
std::wstring wsText = app.GetString(IDS_GAMEOPTION_ONLINE);
#endif
EHTMLFontSize size = eHTMLSize_Normal;
if (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) {
size = eHTMLSize_Splitscreen;
}
wchar_t startTags[64];
@ -499,7 +499,7 @@ void UIScene_LaunchMoreOptionsMenu::handleFocusChange(F64 controlId,
std::wstring wsText = app.GetString(stringId);
EHTMLFontSize size = eHTMLSize_Normal;
if (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) {
size = eHTMLSize_Splitscreen;
}
wchar_t startTags[64];

4
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
View file

@ -6,7 +6,7 @@
#include "platform/PlatformTypes.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"
#include "app/common/DLC/DLCManager.h"
@ -249,7 +249,7 @@ void UIScene_LoadMenu::updateTooltips() {
void UIScene_LoadMenu::updateComponents() {
m_parentLayer->showComponent(m_iPad, eUIComponent_Panorama, true);
if (RenderManager.IsWidescreen()) {
if (PlatformRenderer.IsWidescreen()) {
m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, true);
} else {
m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false);

2
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
View file

@ -8,7 +8,7 @@
#include "platform/PlatformTypes.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/App_Defines.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"

10
targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp
View file

@ -4,7 +4,7 @@
#include <wchar.h>
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/Network/GameNetworkManager.h"
#include "app/common/UI/Controls/UIControl_Button.h"
@ -95,7 +95,7 @@ UIScene_SettingsOptionsMenu::UIScene_SettingsOptionsMenu(int iPad,
app.GetString(m_iDifficultySettingA[app.GetGameSettings(
m_iPad, eGameSetting_Difficulty)]);
EHTMLFontSize size = eHTMLSize_Normal;
if (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) {
size = eHTMLSize_Splitscreen;
}
wchar_t startTags[64];
@ -200,7 +200,7 @@ void UIScene_SettingsOptionsMenu::updateComponents() {
if (app.GetLocalPlayerCount() == 1)
m_parentLayer->showComponent(m_iPad, eUIComponent_Logo,
RenderManager.IsHiDef());
PlatformRenderer.IsHiDef());
else
m_parentLayer->showComponent(m_iPad, eUIComponent_Logo, false);
}
@ -299,7 +299,7 @@ void UIScene_SettingsOptionsMenu::handleReload() {
app.GetString(m_iDifficultySettingA[app.GetGameSettings(
m_iPad, eGameSetting_Difficulty)]);
EHTMLFontSize size = eHTMLSize_Normal;
if (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) {
size = eHTMLSize_Splitscreen;
}
wchar_t startTags[64];
@ -380,7 +380,7 @@ void UIScene_SettingsOptionsMenu::handleSliderMove(F64 sliderId,
std::wstring wsText = app.GetString(m_iDifficultySettingA[value]);
EHTMLFontSize size = eHTMLSize_Normal;
if (!RenderManager.IsHiDef() && !RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && !PlatformRenderer.IsWidescreen()) {
size = eHTMLSize_Splitscreen;
}
wchar_t startTags[64];

4
targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
View file

@ -6,7 +6,7 @@
#include <vector>
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/App_Defines.h"
#include "app/common/Minecraft_Macros.h"
#include "app/common/DLC/DLCManager.h"
@ -527,7 +527,7 @@ void UIScene_SkinSelectMenu::customDraw(IggyCustomDrawCallbackRegion* region) {
// %d, stencil write= %d\n", region->stencil_func_mask,
// region->stencil_func_ref, region->stencil_write_mask);
if (region->stencil_func_ref != 0)
RenderManager.StateSetStencil(GL_EQUAL, region->stencil_func_ref,
PlatformRenderer.StateSetStencil(GL_EQUAL, region->stencil_func_ref,
region->stencil_func_mask,
region->stencil_write_mask);
m_characters[characterId].render(region);

2
targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp
View file

@ -194,7 +194,7 @@ void UIScene_AbstractContainerMenu::tick() {
}
void UIScene_AbstractContainerMenu::render(S32 width, S32 height,
C4JRender::eViewportType viewpBort) {
IPlatformRenderer::eViewportType viewpBort) {
m_cacheSlotRenders = true;
m_needsCacheRendered = m_needsCacheRendered || m_menu->needsRendered();

4
targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h
View file

@ -2,7 +2,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.h"
#include "app/common/UI/Controls/UIControl.h"
#include "app/common/UI/Controls/UIControl_Cursor.h"
@ -83,7 +83,7 @@ public:
}
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewpBort);
IPlatformRenderer::eViewportType viewpBort);
virtual void customDraw(IggyCustomDrawCallbackRegion* region);
// INPUT

2
targets/app/common/UI/UIBitmapFont.cpp
View file

@ -274,7 +274,7 @@ rrbool UIBitmapFont::GetGlyphBitmap(S32 glyph, F32 pixel_scale,
float glyphScale = 1.0f,
truePixelScale = 1.0f / m_cFontData->getFontData()->m_fAdvPerPixel;
F32 targetPixelScale = pixel_scale;
// if(!RenderManager.IsWidescreen())
// if(!PlatformRenderer.IsWidescreen())
//{
// // Fix for different scales in 480
// targetPixelScale = pixel_scale*2/3;

60
targets/app/common/UI/UIController.cpp
View file

@ -245,7 +245,7 @@ UIController::UIController() {
m_iPressStartQuadrantsMask = 0;
m_currentRenderViewport = C4JRender::VIEWPORT_TYPE_FULLSCREEN;
m_currentRenderViewport = IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN;
m_bCustomRenderPosition = false;
m_winUserIndex = 0;
m_accumulatedTicks = 0;
@ -885,27 +885,27 @@ void UIController::renderScenes() {
#endif
}
void UIController::getRenderDimensions(C4JRender::eViewportType viewport,
void UIController::getRenderDimensions(IPlatformRenderer::eViewportType viewport,
S32& width, S32& height) {
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
width = (S32)(getScreenWidth());
height = (S32)(getScreenHeight());
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
width = (S32)(getScreenWidth() / 2);
height = (S32)(getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
width = (S32)(getScreenWidth() / 2);
height = (S32)(getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
width = (S32)(getScreenWidth() / 2);
height = (S32)(getScreenHeight() / 2);
break;
@ -914,36 +914,36 @@ void UIController::getRenderDimensions(C4JRender::eViewportType viewport,
}
}
void UIController::setupRenderPosition(C4JRender::eViewportType viewport) {
void UIController::setupRenderPosition(IPlatformRenderer::eViewportType viewport) {
if (m_bCustomRenderPosition || m_currentRenderViewport != viewport) {
m_currentRenderViewport = viewport;
m_bCustomRenderPosition = false;
S32 xPos = 0;
S32 yPos = 0;
switch (viewport) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
xPos = (S32)(getScreenWidth() / 4);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
xPos = (S32)(getScreenWidth() / 4);
yPos = (S32)(getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
yPos = (S32)(getScreenHeight() / 4);
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
xPos = (S32)(getScreenWidth() / 2);
yPos = (S32)(getScreenHeight() / 4);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
xPos = (S32)(getScreenWidth() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
yPos = (S32)(getScreenHeight() / 2);
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
xPos = (S32)(getScreenWidth() / 2);
yPos = (S32)(getScreenHeight() / 2);
break;
@ -971,18 +971,18 @@ void UIController::setupCustomDrawGameState() {
m_customRenderingClearRect.bottom = LONG_MIN;
#if defined(_WINDOWS64)
RenderManager.StartFrame();
PlatformRenderer.StartFrame();
gdraw_D3D11_setViewport_4J();
#elif defined(__linux__)
RenderManager.StartFrame();
PlatformRenderer.StartFrame();
#endif
RenderManager.Set_matrixDirty();
PlatformRenderer.Set_matrixDirty();
// 4J Stu - We don't need to clear this here as iggy hasn't written anything
// to the depth buffer. We DO however clear after we render which is why we
// still setup the rectangle here
// RenderManager.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect);
// PlatformRenderer.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect);
// glClear(GL_DEPTH_BUFFER_BIT);
glMatrixMode(GL_PROJECTION);
@ -1061,9 +1061,9 @@ void UIController::setupCustomDrawGameStateAndMatrices(
void UIController::endCustomDrawGameState() {
#if defined(__linux__)
RenderManager.Clear(GL_DEPTH_BUFFER_BIT);
PlatformRenderer.Clear(GL_DEPTH_BUFFER_BIT);
#else
RenderManager.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect);
PlatformRenderer.Clear(GL_DEPTH_BUFFER_BIT, &m_customRenderingClearRect);
#endif
// glClear(GL_DEPTH_BUFFER_BIT);
glDepthMask(false);
@ -1126,7 +1126,7 @@ GDrawTexture* RADLINK UIController::TextureSubstitutionCreateCallback(
if (image.getData() != nullptr) {
image.preMultiplyAlpha();
Textures* t = Minecraft::GetInstance()->textures;
int id = t->getTexture(&image, C4JRender::TEXTURE_FORMAT_RxGyBzAw,
int id = t->getTexture(&image, IPlatformRenderer::TEXTURE_FORMAT_RxGyBzAw,
false);
// 4J Stu - All our flash controls that allow replacing textures use
@ -1951,13 +1951,13 @@ void UIController::UpdatePlayerBasePositions() {
for (int idx = 0; idx < XUSER_MAX_COUNT; ++idx) {
if (pMinecraft->localplayers[idx] != nullptr) {
if (pMinecraft->localplayers[idx]->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_FULLSCREEN) {
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN) {
DisplayGamertag(idx, false);
} else {
DisplayGamertag(idx, true);
}
m_groups[idx + 1]->SetViewportType(
(C4JRender::eViewportType)pMinecraft->localplayers[idx]
(IPlatformRenderer::eViewportType)pMinecraft->localplayers[idx]
->m_iScreenSection);
} else {
// 4J Stu - This is a legacy thing from our XUI implementation that
@ -1965,7 +1965,7 @@ void UIController::UpdatePlayerBasePositions() {
// no longer exist is SLOW This should probably be on all platforms,
// but I don't have time to test them all just now!
m_groups[idx + 1]->SetViewportType(
C4JRender::VIEWPORT_TYPE_FULLSCREEN);
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN);
DisplayGamertag(idx, false);
}
}

8
targets/app/common/UI/UIController.h
View file

@ -22,7 +22,7 @@
#include "platform/PlatformTypes.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "app/common/UI/All Platforms/IUIController.h"
#include "app/common/UI/All Platforms/UIEnums.h"
@ -158,7 +158,7 @@ private:
int m_iPressStartQuadrantsMask;
C4JRender::eViewportType m_currentRenderViewport;
IPlatformRenderer::eViewportType m_currentRenderViewport;
bool m_bCustomRenderPosition;
static std::uint32_t m_dwTrialTimerLimitSecs;
@ -267,9 +267,9 @@ public:
}
virtual void render() = 0;
void getRenderDimensions(C4JRender::eViewportType viewport, S32& width,
void getRenderDimensions(IPlatformRenderer::eViewportType viewport, S32& width,
S32& height);
void setupRenderPosition(C4JRender::eViewportType viewport);
void setupRenderPosition(IPlatformRenderer::eViewportType viewport);
void setupRenderPosition(S32 xOrigin, S32 yOrigin);
void SetSysUIShowing(bool bVal);

8
targets/app/common/UI/UIGroup.cpp
View file

@ -1,7 +1,7 @@
#include "UIGroup.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/Tutorial/Tutorial.h"
#include "app/common/Tutorial/TutorialMode.h"
#include "app/common/UI/All Platforms/UIEnums.h"
@ -24,7 +24,7 @@ UIGroup::UIGroup(EUIGroup group, int iPad) {
m_bIgnorePlayerJoinMenuDisplayed = false;
// 4jcraft, moved this to the top
// uninitialized memory was read.
m_viewportType = C4JRender::VIEWPORT_TYPE_FULLSCREEN;
m_viewportType = IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN;
m_updateFocusStateCountdown = 0;
@ -242,7 +242,7 @@ void UIGroup::removeComponent(EUIScene scene, EUILayer layer) {
m_layers[layer]->removeComponent(scene);
}
void UIGroup::SetViewportType(C4JRender::eViewportType type) {
void UIGroup::SetViewportType(IPlatformRenderer::eViewportType type) {
if (m_viewportType != type) {
m_viewportType = type;
for (unsigned int i = 0; i < eUILayer_COUNT; ++i) {
@ -251,7 +251,7 @@ void UIGroup::SetViewportType(C4JRender::eViewportType type) {
}
}
C4JRender::eViewportType UIGroup::GetViewportType() { return m_viewportType; }
IPlatformRenderer::eViewportType UIGroup::GetViewportType() { return m_viewportType; }
void UIGroup::HandleDLCMountingComplete() {
// Ignore this group if the player isn't signed in

8
targets/app/common/UI/UIGroup.h
View file

@ -1,7 +1,7 @@
#pragma once
#include <stdint.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/linux/Iggy/include/rrCore.h"
#include "UILayer.h"
@ -24,7 +24,7 @@ private:
UIComponent_PressStartToPlay* m_pressStartToPlay;
UIScene_HUD* m_hud;
C4JRender::eViewportType m_viewportType;
IPlatformRenderer::eViewportType m_viewportType;
EUIGroup m_group;
int m_iPad;
@ -97,8 +97,8 @@ public:
UIScene* addComponent(int iPad, EUIScene scene, EUILayer layer);
void removeComponent(EUIScene scene, EUILayer layer);
void SetViewportType(C4JRender::eViewportType type);
C4JRender::eViewportType GetViewportType();
void SetViewportType(IPlatformRenderer::eViewportType type);
IPlatformRenderer::eViewportType GetViewportType();
virtual void HandleDLCMountingComplete();
virtual void HandleDLCInstalled();

6
targets/app/common/UI/UILayer.cpp
View file

@ -2,7 +2,7 @@
#include <algorithm>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/Components/UIComponent_Chat.h"
#include "app/common/UI/Components/UIComponent_DebugUIConsole.h"
@ -138,7 +138,7 @@ void UILayer::tick() {
}
}
void UILayer::render(S32 width, S32 height, C4JRender::eViewportType viewport) {
void UILayer::render(S32 width, S32 height, IPlatformRenderer::eViewportType viewport) {
if (!ui.IsExpectingOrReloadingSkin()) {
for (auto it = m_components.begin(); it != m_components.end(); ++it) {
auto itRef = m_componentRefCount.find((*it)->getSceneType());
@ -808,7 +808,7 @@ void UILayer::HandleMessage(EUIMessage message, void* data) {
bool UILayer::IsFullscreenGroup() { return m_parentGroup->IsFullscreenGroup(); }
C4JRender::eViewportType UILayer::getViewport() {
IPlatformRenderer::eViewportType UILayer::getViewport() {
return m_parentGroup->GetViewportType();
}

6
targets/app/common/UI/UILayer.h
View file

@ -6,7 +6,7 @@
#include <utility>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/linux/Iggy/include/rrCore.h"
@ -44,7 +44,7 @@ public:
UILayer(UIGroup* parent);
void tick();
void render(S32 width, S32 height, C4JRender::eViewportType viewport);
void render(S32 width, S32 height, IPlatformRenderer::eViewportType viewport);
void getRenderDimensions(S32& width, S32& height);
void DestroyAll();
@ -83,7 +83,7 @@ public:
public:
bool IsFullscreenGroup();
C4JRender::eViewportType getViewport();
IPlatformRenderer::eViewportType getViewport();
virtual void HandleDLCMountingComplete();
virtual void HandleDLCInstalled();

32
targets/app/common/UI/UIScene.cpp
View file

@ -5,7 +5,7 @@
#include <utility>
#include "platform/PlatformTypes.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl.h"
@ -145,7 +145,7 @@ F64 UIScene::getSafeZoneHalfHeight() {
float safeHeight = 0.0f;
if (!RenderManager.IsHiDef() && RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && PlatformRenderer.IsWidescreen()) {
// 90% safezone
safeHeight = height * (0.15f / 2);
} else {
@ -159,7 +159,7 @@ F64 UIScene::getSafeZoneHalfWidth() {
float width = ui.getScreenWidth();
float safeWidth = 0.0f;
if (!RenderManager.IsHiDef() && RenderManager.IsWidescreen()) {
if (!PlatformRenderer.IsHiDef() && PlatformRenderer.IsWidescreen()) {
// 85% safezone
safeWidth = width * (0.15f / 2);
} else {
@ -177,35 +177,35 @@ void UIScene::updateSafeZone() {
F64 safeRight = 0.0;
switch (m_parentLayer->getViewport()) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
safeTop = getSafeZoneHalfHeight();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
safeBottom = getSafeZoneHalfHeight();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
safeTop = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
safeTop = getSafeZoneHalfHeight();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
safeBottom = getSafeZoneHalfHeight();
safeLeft = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
safeBottom = getSafeZoneHalfHeight();
safeRight = getSafeZoneHalfWidth();
break;
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
default:
safeTop = getSafeZoneHalfHeight();
safeBottom = getSafeZoneHalfHeight();
@ -497,7 +497,7 @@ void UIScene::doHorizontalResizeCheck() {
m_funcHorizontalResizeCheck, 0, nullptr);
}
void UIScene::render(S32 width, S32 height, C4JRender::eViewportType viewport) {
void UIScene::render(S32 width, S32 height, IPlatformRenderer::eViewportType viewport) {
if (m_bIsReloading) return;
if (!m_hasTickedOnce || !swf) return;
ui.setupRenderPosition(viewport);
@ -560,7 +560,7 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion* region,
bool useCommandBuffers = false;
if (!useCommandBuffers || m_needsCacheRendered) {
if (useCommandBuffers) RenderManager.CBuffStart(list, true);
if (useCommandBuffers) PlatformRenderer.CBuffStart(list, true);
ui.setupCustomDrawMatrices(this, customDrawRegion);
_customDrawSlotControl(customDrawRegion, iPad, item, fAlpha,
isFoil, bDecorations,
@ -581,11 +581,11 @@ void UIScene::customDrawSlotControl(IggyCustomDrawCallbackRegion* region,
delete drawData;
}
if (useCommandBuffers) RenderManager.CBuffEnd();
if (useCommandBuffers) PlatformRenderer.CBuffEnd();
}
m_cachedSlotDraw.clear();
if (useCommandBuffers) RenderManager.CBuffCall(list);
if (useCommandBuffers) PlatformRenderer.CBuffCall(list);
// Finish GDraw and anything else that needs to be finalised
ui.endCustomDraw(region);

4
targets/app/common/UI/UIScene.h
View file

@ -13,7 +13,7 @@
#include <unordered_map>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/UI/All Platforms/UIEnums.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/common/UI/Controls/UIControl_Base.h"
@ -198,7 +198,7 @@ public:
// RENDERING
virtual void render(S32 width, S32 height,
C4JRender::eViewportType viewpBort);
IPlatformRenderer::eViewportType viewpBort);
virtual void customDraw(IggyCustomDrawCallbackRegion* region);

168
targets/app/linux/LinuxGL.cpp
View file

@ -1,168 +0,0 @@
#ifdef __linux__
#include "platform/sdl2/Render.h"
#include "platform/stubs.h"
#include "java/ByteBuffer.h"
#include "java/FloatBuffer.h"
#include "java/IntBuffer.h"
extern C4JRender RenderManager;
#ifdef GLES
extern "C" {
extern void glClearDepthf(float depth);
void glClearDepth(double depth) { glClearDepthf((float)depth); }
void glTexGeni(unsigned int, unsigned int, int) {}
void glTexGenfv(unsigned int, unsigned int, const float*) {}
void glTexCoordPointer(int, unsigned int, int, const void*) {}
void glNormalPointer(unsigned int, int, const void*) {}
void glColorPointer(int, unsigned int, int, const void*) {}
void glVertexPointer(int, unsigned int, int, const void*) {}
void glEndList(void) {}
void glCallLists(int, unsigned int, const void*) {}
}
#endif
inline int* getIntPtr(IntBuffer* buf) {
return buf ? (int*)buf->getBuffer() + buf->position() : nullptr;
}
inline void* getBytePtr(ByteBuffer* buf) {
return buf ? (char*)buf->getBuffer() + buf->position() : nullptr;
}
void glGenTextures_4J(IntBuffer* buf) {
if (!buf) return;
int n = buf->limit() - buf->position();
int* dst = getIntPtr(buf);
for (int i = 0; i < n; i++) dst[i] = RenderManager.TextureCreate();
}
void glDeleteTextures_4J(IntBuffer* buf) {
if (!buf) return;
int n = buf->limit() - buf->position();
int* src = getIntPtr(buf);
for (int i = 0; i < n; i++) RenderManager.TextureFree(src[i]);
}
void glTexImage2D_4J(int target, int level, int internalformat, int width,
int height, int border, int format, int type,
ByteBuffer* pixels) {
(void)target;
(void)internalformat;
(void)border;
(void)format;
(void)type;
RenderManager.TextureData(width, height, getBytePtr(pixels), level,
C4JRender::TEXTURE_FORMAT_RxGyBzAw);
}
void glLight_4J(int light, int pname, FloatBuffer* params) {
const float* p = params->_getDataPointer();
int idx = (light == 0x4001) ? 1 : 0;
if (pname == 0x1203)
RenderManager.StateSetLightDirection(idx, p[0], p[1], p[2]);
else if (pname == 0x1201)
RenderManager.StateSetLightColour(idx, p[0], p[1], p[2]);
else if (pname == 0x1200)
RenderManager.StateSetLightAmbientColour(p[0], p[1], p[2]);
}
void glLightModel_4J(int pname, FloatBuffer* params) {
if (pname == 0x0B53) {
const float* p = params->_getDataPointer();
RenderManager.StateSetLightAmbientColour(p[0], p[1], p[2]);
}
}
void glFog_4J(int pname, FloatBuffer* params) {
const float* p = params->_getDataPointer();
if (pname == 0x0B66) RenderManager.StateSetFogColour(p[0], p[1], p[2]);
}
void glGetFloat_4J(int pname, FloatBuffer* params) {
const float* m = RenderManager.MatrixGet(pname);
if (m) memcpy(params->_getDataPointer(), m, 16 * sizeof(float));
}
void glCallLists_4J(IntBuffer* lists) {
if (!lists) return;
int count = lists->limit() - lists->position();
int* ids = getIntPtr(lists);
for (int i = 0; i < count; i++) RenderManager.CBuffCall(ids[i], false);
}
void glReadPixels_4J(int x, int y, int w, int h, int f, int t, ByteBuffer* p) {
(void)f;
(void)t;
RenderManager.ReadPixels(x, y, w, h, getBytePtr(p));
}
// dead stubs
void glTexCoordPointer_4J(int, int, FloatBuffer*) {}
void glNormalPointer_4J(int, ByteBuffer*) {}
void glColorPointer_4J(int, bool, int, ByteBuffer*) {}
void glVertexPointer_4J(int, int, FloatBuffer*) {}
void glEndList_4J(int) {}
void glTexGen_4J(int, int, FloatBuffer*) {}
#include <dlfcn.h>
#include <stdio.h>
#include <string.h>
static PFNGLGENQUERIESARBPROC _glGenQueriesARB = nullptr;
static PFNGLBEGINQUERYARBPROC _glBeginQueryARB = nullptr;
static PFNGLENDQUERYARBPROC _glEndQueryARB = nullptr;
static PFNGLGETQUERYOBJECTUIVARBPROC _glGetQueryObjectuivARB = nullptr;
static bool _queriesInitialized = false;
static void initQueryFuncs() {
if (_queriesInitialized) return;
_queriesInitialized = true;
_glGenQueriesARB =
(PFNGLGENQUERIESARBPROC)dlsym(RTLD_DEFAULT, "glGenQueriesARB");
_glBeginQueryARB =
(PFNGLBEGINQUERYARBPROC)dlsym(RTLD_DEFAULT, "glBeginQueryARB");
_glEndQueryARB = (PFNGLENDQUERYARBPROC)dlsym(RTLD_DEFAULT, "glEndQueryARB");
_glGetQueryObjectuivARB = (PFNGLGETQUERYOBJECTUIVARBPROC)dlsym(
RTLD_DEFAULT, "glGetQueryObjectuivARB");
}
void glGenQueriesARB_4J(IntBuffer* buf) {
initQueryFuncs();
if (_glGenQueriesARB && buf) {
int n = buf->limit() - buf->position();
if (n > 0) _glGenQueriesARB(n, (GLuint*)getIntPtr(buf));
}
}
void glBeginQueryARB_4J(int target, int id) {
initQueryFuncs();
if (_glBeginQueryARB) _glBeginQueryARB((GLenum)target, (GLuint)id);
}
void glEndQueryARB_4J(int target) {
initQueryFuncs();
if (_glEndQueryARB) _glEndQueryARB((GLenum)target);
}
void glGetQueryObjectuARB_4J(int id, int pname, IntBuffer* params) {
initQueryFuncs();
if (_glGetQueryObjectuivARB && params)
// LWJGL does not change limits/positions during these calls, it
// reads/writes exactly at pointer!!
_glGetQueryObjectuivARB((GLuint)id, (GLenum)pname,
(GLuint*)getIntPtr(params));
}
void glGetFloat(int pname, FloatBuffer* params) {
glGetFloat_4J(pname, params);
}
void LinuxGLLogLightmapState(const char* stage, int textureId,
bool scaleLight) {
static int logCount = 0;
if (logCount >= 16) return;
++logCount;
fprintf(stderr, "[linux-lightmap] %s tex=%d scale=%d\n", stage, textureId,
scaleLight ? 1 : 0);
}
#endif

42
targets/app/linux/LinuxGL.h
View file

@ -1,42 +0,0 @@
#pragma once
#ifdef __linux__
#include <GL/gl.h>
#include <GL/glu.h>
class FloatBuffer;
class IntBuffer;
class ByteBuffer;
void glGenTextures(IntBuffer*);
int glGenTextures();
void glDeleteTextures(IntBuffer*);
void glLight(int, int, FloatBuffer*);
void glLightModel(int, FloatBuffer*);
void glGetFloat(int a, FloatBuffer* b);
void glTexCoordPointer(int, int, int, int);
void glTexCoordPointer(int, int, FloatBuffer*);
void glNormalPointer(int, int, int);
void glNormalPointer(int, ByteBuffer*);
void glColorPointer(int, bool, int, ByteBuffer*);
void glColorPointer(int, int, int, int);
void glVertexPointer(int, int, int, int);
void glVertexPointer(int, int, FloatBuffer*);
void glNewList(int, int);
void glEndList(int vertexCount = 0);
void glTexImage2D(int, int, int, int, int, int, int, int, ByteBuffer*);
void glCallLists(IntBuffer*);
void glGenQueriesARB(IntBuffer*);
void glBeginQueryARB(int, int);
void glEndQueryARB(int);
void glGetQueryObjectuARB(int, int, IntBuffer*);
void glFog(int, FloatBuffer*);
void glTexGen(int, int, FloatBuffer*);
void glReadPixels(int, int, int, int, int, int, ByteBuffer*);
void glTexGeni(int, int, int);
void glMultiTexCoord2f(int, float, float);
void glClientActiveTexture(int);
void glActiveTexture(int);
#endif

4
targets/app/linux/LinuxGame.cpp
View file

@ -5,7 +5,7 @@
#include <string>
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "minecraft/GameEnums.h"
#include "app/common/Game.h"
@ -28,7 +28,7 @@ void LinuxGame::SetRichPresenceContext(int iPad, int contextId) {}
void LinuxGame::StoreLaunchData() {}
void LinuxGame::ExitGame() {
app.DebugPrintf("Linux_App LinuxGame::ExitGame AFTER START\n");
RenderManager.Close();
PlatformRenderer.Close();
}
void LinuxGame::FatalLoadError() {
app.DebugPrintf(

20
targets/app/linux/Linux_Minecraft.cpp
View file

@ -56,7 +56,7 @@ static void sigsegv_handler(int sig) {
#include "platform/PlatformTypes.h"
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "app/common/App_Defines.h"
#include "app/common/Audio/SoundEngine.h"
@ -439,13 +439,13 @@ int main(int argc, const char* argv[]) {
reqH = atoi(argv[++i]);
}
}
if (reqW > 0 && reqH > 0) RenderManager.SetWindowSize(reqW, reqH);
if (fs) RenderManager.SetFullscreen(true);
if (reqW > 0 && reqH > 0) PlatformRenderer.SetWindowSize(reqW, reqH);
if (fs) PlatformRenderer.SetFullscreen(true);
}
static bool bTrialTimerDisplayed = true;
RenderManager.Initialise();
PlatformRenderer.Initialise();
// Read the file containing the product codes
app.DebugPrintf("---ReadProductCodes()\n");
@ -523,11 +523,11 @@ int main(int argc, const char* argv[]) {
app.InitGameSettings();
app.InitialiseTips();
while (!RenderManager.ShouldClose()) {
RenderManager.StartFrame();
while (!PlatformRenderer.ShouldClose()) {
PlatformRenderer.StartFrame();
if (pMinecraft->pollResize()) {
int fbw, fbh;
RenderManager.GetFramebufferSize(fbw, fbh);
PlatformRenderer.GetFramebufferSize(fbw, fbh);
ui.setScreenSize(fbw, fbh);
}
app.UpdateTime();
@ -537,7 +537,7 @@ int main(int argc, const char* argv[]) {
PlatformStorage.Tick();
RenderManager.Tick();
PlatformRenderer.Tick();
// Tick the social networking manager.
// CSocialManager::Instance()->Tick();
@ -586,7 +586,7 @@ int main(int argc, const char* argv[]) {
ui.render();
// Present the frame.
RenderManager.Present();
PlatformRenderer.Present();
ui.CheckMenuDisplayed();
// has the game defined profile data been changed (by a profile load)
@ -638,7 +638,7 @@ int main(int argc, const char* argv[]) {
// Graceful shutdown: destroy GL context and GLFW before any C++ dtors run.
// Without this, static/global destructors that touch GL objects cause
// SIGSEGV.
RenderManager.Shutdown();
PlatformRenderer.Shutdown();
_exit(0);
} // end main

2
targets/app/linux/Linux_UIController.cpp
View file

@ -1,7 +1,7 @@
#include <GL/gl.h>
// GDraw GL backend for Linux
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Linux_UIController.h"
#include "app/common/UI/All Platforms/UIStructs.h"
#include "app/linux/Iggy/gdraw/gdraw.h"

2
targets/app/windows/Windows64_UIController.cpp
View file

@ -150,7 +150,7 @@ GDrawTexture* ConsoleUIController::getSubstitutionTexture(int textureId) {
this texture, or stream video into it. Wrapped textures take up a handle.
They will never be freed or otherwise modified by GDraw; nor will GDraw
change any reference counts. All this is up to the application. */
ID3D11ShaderResourceView* tex = RenderManager.TextureGetTexture(textureId);
ID3D11ShaderResourceView* tex = PlatformRenderer.TextureGetTexture(textureId);
ID3D11Resource* resource;
tex->GetResource(&resource);
ID3D11Texture2D* tex2d = (ID3D11Texture2D*)resource;

10
targets/app/windows/src/Windows64_Minecraft.cpp
View file

@ -635,7 +635,7 @@ int32_t InitDevice() {
vp.TopLeftY = 0;
g_pImmediateContext->RSSetViewports(1, &vp);
RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
PlatformRenderer.Initialise(g_pd3dDevice, g_pSwapChain);
return 0;
}
@ -706,7 +706,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
app.loadMediaArchive();
RenderManager.Initialise(g_pd3dDevice, g_pSwapChain);
PlatformRenderer.Initialise(g_pd3dDevice, g_pSwapChain);
app.loadStringTable();
ui.init(g_pd3dDevice, g_pImmediateContext, g_pRenderTargetView,
@ -780,7 +780,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
DispatchMessage(&msg);
continue;
}
RenderManager.StartFrame();
PlatformRenderer.StartFrame();
// static bool bPlay=false;
// if(bPlay)
@ -796,7 +796,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
PlatformStorage.Tick();
RenderManager.Tick();
PlatformRenderer.Tick();
// Tick the social networking manager.
// CSocialManager::Instance()->Tick();
@ -830,7 +830,7 @@ int APIENTRY _tWinMain(_In_ HINSTANCE hInstance,
ui.tick();
ui.render();
// Present the frame.
RenderManager.Present();
PlatformRenderer.Present();
ui.CheckMenuDisplayed();
// Any threading type things to deal with from the xui side?

10
targets/minecraft/client/BufferedImage.cpp
View file

@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/DLC/DLCFile.h"
#include "app/common/DLC/DLCManager.h"
#include "app/common/DLC/DLCPack.h"
@ -94,13 +94,13 @@ BufferedImage::BufferedImage(const std::wstring& File,
if (foundOnDisk) {
std::string nativePath = std::filesystem::path(finalPath).string();
hr = RenderManager.LoadTextureData(nativePath.c_str(),
hr = PlatformRenderer.LoadTextureData(nativePath.c_str(),
&ImageInfo, &data[l]);
} else {
std::wstring archiveKey = L"res/" + fileName;
if (gameServices().hasArchiveFile(archiveKey)) {
std::vector<uint8_t> ba = gameServices().getArchiveFile(archiveKey);
hr = RenderManager.LoadTextureData(ba.data(), ba.size(),
hr = PlatformRenderer.LoadTextureData(ba.data(), ba.size(),
&ImageInfo, &data[l]);
}
}
@ -152,7 +152,7 @@ BufferedImage::BufferedImage(DLCPack* dlcPack, const std::wstring& File,
}
D3DXIMAGE_INFO ImageInfo;
hr = RenderManager.LoadTextureData(pbData, dataBytes, &ImageInfo,
hr = PlatformRenderer.LoadTextureData(pbData, dataBytes, &ImageInfo,
&data[l]);
if (hr == ERROR_SUCCESS && l == 0) {
width = ImageInfo.Width;
@ -169,7 +169,7 @@ BufferedImage::BufferedImage(std::uint8_t* pbData, std::uint32_t dataBytes) {
D3DXIMAGE_INFO ImageInfo;
memset(&ImageInfo, 0, sizeof(D3DXIMAGE_INFO));
int32_t hr =
RenderManager.LoadTextureData(pbData, dataBytes, &ImageInfo, &data[0]);
PlatformRenderer.LoadTextureData(pbData, dataBytes, &ImageInfo, &data[0]);
if (hr == ERROR_SUCCESS) {
width = ImageInfo.Width;

3
targets/minecraft/client/Lighting.cpp
View file

@ -2,8 +2,7 @@
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/stubs.h"
#include "platform/renderer/renderer.h"
#include "java/FloatBuffer.h"
#include "minecraft/world/phys/Vec3.h"

3
targets/minecraft/client/MemoryTracker.cpp
View file

@ -2,8 +2,9 @@
#include <utility>
#include <vector>
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "java/ByteBuffer.h"
std::unordered_map<int, int> MemoryTracker::GL_LIST_IDS;

59
targets/minecraft/client/Minecraft.cpp
View file

@ -14,7 +14,7 @@
#include <thread>
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/storage/storage.h"
#include "minecraft/GameEnums.h"
#include "app/common/Audio/SoundEngine.h"
@ -111,7 +111,6 @@
#include "app/common/Tutorial/FullTutorialMode.h"
#include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
#include "app/common/UI/UIFontData.h"
#include "platform/stubs.h"
#include "util/StringHelpers.h"
#include "java/File.h"
#include "java/System.h"
@ -234,7 +233,7 @@ Minecraft::Minecraft(Component* mouseComponent, Canvas* parent,
// code that the width is 3/4 what it actually is, to correctly present a
// 4:3 image. Have added width_phys and height_phys for any code we add that
// requires to know the real physical dimensions of the frame buffer.
if (RenderManager.IsWidescreen()) {
if (PlatformRenderer.IsWidescreen()) {
this->width = width;
} else {
this->width = (width * 3) / 4;
@ -391,7 +390,7 @@ void Minecraft::init() {
}
progressRenderer = new ProgressRenderer(this);
RenderManager.CBuffLockStaticCreations();
PlatformRenderer.CBuffLockStaticCreations();
}
void Minecraft::renderLoadingScreen() {
@ -401,7 +400,7 @@ void Minecraft::renderLoadingScreen() {
ScreenSizeCalculator ssc(options, width, height);
// xxx
RenderManager.StartFrame();
PlatformRenderer.StartFrame();
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
@ -442,7 +441,7 @@ void Minecraft::renderLoadingScreen() {
// Display::swapBuffers();
// xxx
RenderManager.Present();
PlatformRenderer.Present();
#endif
}
@ -707,7 +706,7 @@ void Minecraft::updatePlayerViewportAssignments() {
for (int i = 0; i < XUSER_MAX_COUNT; i++) {
if (localplayers[i] != nullptr)
localplayers[i]->m_iScreenSection =
C4JRender::VIEWPORT_TYPE_FULLSCREEN;
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN;
}
} else if (viewportsRequired == 2) {
// Split screen - TODO - option for vertical/horizontal split
@ -718,10 +717,10 @@ void Minecraft::updatePlayerViewportAssignments() {
if (gameServices().getGameSettings(PlatformInput.GetPrimaryPad(),
eGameSetting_SplitScreenVertical)) {
localplayers[i]->m_iScreenSection =
C4JRender::VIEWPORT_TYPE_SPLIT_LEFT + found;
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT + found;
} else {
localplayers[i]->m_iScreenSection =
C4JRender::VIEWPORT_TYPE_SPLIT_TOP + found;
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP + found;
}
found++;
}
@ -740,18 +739,18 @@ void Minecraft::updatePlayerViewportAssignments() {
// quadrant, but ending up in the 3rd viewport.
if (gameServices().getGameStarted()) {
if ((localplayers[i]->m_iScreenSection >=
C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT) &&
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT) &&
(localplayers[i]->m_iScreenSection <=
C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT)) {
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT)) {
quadrantsAllocated
[localplayers[i]->m_iScreenSection -
C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT] = true;
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT] = true;
}
} else {
// Reset the viewport so that it can be assigned in the next
// loop
localplayers[i]->m_iScreenSection =
C4JRender::VIEWPORT_TYPE_FULLSCREEN;
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN;
}
}
}
@ -761,13 +760,13 @@ void Minecraft::updatePlayerViewportAssignments() {
for (int i = 0; i < XUSER_MAX_COUNT; i++) {
if (localplayers[i] != nullptr) {
if ((localplayers[i]->m_iScreenSection <
C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT) ||
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT) ||
(localplayers[i]->m_iScreenSection >
C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT)) {
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT)) {
for (int j = 0; j < 4; j++) {
if (!quadrantsAllocated[j]) {
localplayers[i]->m_iScreenSection =
C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT + j;
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT + j;
quadrantsAllocated[j] = true;
break;
}
@ -841,7 +840,7 @@ std::shared_ptr<MultiplayerLocalPlayer> Minecraft::createExtraLocalPlayer(
if (clientConnection == nullptr) return nullptr;
if (clientConnection == m_pendingLocalConnections[idx]) {
int tempScreenSection = C4JRender::VIEWPORT_TYPE_FULLSCREEN;
int tempScreenSection = IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN;
if (localplayers[idx] != nullptr && localgameModes[idx] == nullptr) {
// A temp player displaying a connecting screen
tempScreenSection = localplayers[idx]->m_iScreenSection;
@ -1383,7 +1382,7 @@ void Minecraft::run_middle() {
!ui.IsIgnorePlayerJoinMenuDisplayed(
PlatformInput.GetPrimaryPad()) &&
g_NetworkManager.SessionHasSpace() &&
RenderManager.IsHiDef() &&
PlatformRenderer.IsHiDef() &&
PlatformInput.ButtonPressed(i);
if (tryJoin) {
if (!ui.PressStartPlaying(i)) {
@ -1650,8 +1649,8 @@ void Minecraft::run_middle() {
int iPrimaryPad = PlatformInput.GetPrimaryPad();
for (int i = 0; i < XUSER_MAX_COUNT; i++) {
if (setLocalPlayerIdx(i)) {
RenderManager.StateSetViewport(
(C4JRender::eViewportType)
PlatformRenderer.StateSetViewport(
(IPlatformRenderer::eViewportType)
player->m_iScreenSection);
gameRenderer->render(timer->a, bFirst);
bFirst = false;
@ -1679,8 +1678,8 @@ void Minecraft::run_middle() {
// GameRenderer directly so mc->screen draws.
if (bFirst) {
localPlayerIdx = 0;
RenderManager.StateSetViewport(
C4JRender::VIEWPORT_TYPE_FULLSCREEN);
PlatformRenderer.StateSetViewport(
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN);
gameRenderer->render(timer->a, true);
}
#endif
@ -1689,21 +1688,21 @@ void Minecraft::run_middle() {
// black
if (unoccupiedQuadrant > -1) {
// render a logo
RenderManager.StateSetViewport((
C4JRender::
eViewportType)(C4JRender::
PlatformRenderer.StateSetViewport((
IPlatformRenderer::
eViewportType)(IPlatformRenderer::
VIEWPORT_TYPE_QUADRANT_TOP_LEFT +
unoccupiedQuadrant));
glClearColor(0, 0, 0, 0);
glClear(GL_COLOR_BUFFER_BIT);
ui.SetEmptyQuadrantLogo(
C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT +
IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT +
unoccupiedQuadrant);
}
setLocalPlayerIdx(iPrimaryPad);
RenderManager.StateSetViewport(
C4JRender::VIEWPORT_TYPE_FULLSCREEN);
PlatformRenderer.StateSetViewport(
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN);
}
glFlush();
@ -1936,7 +1935,7 @@ void Minecraft::pauseGame() {
bool Minecraft::pollResize() {
int fbw, fbh;
RenderManager.GetFramebufferSize(fbw, fbh);
PlatformRenderer.GetFramebufferSize(fbw, fbh);
if (fbw != width_phys || fbh != height_phys) {
resize(fbw, fbh);
return true;
@ -1951,7 +1950,7 @@ void Minecraft::resize(int width, int height) {
// for non-widescreen aspect ratio to fix UI scaling.
this->width_phys = width;
this->height_phys = height;
if (RenderManager.IsWidescreen()) {
if (PlatformRenderer.IsWidescreen()) {
this->width = width;
} else {
this->width = (width * 3) / 4;

1
targets/minecraft/client/Options.cpp
View file

@ -4,7 +4,6 @@
#include "KeyMapping.h"
#include "app/common/Audio/SoundEngine.h"
#include "app/linux/LinuxGame.h"
#include "platform/stubs.h"
#include "util/StringHelpers.h"
#include "java/File.h"
#include "java/InputOutputStream/BufferedReader.h"

2
targets/minecraft/client/gui/Button.cpp
View file

@ -1,6 +1,6 @@
#include "Button.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/renderer/Textures.h"
#include "minecraft/client/resources/ResourceLocation.h"

2
targets/minecraft/client/gui/DeathScreen.cpp
View file

@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Button.h"
#include "PauseScreen.h"
#include "util/StringHelpers.h"

3
targets/minecraft/client/gui/Font.cpp
View file

@ -4,8 +4,9 @@
#include <utility>
#include <vector>
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/BufferedImage.h"
#include "util/StringHelpers.h"
#include "java/Random.h"

47
targets/minecraft/client/gui/Gui.cpp
View file

@ -6,7 +6,7 @@
#include "platform/PlatformTypes.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Facing.h"
#include "minecraft/GameEnums.h"
#include "app/common/App_structs.h"
@ -56,7 +56,6 @@
#include "minecraft/world/level/storage/LevelData.h"
#include "minecraft/world/level/tile/PortalTile.h"
#include "minecraft/world/level/tile/Tile.h"
#include "platform/stubs.h"
#include "strings.h"
@ -104,7 +103,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
// scaling above to move the gui out of the way of the
// tool tips
int guiScale; // = ( minecraft->player->m_iScreenSection ==
// C4JRender::VIEWPORT_TYPE_FULLSCREEN ? 3 : 2 );
// IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN ? 3 : 2 );
int iPad = minecraft->player->GetXboxPad();
int iWidthOffset = 0,
iHeightOffset = 0; // used to get the interface looking right on a 2
@ -112,7 +111,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
// 4J-PB - selected the gui scale based on the slider settings
if (minecraft->player->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_FULLSCREEN) {
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN) {
guiScale = gameServices().getGameSettings(iPad, eGameSetting_UISize) + 2;
} else {
guiScale =
@ -148,14 +147,14 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
// Check which screen section this player is in
switch (minecraft->player->m_iScreenSection) {
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
// single player
iSafezoneXHalf = screenWidth / 20; // 5%
iSafezoneYHalf = screenHeight / 20; // 5%
iSafezoneTopYHalf = iSafezoneYHalf;
iTooltipsYOffset = 40 + splitYOffset;
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
iSafezoneXHalf =
screenWidth /
10; // 5% (need to treat the whole screen is 2x this screen)
@ -168,7 +167,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
bTwoPlayerSplitscreen = true;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
iSafezoneXHalf =
screenWidth /
10; // 5% (need to treat the whole screen is 2x this screen)
@ -183,7 +182,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
bTwoPlayerSplitscreen = true;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT:
iSafezoneXHalf =
screenWidth / 10; // 5% (the whole screen is 2x this screen)
iSafezoneYHalf = splitYOffset +
@ -196,7 +195,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
bTwoPlayerSplitscreen = true;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT:
iSafezoneXHalf = 0;
iSafezoneYHalf = splitYOffset +
screenHeight / 10; // 5% (need to treat the whole
@ -208,7 +207,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
bTwoPlayerSplitscreen = true;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_LEFT:
iSafezoneXHalf =
screenWidth / 10; // 5% (the whole screen is 2x this screen)
iSafezoneYHalf = splitYOffset;
@ -216,14 +215,14 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
iTooltipsYOffset = 44;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_TOP_RIGHT:
iSafezoneXHalf = 0;
iSafezoneYHalf = splitYOffset; // 5%
iSafezoneTopYHalf = screenHeight / 10;
iTooltipsYOffset = 44;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_LEFT:
iSafezoneXHalf =
screenWidth / 10; // 5% (the whole screen is 2x this screen)
iSafezoneYHalf =
@ -233,7 +232,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
iTooltipsYOffset = 44;
currentGuiScaleFactor *= 0.5f;
break;
case C4JRender::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
case IPlatformRenderer::VIEWPORT_TYPE_QUADRANT_BOTTOM_RIGHT:
iSafezoneXHalf = 0;
iSafezoneYHalf =
splitYOffset +
@ -253,7 +252,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
// if tooltips are off, set the y offset to zero
if (gameServices().getGameSettings(iPad, eGameSetting_Tooltips) == 0 && bDisplayGui) {
switch (minecraft->player->m_iScreenSection) {
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
iTooltipsYOffset = screenHeight / 10;
break;
default:
@ -358,10 +357,10 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
fVal = fAlphaIncrementPerCent * (float)ucAlpha;
}
RenderManager.StateSetBlendFactor(0xffffff |
PlatformRenderer.StateSetBlendFactor(0xffffff |
(((unsigned int)fVal) << 24));
currentGuiBlendFactor = fVal / 255.0f;
// RenderManager.StateSetBlendFactor(0x40ffffff);
// PlatformRenderer.StateSetBlendFactor(0x40ffffff);
glBlendFunc(GL_CONSTANT_ALPHA, GL_ONE_MINUS_CONSTANT_ALPHA);
blitOffset = -90;
@ -410,7 +409,7 @@ void Gui::render(float a, bool mouseFree, int xMouse, int yMouse) {
minecraft->textures->bindTexture(
&GUI_ICONS_LOCATION); // L"/gui/icons.png"));
glEnable(GL_BLEND);
RenderManager.StateSetBlendFactor(0xffffff |
PlatformRenderer.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);
@ -1374,9 +1373,9 @@ void Gui::addMessage(const std::wstring& _string, int iPad,
std::wstring string = _string; // 4J - Take copy of input as it is const
// int iScale=1;
// if((minecraft->player->m_iScreenSection==C4JRender::VIEWPORT_TYPE_SPLIT_TOP)
// if((minecraft->player->m_iScreenSection==IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP)
// ||
// (minecraft->player->m_iScreenSection==C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM))
// (minecraft->player->m_iScreenSection==IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM))
//{
// iScale=2;
// }
@ -1404,10 +1403,10 @@ void Gui::addMessage(const std::wstring& _string, int iPad,
int maximumChars;
switch (minecraft->player->m_iScreenSection) {
case C4JRender::VIEWPORT_TYPE_SPLIT_TOP:
case C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM:
case C4JRender::VIEWPORT_TYPE_FULLSCREEN:
if (RenderManager.IsHiDef()) {
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP:
case IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM:
case IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN:
if (PlatformRenderer.IsHiDef()) {
maximumChars = 105;
} else {
maximumChars = 55;
@ -1416,7 +1415,7 @@ void Gui::addMessage(const std::wstring& _string, int iPad,
case XC_LANGUAGE_JAPANESE:
case XC_LANGUAGE_TCHINESE:
case XC_LANGUAGE_KOREAN:
if (RenderManager.IsHiDef()) {
if (PlatformRenderer.IsHiDef()) {
maximumChars = 70;
} else {
maximumChars = 35;

3
targets/minecraft/client/gui/GuiComponent.cpp
View file

@ -3,8 +3,7 @@
#include <GL/gl.h>
#include <math.h>
#include "platform/sdl2/Render.h"
#include "platform/stubs.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/gui/Font.h"
#include "minecraft/client/gui/Gui.h"

4
targets/minecraft/client/gui/Minimap.cpp
View file

@ -7,7 +7,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Font.h"
#include "minecraft/GameEnums.h"
#include "app/common/Colours/ColourTable.h"
@ -29,7 +29,7 @@ Minimap::Minimap(Font* font, Options* options, Textures* textures,
this->font = font;
BufferedImage* img = new BufferedImage(w, h, BufferedImage::TYPE_INT_ARGB);
mapTexture =
textures->getTexture(img, C4JRender::TEXTURE_FORMAT_RxGyBzAw,
textures->getTexture(img, IPlatformRenderer::TEXTURE_FORMAT_RxGyBzAw,
false); // 4J - make sure we aren't mipmapping as
// we never set the data for mipmaps
delete img;

2
targets/minecraft/client/gui/Screen.cpp
View file

@ -101,7 +101,7 @@ void Screen::updateEvents() {
// TODO: update for SDL if we ever get around to that
#if (defined(ENABLE_JAVA_GUIS))
int fbw, fbh;
RenderManager.GetFramebufferSize(fbw, fbh);
PlatformRenderer.GetFramebufferSize(fbw, fbh);
glViewport(0, 0, fbw, fbh);
ScreenSizeCalculator ssc(minecraft->options, minecraft->width,
minecraft->height);

2
targets/minecraft/client/gui/SlideButton.cpp
View file

@ -1,6 +1,6 @@
#include "SlideButton.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/Options.h"
#include "minecraft/client/gui/Button.h"

1
targets/minecraft/client/gui/TradeSwitchButton.cpp
View file

@ -1,6 +1,7 @@
#include "TradeSwitchButton.h"
#include <string>
#include <GL/gl.h>
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/gui/Button.h"

4
targets/minecraft/client/gui/achievement/AchievementPopup.cpp
View file

@ -2,7 +2,7 @@
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "java/System.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/gui/Font.h"
@ -44,7 +44,7 @@ void AchievementPopup::permanent(Achievement* ach) {
void AchievementPopup::prepareWindow() {
{
int fbw, fbh;
RenderManager.GetFramebufferSize(fbw, fbh);
PlatformRenderer.GetFramebufferSize(fbw, fbh);
glViewport(0, 0, fbw, fbh);
} // just future proofing
glMatrixMode(GL_PROJECTION);

2
targets/minecraft/client/gui/achievement/AchievementScreen.cpp
View file

@ -5,7 +5,7 @@
#include <string>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/stubs.h"
#include "minecraft/client/KeyMapping.h"
#include "minecraft/client/Minecraft.h"

2
targets/minecraft/client/gui/inventory/AbstractBeaconButton.cpp
View file

@ -2,7 +2,7 @@
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/gui/Button.h"
#include "minecraft/client/renderer/Textures.h"
#include "minecraft/client/resources/ResourceLocation.h"

2
targets/minecraft/client/gui/inventory/BeaconScreen.cpp
View file

@ -6,7 +6,7 @@
#include <string>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "BeaconCancelButton.h"
#include "BeaconConfirmButton.h"
#include "BeaconPowerButton.h"

1
targets/minecraft/client/gui/inventory/BrewingStandScreen.cpp
View file

@ -1,6 +1,7 @@
#include "BrewingStandScreen.h"
#include <memory>
#include <GL/gl.h>
#include "minecraft/client/gui/Font.h"
#include "minecraft/client/gui/inventory/AbstractContainerScreen.h"

2
targets/minecraft/client/gui/inventory/CreativeInventoryScreen.cpp
View file

@ -7,7 +7,7 @@
#include <string>
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "AbstractContainerScreen.h"
#include "app/common/UI/All Platforms/IUIScene_CreativeMenu.h"
#include "app/linux/LinuxGame.h"

3
targets/minecraft/client/gui/inventory/EnchantmentScreen.cpp
View file

@ -6,6 +6,7 @@
#include <memory>
#include <sstream>
#include <string>
#include <GL/gl.h>
#include "AbstractContainerScreen.h"
#include "minecraft/client/Lighting.h"
@ -159,7 +160,7 @@ void EnchantmentScreen::renderBg(float a) {
240 * scaleFactor);
glTranslatef(-0.34f, 0.23f, 0.0f);
gluPerspective(90.0f, 1.3333334f, 9.0f, 80.0f);
PlatformRenderer.MatrixPerspective(90.0f, 1.3333334f, 9.0f, 80.0f);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();

1
targets/minecraft/client/gui/inventory/HorseInventoryScreen.cpp
View file

@ -2,6 +2,7 @@
#include <cmath>
#include <string>
#include <GL/gl.h>
#include "minecraft/client/Lighting.h"
#include "minecraft/client/Minecraft.h"

2
targets/minecraft/client/gui/inventory/InventoryScreen.cpp
View file

@ -4,7 +4,7 @@
#include <string>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/Lighting.h"
#include "minecraft/client/Minecraft.h"
#include "minecraft/client/gui/Button.h"

1
targets/minecraft/client/gui/inventory/MerchantScreen.cpp
View file

@ -3,6 +3,7 @@
#include <memory>
#include <string>
#include <vector>
#include <GL/gl.h>
#include "AbstractContainerScreen.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"

2
targets/minecraft/client/gui/inventory/RepairScreen.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "java/InputOutputStream/ByteArrayOutputStream.h"
#include "java/InputOutputStream/DataOutputStream.h"
#include "minecraft/client/Minecraft.h"

2
targets/minecraft/client/gui/inventory/TextEditScreen.cpp
View file

@ -2,7 +2,7 @@
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "platform/stubs.h"
#include "minecraft/SharedConstants.h"
#include "minecraft/client/Minecraft.h"

2
targets/minecraft/client/model/ChickenModel.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"

2
targets/minecraft/client/model/GhastModel.cpp
View file

@ -4,7 +4,7 @@
#include <memory>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "java/Random.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"

2
targets/minecraft/client/model/HumanoidModel.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/linux/LinuxGame.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"

2
targets/minecraft/client/model/ModelHorse.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"
#include "minecraft/util/Mth.h"

2
targets/minecraft/client/model/OcelotModel.cpp
View file

@ -6,7 +6,7 @@
#include <numbers>
#include <string>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/ModelPart.h"
#include "minecraft/world/entity/LivingEntity.h"
#include "minecraft/world/entity/animal/Ocelot.h"

3
targets/minecraft/client/model/QuadrupedModel.cpp
View file

@ -5,9 +5,10 @@
#include <memory>
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"
#include <GL/gl.h>
QuadrupedModel::QuadrupedModel(int legSize, float g) : Model() {
yHeadOffs = 8;

2
targets/minecraft/client/model/WolfModel.cpp
View file

@ -5,7 +5,7 @@
#include <memory>
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"
#include "minecraft/world/entity/LivingEntity.h"

4
targets/minecraft/client/model/dragon/DragonModel.cpp
View file

@ -6,9 +6,9 @@
#include <numbers>
#include <string>
#include <vector>
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/Model.h"
#include "minecraft/client/model/geom/ModelPart.h"
#include "minecraft/world/entity/Entity.h"

3
targets/minecraft/client/model/dragon/EnderCrystalModel.cpp
View file

@ -2,8 +2,9 @@
#include <memory>
#include <string>
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/model/geom/ModelPart.h"
EnderCrystalModel::EnderCrystalModel(float g) {

2
targets/minecraft/client/model/geom/ModelPart.cpp
View file

@ -4,7 +4,7 @@
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Cube.h"
#include "TexOffs.h"
#include "minecraft/client/MemoryTracker.h"

2
targets/minecraft/client/particle/FootstepParticle.cpp
View file

@ -4,7 +4,7 @@
#include <cmath>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/client/particle/Particle.h"
#include "minecraft/client/particle/ParticleEngine.h"
#include "minecraft/client/renderer/Tesselator.h"

2
targets/minecraft/client/particle/HugeExplosionParticle.cpp
View file

@ -2,7 +2,7 @@
#include <GL/gl.h>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/Colours/ColourTable.h"
#include "java/Random.h"

2
targets/minecraft/client/particle/ParticleEngine.cpp
View file

@ -6,7 +6,7 @@
#include <algorithm>
#include <numbers>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Particle.h"
#include "TerrainParticle.h"
#include "util/StringHelpers.h"

2
targets/minecraft/client/particle/TakeAnimationParticle.cpp
View file

@ -4,7 +4,7 @@
#include <cmath>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/SharedConstants.h"
#include "minecraft/client/particle/Particle.h"
#include "minecraft/client/particle/ParticleEngine.h"

4
targets/minecraft/client/player/LocalPlayer.cpp
View file

@ -30,7 +30,7 @@
// 4J Stu - Added for tutorial callbacks
#include "platform/input/input.h"
#include "platform/profile/profile.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/common/App_structs.h"
#include "app/common/Audio/SoundEngine.h"
#include "app/common/Network/GameNetworkManager.h"
@ -124,7 +124,7 @@ LocalPlayer::LocalPlayer(Minecraft* minecraft, Level* level, User* user,
input = nullptr;
m_iPad = -1;
m_iScreenSection =
C4JRender::VIEWPORT_TYPE_FULLSCREEN; // assume singleplayer default
IPlatformRenderer::VIEWPORT_TYPE_FULLSCREEN; // assume singleplayer default
m_bPlayerRespawned = false;
ullButtonsPressed = 0LL;
ullDpad_last = ullDpad_this = ullDpad_filtered = 0;

10
targets/minecraft/client/renderer/Chunk.cpp
View file

@ -9,7 +9,7 @@
#include <utility>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "LevelRenderer.h"
#include "app/linux/Stubs/winapi_stubs.h"
#include "util/FrameProfiler.h"
@ -412,7 +412,7 @@ void Chunk::rebuild() {
levelRenderer->setGlobalChunkFlag(this->x, this->y, this->z, level,
LevelRenderer::CHUNK_FLAG_EMPTY0,
currentLayer);
RenderManager.CBuffClear(lists + currentLayer);
PlatformRenderer.CBuffClear(lists + currentLayer);
}
int globalIdx = levelRenderer->getGlobalIndexForChunk(this->x, this->y,
@ -523,12 +523,12 @@ void Chunk::rebuild() {
levelRenderer->setGlobalChunkFlag(this->x, this->y, this->z, level,
LevelRenderer::CHUNK_FLAG_EMPTY0,
currentLayer);
RenderManager.CBuffClear(lists + currentLayer);
PlatformRenderer.CBuffClear(lists + currentLayer);
}
if ((currentLayer == 0) && (!renderNextLayer)) {
levelRenderer->setGlobalChunkFlag(this->x, this->y, this->z, level,
LevelRenderer::CHUNK_FLAG_EMPTY1);
RenderManager.CBuffClear(lists + 1);
PlatformRenderer.CBuffClear(lists + 1);
break;
}
}
@ -744,7 +744,7 @@ void Chunk::reset() {
for (int i = 0; i < 2; i++) {
// 4J - added - clear any renderer data associated with
// this unused list
RenderManager.CBuffClear(lists + i);
PlatformRenderer.CBuffClear(lists + i);
}
levelRenderer->setGlobalChunkFlags(x, y, z, level, 0);
}

67
targets/minecraft/client/renderer/GameRenderer.cpp
View file

@ -10,7 +10,7 @@
#include "platform/PlatformTypes.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "BossMobGuiInfo.h"
#include "Chunk.h"
#include "ItemInHandRenderer.h"
@ -610,16 +610,16 @@ void GameRenderer::getFovAndAspect(float& fov, float& aspect, float a,
aspect = mc->width / (float)mc->height;
fov = getFov(a, applyEffects);
if ((mc->player->m_iScreenSection == C4JRender::VIEWPORT_TYPE_SPLIT_TOP) ||
if ((mc->player->m_iScreenSection == IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP) ||
(mc->player->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM)) {
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM)) {
aspect *= 2.0f;
fov *= 0.7f; // Reduce FOV to make things less fish-eye, at the expense
// of reducing vertical FOV from single player mode
} else if ((mc->player->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_LEFT) ||
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT) ||
(mc->player->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT)) {
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT)) {
// Ideally I'd like to make the fov bigger here, but if I do then you an
// see that the arm isn't very long...
aspect *= 0.5f;
@ -644,7 +644,7 @@ void GameRenderer::setupCamera(float a, int eye) {
glTranslatef((float)zoom_x, (float)-zoom_y, 0);
glScaled(zoom, zoom, 1);
}
gluPerspective(fov, aspect, 0.05f, renderDistance * 2);
PlatformRenderer.MatrixPerspective(fov, aspect, 0.05f, renderDistance * 2);
if (mc->gameMode->isCutScene()) {
float s = 1 / 1.5f;
@ -740,7 +740,7 @@ void GameRenderer::renderItemInHand(float a, int eye) {
glTranslatef((float)zoom_x, (float)-zoom_y, 0);
glScaled(zoom, zoom, 1);
}
gluPerspective(fov, aspect, 0.05f, renderDistance * 2);
PlatformRenderer.MatrixPerspective(fov, aspect, 0.05f, renderDistance * 2);
if (mc->gameMode->isCutScene()) {
float s = 1 / 1.5f;
@ -803,8 +803,7 @@ void GameRenderer::turnOffLightLayer(double alpha) { // 4J - TODO
#if defined(__linux__)
if (SharedConstants::TEXTURE_LIGHTING) {
LinuxLogStubLightmapProbe();
RenderManager.TextureBindVertex(-1);
LinuxGLLogLightmapState("turnOffLightLayer", -1, false);
PlatformRenderer.TextureBindVertex(-1);
}
#else
// 4jcraft: manually handle this in order to ensure that the light layer is
@ -841,12 +840,12 @@ void GameRenderer::turnOnLightLayer(
textureId, scaleLight ? 1 : 0);
}
RenderManager.TextureBindVertex(textureId, scaleLight);
PlatformRenderer.TextureBindVertex(textureId, scaleLight);
LinuxGLLogLightmapState("turnOnLightLayer", textureId, scaleLight);
#else
// 4jcraft: update light texture
// todo: check implementation of getLightTexture.
RenderManager.TextureBindVertex(
PlatformRenderer.TextureBindVertex(
getLightTexture(mc->player->GetXboxPad(), mc->level), scaleLight);
#endif
}
@ -1119,7 +1118,7 @@ int GameRenderer::runUpdate(void* lpParam) {
Minecraft* minecraft = Minecraft::GetInstance();
Tesselator::CreateNewThreadStorage(1024 * 1024);
Compression::UseDefaultThreadStorage();
RenderManager.InitialiseContext();
PlatformRenderer.InitialiseContext();
#if defined(_LARGE_WORLDS)
Chunk::CreateNewThreadStorage();
#endif
@ -1159,7 +1158,7 @@ int GameRenderer::runUpdate(void* lpParam) {
// while( minecraft->levelRenderer->updateDirtyChunks() )
// ;
RenderManager.CBuffDeferredModeEnd();
PlatformRenderer.CBuffDeferredModeEnd();
// If any renderable tile entities were flagged in this last block of
// chunk(s) that were udpated, then change their flags to say that this
@ -1265,9 +1264,9 @@ void GameRenderer::renderLevel(float a, int64_t until) {
if (mc->options->anaglyph3d) {
GameRenderer::anaglyphPass = i;
if (GameRenderer::anaglyphPass == 0)
RenderManager.StateSetWriteEnable(false, true, true, false);
PlatformRenderer.StateSetWriteEnable(false, true, true, false);
else
RenderManager.StateSetWriteEnable(true, false, false, false);
PlatformRenderer.StateSetWriteEnable(true, false, false, false);
}
glViewport(0, 0, mc->width, mc->height);
@ -1297,7 +1296,7 @@ void GameRenderer::renderLevel(float a, int64_t until) {
setupFog(1, a);
if (mc->options->ambientOcclusion) {
GL11::glShadeModel(GL11::GL_SMOOTH);
glShadeModel(GL_SMOOTH);
}
// Culler *frustum = new FrustumCuller();
@ -1345,7 +1344,7 @@ void GameRenderer::renderLevel(float a, int64_t until) {
Lighting::turnOff();
levelRenderer->render(cameraEntity, 0, a, updateChunks);
GL11::glShadeModel(GL11::GL_FLAT);
glShadeModel(GL_FLAT);
if (cameraFlip == 0) {
Lighting::turnOn();
@ -1401,8 +1400,8 @@ void GameRenderer::renderLevel(float a, int64_t until) {
glDisable(GL_BLEND);
glEnable(GL_CULL_FACE);
RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
RenderManager.StateSetDepthMask(true);
PlatformRenderer.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
PlatformRenderer.StateSetDepthMask(true);
setupFog(0, a);
glEnable(GL_BLEND);
glDisable(GL_CULL_FACE);
@ -1416,14 +1415,14 @@ void GameRenderer::renderLevel(float a, int64_t until) {
if (true) // (mc->options->fancyGraphics)
{
if (mc->options->ambientOcclusion) {
GL11::glShadeModel(GL11::GL_SMOOTH);
glShadeModel(GL_SMOOTH);
}
RenderManager.StateSetBlendFunc(GL_ZERO, GL_ONE);
PlatformRenderer.StateSetBlendFunc(GL_ZERO, GL_ONE);
int visibleWaterChunks =
levelRenderer->render(cameraEntity, 1, a, updateChunks);
RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
PlatformRenderer.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
if (visibleWaterChunks > 0) {
levelRenderer->render(
@ -1433,7 +1432,7 @@ void GameRenderer::renderLevel(float a, int64_t until) {
// that anymore
}
GL11::glShadeModel(GL11::GL_FLAT);
glShadeModel(GL_FLAT);
} else {
levelRenderer->render(cameraEntity, 1, a, updateChunks);
}
@ -1458,7 +1457,7 @@ void GameRenderer::renderLevel(float a, int64_t until) {
turnOffLightLayer(a); // 4J - brought forward from 1.8.2
////////////////////////// End of 4J added section
RenderManager.StateSetDepthMask(true);
PlatformRenderer.StateSetDepthMask(true);
glEnable(GL_CULL_FACE);
glDisable(GL_BLEND);
@ -1482,7 +1481,7 @@ void GameRenderer::renderLevel(float a, int64_t until) {
*/
glEnable(GL_BLEND);
RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE);
PlatformRenderer.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE);
{
FRAME_PROFILE_SCOPE(WeatherSky);
levelRenderer->renderDestroyAnimation(
@ -1516,7 +1515,7 @@ void GameRenderer::renderLevel(float a, int64_t until) {
return;
}
}
RenderManager.StateSetWriteEnable(true, true, true, false);
PlatformRenderer.StateSetWriteEnable(true, true, true, false);
}
void GameRenderer::prepareAndRenderClouds(LevelRenderer* levelRenderer,
@ -1615,7 +1614,7 @@ void GameRenderer::renderSnowAndRain(float a) {
if (rainLevel <= 0) return;
// 4J - rain is relatively low poly, but high fill-rate - better to clip it
RenderManager.StateSetEnableViewportClipPlanes(true);
PlatformRenderer.StateSetEnableViewportClipPlanes(true);
turnOnLightLayer(a);
@ -1645,7 +1644,7 @@ void GameRenderer::renderSnowAndRain(float a) {
glDisable(GL_CULL_FACE);
glNormal3f(0, 1, 0);
glEnable(GL_BLEND);
RenderManager.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
PlatformRenderer.StateSetBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glAlphaFunc(GL_GREATER, 0.01f);
mc->textures->bindTexture(
@ -1815,13 +1814,13 @@ void GameRenderer::renderSnowAndRain(float a) {
glAlphaFunc(GL_GREATER, 0.1f);
turnOffLightLayer(a);
RenderManager.StateSetEnableViewportClipPlanes(false);
PlatformRenderer.StateSetEnableViewportClipPlanes(false);
}
// 4J - added forceScale parameter
void GameRenderer::setupGuiScreen(int forceScale /*=-1*/) {
int fbw, fbh;
RenderManager.GetFramebufferSize(fbw, fbh);
PlatformRenderer.GetFramebufferSize(fbw, fbh);
// 4jcraft: use actual framebuffer dimensions instead of mc->width/height
// to ensure GUI scales correctly after a window resize.
@ -1829,17 +1828,17 @@ void GameRenderer::setupGuiScreen(int forceScale /*=-1*/) {
// 4jcraft: Java GUI screens still assume a clean 2D fixed-function style
// state.
RenderManager.StateSetFaceCull(false);
PlatformRenderer.StateSetFaceCull(false);
glDisable(GL_LIGHTING);
glDisable(GL_FOG);
glColor4f(1, 1, 1, 1);
glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.1f);
glEnable(GL_DEPTH_TEST);
RenderManager.StateSetDepthFunc(GL_LEQUAL);
RenderManager.StateSetDepthMask(true);
PlatformRenderer.StateSetDepthFunc(GL_LEQUAL);
PlatformRenderer.StateSetDepthMask(true);
RenderManager.TextureBindVertex(-1);
PlatformRenderer.TextureBindVertex(-1);
glClientActiveTexture(GL_TEXTURE1);
glActiveTexture(GL_TEXTURE1);

14
targets/minecraft/client/renderer/ItemInHandRenderer.cpp
View file

@ -8,7 +8,7 @@
#include <numbers>
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "minecraft/GameEnums.h"
#include "app/common/Colours/ColourTable.h"
#include "app/linux/LinuxGame.h"
@ -302,7 +302,7 @@ void ItemInHandRenderer::renderItem(std::shared_ptr<LivingEntity> mob,
LOD = 2; // Force LOD level 2 to achieve texture reads from 256x256
// map
}
RenderManager.StateSetForceLOD(LOD);
PlatformRenderer.StateSetForceLOD(LOD);
// 4J Original comment
// Yes, these are backwards.
@ -364,7 +364,7 @@ void ItemInHandRenderer::renderItem(std::shared_ptr<LivingEntity> mob,
glDepthFunc(GL_LEQUAL);
}
RenderManager.StateSetForceLOD(-1);
PlatformRenderer.StateSetForceLOD(-1);
glDisable(GL_RESCALE_NORMAL);
}
@ -417,15 +417,15 @@ void ItemInHandRenderer::render(float a) {
std::dynamic_pointer_cast<LocalPlayer>(player);
if (localPlayer) {
if (localPlayer->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_BOTTOM ||
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_BOTTOM ||
localPlayer->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_TOP) {
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_TOP) {
fudgeY = 0.08f;
splitHoriz = true;
} else if (localPlayer->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_LEFT ||
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_LEFT ||
localPlayer->m_iScreenSection ==
C4JRender::VIEWPORT_TYPE_SPLIT_RIGHT) {
IPlatformRenderer::VIEWPORT_TYPE_SPLIT_RIGHT) {
fudgeX = -0.18f;
}
}

43
targets/minecraft/client/renderer/LevelRenderer.cpp
View file

@ -17,7 +17,7 @@
#include "platform/PlatformTypes.h"
#include "platform/input/input.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "Chunk.h"
#include "GameRenderer.h"
#include "minecraft/GameEnums.h"
@ -27,7 +27,6 @@
#include "app/linux/LinuxGame.h"
#include "util/FrameProfiler.h"
#include "minecraft/client/renderer/MobSkinMemTextureProcessor.h"
#include "platform/stubs.h"
#include "Tesselator.h"
#include "util/StringHelpers.h"
#include "java/Class.h"
@ -299,7 +298,7 @@ LevelRenderer::LevelRenderer(Minecraft* mc, Textures* textures) {
t->color(0xffffff);
for (unsigned int i = 0; i <= ARC_SEGMENTS; ++i) {
float DIFF = abs(i - HALF_ARC_SEG);
float DIFF = std::abs(i - HALF_ARC_SEG);
if (DIFF < (HALF_ARC_SEG - WIDE_ARC_SEGS))
DIFF = 0;
else
@ -436,7 +435,7 @@ void LevelRenderer::setLevel(int playerIndex, MultiPlayerLevel* level) {
// actually exiting the game, so only when the primary player sets there
// level to nullptr
if (playerIndex == PlatformInput.GetPrimaryPad()) {
RenderManager.CBuffDeleteAll();
PlatformRenderer.CBuffDeleteAll();
{
std::lock_guard<std::mutex> lock(m_csRenderableTileEntities);
renderableTileEntities.clear();
@ -858,16 +857,16 @@ int LevelRenderer::renderChunks(int from, int to, int layer, double alpha) {
// 4jcraft: replaced glPushMatrix/glTranslatef/glPopMatrix per chunk
// no more full MVP upload per chunk, can also be bkwards compat
RenderManager.SetChunkOffset((float)chunk->chunk->x,
PlatformRenderer.SetChunkOffset((float)chunk->chunk->x,
(float)chunk->chunk->y,
(float)chunk->chunk->z);
if (RenderManager.CBuffCall(list, first)) {
if (PlatformRenderer.CBuffCall(list, first)) {
first = false;
}
count++;
}
RenderManager.SetChunkOffset(0.f, 0.f, 0.f);
PlatformRenderer.SetChunkOffset(0.f, 0.f, 0.f);
}
glPopMatrix();
@ -1431,7 +1430,7 @@ void LevelRenderer::renderAdvancedClouds(float alpha) {
// stencilling to limit the area drawn to. Clouds have a relatively large
// fill area compared to the number of vertices that they have, and so
// enabling clipping here to try and reduce fill rate cost.
RenderManager.StateSetEnableViewportClipPlanes(true);
PlatformRenderer.StateSetEnableViewportClipPlanes(true);
float yOffs =
(float)(mc->cameraTargetPlayer->yOld +
(mc->cameraTargetPlayer->y - mc->cameraTargetPlayer->yOld) *
@ -1694,7 +1693,7 @@ void LevelRenderer::renderAdvancedClouds(float alpha) {
m_freezeticks = iTicks;
}
}
RenderManager.StateSetEnableViewportClipPlanes(false);
PlatformRenderer.StateSetEnableViewportClipPlanes(false);
}
bool LevelRenderer::updateDirtyChunks() {
@ -1745,7 +1744,7 @@ bool LevelRenderer::updateDirtyChunks() {
{
FRAME_PROFILE_SCOPE(ChunkDirtyScan);
unsigned int memAlloc = RenderManager.CBuffSize(-1);
unsigned int memAlloc = PlatformRenderer.CBuffSize(-1);
/*
static int throttle = 0;
if( ( throttle % 100 ) == 0 )
@ -1960,7 +1959,7 @@ bool LevelRenderer::updateDirtyChunks() {
// exactly the same thing would happen further away, but we just
// don't care about it so much from terms of visual impact.
if (veryNearCount > 0) {
RenderManager.CBuffDeferredModeStart();
PlatformRenderer.CBuffDeferredModeStart();
}
// Build this chunk & return false to continue processing
chunk->clearDirty();
@ -2052,7 +2051,7 @@ bool LevelRenderer::updateDirtyChunks() {
// happen further away, but we just don't care about it so much from
// terms of visual impact.
if (veryNearCount > 0) {
RenderManager.CBuffDeferredModeStart();
PlatformRenderer.CBuffDeferredModeStart();
}
// Build this chunk & return false to continue processing
chunk->clearDirty();
@ -2221,12 +2220,12 @@ void LevelRenderer::renderHitOutline(std::shared_ptr<Player> player,
// 4J-PB - If Display HUD is false, don't render the hit outline
if (gameServices().getGameSettings(iPad, eGameSetting_DisplayHUD) == 0) return;
RenderManager.StateSetLightingEnable(false);
PlatformRenderer.StateSetLightingEnable(false);
glDisable(GL_TEXTURE_2D);
// draw hit outline
RenderManager.StateSetColour(0.0f, 0.0f, 0.0f, 0.4f);
RenderManager.StateSetLineWidth(1.0f);
PlatformRenderer.StateSetColour(0.0f, 0.0f, 0.0f, 0.4f);
PlatformRenderer.StateSetLineWidth(1.0f);
// hack
glDepthFunc(GL_LEQUAL);
@ -2251,17 +2250,17 @@ void LevelRenderer::renderHitOutline(std::shared_ptr<Player> player,
// restore
glDisable(GL_POLYGON_OFFSET_LINE);
RenderManager.StateSetColour(1.0f, 1.0f, 1.0f, 1.0f);
PlatformRenderer.StateSetColour(1.0f, 1.0f, 1.0f, 1.0f);
glEnable(GL_TEXTURE_2D);
RenderManager.StateSetLightingEnable(true);
PlatformRenderer.StateSetLightingEnable(true);
}
}
void LevelRenderer::render(AABB* b) {
Tesselator* t = Tesselator::getInstance();
RenderManager.StateSetLightingEnable(false);
PlatformRenderer.StateSetLightingEnable(false);
glDisable(GL_TEXTURE_2D);
RenderManager.StateSetColour(0.0f, 0.0f, 0.0f, 0.4f);
PlatformRenderer.StateSetColour(0.0f, 0.0f, 0.0f, 0.4f);
// prevent zfight
glEnable(GL_POLYGON_OFFSET_LINE);
@ -2302,9 +2301,9 @@ void LevelRenderer::render(AABB* b) {
t->end();
glDisable(GL_POLYGON_OFFSET_LINE);
RenderManager.StateSetLightingEnable(true);
PlatformRenderer.StateSetLightingEnable(true);
glEnable(GL_TEXTURE_2D);
RenderManager.StateSetColour(1.0f, 1.0f, 1.0f, 1.0f);
PlatformRenderer.StateSetColour(1.0f, 1.0f, 1.0f, 1.0f);
}
void LevelRenderer::setDirty(int x0, int y0, int z0, int x1, int y1, int z1,
@ -4040,7 +4039,7 @@ void LevelRenderer::staticCtor() {
int LevelRenderer::rebuildChunkThreadProc(void* lpParam) {
Tesselator::CreateNewThreadStorage(1024 * 1024);
RenderManager.InitialiseContext();
PlatformRenderer.InitialiseContext();
Chunk::CreateNewThreadStorage();
Tile::CreateNewThreadStorage();

1
targets/minecraft/client/renderer/MobSkinTextureProcessor.cpp
View file

@ -1,7 +1,6 @@
#include "MobSkinTextureProcessor.h"
#include "minecraft/client/BufferedImage.h"
#include "platform/stubs.h"
BufferedImage* MobSkinTextureProcessor::process(BufferedImage* in) {
if (in == nullptr) return nullptr;

2
targets/minecraft/client/renderer/OffsettedRenderList.cpp
View file

@ -1,6 +1,6 @@
#include "OffsettedRenderList.h"
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "java/IntBuffer.h"
#include "minecraft/client/MemoryTracker.h"

40
targets/minecraft/client/renderer/Tesselator.cpp
View file

@ -5,7 +5,7 @@
#include <vector>
#include "platform/sdl2/Render.h"
#include "platform/renderer/renderer.h"
#include "app/linux/LinuxGame.h"
#include "platform/stubs.h"
#include "minecraft/client/MemoryTracker.h"
@ -106,15 +106,15 @@ void Tesselator::end() {
}
if (mode == GL_QUADS && TRIANGLE_MODE) {
// glDrawArrays(GL_TRIANGLES, 0, vertices); // 4J - changed for xbox
RenderManager.DrawVertices(
C4JRender::PRIMITIVE_TYPE_TRIANGLE_LIST, vertices,
PlatformRenderer.DrawVertices(
IPlatformRenderer::PRIMITIVE_TYPE_TRIANGLE_LIST, vertices,
_array->data(),
useCompactFormat360
? C4JRender::VERTEX_TYPE_COMPRESSED
: C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1,
? IPlatformRenderer::VERTEX_TYPE_COMPRESSED
: IPlatformRenderer::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1,
useProjectedTexturePixelShader
? C4JRender::PIXEL_SHADER_TYPE_PROJECTION
: C4JRender::PIXEL_SHADER_TYPE_STANDARD);
? IPlatformRenderer::PIXEL_SHADER_TYPE_PROJECTION
: IPlatformRenderer::PIXEL_SHADER_TYPE_STANDARD);
} else {
// glDrawArrays(mode, 0, vertices); // 4J - changed
// for xbox
@ -124,23 +124,23 @@ void Tesselator::end() {
// axis aligned UVs (eg flowing lava/water)
int vertexCount = vertices;
if (useCompactFormat360) {
RenderManager.DrawVertices(
(C4JRender::ePrimitiveType)mode, vertexCount,
_array->data(), C4JRender::VERTEX_TYPE_COMPRESSED,
C4JRender::PIXEL_SHADER_TYPE_STANDARD);
PlatformRenderer.DrawVertices(
(IPlatformRenderer::ePrimitiveType)mode, vertexCount,
_array->data(), IPlatformRenderer::VERTEX_TYPE_COMPRESSED,
IPlatformRenderer::PIXEL_SHADER_TYPE_STANDARD);
} else {
if (useProjectedTexturePixelShader) {
RenderManager.DrawVertices(
(C4JRender::ePrimitiveType)mode, vertexCount,
PlatformRenderer.DrawVertices(
(IPlatformRenderer::ePrimitiveType)mode, vertexCount,
_array->data(),
C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_TEXGEN,
C4JRender::PIXEL_SHADER_TYPE_PROJECTION);
IPlatformRenderer::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1_TEXGEN,
IPlatformRenderer::PIXEL_SHADER_TYPE_PROJECTION);
} else {
RenderManager.DrawVertices(
(C4JRender::ePrimitiveType)mode, vertexCount,
PlatformRenderer.DrawVertices(
(IPlatformRenderer::ePrimitiveType)mode, vertexCount,
_array->data(),
C4JRender::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1,
C4JRender::PIXEL_SHADER_TYPE_STANDARD);
IPlatformRenderer::VERTEX_TYPE_PF3_TF2_CB4_NB4_XW1,
IPlatformRenderer::PIXEL_SHADER_TYPE_STANDARD);
}
}
}
@ -539,7 +539,7 @@ void Tesselator::vertex(float x, float y, float z) {
#endif
} else {
// -512 each for u/v will mean that the renderer will use global
// settings (set via RenderManager.StateSetVertexTextureUV) rather
// settings (set via PlatformRenderer.StateSetVertexTextureUV) rather
// than these local ones
*(unsigned int*)(&_array->data()[p + 7]) = 0xfe00fe00;
}

Some files were not shown because too many files have changed in this diff Show more