summaryrefslogtreecommitdiffstats
path: root/src/core/main.cpp
diff options
context:
space:
mode:
authorerorcun <erorcunerorcun@hotmail.com.tr>2020-12-03 03:22:58 +0100
committererorcun <erorcunerorcun@hotmail.com.tr>2020-12-03 03:22:58 +0100
commitab3e810a95f60a97b2482f714608e88ac14f118b (patch)
treeb0e7d42629563fe847a199cfd7f3253f59d173a9 /src/core/main.cpp
parentStats page (diff)
downloadre3-ab3e810a95f60a97b2482f714608e88ac14f118b.tar
re3-ab3e810a95f60a97b2482f714608e88ac14f118b.tar.gz
re3-ab3e810a95f60a97b2482f714608e88ac14f118b.tar.bz2
re3-ab3e810a95f60a97b2482f714608e88ac14f118b.tar.lz
re3-ab3e810a95f60a97b2482f714608e88ac14f118b.tar.xz
re3-ab3e810a95f60a97b2482f714608e88ac14f118b.tar.zst
re3-ab3e810a95f60a97b2482f714608e88ac14f118b.zip
Diffstat (limited to '')
-rw-r--r--src/core/main.cpp30
1 files changed, 14 insertions, 16 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index ef40777f..7fb07fff 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -599,8 +599,10 @@ LoadingScreen(const char *str1, const char *str2, const char *splashscreen)
AsciiToUnicode(str1, tmpstr);
CFont::PrintString(hpos, top, tmpstr);
top += 22*yscale;
- AsciiToUnicode(str2, tmpstr);
- CFont::PrintString(hpos, top, tmpstr);
+ if (str2) {
+ AsciiToUnicode(str2, tmpstr);
+ CFont::PrintString(hpos, top, tmpstr);
+ }
#endif
}
@@ -1424,15 +1426,6 @@ AppEventHandler(RsEvent event, void *param)
return rsEVENTPROCESSED;
}
-#ifndef MASTER
- case rsANIMVIEWER:
- {
- TheModelViewer();
-
- return rsEVENTPROCESSED;
- }
-#endif
-
default:
{
return rsEVENTNOTPROCESSED;
@@ -1448,22 +1441,27 @@ TheModelViewer(void)
//TODO
#else
- CDraw::CalculateAspectRatio();
+ // This is not original. Because;
+ // 1- We want 2D things to be initalized, whereas original AnimViewer doesn't use them. my additions marked with X
+ // 2- VC Mobile code run it like main function(as opposed to III and LCS), so it has it's own loop inside it, but our func. already called in a loop.
+
+ CDraw::CalculateAspectRatio(); // X
CAnimViewer::Update();
- CTimer::Update();
SetLightsWithTimeOfDayColour(Scene.world);
CRenderer::ConstructRenderList();
DoRWStuffStartOfFrame(CTimeCycle::GetSkyTopRed()*0.5f, CTimeCycle::GetSkyTopGreen()*0.5f, CTimeCycle::GetSkyTopBlue()*0.5f,
CTimeCycle::GetSkyBottomRed(), CTimeCycle::GetSkyBottomGreen(), CTimeCycle::GetSkyBottomBlue(),
255);
- CSprite2d::InitPerFrame();
- CFont::InitPerFrame();
+ CSprite2d::SetRecipNearClip(); // X
+ CSprite2d::InitPerFrame(); // X
+ CFont::InitPerFrame(); // X
DefinedState();
CVisibilityPlugins::InitAlphaEntityList();
CAnimViewer::Render();
- Render2dStuff();
+ Render2dStuff(); // X
DoRWStuffEndOfFrame();
+ CTimer::Update();
#endif
}
#endif