LegacyConsoleArchive/4jcraft
1
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-09-23 10:42:46 +00:00
Code Issues 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
Download Patch File Download Diff File Expand all files Collapse all files
targets/app/common/DLC/DLCAudioFile.cpp
+2 -2
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;
targets/app/common/DLC/DLCSkinFile.cpp
+2 -2
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;
targets/app/common/Game.cpp
+2 -2
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;
targets/app/common/GameSettingsManager.cpp
+3 -3
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);
targets/app/common/LocalizationManager.cpp
+2 -2
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;
}
targets/app/common/Network/GameNetworkManager.cpp
+4 -4
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) {
targets/app/common/UI/All Platforms/IUIScene_AbstractContainerMenu.cpp
+2 -2
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;
targets/app/common/UI/All Platforms/IUIScene_CraftingMenu.cpp
+4 -4
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];
targets/app/common/UI/All Platforms/IUIScene_CreativeMenu.cpp
+1 -1
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);
targets/app/common/UI/All Platforms/IUIScene_HUD.cpp
+2 -2
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);
targets/app/common/UI/Components/UIComponent_Chat.cpp
+24 -24
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:
targets/app/common/UI/Components/UIComponent_Chat.h
+2 -2
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);
targets/app/common/UI/Components/UIComponent_Logo.cpp
+10 -10
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;
targets/app/common/UI/Components/UIComponent_MenuBackground.cpp
+24 -24
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:
targets/app/common/UI/Components/UIComponent_MenuBackground.h
+2 -2
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);
};
targets/app/common/UI/Components/UIComponent_Panorama.cpp
+19 -19
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;
targets/app/common/UI/Components/UIComponent_Panorama.h
+2 -2
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);
targets/app/common/UI/Components/UIComponent_Tooltips.cpp
+34 -34
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:
targets/app/common/UI/Components/UIComponent_Tooltips.h
+2 -2
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);
targets/app/common/UI/Components/UIComponent_TutorialPopup.cpp
+30 -30
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:
targets/app/common/UI/Components/UIComponent_TutorialPopup.h
+2 -2
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);
targets/app/common/UI/Components/UIScene_HUD.cpp
+37 -37
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:
targets/app/common/UI/Components/UIScene_HUD.h
+2 -2
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);
targets/app/common/UI/Controls/UIControl_EnchantmentBook.cpp
+1 -1
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"
targets/app/common/UI/Controls/UIControl_EnchantmentButton.cpp
+1 -1
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"
targets/app/common/UI/Controls/UIControl_MinecraftHorse.cpp
+1 -1
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"
targets/app/common/UI/Controls/UIControl_MinecraftPlayer.cpp
+1 -1
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"
targets/app/common/UI/Controls/UIControl_PlayerSkinPreview.cpp
+1 -1
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"
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_DLCOffersMenu.cpp
+2 -2
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);
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LaunchMoreOptionsMenu.cpp
+3 -3
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];
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_LoadMenu.cpp
+2 -2
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);
targets/app/common/UI/Scenes/Frontend Menu screens/UIScene_MainMenu.cpp
+1 -1
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"
targets/app/common/UI/Scenes/Help & Options/UIScene_SettingsOptionsMenu.cpp
+5 -5
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];
targets/app/common/UI/Scenes/Help & Options/UIScene_SkinSelectMenu.cpp
+2 -2
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);
targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.cpp
+1 -1
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();
targets/app/common/UI/Scenes/In-Game Menu Screens/Containers/UIScene_AbstractContainerMenu.h
+2 -2
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
targets/app/common/UI/UIBitmapFont.cpp
+1 -1
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;
targets/app/common/UI/UIController.cpp
+30 -30
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);
}
}
targets/app/common/UI/UIController.h
+4 -4
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);
targets/app/common/UI/UIGroup.cpp
+4 -4
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
targets/app/common/UI/UIGroup.h
+4 -4
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();
targets/app/common/UI/UILayer.cpp
+3 -3
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();
}
targets/app/common/UI/UILayer.h
+3 -3
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();
targets/app/common/UI/UIScene.cpp
+16 -16
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);
targets/app/common/UI/UIScene.h
+2 -2
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);