diff --git a/.clang-format b/.clang-format new file mode 100644 index 0000000..86efe6e --- /dev/null +++ b/.clang-format @@ -0,0 +1,110 @@ +--- +Language: Cpp +AccessModifierOffset: -4 +AlignAfterOpenBracket: Align +AlignConsecutiveMacros: true +AlignConsecutiveAssignments: true +AlignConsecutiveDeclarations: true +AlignEscapedNewlines: Left +AlignOperands: false +AlignTrailingComments: true +AllowAllArgumentsOnNextLine: true +AllowAllConstructorInitializersOnNextLine: true +AllowAllParametersOfDeclarationOnNextLine: true +AllowShortCaseLabelsOnASingleLine: true +AllowShortFunctionsOnASingleLine: All +AllowShortLambdasOnASingleLine: Inline +AllowShortIfStatementsOnASingleLine: AllIfsAndElse +AllowShortLoopsOnASingleLine: true +AllowShortBlocksOnASingleLine: true +AlwaysBreakAfterDefinitionReturnType: None +AlwaysBreakAfterReturnType: None +AlwaysBreakBeforeMultilineStrings: false +AlwaysBreakTemplateDeclarations: No +BinPackArguments: true +BreakBeforeBraces: Custom +BraceWrapping: + AfterCaseLabel: false + AfterClass: true + AfterControlStatement: MultiLine + AfterEnum: true + AfterFunction: true + AfterNamespace: true + AfterObjCDeclaration: true + AfterStruct: true + AfterUnion: true + AfterExternBlock: true + BeforeCatch: true + BeforeElse: true + IndentBraces: false + SplitEmptyFunction: false + SplitEmptyRecord: false + SplitEmptyNamespace: false +BreakBeforeBinaryOperators: None +BreakBeforeInheritanceComma: false +BreakBeforeTernaryOperators: false +BreakAfterJavaFieldAnnotations: false +BreakStringLiterals: false +ColumnLimit: 0 +CommentPragmas: '^ IWYU pragma:' +CompactNamespaces: false +ConstructorInitializerAllOnOneLineOrOnePerLine: true +ConstructorInitializerIndentWidth: 4 +ContinuationIndentWidth: 4 +Cpp11BracedListStyle: false +DerivePointerAlignment: false +DisableFormat: false +ExperimentalAutoDetectBinPacking: false +FixNamespaceComments: true +IndentCaseLabels: true +IndentGotoLabels: true +IndentPPDirectives: AfterHash +PPIndentWidth: 2 +InsertNewlineAtEOF: true +IndentWidth: 4 +IndentWrappedFunctionNames: false +JavaScriptQuotes: Leave +JavaScriptWrapImports: true +KeepEmptyLinesAtTheStartOfBlocks: true +MacroBlockBegin: '' +MacroBlockEnd: '' +MaxEmptyLinesToKeep: 10000 +NamespaceIndentation: None +ObjCBinPackProtocolList: Auto +ObjCBlockIndentWidth: 4 +ObjCSpaceAfterProperty: false +ObjCSpaceBeforeProtocolList: true +PenaltyBreakAssignment: 2 +PenaltyBreakBeforeFirstCallParameter: 19 +PenaltyBreakComment: 300 +PenaltyBreakFirstLessLess: 120 +PenaltyBreakString: 1000 +PenaltyBreakTemplateDeclaration: 10 +PenaltyExcessCharacter: 1000000 +PenaltyReturnTypeOnItsOwnLine: 1000 +PointerAlignment: Right +ReflowComments: false +SortIncludes: false +SortUsingDeclarations: false +SpaceAfterLogicalNot: false +SpaceAfterTemplateKeyword: true +SpaceBeforeAssignmentOperators: true +SpaceBeforeCpp11BracedList: false +SpaceBeforeCtorInitializerColon: true +SpaceBeforeInheritanceColon: true +SpaceBeforeParens: ControlStatements +SpaceBeforeRangeBasedForLoopColon: true +SpaceInEmptyBlock: false +SpaceInEmptyParentheses: false +SpacesBeforeTrailingComments: 1 +SpacesInAngles: false +SpacesInContainerLiterals: false +SpacesInCStyleCastParentheses: false +SpacesInParentheses: false +SpacesInSquareBrackets: false +Standard: Latest +TabWidth: 4 +UseTab: AlignWithSpaces +BreakInheritanceList: BeforeComma +BreakConstructorInitializers: BeforeComma +SpaceAfterCStyleCast: false diff --git a/Format-Code.bat b/Format-Code.bat new file mode 100644 index 0000000..9d80474 --- /dev/null +++ b/Format-Code.bat @@ -0,0 +1,5 @@ +@echo off +set clang_format=%cd%\vendor\clang-format.exe +set directories=(OpenJPOG\Source, OpenJPOG\Include, Toshi\Source, Toshi\Include, Toshi\Plugins\Source, Toshi\Plugins\Include) + +for %%P in %directories% do (for %%G in (.cpp, .hpp, .h) do forfiles /p .\%%P\ /s /m *%%G /c "cmd /c %clang_format% -i @path") \ No newline at end of file diff --git a/OpenJPOG/Source/AOptions.cpp b/OpenJPOG/Source/AOptions.cpp index 8ec4a6b..b2b0b04 100644 --- a/OpenJPOG/Source/AOptions.cpp +++ b/OpenJPOG/Source/AOptions.cpp @@ -3,89 +3,88 @@ TOSHI_NAMESPACE_USING -TPCCHAR AOptions::sm_szOptionsDir = TNULL; -TPCCHAR AOptions::sm_szOptionsName = "Options"; -AOptions *AOptions::ms_pSingleton = TNULL; +TPCCHAR AOptions::sm_szOptionsDir = TNULL; +TPCCHAR AOptions::sm_szOptionsName = "Options"; +AOptions *AOptions::ms_pSingleton = TNULL; AOptions::AOptions() { - m_iAutoSaveState = 1; - ms_pSingleton = this; - PProperties *props = new PProperties(); - m_pUnkProps = props; - m_pCurProps = props; + m_iAutoSaveState = 1; + ms_pSingleton = this; + PProperties *props = new PProperties(); + m_pUnkProps = props; + m_pCurProps = props; } TBOOL AOptions::GetOption(TPCCHAR a_szProp, TINT &a_iValue) { - const PPropertyValue *value = m_pCurProps->GetProperty(TSystem::GetCStringPool()->Get(a_szProp)); - if (!value) { - return TFALSE; - } - if (!value->CanBeType(PPropertyValue::TYPE_INT)) { - return TFALSE; - } - a_iValue = value->GetInteger(); - return TTRUE; + const PPropertyValue *value = m_pCurProps->GetProperty(TSystem::GetCStringPool()->Get(a_szProp)); + if (!value) { + return TFALSE; + } + if (!value->CanBeType(PPropertyValue::TYPE_INT)) { + return TFALSE; + } + a_iValue = value->GetInteger(); + return TTRUE; } AOptions::Result AOptions::LoadOptions() { - AOptions::Result result = LoadOptions(-1, -1, sm_szOptionsDir, sm_szOptionsName); - return result; + AOptions::Result result = LoadOptions(-1, -1, sm_szOptionsDir, sm_szOptionsName); + return result; } AOptions::Result AOptions::LoadOptions(TINT a_int, TINT a_int2, const Toshi::TCString &a_szOptionsDir, const Toshi::TCString &a_szOptionsName) { - PPropertyReader reader = PPropertyReader(); - Toshi::TCString filepath = Toshi::TCString().Format("%s/%s.ini", a_szOptionsDir.GetString(), a_szOptionsName.GetString()); - TBOOL res = reader.Open("Options.ini"); - if (!res) { - return RESULT_ERROR; - } - PProperties *props = new PProperties(); - res = reader.LoadPropertyBlock(*props); - if (!res) { - return RESULT_ERROR; - } - if (m_pUnkProps) { - delete m_pUnkProps; - } - m_pUnkProps = props; - m_pCurProps = props; - return RESULT_OK; + PPropertyReader reader = PPropertyReader(); + Toshi::TCString filepath = Toshi::TCString().Format("%s/%s.ini", a_szOptionsDir.GetString(), a_szOptionsName.GetString()); + TBOOL res = reader.Open("Options.ini"); + if (!res) { + return RESULT_ERROR; + } + PProperties *props = new PProperties(); + res = reader.LoadPropertyBlock(*props); + if (!res) { + return RESULT_ERROR; + } + if (m_pUnkProps) { + delete m_pUnkProps; + } + m_pUnkProps = props; + m_pCurProps = props; + return RESULT_OK; } AOptionsLogic::AScreenRes AOptionsLogic::m_oScreenRes = AOptionsLogic::AScreenRes(640, 480, 32, 0); AOptionsLogic::AOptionsLogic() { - } TBOOL AOptionsLogic::GetOption(OPTION a_eOption, AScreenRes &a_rScreenRes) { - AOptionSetting setting; - setting.m_eOption = a_eOption; - OptionGet(setting); - a_rScreenRes = *(AScreenRes *)(&setting + 1); - return setting.m_bFetched; + AOptionSetting setting; + setting.m_eOption = a_eOption; + OptionGet(setting); + a_rScreenRes = *(AScreenRes *)(&setting + 1); + return setting.m_bFetched; } TBOOL AOptionsLogic::SetOption(OPTION a_eOption, AScreenRes &a_rScreenRes) { - return TBOOL(); + return TBOOL(); } void AOptionsLogic::OptionGet(AOptionSetting &a_rSetting) { - // GetShaders - AScreenRes *screenRes = (AScreenRes *)(&a_rSetting + 1); - switch (a_rSetting.m_eOption) { - case OPTION_SCREENRES: - screenRes = &m_oScreenRes; - break; - default: - break; - } + // GetShaders + AScreenRes *screenRes = (AScreenRes *)(&a_rSetting + 1); + switch (a_rSetting.m_eOption) { + case OPTION_SCREENRES: + screenRes = &m_oScreenRes; + break; + default: + break; + } } diff --git a/OpenJPOG/Source/AOptions.h b/OpenJPOG/Source/AOptions.h index ebe3223..95b0e96 100644 --- a/OpenJPOG/Source/AOptions.h +++ b/OpenJPOG/Source/AOptions.h @@ -13,7 +13,7 @@ class AOptionsLogic struct AOptionSetting { OPTION m_eOption; - TBOOL m_bFetched; + TBOOL m_bFetched; }; struct AScreenRes @@ -23,12 +23,13 @@ class AOptionsLogic TINT m_iScreenDepth; TINT m_iScreenUnk; }; + public: AOptionsLogic(); TBOOL GetOption(OPTION a_eOption, AScreenRes &a_rScreenRes); TBOOL SetOption(OPTION a_eOption, AScreenRes &a_rScreenRes); - void OptionGet(AOptionSetting &a_rSetting); + void OptionGet(AOptionSetting &a_rSetting); private: static AScreenRes m_oScreenRes; @@ -41,7 +42,7 @@ class AOptions enum Result { - RESULT_OK = 0, + RESULT_OK = 0, RESULT_ERROR = 3 }; @@ -56,15 +57,14 @@ class AOptions } private: - static TPCCHAR sm_szOptionsName; - static TPCCHAR sm_szOptionsDir; + static TPCCHAR sm_szOptionsName; + static TPCCHAR sm_szOptionsDir; static const TINT sm_iSlot = -1; static const TINT sm_iPort = -1; static AOptions *ms_pSingleton; - TINT m_iAutoSaveState; // 0x1C - PProperties *m_pUnkProps; // 0x20 - PProperties *m_pCurProps; // 0x24 + TINT m_iAutoSaveState; // 0x1C + PProperties *m_pUnkProps; // 0x20 + PProperties *m_pCurProps; // 0x24 }; - diff --git a/OpenJPOG/Source/ARenderer.cpp b/OpenJPOG/Source/ARenderer.cpp index c70d6c7..d38e4fb 100644 --- a/OpenJPOG/Source/ARenderer.cpp +++ b/OpenJPOG/Source/ARenderer.cpp @@ -15,14 +15,14 @@ const TMatrix44 ARenderer::ms_mLightDir = TMatrix44(); ARenderer::ARenderer() { - m_pViewport = TNULL; - m_fFarClip = 160.0f; + m_pViewport = TNULL; + m_fFarClip = 160.0f; m_pcScreenCaptureBuffer = TNULL; } TBOOL ARenderer::OnCreate() { - TRenderInterface* pRenderer = TRenderInterface::GetRenderer(); + TRenderInterface *pRenderer = TRenderInterface::GetRenderer(); //pRenderer->GetSystemResource(TRenderInterface::SYSRESOURCE_SHSYS); //pRenderer->GetSystemResource(TRenderInterface::SYSRESOURCE_SCENE); return TTask::OnCreate(); @@ -45,8 +45,8 @@ TBOOL ARenderer::OnUpdate(TFLOAT a_fDeltaTime) void ARenderer::UpdateMovie(TFLOAT a_fDeltaTime) { - ARootStateController* pGameStateController = g_oTheApp.GetRootTask()->GetRootStateController(); - AMoviePlayer* pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); + ARootStateController *pGameStateController = g_oTheApp.GetRootTask()->GetRootStateController(); + AMoviePlayer *pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); if (pMoviePlayer && pMoviePlayer->IsMoviePlaying()) { pMoviePlayer->Update(a_fDeltaTime); } @@ -54,8 +54,8 @@ void ARenderer::UpdateMovie(TFLOAT a_fDeltaTime) ARenderer::MoviePlayerState ARenderer::RenderMovie(TFLOAT a_fDeltaTime) { - ARootStateController * pGameStateController = g_oTheApp.GetRootTask()->GetRootStateController(); - AMoviePlayer *pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); + ARootStateController *pGameStateController = g_oTheApp.GetRootTask()->GetRootStateController(); + AMoviePlayer *pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); if (!pMoviePlayer || !pMoviePlayer->IsMoviePlaying()) { return MOVIEPLAYERSTATE_STOPPED; } @@ -63,30 +63,30 @@ ARenderer::MoviePlayerState ARenderer::RenderMovie(TFLOAT a_fDeltaTime) return MOVIEPLAYERSTATE_RUNNING; } -void ARenderer::CheckScreenCapture(TRenderInterface* a_pRenderer) +void ARenderer::CheckScreenCapture(TRenderInterface *a_pRenderer) { switch (m_eCaptureState) { - case Toshi::ARenderer::CAPTURESTATE_CREATE: - m_pCapture = a_pRenderer->CreateCapture(); - m_pCapture->Create(TRenderCapture::FORMAT_RGBA32, m_iCaptureWidth, m_iCaptureHeight); - m_pCapture->Request(); - m_eCaptureState = CAPTURESTATE_POLL; - break; - case Toshi::ARenderer::CAPTURESTATE_POLL: - if (m_pCapture->Poll()) { - m_eCaptureState = CAPTURESTATE_FINISHED; - if (m_pcScreenCaptureBuffer) { - delete m_pcScreenCaptureBuffer; + case Toshi::ARenderer::CAPTURESTATE_CREATE: + m_pCapture = a_pRenderer->CreateCapture(); + m_pCapture->Create(TRenderCapture::FORMAT_RGBA32, m_iCaptureWidth, m_iCaptureHeight); + m_pCapture->Request(); + m_eCaptureState = CAPTURESTATE_POLL; + break; + case Toshi::ARenderer::CAPTURESTATE_POLL: + if (m_pCapture->Poll()) { + m_eCaptureState = CAPTURESTATE_FINISHED; + if (m_pcScreenCaptureBuffer) { + delete m_pcScreenCaptureBuffer; + } + m_pcScreenCaptureBuffer = new TCHAR[m_iCaptureWidth * m_iCaptureHeight * 4]; + TSystem::MemCopy(m_pcScreenCaptureBuffer, m_pCapture->ObtainBuffer(), m_iCaptureWidth * m_iCaptureHeight * 4); + m_pCapture->Destroy(); + a_pRenderer->DestroyCapture(m_pCapture); + m_pCapture = TNULL; } - m_pcScreenCaptureBuffer = new TCHAR[m_iCaptureWidth * m_iCaptureHeight * 4]; - TSystem::MemCopy(m_pcScreenCaptureBuffer, m_pCapture->ObtainBuffer(), m_iCaptureWidth * m_iCaptureHeight * 4); - m_pCapture->Destroy(); - a_pRenderer->DestroyCapture(m_pCapture); - m_pCapture = TNULL; - } - break; - default: - break; + break; + default: + break; } } diff --git a/OpenJPOG/Source/ARenderer.h b/OpenJPOG/Source/ARenderer.h index 718e92b..f94ca27 100644 --- a/OpenJPOG/Source/ARenderer.h +++ b/OpenJPOG/Source/ARenderer.h @@ -30,7 +30,7 @@ class ARenderer : public TTask virtual TBOOL OnCreate() override; virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) override; - + // $JPOG: FUNCTION 004787b0 void UpdateMovie(TFLOAT a_fDeltaTime); // $JPOG: FUNCTION 00478e10 @@ -38,14 +38,14 @@ class ARenderer : public TTask private: // $JPOG: FUNCTION 00479140 - void CheckScreenCapture(TRenderInterface* a_pRenderer); -public: + void CheckScreenCapture(TRenderInterface *a_pRenderer); - TFLOAT GetCurrentRenderTime() { return m_fCurRenderTime; } - TFLOAT GetFarClip() { return m_fFarClip; } - TFLOAT GetLastRenderTime() { return m_fLastRenderTime; } - TPCHAR GetScreenCaptureBuffer() { return m_pcScreenCaptureBuffer; } - TViewport* GetViewport() { return m_pViewport; } +public: + TFLOAT GetCurrentRenderTime() { return m_fCurRenderTime; } + TFLOAT GetFarClip() { return m_fFarClip; } + TFLOAT GetLastRenderTime() { return m_fLastRenderTime; } + TPCHAR GetScreenCaptureBuffer() { return m_pcScreenCaptureBuffer; } + TViewport *GetViewport() { return m_pViewport; } public: static const TFLOAT ms_fMainZMax; @@ -57,15 +57,15 @@ class ARenderer : public TTask static const TMatrix44 ms_mLightDir; private: - TFLOAT m_fLastRenderTime; // 0x24 - TFLOAT m_fCurRenderTime; // 0x28 - TViewport* m_pViewport; // 0x2C - TFLOAT m_fFarClip; // 0x38 - CaptureState m_eCaptureState; // 0x3C - TRenderCapture* m_pCapture; // 0x40 - TPCHAR m_pcScreenCaptureBuffer; // 0x44 - TINT m_iCaptureWidth; // 0x48 - TINT m_iCaptureHeight; // 0x4C + TFLOAT m_fLastRenderTime; // 0x24 + TFLOAT m_fCurRenderTime; // 0x28 + TViewport *m_pViewport; // 0x2C + TFLOAT m_fFarClip; // 0x38 + CaptureState m_eCaptureState; // 0x3C + TRenderCapture *m_pCapture; // 0x40 + TPCHAR m_pcScreenCaptureBuffer; // 0x44 + TINT m_iCaptureWidth; // 0x48 + TINT m_iCaptureHeight; // 0x4C }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/OpenJPOG/Source/ASoundManager.cpp b/OpenJPOG/Source/ASoundManager.cpp index d27f72e..4ed740b 100644 --- a/OpenJPOG/Source/ASoundManager.cpp +++ b/OpenJPOG/Source/ASoundManager.cpp @@ -8,11 +8,11 @@ TFLOAT ASoundManager::GetPitch(TINT a_iChannel) const { TINT freq; if (a_iChannel != -1) { - FSOUND_SAMPLE* pSample = FSOUND_GetCurrentSample(a_iChannel); + FSOUND_SAMPLE *pSample = FSOUND_GetCurrentSample(a_iChannel); if (pSample) { FSOUND_Sample_GetDefaults(pSample, &freq, NULL, NULL, NULL); return (TFLOAT)FSOUND_GetFrequency(a_iChannel) / freq; } } return 0.0f; -} \ No newline at end of file +} diff --git a/OpenJPOG/Source/ASoundManager.h b/OpenJPOG/Source/ASoundManager.h index 936c678..187f166 100644 --- a/OpenJPOG/Source/ASoundManager.h +++ b/OpenJPOG/Source/ASoundManager.h @@ -5,7 +5,6 @@ class ASample { - }; class ASoundManager : public Toshi::TObject @@ -14,15 +13,14 @@ class ASoundManager : public Toshi::TObject struct AChannel { - }; protected: - inline static ASample** s_aSamples = TNULL; + inline static ASample **s_aSamples = TNULL; public: TFLOAT GetPitch(TINT a_iChannel) const; - TBOOL GetPaused(TINT a_iChannel) const { return a_iChannel != -1 ? FSOUND_GetPaused(a_iChannel) : TFALSE; } + TBOOL GetPaused(TINT a_iChannel) const { return a_iChannel != -1 ? FSOUND_GetPaused(a_iChannel) : TFALSE; } TFLOAT GetPan(TINT a_iChannel) const { return a_iChannel != -1 ? -1.0f + (FSOUND_GetPan(a_iChannel) / 127.5f) : 0.0f; } TFLOAT GetSFXVolume() { return 1.0f; }; }; diff --git a/OpenJPOG/Source/AVibrationManager.cpp b/OpenJPOG/Source/AVibrationManager.cpp index b77139d..9be8fde 100644 --- a/OpenJPOG/Source/AVibrationManager.cpp +++ b/OpenJPOG/Source/AVibrationManager.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -IMPLEMENT_DYNCREATE(AVibrationManager, TTask); \ No newline at end of file +IMPLEMENT_DYNCREATE(AVibrationManager, TTask); diff --git a/OpenJPOG/Source/AVibrationManager.h b/OpenJPOG/Source/AVibrationManager.h index 839fc49..5163540 100644 --- a/OpenJPOG/Source/AVibrationManager.h +++ b/OpenJPOG/Source/AVibrationManager.h @@ -5,11 +5,11 @@ class AVibrationManager : public Toshi::TTask { DECLARE_DYNAMIC(AVibrationManager); + public: - AVibrationManager() = default; + AVibrationManager() = default; virtual ~AVibrationManager() = default; private: - private: -}; \ No newline at end of file +}; diff --git a/OpenJPOG/Source/GUI/AGUIGameHUD.h b/OpenJPOG/Source/GUI/AGUIGameHUD.h index e14d807..3e8a899 100644 --- a/OpenJPOG/Source/GUI/AGUIGameHUD.h +++ b/OpenJPOG/Source/GUI/AGUIGameHUD.h @@ -7,7 +7,6 @@ class AGUIGameHUD { public: - enum HUDComponents { @@ -54,8 +53,7 @@ class AGUIGameHUD } private: - Toshi::TLString m_LSHintMessage; // 0x4 - HUDComponents m_eHUDComponents; // 0x8 - Toshi::TCString m_szBKGMatLib; // 0x2C + Toshi::TLString m_LSHintMessage; // 0x4 + HUDComponents m_eHUDComponents; // 0x8 + Toshi::TCString m_szBKGMatLib; // 0x2C }; - diff --git a/OpenJPOG/Source/GUI/AGUISystem.cpp b/OpenJPOG/Source/GUI/AGUISystem.cpp index 9065503..212d78b 100644 --- a/OpenJPOG/Source/GUI/AGUISystem.cpp +++ b/OpenJPOG/Source/GUI/AGUISystem.cpp @@ -12,8 +12,8 @@ AGUISystem::AGUISystem() TBOOL AGUISystem::OnCreate() { - auto pRenderer = g_oTheApp.GetRootTask()->GetRenderInterface(); - m_pNullResource = (TNullResource*)pRenderer->CreateResource(&TGetClass(TNullResource), TNULL, TNULL); + auto pRenderer = g_oTheApp.GetRootTask()->GetRenderInterface(); + m_pNullResource = (TNullResource *)pRenderer->CreateResource(&TGetClass(TNullResource), TNULL, TNULL); m_pGUIInterface->Create(); return TBOOL(); } @@ -27,7 +27,7 @@ void AGUISystem::UpdateHUDComponets() { } -AGUISystem* TOSHI_API AGUISystem::GetGUISystem() +AGUISystem *TOSHI_API AGUISystem::GetGUISystem() { return g_oTheApp.GetRootTask()->GetGUISystem(); -} \ No newline at end of file +} diff --git a/OpenJPOG/Source/GUI/AGUISystem.h b/OpenJPOG/Source/GUI/AGUISystem.h index 7784865..bc59302 100644 --- a/OpenJPOG/Source/GUI/AGUISystem.h +++ b/OpenJPOG/Source/GUI/AGUISystem.h @@ -9,22 +9,20 @@ class AGUISystem : public Toshi::TTask { DECLARE_DYNAMIC(AGUISystem) public: - AGUISystem(); virtual TBOOL OnCreate() override; virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) override; - void UpdateHUDComponets(); + void UpdateHUDComponets(); Toshi::TManagedPtr GetGUIInterface() const { return m_pGUIInterface; } - static AGUISystem* TOSHI_API GetGUISystem(); + static AGUISystem *TOSHI_API GetGUISystem(); private: - Toshi::TGUIInterface* m_pGUIInterface; // 0x24 - Toshi::TNullResource* m_pNullResource; // 0x140 + Toshi::TGUIInterface *m_pGUIInterface; // 0x24 + Toshi::TNullResource *m_pNullResource; // 0x140 }; - diff --git a/OpenJPOG/Source/Movie/ABINKMoviePlayer.cpp b/OpenJPOG/Source/Movie/ABINKMoviePlayer.cpp index 2987a43..289a47d 100644 --- a/OpenJPOG/Source/Movie/ABINKMoviePlayer.cpp +++ b/OpenJPOG/Source/Movie/ABINKMoviePlayer.cpp @@ -9,273 +9,272 @@ static U32 s_iPlayForegroundFast = 0; ABINKMoviePlayer::ABINKMoviePlayer() { - m_bHasMovieStopped = TTRUE; - m_bIsBINKInitialized = TFALSE; - m_hBink = NULL; - m_iFrameBufferHeight = 0; - m_iFrameBufferWidth = 0; - m_pFrameBufferBits = TNULL; - RADSetMemory(RADMEMALLOC, RADMEMFREE); - m_pTextures[0] = TNULL; - m_pTextures[1] = TNULL; - m_pTextures[2] = TNULL; - m_pTextures[3] = TNULL; - m_pTextures[4] = TNULL; - m_pTextures[5] = TNULL; - m_pTextures[6] = TNULL; - m_pTextures[7] = TNULL; - m_iCurrentTextureIndex = 0; - SetFrameReady(TFALSE); + m_bHasMovieStopped = TTRUE; + m_bIsBINKInitialized = TFALSE; + m_hBink = NULL; + m_iFrameBufferHeight = 0; + m_iFrameBufferWidth = 0; + m_pFrameBufferBits = TNULL; + RADSetMemory(RADMEMALLOC, RADMEMFREE); + m_pTextures[0] = TNULL; + m_pTextures[1] = TNULL; + m_pTextures[2] = TNULL; + m_pTextures[3] = TNULL; + m_pTextures[4] = TNULL; + m_pTextures[5] = TNULL; + m_pTextures[6] = TNULL; + m_pTextures[7] = TNULL; + m_iCurrentTextureIndex = 0; + SetFrameReady(TFALSE); } TBOOL ABINKMoviePlayer::InitializeMoviePlayer() { - if (!m_bIsBINKInitialized) { - InitializeAudioResource(); - InitializeVideoResource(); - m_bIsBINKInitialized = TTRUE; - } - return TFALSE; + if (!m_bIsBINKInitialized) { + InitializeAudioResource(); + InitializeVideoResource(); + m_bIsBINKInitialized = TTRUE; + } + return TFALSE; } TBOOL ABINKMoviePlayer::ShutdownMoviePlayer() { - if (m_bIsBINKInitialized) { - FreeAudioResource(); - FreeVideoResource(); - m_bIsBINKInitialized = TFALSE; - SetFrameReady(TFALSE); - } - return TFALSE; + if (m_bIsBINKInitialized) { + FreeAudioResource(); + FreeVideoResource(); + m_bIsBINKInitialized = TFALSE; + SetFrameReady(TFALSE); + } + return TFALSE; } TBOOL ABINKMoviePlayer::StartMovie(TPCHAR a_szMovieName, TBOOL a_bUnk1, TPCHAR a_szUnk2, TBOOL a_bUseLocale) { - TRenderInterface* renderer = g_oTheApp.GetRootTask()->GetRenderInterface(); - - if (a_szMovieName) { - Toshi::TSystem::StringCopy(m_szMovieFileName, a_szMovieName, -1); - } - else { - Toshi::TSystem::MemSet(m_szMovieFileName, 0, sizeof(m_szMovieFileName)); - } - - if (a_szUnk2) { - Toshi::TSystem::StringCopy(m_szMovieName, a_szUnk2, -1); - } - else { - Toshi::TSystem::MemSet(m_szMovieName, 0, sizeof(m_szMovieName)); - } - - TCHAR buffer3[256]; - if (a_bUseLocale) { - SetLocaleInfoA(buffer3); - } - else { - sprintf(buffer3, "Data\\Movies\\%s.bik", m_szMovieFileName); - } - - m_bDrawingFrame = TTRUE; - SetFrameReady(TFALSE); - m_iFrameCount = 0; - - if (m_bDoAudio) { - m_hBink = BinkOpen(buffer3, 0); - } - else { - BinkSetSoundTrack(0, NULL); - m_hBink = BinkOpen(buffer3, BINKSNDTRACK); - } - if (!m_hBink) { - return TFALSE; - } - - InitializeMoviePlayer(); - m_iWidth = m_hBink->Width; - m_iHeight = m_hBink->Height; - - TTextureResource* pTexture = GetCurrentTexture(); - if (!pTexture) { - TTextureFactory* pTextureFactory = (TTextureFactory*)renderer->GetSystemResource(TRenderInterface::SYSRESOURCE_TEXTUREFACTORY); - TPCHAR pData = new char[0x200000]; - TSystem::MemSet(pData, 0xFF, sizeof(pData)); - pTexture = pTextureFactory->CreateEx(pData, 0x200000, 1024, 512, 1, TTEXTURERESOURCEFORMAT::R8G8B8A8, 32); - if (pTexture) { - pTexture->Validate(); - m_iFrameBufferWidth = 1024; - m_iFrameBufferHeight = 512; - SetCurrentTexture(pTexture); - } - delete[] pData; - } - - if (!m_bDoAudio) { - BinkSetSoundOnOff(m_hBink, 0); - } - RenderMovie(TTRUE); - m_bHasMovieStopped = TFALSE; - return TTRUE; + TRenderInterface *renderer = g_oTheApp.GetRootTask()->GetRenderInterface(); + + if (a_szMovieName) { + Toshi::TSystem::StringCopy(m_szMovieFileName, a_szMovieName, -1); + } + else { + Toshi::TSystem::MemSet(m_szMovieFileName, 0, sizeof(m_szMovieFileName)); + } + + if (a_szUnk2) { + Toshi::TSystem::StringCopy(m_szMovieName, a_szUnk2, -1); + } + else { + Toshi::TSystem::MemSet(m_szMovieName, 0, sizeof(m_szMovieName)); + } + + TCHAR buffer3[256]; + if (a_bUseLocale) { + SetLocaleInfoA(buffer3); + } + else { + sprintf(buffer3, "Data\\Movies\\%s.bik", m_szMovieFileName); + } + + m_bDrawingFrame = TTRUE; + SetFrameReady(TFALSE); + m_iFrameCount = 0; + + if (m_bDoAudio) { + m_hBink = BinkOpen(buffer3, 0); + } + else { + BinkSetSoundTrack(0, NULL); + m_hBink = BinkOpen(buffer3, BINKSNDTRACK); + } + if (!m_hBink) { + return TFALSE; + } + + InitializeMoviePlayer(); + m_iWidth = m_hBink->Width; + m_iHeight = m_hBink->Height; + + TTextureResource *pTexture = GetCurrentTexture(); + if (!pTexture) { + TTextureFactory *pTextureFactory = (TTextureFactory *)renderer->GetSystemResource(TRenderInterface::SYSRESOURCE_TEXTUREFACTORY); + TPCHAR pData = new char[0x200000]; + TSystem::MemSet(pData, 0xFF, sizeof(pData)); + pTexture = pTextureFactory->CreateEx(pData, 0x200000, 1024, 512, 1, TTEXTURERESOURCEFORMAT::R8G8B8A8, 32); + if (pTexture) { + pTexture->Validate(); + m_iFrameBufferWidth = 1024; + m_iFrameBufferHeight = 512; + SetCurrentTexture(pTexture); + } + delete[] pData; + } + + if (!m_bDoAudio) { + BinkSetSoundOnOff(m_hBink, 0); + } + RenderMovie(TTRUE); + m_bHasMovieStopped = TFALSE; + return TTRUE; } TBOOL ABINKMoviePlayer::Update(TFLOAT a_fDeltaTime) { - if (!m_bHasMovieStopped && m_hBink) { - BinkService(m_hBink); - if (BinkWait(m_hBink)) { - BinkSleep(500); - return TFALSE; - } - RenderToFrameBuffer(); - } - return TFALSE; + if (!m_bHasMovieStopped && m_hBink) { + BinkService(m_hBink); + if (BinkWait(m_hBink)) { + BinkSleep(500); + return TFALSE; + } + RenderToFrameBuffer(); + } + return TFALSE; } -TBOOL ABINKMoviePlayer::RenderToTexture(TTextureResource* a_pTexture) +TBOOL ABINKMoviePlayer::RenderToTexture(TTextureResource *a_pTexture) { - if (m_hBink) { - m_iWidth = m_hBink->Width; - m_iHeight = m_hBink->Height; - if (a_pTexture && !m_bHasMovieStopped) { - if (s_iPlayForegroundFast) { - BinkDoFrame(m_hBink); - BinkNextFrame(m_hBink); - return FALSE; - } - m_iFrameCount++; - // TODO: Do some Texture stuff - BinkDoFrame(m_hBink); - if (m_iFrameCount == m_hBink->Frames) { - - } - } - } - return TBOOL(); + if (m_hBink) { + m_iWidth = m_hBink->Width; + m_iHeight = m_hBink->Height; + if (a_pTexture && !m_bHasMovieStopped) { + if (s_iPlayForegroundFast) { + BinkDoFrame(m_hBink); + BinkNextFrame(m_hBink); + return FALSE; + } + m_iFrameCount++; + // TODO: Do some Texture stuff + BinkDoFrame(m_hBink); + if (m_iFrameCount == m_hBink->Frames) { + } + } + } + return TBOOL(); } TBOOL ABINKMoviePlayer::RenderToFrameBuffer() { - if (!m_bHasMovieStopped && !m_bRenderingTiles) { - RenderToTiles(); - m_bRenderingTiles = TTRUE; - } - return TFALSE; + if (!m_bHasMovieStopped && !m_bRenderingTiles) { + RenderToTiles(); + m_bRenderingTiles = TTRUE; + } + return TFALSE; } TBOOL ABINKMoviePlayer::RenderToFrameBuffer(TPBYTE a_pDest, TINT a_iDestWidth, TINT a_iDestHeigth, TINT a_iDestPitch, TINT a_iDestX, INT a_iDestY, INT a_iSrcX, INT a_iSrcY) { - BinkCopyToBufferRect(m_hBink, a_pDest, a_iDestPitch, a_iDestHeigth, - a_iDestX, a_iDestY, a_iSrcX, a_iSrcY, m_hBink->Width, m_hBink->Height, BINKCOPYALL | BINKNOSKIP | BINKSURFACE32A); - TPBYTE pBuf = a_pDest + a_iDestX + a_iDestY * a_iDestWidth; - - if (a_iDestHeigth == a_iDestWidth) { - // I think this ignores alpha? - for (TINT i = 0; i < a_iDestHeigth; i++) { - for (TINT j = 0; j < a_iDestWidth; j++) { - *pBuf = *pBuf | 0xFF000000; - } - pBuf += a_iDestPitch * 4; - } - } - else if (a_iDestHeigth != a_iDestWidth && a_iDestHeigth - a_iDestWidth >= 0) { - // I think this ignores alpha? - for (TINT i = 0; i < a_iDestWidth; i++) { - for (TINT j = 0; j < a_iDestWidth; j++) { - *pBuf = *pBuf | 0xFF000000; - } - pBuf += a_iDestPitch * 4; - } - } - - return TFALSE; + BinkCopyToBufferRect(m_hBink, a_pDest, a_iDestPitch, a_iDestHeigth, + a_iDestX, a_iDestY, a_iSrcX, a_iSrcY, m_hBink->Width, m_hBink->Height, BINKCOPYALL | BINKNOSKIP | BINKSURFACE32A); + TPBYTE pBuf = a_pDest + a_iDestX + a_iDestY * a_iDestWidth; + + if (a_iDestHeigth == a_iDestWidth) { + // I think this ignores alpha? + for (TINT i = 0; i < a_iDestHeigth; i++) { + for (TINT j = 0; j < a_iDestWidth; j++) { + *pBuf = *pBuf | 0xFF000000; + } + pBuf += a_iDestPitch * 4; + } + } + else if (a_iDestHeigth != a_iDestWidth && a_iDestHeigth - a_iDestWidth >= 0) { + // I think this ignores alpha? + for (TINT i = 0; i < a_iDestWidth; i++) { + for (TINT j = 0; j < a_iDestWidth; j++) { + *pBuf = *pBuf | 0xFF000000; + } + pBuf += a_iDestPitch * 4; + } + } + + return TFALSE; } TBOOL ABINKMoviePlayer::InitializeVideoResource() { - TRenderInterface* renderer = g_oTheApp.GetRootTask()->GetRenderInterface(); - TTextureFactory* factory = (TTextureFactory*)renderer->GetSystemResource(TRenderInterface::SYSRESOURCE_TEXTUREFACTORY); - TINT size; - TTEXTURERESOURCEFORMAT textureFormat; - TINT textureFormatSize; - if (renderer->Supports32BitTextures()) { - size = 4; - textureFormat = TTEXTURERESOURCEFORMAT::R8G8B8A8; - textureFormatSize = 32; - } - else { - size = 2; - textureFormat = TTEXTURERESOURCEFORMAT::R5G5B5A1; - textureFormatSize = 8; - } - size *= 256 * 256; - TPVOID buffer = tmalloc(size, TNULL, -1); - TSystem::MemSet(buffer, 0xFF, size); - m_pTextures[2] = factory->CreateEx(buffer, size, 256, 256, 1, textureFormat, textureFormatSize); - m_pTextures[2]->SetAddressModeMode(TTextureResource::ADDRESSMODE_UNKNOWN3); - - return TTRUE; + TRenderInterface *renderer = g_oTheApp.GetRootTask()->GetRenderInterface(); + TTextureFactory *factory = (TTextureFactory *)renderer->GetSystemResource(TRenderInterface::SYSRESOURCE_TEXTUREFACTORY); + TINT size; + TTEXTURERESOURCEFORMAT textureFormat; + TINT textureFormatSize; + if (renderer->Supports32BitTextures()) { + size = 4; + textureFormat = TTEXTURERESOURCEFORMAT::R8G8B8A8; + textureFormatSize = 32; + } + else { + size = 2; + textureFormat = TTEXTURERESOURCEFORMAT::R5G5B5A1; + textureFormatSize = 8; + } + size *= 256 * 256; + TPVOID buffer = tmalloc(size, TNULL, -1); + TSystem::MemSet(buffer, 0xFF, size); + m_pTextures[2] = factory->CreateEx(buffer, size, 256, 256, 1, textureFormat, textureFormatSize); + m_pTextures[2]->SetAddressModeMode(TTextureResource::ADDRESSMODE_UNKNOWN3); + + return TTRUE; } TBOOL ABINKMoviePlayer::InitializeAudioResource() { - TManagedPtr renderer = g_oTheApp.GetRootTask()->GetRenderInterface(); - TRenderD3DInterface *d3drenderer = (TRenderD3DInterface *)renderer.operator Toshi::TRenderInterface *(); - HRESULT hResult = DirectSoundCreate(NULL, &m_pDirectSound, NULL); - - if (FAILED(hResult)) { - m_pDirectSound = NULL; - } - else { - m_pDirectSound->SetCooperativeLevel(d3drenderer->GetMSWindow()->GetHWND(), 2); - BinkSoundUseDirectSound(m_pDirectSound); - } - return TTRUE; + TManagedPtr renderer = g_oTheApp.GetRootTask()->GetRenderInterface(); + TRenderD3DInterface *d3drenderer = (TRenderD3DInterface *)renderer.operator Toshi::TRenderInterface *(); + HRESULT hResult = DirectSoundCreate(NULL, &m_pDirectSound, NULL); + + if (FAILED(hResult)) { + m_pDirectSound = NULL; + } + else { + m_pDirectSound->SetCooperativeLevel(d3drenderer->GetMSWindow()->GetHWND(), 2); + BinkSoundUseDirectSound(m_pDirectSound); + } + return TTRUE; } TBOOL ABINKMoviePlayer::FreeVideoResource() { - return TTRUE; + return TTRUE; } void ABINKMoviePlayer::SetLocaleInfoA(TPCHAR a_szBuffer) { - //Toshi::TSystem::GetCStringPool(); - //Toshi::TSystem::GetLocale(); - sprintf(a_szBuffer, "Data\\Movies\\%s.bik", m_szMovieFileName); + //Toshi::TSystem::GetCStringPool(); + //Toshi::TSystem::GetLocale(); + sprintf(a_szBuffer, "Data\\Movies\\%s.bik", m_szMovieFileName); } void ABINKMoviePlayer::BinkSleep(TINT a_iMicroseconds) { - static S32 s_iTotalSleep = 0; - static S32 s_iSleepForward = 0; - static U64 s_iFrequency = 1000; - static S32 s_bFrequencyAquired = 0; + static S32 s_iTotalSleep = 0; + static S32 s_iSleepForward = 0; + static U64 s_iFrequency = 1000; + static S32 s_bFrequencyAquired = 0; - if (!s_bFrequencyAquired) - { - s_bFrequencyAquired = 1; - QueryPerformanceFrequency((LARGE_INTEGER*)&s_iFrequency); - } + if (!s_bFrequencyAquired) + { + s_bFrequencyAquired = 1; + QueryPerformanceFrequency((LARGE_INTEGER *)&s_iFrequency); + } - s_iTotalSleep += a_iMicroseconds; + s_iTotalSleep += a_iMicroseconds; - if ((s_iTotalSleep - s_iSleepForward) > 1000) - { - U64 start, end; - s_iTotalSleep -= s_iSleepForward; + if ((s_iTotalSleep - s_iSleepForward) > 1000) + { + U64 start, end; + s_iTotalSleep -= s_iSleepForward; - QueryPerformanceCounter((LARGE_INTEGER*)&start); - Sleep(s_iTotalSleep / 1000); - QueryPerformanceCounter((LARGE_INTEGER*)&end); + QueryPerformanceCounter((LARGE_INTEGER *)&start); + Sleep(s_iTotalSleep / 1000); + QueryPerformanceCounter((LARGE_INTEGER *)&end); - end = ((end - start) * (U64)1000000) / s_iFrequency; + end = ((end - start) * (U64)1000000) / s_iFrequency; - s_iSleepForward = (U32)end - s_iTotalSleep; - s_iTotalSleep %= 1000; - } + s_iSleepForward = (U32)end - s_iTotalSleep; + s_iTotalSleep %= 1000; + } } TBOOL ABINKMoviePlayer::RenderToTiles() { - return TBOOL(); + return TBOOL(); } diff --git a/OpenJPOG/Source/Movie/ABINKMoviePlayer.h b/OpenJPOG/Source/Movie/ABINKMoviePlayer.h index 4e1f08d..267e4d4 100644 --- a/OpenJPOG/Source/Movie/ABINKMoviePlayer.h +++ b/OpenJPOG/Source/Movie/ABINKMoviePlayer.h @@ -38,13 +38,13 @@ class ABINKMoviePlayer : public AMoviePlayer delete m_pDirectSound; return TTRUE; } - virtual void SetLocaleInfoA(TPCHAR a_szBuffer); - virtual TTextureResource* GetTexture() { return m_pTextures[m_iCurrentTextureIndex]; } + virtual void SetLocaleInfoA(TPCHAR a_szBuffer); + virtual TTextureResource *GetTexture() { return m_pTextures[m_iCurrentTextureIndex]; } - void BinkSleep(TINT a_iMicroseconds); - TBOOL RenderToTiles(); - TTextureResource* GetCurrentTexture() { return m_pTextures[m_iCurrentTextureIndex]; } - void SetCurrentTexture(TTextureResource* a_pTexture) + void BinkSleep(TINT a_iMicroseconds); + TBOOL RenderToTiles(); + TTextureResource *GetCurrentTexture() { return m_pTextures[m_iCurrentTextureIndex]; } + void SetCurrentTexture(TTextureResource *a_pTexture) { if (!m_pTextures[m_iCurrentTextureIndex]) { m_pTextures[m_iCurrentTextureIndex] = a_pTexture; @@ -52,34 +52,33 @@ class ABINKMoviePlayer : public AMoviePlayer } private: - - static void PTR4* RADLINK RADMEMALLOC(U32 bytes) + static void PTR4 *RADLINK RADMEMALLOC(U32 bytes) { return tmalloc(bytes, TNULL, -1); } - static void RADLINK RADMEMFREE(void PTR4* ptr) + static void RADLINK RADMEMFREE(void PTR4 *ptr) { tfree(ptr); } private: - TCHAR m_szMovieFileName[256]; // 0x10 - TCHAR m_szMovieName[256]; // 0x110 - TBOOL m_bHasMovieStopped; // 0x210 - TBOOL m_bIsBINKInitialized; // 0x211 - TBOOL m_bDrawingFrame; // 0x213 - TBOOL m_bRenderingTiles; // 0x214 - HBINK m_hBink; // 0x218 - TINT m_iFrameCount; // 0x220 - TINT m_iFrameBufferWidth; // 0x224 - TINT m_iFrameBufferHeight; // 0x228 - TINT m_iWidth; // 0x22C - TINT m_iHeight; // 0x230 - Toshi::TTextureResource* m_pTextures[8]; // 0x240 - TPBYTE m_pFrameBufferBits; // 0x234 - LPDIRECTSOUND m_pDirectSound; // 0x278 - TINT m_iCurrentTextureIndex; // 0x27C + TCHAR m_szMovieFileName[256]; // 0x10 + TCHAR m_szMovieName[256]; // 0x110 + TBOOL m_bHasMovieStopped; // 0x210 + TBOOL m_bIsBINKInitialized; // 0x211 + TBOOL m_bDrawingFrame; // 0x213 + TBOOL m_bRenderingTiles; // 0x214 + HBINK m_hBink; // 0x218 + TINT m_iFrameCount; // 0x220 + TINT m_iFrameBufferWidth; // 0x224 + TINT m_iFrameBufferHeight; // 0x228 + TINT m_iWidth; // 0x22C + TINT m_iHeight; // 0x230 + Toshi::TTextureResource *m_pTextures[8]; // 0x240 + TPBYTE m_pFrameBufferBits; // 0x234 + LPDIRECTSOUND m_pDirectSound; // 0x278 + TINT m_iCurrentTextureIndex; // 0x27C }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/OpenJPOG/Source/Movie/AMoviePlayer.h b/OpenJPOG/Source/Movie/AMoviePlayer.h index 125e030..ad15f9b 100644 --- a/OpenJPOG/Source/Movie/AMoviePlayer.h +++ b/OpenJPOG/Source/Movie/AMoviePlayer.h @@ -11,12 +11,12 @@ class AMoviePlayer public: AMoviePlayer() { - m_bIsStopped = TTRUE; + m_bIsStopped = TTRUE; m_bIsInitialized = TFALSE; - m_bIsFrameReady = TFALSE; - m_bIsFullscreen = TTRUE; - m_bIsPaused = TFALSE; - m_bRenderMovie = TTRUE; + m_bIsFrameReady = TFALSE; + m_bIsFullscreen = TTRUE; + m_bIsPaused = TFALSE; + m_bRenderMovie = TTRUE; } virtual ~AMoviePlayer() = default; @@ -129,7 +129,6 @@ class AMoviePlayer } private: - virtual TBOOL GetTextureUVs(TVector2 &a_rvUV1, TVector2 &a_rvUV2) { return TFALSE; @@ -145,13 +144,13 @@ class AMoviePlayer return TFALSE; } - virtual TTextureResource* GetTexture() + virtual TTextureResource *GetTexture() { return TNULL; } protected: - // 0x0 vftable + // 0x0 vftable TBOOL m_bIsStopped; // 0x4 TBOOL m_bIsInitialized; // 0x5 TBOOL m_bIsFrameReady; // 0x7 @@ -162,4 +161,4 @@ class AMoviePlayer TBOOL m_bRenderMovie; // 0xC }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/OpenJPOG/Source/States/AFrontEndSplashState.cpp b/OpenJPOG/Source/States/AFrontEndSplashState.cpp index 5f6ea7d..6f0f7a7 100644 --- a/OpenJPOG/Source/States/AFrontEndSplashState.cpp +++ b/OpenJPOG/Source/States/AFrontEndSplashState.cpp @@ -8,16 +8,16 @@ IMPLEMENT_DYNCREATE(AFrontEndSplashState, AFrontendState) AFrontEndSplashState::AFrontEndSplashState(TBOOL a_bInitialise, TFLOAT a_fUnk) { - m_bInitialise = a_bInitialise; - m_bMovieStarted = TFALSE; + m_bInitialise = a_bInitialise; + m_bMovieStarted = TFALSE; m_iLogoScreenIndex = 0; - m_bLogoScreenSet = TFALSE; + m_bLogoScreenSet = TFALSE; } void AFrontEndSplashState::OnActivate() { ARootState::OnActivate(); - AMoviePlayer* pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); + AMoviePlayer *pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); //AGUISystem::GetGUISystem()->Get; @@ -27,11 +27,11 @@ void AFrontEndSplashState::OnActivate() TBOOL AFrontEndSplashState::OnUpdate(TFLOAT a_fDeltaTime) { - AMoviePlayer* pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); + AMoviePlayer *pMoviePlayer = g_oTheApp.GetRootTask()->GetMoviePlayer(); if (m_bInitialise) { - static TFLOAT s_fStopLoadingSounds = 0.0f; - static TFLOAT s_fStartLoadingSounds = 5.0f; + static TFLOAT s_fStopLoadingSounds = 0.0f; + static TFLOAT s_fStartLoadingSounds = 5.0f; static TFLOAT s_fTimeLeftLoadingSounds = 5.0f; if (s_fStopLoadingSounds < s_fTimeLeftLoadingSounds) { if (s_fTimeLeftLoadingSounds < s_fStartLoadingSounds && s_bLoadedSound) { @@ -58,7 +58,7 @@ TBOOL AFrontEndSplashState::OnUpdate(TFLOAT a_fDeltaTime) if (s_StartMovie) { s_StartMovie = TFALSE; if (pMoviePlayer && !pMoviePlayer->IsMoviePlaying()) { - pMoviePlayer->StartMovie((TPCHAR)"Intro", TFALSE, (TPCHAR)"Intro", TTRUE); + pMoviePlayer->StartMovie((TPCHAR) "Intro", TFALSE, (TPCHAR) "Intro", TTRUE); } } else if (!pMoviePlayer) { diff --git a/OpenJPOG/Source/States/AFrontEndSplashState.h b/OpenJPOG/Source/States/AFrontEndSplashState.h index 4a1b4e9..650e05f 100644 --- a/OpenJPOG/Source/States/AFrontEndSplashState.h +++ b/OpenJPOG/Source/States/AFrontEndSplashState.h @@ -7,15 +7,14 @@ class AFrontEndSplashState : public AFrontendState DECLARE_DYNAMIC(AFrontEndSplashState) public: - - AFrontEndSplashState() : AFrontEndSplashState(TTRUE, 0.0f) + AFrontEndSplashState() + : AFrontEndSplashState(TTRUE, 0.0f) { - } AFrontEndSplashState(TBOOL a_bUnk, TFLOAT a_fUnk); - virtual void OnActivate() override; + virtual void OnActivate() override; virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) override; // $JPOG: FUNCTION 0048a220 virtual void OnInsertion() override; @@ -24,14 +23,13 @@ class AFrontEndSplashState : public AFrontendState TBOOL RunLogoState(TFLOAT a_fDeltaTime); private: - static inline Toshi::TCString* sm_asLogoScreens = new Toshi::TCString("bkg_bink.tml"); - static inline TBOOL s_bLoadedSound = TFALSE; - static inline TFLOAT sm_fLogoDisplayTime = 2.5f; + static inline Toshi::TCString *sm_asLogoScreens = new Toshi::TCString("bkg_bink.tml"); + static inline TBOOL s_bLoadedSound = TFALSE; + static inline TFLOAT sm_fLogoDisplayTime = 2.5f; - TBOOL m_bMovieStarted; // 0x5C - TBOOL m_bInitialise; // 0x64 - TINT m_iLogoScreenIndex; // 0x68 + TBOOL m_bMovieStarted; // 0x5C + TBOOL m_bInitialise; // 0x64 + TINT m_iLogoScreenIndex; // 0x68 TFLOAT m_fLogoDisplayTime; // 0x6C - TBOOL m_bLogoScreenSet; // 0x70 + TBOOL m_bLogoScreenSet; // 0x70 }; - diff --git a/OpenJPOG/Source/States/AFrontEndState.cpp b/OpenJPOG/Source/States/AFrontEndState.cpp index 2298e57..5385258 100644 --- a/OpenJPOG/Source/States/AFrontEndState.cpp +++ b/OpenJPOG/Source/States/AFrontEndState.cpp @@ -26,7 +26,7 @@ void AFrontendState::OnRemoval() ARootState::OnRemoval(); } -TBOOL AFrontendState::ParentAllowed(ARootState& a_rParent) +TBOOL AFrontendState::ParentAllowed(ARootState &a_rParent) { return !a_rParent.IsA(TGetClass(AGameState)); } diff --git a/OpenJPOG/Source/States/AFrontEndState.h b/OpenJPOG/Source/States/AFrontEndState.h index 80837a4..1bf965a 100644 --- a/OpenJPOG/Source/States/AFrontEndState.h +++ b/OpenJPOG/Source/States/AFrontEndState.h @@ -8,10 +8,10 @@ class AFrontendState : public ARootState public: virtual ~AFrontendState() = default; - virtual void OnInsertion() override; - virtual void OnRemoval() override; - virtual TBOOL ParentAllowed(ARootState& a_rParent) override; + virtual void OnInsertion() override; + virtual void OnRemoval() override; + virtual TBOOL ParentAllowed(ARootState &a_rParent) override; protected: static inline int sm_iFERefCount = 0; -}; \ No newline at end of file +}; diff --git a/OpenJPOG/Source/States/AGameState.cpp b/OpenJPOG/Source/States/AGameState.cpp index e81bf10..4cf4e94 100644 --- a/OpenJPOG/Source/States/AGameState.cpp +++ b/OpenJPOG/Source/States/AGameState.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -IMPLEMENT_DYNCREATE(AGameState, ARootState) \ No newline at end of file +IMPLEMENT_DYNCREATE(AGameState, ARootState) diff --git a/OpenJPOG/Source/States/AGameState.h b/OpenJPOG/Source/States/AGameState.h index 67ad538..45ab53e 100644 --- a/OpenJPOG/Source/States/AGameState.h +++ b/OpenJPOG/Source/States/AGameState.h @@ -6,4 +6,3 @@ class AGameState : public ARootState { DECLARE_DYNAMIC(AGameState) }; - diff --git a/OpenJPOG/Source/States/ARootState.cpp b/OpenJPOG/Source/States/ARootState.cpp index a1c4813..8d25c75 100644 --- a/OpenJPOG/Source/States/ARootState.cpp +++ b/OpenJPOG/Source/States/ARootState.cpp @@ -6,10 +6,10 @@ IMPLEMENT_DYNAMIC(ARootState, TObject) ARootState::ARootState() { - m_pParent = TNULL; - m_pChild = TNULL; - m_bAllowExit = TTRUE; - m_bHasControl = TFALSE; + m_pParent = TNULL; + m_pChild = TNULL; + m_bAllowExit = TTRUE; + m_bHasControl = TFALSE; } void ARootState::OnActivate() @@ -20,113 +20,117 @@ void ARootState::OnDeactivate() { } -void ARootState::TransferControlTemporary(ARootState* a_pState) +void ARootState::TransferControlTemporary(ARootState *a_pState) { - m_pChild = a_pState; - a_pState->m_bHasControl = TTRUE; - m_pChild->m_pParent = this; - m_pChild->OnInsertion(); - m_pChild->OnActivate(); + m_pChild = a_pState; + a_pState->m_bHasControl = TTRUE; + m_pChild->m_pParent = this; + m_pChild->OnInsertion(); + m_pChild->OnActivate(); } -void ARootState::TransferControl(ARootState* a_pState) +void ARootState::TransferControl(ARootState *a_pState) { - if (!a_pState->ParentAllowed(*this)) { - m_pParent->TransferControl(a_pState); - return; - } - - if (!m_pChild) { - OnDeactivate(); - } - else { - m_pChild->ExplicitDelete(); - } - m_pChild = a_pState; - a_pState->m_pParent = this; - m_pChild->OnInsertion(); - m_pChild->OnActivate(); + if (!a_pState->ParentAllowed(*this)) { + m_pParent->TransferControl(a_pState); + return; + } + + if (!m_pChild) { + OnDeactivate(); + } + else { + m_pChild->ExplicitDelete(); + } + m_pChild = a_pState; + a_pState->m_pParent = this; + m_pChild->OnInsertion(); + m_pChild->OnActivate(); } void ARootState::RemoveSelf() { - ExplicitDelete(); - if (m_pParent) { - m_pParent->m_pChild = TNULL; - if (!m_bHasControl) { - m_pParent->OnActivate(); - return; - } - TWARNING("Not implemented: AGUIGameHUD::OnActivate(&this->m_pParent->m_oGameHUD);"); - } + ExplicitDelete(); + if (m_pParent) { + m_pParent->m_pChild = TNULL; + if (!m_bHasControl) { + m_pParent->OnActivate(); + return; + } + TWARNING("Not implemented: AGUIGameHUD::OnActivate(&this->m_pParent->m_oGameHUD);"); + } } -ARootState* ARootState::ReturnToState(const TClass& a_rStateClass) +ARootState *ARootState::ReturnToState(const TClass &a_rStateClass) { - ARootState* pCurrent; - for (pCurrent = m_pParent; !pCurrent->IsA(a_rStateClass); pCurrent = pCurrent->m_pParent); - pCurrent->RemoveChild(); - return pCurrent; + ARootState *pCurrent; + for (pCurrent = m_pParent; !pCurrent->IsA(a_rStateClass); pCurrent = pCurrent->m_pParent) + ; + pCurrent->RemoveChild(); + return pCurrent; } -ARootState* ARootState::ReturnToExactState(const Toshi::TClass& a_rStateClass) +ARootState *ARootState::ReturnToExactState(const Toshi::TClass &a_rStateClass) { - ARootState* pCurrent; - for (pCurrent = m_pParent; !pCurrent->IsExactly(a_rStateClass); pCurrent = pCurrent->m_pParent); - pCurrent->RemoveChild(); - return pCurrent; + ARootState *pCurrent; + for (pCurrent = m_pParent; !pCurrent->IsExactly(a_rStateClass); pCurrent = pCurrent->m_pParent) + ; + pCurrent->RemoveChild(); + return pCurrent; } -TBOOL ARootState::AddChild(ARootState& a_rState) +TBOOL ARootState::AddChild(ARootState &a_rState) { - if (m_pChild) { - return TFALSE; - } - OnDeactivate(); - m_pChild = &a_rState; - m_pParent = this; - m_pChild->OnInsertion(); - m_pChild->OnActivate(); - return TTRUE; + if (m_pChild) { + return TFALSE; + } + OnDeactivate(); + m_pChild = &a_rState; + m_pParent = this; + m_pChild->OnInsertion(); + m_pChild->OnActivate(); + return TTRUE; } TBOOL ARootState::RemoveChild() { - if (m_pChild) { - m_pChild = TNULL; - ExplicitDelete(); - if (!m_bHasControl) { - OnActivate(); - } - else { - TWARNING("Not implemented: AGUIGameHUD::OnActivate(&this->m_oGameHUD);"); - } - return TTRUE; - } - return TFALSE; + if (m_pChild) { + m_pChild = TNULL; + ExplicitDelete(); + if (!m_bHasControl) { + OnActivate(); + } + else { + TWARNING("Not implemented: AGUIGameHUD::OnActivate(&this->m_oGameHUD);"); + } + return TTRUE; + } + return TFALSE; } -ARootState& ARootState::GetCurrent() +ARootState &ARootState::GetCurrent() { - ARootState* current; - for (current = this; current->m_pChild != TNULL; current = current->m_pChild); - return *current; + ARootState *current; + for (current = this; current->m_pChild != TNULL; current = current->m_pChild) { + } + return *current; } void ARootState::ExplicitDelete() { - ARootState* parent = m_pParent; - - ARootState* current; - for (current = this; current->m_pChild != TNULL; current = current->m_pChild); - current->OnDeactivate(); - - ARootState* j; - while (j = current, j != parent) { - current = j->m_pParent; - j->OnRemoval(); - j->m_pParent = TNULL; - j->m_pChild = TNULL; - delete j; - } + ARootState *parent = m_pParent; + + ARootState *current; + for (current = this; current->m_pChild != TNULL; current = current->m_pChild) { + } + current->OnDeactivate(); + + ARootState *j; + while (j = current, j != parent) { + current = j->m_pParent; + j->OnRemoval(); + j->m_pParent = TNULL; + j->m_pChild = TNULL; + delete j; + } } diff --git a/OpenJPOG/Source/States/ARootState.h b/OpenJPOG/Source/States/ARootState.h index 0f08831..002f458 100644 --- a/OpenJPOG/Source/States/ARootState.h +++ b/OpenJPOG/Source/States/ARootState.h @@ -8,7 +8,6 @@ class ARootState : public Toshi::TObject public: - ARootState(); virtual ~ARootState() = default; @@ -16,36 +15,34 @@ class ARootState : public Toshi::TObject //virtual void ProcessLostInput(); //virtual void ProcessInput(); //virtual void ProcessCommand(); - virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) { return TTRUE; } - virtual void OnInsertion() {}; - virtual void OnRemoval() {}; - virtual void OnActivate(); - virtual void OnDeactivate(); - virtual void Render() {}; - virtual void TransferControlTemporary(ARootState* a_pState); - virtual void TransferControl(ARootState* a_pState); - virtual void RemoveSelf(); - virtual ARootState* ReturnToState(const Toshi::TClass& a_rStateClass); - virtual ARootState* ReturnToExactState(const Toshi::TClass& a_rStateClass); - virtual TBOOL ParentAllowed(ARootState& a_rParent) { return TTRUE; } - virtual void FlushUnitProxy() {}; - - TBOOL AddChild(ARootState& a_rState); - TBOOL RemoveChild(); - ARootState& GetCurrent(); + virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) { return TTRUE; } + virtual void OnInsertion(){}; + virtual void OnRemoval(){}; + virtual void OnActivate(); + virtual void OnDeactivate(); + virtual void Render(){}; + virtual void TransferControlTemporary(ARootState *a_pState); + virtual void TransferControl(ARootState *a_pState); + virtual void RemoveSelf(); + virtual ARootState *ReturnToState(const Toshi::TClass &a_rStateClass); + virtual ARootState *ReturnToExactState(const Toshi::TClass &a_rStateClass); + virtual TBOOL ParentAllowed(ARootState &a_rParent) { return TTRUE; } + virtual void FlushUnitProxy(){}; + + TBOOL AddChild(ARootState &a_rState); + TBOOL RemoveChild(); + ARootState &GetCurrent(); private: - void ExplicitDelete(); public: - AGUIGameHUD& GetHUDState() { return m_oHUDState; } + AGUIGameHUD &GetHUDState() { return m_oHUDState; } protected: - ARootState* m_pParent; // 0x4 - ARootState* m_pChild; // 0x8 - TBOOL m_bAllowExit; // 0xC - TBOOL m_bHasControl; // 0xE - AGUIGameHUD m_oHUDState; // 0x10 + ARootState *m_pParent; // 0x4 + ARootState *m_pChild; // 0x8 + TBOOL m_bAllowExit; // 0xC + TBOOL m_bHasControl; // 0xE + AGUIGameHUD m_oHUDState; // 0x10 }; - diff --git a/OpenJPOG/Source/Tasks/ADummyTask.cpp b/OpenJPOG/Source/Tasks/ADummyTask.cpp index aeea397..06be0c6 100644 --- a/OpenJPOG/Source/Tasks/ADummyTask.cpp +++ b/OpenJPOG/Source/Tasks/ADummyTask.cpp @@ -1,3 +1,3 @@ #include "ADummyTask.h" -IMPLEMENT_DYNCREATE(ADummyTask, Toshi::TTask); \ No newline at end of file +IMPLEMENT_DYNCREATE(ADummyTask, Toshi::TTask); diff --git a/OpenJPOG/Source/Tasks/ADummyTask.h b/OpenJPOG/Source/Tasks/ADummyTask.h index 7a5668c..26dd30e 100644 --- a/OpenJPOG/Source/Tasks/ADummyTask.h +++ b/OpenJPOG/Source/Tasks/ADummyTask.h @@ -5,8 +5,9 @@ class ADummyTask : public Toshi::TTask { DECLARE_DYNAMIC(ADummyTask); + public: - ADummyTask() = default; + ADummyTask() = default; virtual ~ADummyTask() = default; // Shouldn't a_szName be TPCCHAR? [7/8/2024 InfiniteC0re] @@ -22,4 +23,4 @@ class ADummyTask : public Toshi::TTask private: Toshi::TCString m_szName; -}; \ No newline at end of file +}; diff --git a/OpenJPOG/Source/Tasks/AFrontEndController.cpp b/OpenJPOG/Source/Tasks/AFrontEndController.cpp index 9cab201..5512e92 100644 --- a/OpenJPOG/Source/Tasks/AFrontEndController.cpp +++ b/OpenJPOG/Source/Tasks/AFrontEndController.cpp @@ -1,3 +1,3 @@ #include "AFrontEndController.h" -IMPLEMENT_DYNCREATE(AFrontEndController, Toshi::TTask) \ No newline at end of file +IMPLEMENT_DYNCREATE(AFrontEndController, Toshi::TTask) diff --git a/OpenJPOG/Source/Tasks/AFrontEndController.h b/OpenJPOG/Source/Tasks/AFrontEndController.h index 29c92a2..7315858 100644 --- a/OpenJPOG/Source/Tasks/AFrontEndController.h +++ b/OpenJPOG/Source/Tasks/AFrontEndController.h @@ -14,4 +14,4 @@ class AFrontEndController : public Toshi::TTask { TTask::OnDestroy(); } -}; \ No newline at end of file +}; diff --git a/OpenJPOG/Source/Tasks/ARootStateController.cpp b/OpenJPOG/Source/Tasks/ARootStateController.cpp index ca130ee..3f6247a 100644 --- a/OpenJPOG/Source/Tasks/ARootStateController.cpp +++ b/OpenJPOG/Source/Tasks/ARootStateController.cpp @@ -7,7 +7,7 @@ IMPLEMENT_DYNCREATE(ARootStateController, TTask); ARootStateController::ARootStateController() { s_pCurrentStateController = this; - m_pBaseAppState = TNULL; + m_pBaseAppState = TNULL; } TBOOL ARootStateController::OnCreate() @@ -21,7 +21,7 @@ TBOOL ARootStateController::OnCreate() TBOOL ARootStateController::OnUpdate(TFLOAT a_fDeltaTime) { if (m_pBaseAppState) { - ARootState& currentState = m_pBaseAppState->GetCurrent(); + ARootState ¤tState = m_pBaseAppState->GetCurrent(); currentState.OnUpdate(a_fDeltaTime); } return TTRUE; @@ -31,7 +31,7 @@ void ARootStateController::OnDestroy() { } -void ARootStateController::TransferControl(ARootState* a_pState) +void ARootStateController::TransferControl(ARootState *a_pState) { GetBaseAppState()->GetCurrent().TransferControl(a_pState); } diff --git a/OpenJPOG/Source/Tasks/ARootStateController.h b/OpenJPOG/Source/Tasks/ARootStateController.h index 2b1435e..cae60c3 100644 --- a/OpenJPOG/Source/Tasks/ARootStateController.h +++ b/OpenJPOG/Source/Tasks/ARootStateController.h @@ -5,7 +5,7 @@ class ARootStateController; -static inline ARootStateController* s_pCurrentStateController = TNULL; +static inline ARootStateController *s_pCurrentStateController = TNULL; class ARootStateController : public Toshi::TTask { @@ -16,15 +16,15 @@ class ARootStateController : public Toshi::TTask virtual TBOOL OnCreate() override; virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) override; - virtual void OnDestroy() override; + virtual void OnDestroy() override; - void TransferControl(ARootState* a_pState); + void TransferControl(ARootState *a_pState); void SetupToolBarHUD(); public: - ARootState* GetBaseAppState() { return m_pBaseAppState; } - static ARootStateController* TOSHI_API GetRootStateController() { return s_pCurrentStateController; } + ARootState *GetBaseAppState() { return m_pBaseAppState; } + static ARootStateController *TOSHI_API GetRootStateController() { return s_pCurrentStateController; } private: - ARootState* m_pBaseAppState; // 0x24 -}; \ No newline at end of file + ARootState *m_pBaseAppState; // 0x24 +}; diff --git a/OpenJPOG/Source/Tasks/ARootTask.cpp b/OpenJPOG/Source/Tasks/ARootTask.cpp index a3be0fc..5c3c2ea 100644 --- a/OpenJPOG/Source/Tasks/ARootTask.cpp +++ b/OpenJPOG/Source/Tasks/ARootTask.cpp @@ -9,15 +9,15 @@ IMPLEMENT_DYNCREATE(ARootTask, TTask); ARootTask::ARootTask() { - m_pOptions = TNULL; - m_pGUISystem = TNULL; - m_pInputTask = TNULL; - m_pRenderInterface = TNULL; - m_pRenderer = TNULL; + m_pOptions = TNULL; + m_pGUISystem = TNULL; + m_pInputTask = TNULL; + m_pRenderInterface = TNULL; + m_pRenderer = TNULL; m_pGameStateController = TNULL; - m_pVibrationTask = TNULL; - m_pMoviePlayer = TNULL; - m_pOptions = new AOptions(); + m_pVibrationTask = TNULL; + m_pMoviePlayer = TNULL; + m_pOptions = new AOptions(); AllocateRenderInterface(); AllocateGUISystem(); AllocateARenderer(); @@ -44,7 +44,7 @@ void ARootTask::OnDestroy() TTask::OnDestroy(); } -void ARootTask::OnChildDied(TClass* a_pClass, TTask* a_pDeletedTask) +void ARootTask::OnChildDied(TClass *a_pClass, TTask *a_pDeletedTask) { TTask::OnChildDied(a_pClass, a_pDeletedTask); } @@ -73,7 +73,7 @@ void ARootTask::OnDeactivate() void ARootTask::LoadFrontEndController() { - m_pFrontEndController = (AFrontEndController*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(AFrontEndController), this); + m_pFrontEndController = (AFrontEndController *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(AFrontEndController), this); m_pFrontEndController->Create(); LoadMaterialLibrary(1); LoadMaterialLibrary(25); @@ -92,7 +92,7 @@ void ARootTask::AllocateARenderer() void ARootTask::AllocateRenderInterface() { g_oTheApp.GetKernel()->LoadInterface("TRenderD3DInterface"); - m_pRenderInterface = (TRenderInterface*)TFindClass(TRenderD3DInterface, TNULL)->CreateObject(); + m_pRenderInterface = (TRenderInterface *)TFindClass(TRenderD3DInterface, TNULL)->CreateObject(); m_pRenderInterface->Create(g_oTheApp.GetKernel()); m_pRenderInterface->DumpStats(); } @@ -109,7 +109,7 @@ void ARootTask::AllocateGUISystem() void ARootTask::AllocateInputSystem() { - m_pInputTask = ApplicationCreateTask(ADummyTask, g_oTheApp.GetInputRootTask()); + m_pInputTask = ApplicationCreateTask(ADummyTask, g_oTheApp.GetInputRootTask()); m_pVibrationTask = ApplicationCreateTask(AVibrationManager, g_oTheApp.GetInputRootTask()); } @@ -124,10 +124,10 @@ void ARootTask::CreateARenderer() TBOOL ARootTask::CreateRenderInterface() { TRenderInterface::DisplayParams displayParams; - displayParams.uiWidth = 640; - displayParams.uiHeight = 480; - displayParams.bWindowed = TTRUE; - displayParams.uiColourDepth = 32; + displayParams.uiWidth = 640; + displayParams.uiHeight = 480; + displayParams.bWindowed = TTRUE; + displayParams.uiColourDepth = 32; displayParams.eDepthStencilFormat = 0; CreateDisplayDevice(displayParams, TFALSE); m_pRenderInterface->CreateDisplay(displayParams); @@ -143,48 +143,48 @@ void ARootTask::DeserialiseOptions() { TRenderInterface *renderer = g_oTheApp.GetRootTask()->m_pRenderInterface; renderer->GetCurrentDisplayParams(); - AOptions *options = g_oTheApp.GetRootTask()->GetOptions(); + AOptions *options = g_oTheApp.GetRootTask()->GetOptions(); AOptionsLogic logic; - TINT screenWidth; - TINT screenHeight; - TINT screenDepth; + TINT screenWidth; + TINT screenHeight; + TINT screenDepth; if (options->GetOption("ScreenWidth", screenWidth) && - options->GetOption("ScreenHeight", screenHeight) && - options->GetOption("ScreenDepth", screenDepth)) { + options->GetOption("ScreenHeight", screenHeight) && + options->GetOption("ScreenDepth", screenDepth)) { AOptionsLogic::AScreenRes screenRes; logic.GetOption(AOptionsLogic::OPTION_SCREENRES, screenRes); } } -const TRenderAdapter::Mode::Device* ARootTask::CreateDisplayDevice(TRenderInterface::DisplayParams& a_rDisplayParams, bool a_bReverseOrder) +const TRenderAdapter::Mode::Device *ARootTask::CreateDisplayDevice(TRenderInterface::DisplayParams &a_rDisplayParams, bool a_bReverseOrder) { - TRenderInterface* pRenderer = TRenderInterface::GetRenderer(); - const TRenderAdapter::Mode::Device* pDevice = TNULL; + TRenderInterface *pRenderer = TRenderInterface::GetRenderer(); + const TRenderAdapter::Mode::Device *pDevice = TNULL; if (a_bReverseOrder) { a_rDisplayParams.eDepthStencilFormat = 4; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pDevice) { a_rDisplayParams.eDepthStencilFormat = 2; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pDevice) { a_rDisplayParams.eDepthStencilFormat = 3; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pDevice) { a_rDisplayParams.eDepthStencilFormat = 0; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pDevice) { a_rDisplayParams.eDepthStencilFormat = 1; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); } } } @@ -192,28 +192,28 @@ const TRenderAdapter::Mode::Device* ARootTask::CreateDisplayDevice(TRenderInterf } else { - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); a_rDisplayParams.eDepthStencilFormat = 0; if (!pDevice) { a_rDisplayParams.eDepthStencilFormat = 1; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pRenderer->FindDevice(&a_rDisplayParams)) { a_rDisplayParams.eDepthStencilFormat = 2; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pRenderer->FindDevice(&a_rDisplayParams)) { a_rDisplayParams.eDepthStencilFormat = 4; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); if (!pRenderer->FindDevice(&a_rDisplayParams)) { a_rDisplayParams.eDepthStencilFormat = 3; - pDevice = pRenderer->FindDevice(&a_rDisplayParams); + pDevice = pRenderer->FindDevice(&a_rDisplayParams); } } } @@ -221,7 +221,6 @@ const TRenderAdapter::Mode::Device* ARootTask::CreateDisplayDevice(TRenderInterf } return pDevice; - } void ARootTask::LoadMaterialLibrary(TINT a_iIndex) diff --git a/OpenJPOG/Source/Tasks/ARootTask.h b/OpenJPOG/Source/Tasks/ARootTask.h index c7ca565..5d9466c 100644 --- a/OpenJPOG/Source/Tasks/ARootTask.h +++ b/OpenJPOG/Source/Tasks/ARootTask.h @@ -15,16 +15,17 @@ class ARootTask : public Toshi::TTask { DECLARE_DYNAMIC(ARootTask); + public: ARootTask(); virtual ~ARootTask() = default; virtual TBOOL OnCreate() override; virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) override { return TTRUE; } - virtual void OnDestroy() override; - virtual void OnChildDied(Toshi::TClass* a_pClass, Toshi::TTask* a_pDeletedTask) override; - virtual void OnActivate() override; - virtual void OnDeactivate() override; + virtual void OnDestroy() override; + virtual void OnChildDied(Toshi::TClass *a_pClass, Toshi::TTask *a_pDeletedTask) override; + virtual void OnActivate() override; + virtual void OnDeactivate() override; void LoadFrontEndController(); void UnloadFrontEndController(); @@ -45,19 +46,19 @@ class ARootTask : public Toshi::TTask { return m_pRenderInterface; } - AGUISystem* GetGUISystem() + AGUISystem *GetGUISystem() { return m_pGUISystem; } - Toshi::AMoviePlayer* GetMoviePlayer() + Toshi::AMoviePlayer *GetMoviePlayer() { return m_pMoviePlayer; } - ARootStateController* GetRootStateController() const + ARootStateController *GetRootStateController() const { return m_pGameStateController; } - Toshi::ARenderer* GetARenderer() + Toshi::ARenderer *GetARenderer() { return m_pRenderer; } @@ -69,23 +70,23 @@ class ARootTask : public Toshi::TTask void AllocateGUISystem(); void AllocateInputSystem(); - void CreateARenderer(); + void CreateARenderer(); TBOOL CreateRenderInterface(); - void CreateGameStateController(); + void CreateGameStateController(); - const Toshi::TRenderAdapter::Mode::Device* CreateDisplayDevice(Toshi::TRenderInterface::DisplayParams& a_rDisplayParams, bool a_bReverseOrder); + const Toshi::TRenderAdapter::Mode::Device *CreateDisplayDevice(Toshi::TRenderInterface::DisplayParams &a_rDisplayParams, bool a_bReverseOrder); void LoadMaterialLibrary(TINT a_iIndex); private: - Toshi::TCString m_szName; - AOptions *m_pOptions; // 0x24 - AFrontEndController* m_pFrontEndController; // 0x28 - AGUISystem* m_pGUISystem; // 0x34 - Toshi::TTask* m_pInputTask; // 0x38 - Toshi::TRenderInterface* m_pRenderInterface; // 0xD0 - Toshi::ARenderer* m_pRenderer; // 0xD4 - ARootStateController* m_pGameStateController; // 0xD8 - AVibrationManager* m_pVibrationTask; // 0xE8 - Toshi::AMoviePlayer* m_pMoviePlayer; // 0xF0 -}; \ No newline at end of file + Toshi::TCString m_szName; + AOptions *m_pOptions; // 0x24 + AFrontEndController *m_pFrontEndController; // 0x28 + AGUISystem *m_pGUISystem; // 0x34 + Toshi::TTask *m_pInputTask; // 0x38 + Toshi::TRenderInterface *m_pRenderInterface; // 0xD0 + Toshi::ARenderer *m_pRenderer; // 0xD4 + ARootStateController *m_pGameStateController; // 0xD8 + AVibrationManager *m_pVibrationTask; // 0xE8 + Toshi::AMoviePlayer *m_pMoviePlayer; // 0xF0 +}; diff --git a/OpenJPOG/Source/main.cpp b/OpenJPOG/Source/main.cpp index 82a6072..446488e 100644 --- a/OpenJPOG/Source/main.cpp +++ b/OpenJPOG/Source/main.cpp @@ -3,34 +3,34 @@ AApplication g_oTheApp; -TBOOL AApplication::OnCreate(TINT argc, TPCHAR* const argv) +TBOOL AApplication::OnCreate(TINT argc, TPCHAR *const argv) { - m_pRenderTask = (ADummyTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); + m_pRenderTask = (ADummyTask *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); m_pRenderTask->Create(); m_pRenderTask->Activate(TTRUE); - m_pRenderTask->SetName((TPCHAR)"RenderTask"); + m_pRenderTask->SetName((TPCHAR) "RenderTask"); - m_pUpdate3Task = (ADummyTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); + m_pUpdate3Task = (ADummyTask *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); m_pUpdate3Task->Create(); m_pUpdate3Task->Activate(TTRUE); - m_pUpdate3Task->SetName((TPCHAR)"Update3"); + m_pUpdate3Task->SetName((TPCHAR) "Update3"); - m_pUpdate2Task = (ADummyTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); + m_pUpdate2Task = (ADummyTask *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); m_pUpdate2Task->Create(); m_pUpdate2Task->Activate(TTRUE); - m_pUpdate2Task->SetName((TPCHAR)"Update2"); + m_pUpdate2Task->SetName((TPCHAR) "Update2"); - m_pUpdate1Task = (ADummyTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); + m_pUpdate1Task = (ADummyTask *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); m_pUpdate1Task->Create(); m_pUpdate1Task->Activate(TTRUE); - m_pUpdate1Task->SetName((TPCHAR)"Update1"); + m_pUpdate1Task->SetName((TPCHAR) "Update1"); - m_pInputTask = (ADummyTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); + m_pInputTask = (ADummyTask *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ADummyTask), TNULL); m_pInputTask->Create(); m_pInputTask->Activate(TTRUE); - m_pInputTask->SetName((TPCHAR)"InputTask"); + m_pInputTask->SetName((TPCHAR) "InputTask"); - m_pRootTask = (ARootTask*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ARootTask), m_pUpdate2Task); + m_pRootTask = (ARootTask *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(ARootTask), m_pUpdate2Task); if (m_pRootTask) { if (!m_pRootTask->Create()) { return TFALSE; @@ -49,7 +49,7 @@ TBOOL AApplication::OnDestroy() return TTRUE; } -int main(int argc, char** argv) +int main(int argc, char **argv) { if (g_oTheApp.Create("Jurassic Park: Operation Genesis - (c) Blue Tongue Software", argc, argv)) { Toshi::TMemory::DebugPrintHALMemInfo(TNULL); @@ -57,4 +57,4 @@ int main(int argc, char** argv) } g_oTheApp.Destroy(); return 0; -} \ No newline at end of file +} diff --git a/OpenJPOG/Source/main.h b/OpenJPOG/Source/main.h index dd4fad2..1ebf09e 100644 --- a/OpenJPOG/Source/main.h +++ b/OpenJPOG/Source/main.h @@ -7,30 +7,29 @@ class AApplication : public Toshi::TApplication { public: - AApplication() { - } - virtual TBOOL OnCreate(TINT argc, TPCHAR* const argv) override; + virtual TBOOL OnCreate(TINT argc, TPCHAR *const argv) override; virtual TBOOL OnDestroy() override; + public: - ARootTask* GetRootTask() const { return m_pRootTask; } - ADummyTask* GetInputRootTask() const { return m_pInputTask; } - ADummyTask* GetUpdate1RootTask() const { return m_pUpdate1Task; } - ADummyTask* GetUpdate2RootTask() const { return m_pUpdate2Task; } - ADummyTask* GetUpdate3RootTask() const { return m_pUpdate3Task; } - ADummyTask* GetRenderRootTask() const { return m_pRenderTask; } + ARootTask *GetRootTask() const { return m_pRootTask; } + ADummyTask *GetInputRootTask() const { return m_pInputTask; } + ADummyTask *GetUpdate1RootTask() const { return m_pUpdate1Task; } + ADummyTask *GetUpdate2RootTask() const { return m_pUpdate2Task; } + ADummyTask *GetUpdate3RootTask() const { return m_pUpdate3Task; } + ADummyTask *GetRenderRootTask() const { return m_pRenderTask; } private: - // 0x0 -> 0x1C TApplication - ARootTask* m_pRootTask; // 0x1C - ADummyTask* m_pInputTask; // 0x20 - ADummyTask* m_pUpdate1Task; // 0x24 - ADummyTask* m_pUpdate2Task; // 0x28 - ADummyTask* m_pUpdate3Task; // 0x2C - ADummyTask* m_pRenderTask; // 0x24 + // 0x0 -> 0x1C TApplication + ARootTask *m_pRootTask; // 0x1C + ADummyTask *m_pInputTask; // 0x20 + ADummyTask *m_pUpdate1Task; // 0x24 + ADummyTask *m_pUpdate2Task; // 0x28 + ADummyTask *m_pUpdate3Task; // 0x2C + ADummyTask *m_pRenderTask; // 0x24 }; -extern AApplication g_oTheApp; \ No newline at end of file +extern AApplication g_oTheApp; diff --git a/OpenJPOG/premake5.lua b/OpenJPOG/premake5.lua index 19e5d9b..989d65b 100644 --- a/OpenJPOG/premake5.lua +++ b/OpenJPOG/premake5.lua @@ -1,7 +1,6 @@ project ("OpenJPOG") + kind "ConsoleApp" language "C++" - cppdialect "C++20" - characterset "ASCII" staticruntime "on" links @@ -33,9 +32,9 @@ project ("OpenJPOG") includedirs { + "Source", "%{wks.location}/Toshi/Include", "%{wks.location}/Toshi/Plugins/Include", - "Source", "%{IncludeDir.fmod}", "%{IncludeDir.bink}" } @@ -68,29 +67,3 @@ project ("OpenJPOG") "{COPY} \"%{wks.location}Toshi/vendor/fmod/lib/fmod.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"", "{COPY} \"%{wks.location}Toshi/vendor/bink/lib/binkw32.dll\" \"%{wks.location}bin/" .. outputdir .. "/%{prj.name}\"", } - - filter "system:windows" - systemversion "latest" - - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - kind "ConsoleApp" - runtime "Debug" - defines "TOSHI_DEBUG" - symbols "On" - - filter "configurations:Release" - kind "ConsoleApp" - runtime "Release" - defines "TOSHI_RELEASE" - optimize "On" - - filter "configurations:Final" - kind "ConsoleApp" - runtime "Release" - defines "TOSHI_FINAL" - optimize "On" diff --git a/Tools/UnitTests/Source/TApplication/TApplication_Tests.cpp b/Tools/UnitTests/Source/TApplication/TApplication_Tests.cpp index 9c8716a..a299fd9 100644 --- a/Tools/UnitTests/Source/TApplication/TApplication_Tests.cpp +++ b/Tools/UnitTests/Source/TApplication/TApplication_Tests.cpp @@ -5,5 +5,4 @@ TOSHI_NAMESPACE_USING TEST_CASE("Create", "[TApplication]") { - -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TCString_Tests.cpp b/Tools/UnitTests/Source/TKernel/TCString_Tests.cpp index 3135f53..b18524b 100644 --- a/Tools/UnitTests/Source/TKernel/TCString_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TCString_Tests.cpp @@ -24,9 +24,9 @@ TEST_CASE("Mid", "[TCString]") REQUIRE(result == "World"); TCString string2("Name[Subname]"); - TINT index = string2.Find('['); - TCString name = string2.Mid(0, index); + TINT index = string2.Find('['); + TCString name = string2.Mid(0, index); TCString subName = string2.Mid(index + 1, (string2.Find(']') - index) - 1); REQUIRE(name == "Name"); REQUIRE(subName == "Subname"); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TDList_Tests.cpp b/Tools/UnitTests/Source/TKernel/TDList_Tests.cpp index a51fc2e..3ed1618 100644 --- a/Tools/UnitTests/Source/TKernel/TDList_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TDList_Tests.cpp @@ -10,8 +10,10 @@ struct Test : TDList::TNode struct Test2 : TPriList::TNode { - Test2() : m_iTest(0) {} - Test2(int a_iTest) : m_iTest(a_iTest) {} + Test2() + : m_iTest(0) {} + Test2(int a_iTest) + : m_iTest(a_iTest) {} int m_iTest; }; @@ -20,22 +22,22 @@ struct Test2 : TPriList::TNode TEST_CASE("List", "[TDList]") { TDList list; - Test *t = new Test{}; + Test* t = new Test{}; list.InsertHead(t); REQUIRE(!list.IsEmpty()); TDList::TNode* node = list.Begin(); - Test *t2 = list.Head(); + Test* t2 = list.Head(); REQUIRE(t2 == t); } TEST_CASE("Priority List", "[TDList]") { TPriList list; - Test2 t; + Test2 t; list.InsertHead(&t); REQUIRE(!list.IsEmpty()); REQUIRE(list.Head() == &t); - Test2 t2{1}; + Test2 t2{ 1 }; list.InsertHead(&t2); REQUIRE(!list.IsEmpty()); REQUIRE(list.Head() == &t2); @@ -50,4 +52,4 @@ TEST_CASE("Priority List", "[TDList]") // auto val = *it; // REQUIRE(val.m_iTest == expected[i++]); //} -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TDebug_Tests.cpp b/Tools/UnitTests/Source/TKernel/TDebug_Tests.cpp index f568c80..9d6ea3f 100644 --- a/Tools/UnitTests/Source/TKernel/TDebug_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TDebug_Tests.cpp @@ -11,4 +11,4 @@ TEST_CASE("Test Assert", "[TDebug]") } TASSERT(!TTRUE); TASSERT(!TTRUE); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TFileLexer_Tests.cpp b/Tools/UnitTests/Source/TKernel/TFileLexer_Tests.cpp index 4632b5e..4864e35 100644 --- a/Tools/UnitTests/Source/TKernel/TFileLexer_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TFileLexer_Tests.cpp @@ -5,11 +5,11 @@ TOSHI_NAMESPACE_USING TEST_CASE("Single Line Comment", "[TFileLexer]") { - TFile* f = TFile::Create("singelLineComment.ini", TMODE_CREATE); + TFile* f = TFile::Create("singelLineComment.ini", TMODE_CREATE); TPCCHAR data = "// Test Comment\n"; f->Write(data, strlen(data)); f->Destroy(); - f = TFile::Create("singelLineComment.ini", TMODE_READONLY); + f = TFile::Create("singelLineComment.ini", TMODE_READONLY); TFileLexerUTF8 lexer = TFileLexerUTF8(f, 2); lexer.SetOutputComments(TTRUE); REQUIRE(lexer.Expect(TFileLexer::TOKEN_COMMENT)); @@ -18,11 +18,11 @@ TEST_CASE("Single Line Comment", "[TFileLexer]") TEST_CASE("Multi Line Comment", "[TFileLexer]") { - TFile* f = TFile::Create("multiLineComment.ini", TMODE_CREATE); + TFile* f = TFile::Create("multiLineComment.ini", TMODE_CREATE); TPCCHAR data = "/* Test Comment\n \tABCD\n*//**/"; f->Write(data, strlen(data)); f->Destroy(); - f = TFile::Create("multiLineComment.ini", TMODE_READONLY); + f = TFile::Create("multiLineComment.ini", TMODE_READONLY); TFileLexerUTF8 lexer = TFileLexerUTF8(f, 2); lexer.SetOutputComments(TTRUE); REQUIRE(lexer.Expect(TFileLexer::TOKEN_COMMENT)); @@ -34,11 +34,11 @@ TEST_CASE("Multi Line Comment", "[TFileLexer]") TEST_CASE("String", "[TFileLexer]") { - TFile* f = TFile::Create("quotes.ini", TMODE_CREATE); + TFile* f = TFile::Create("quotes.ini", TMODE_CREATE); TPCCHAR data = "\"Test\"\n"; f->Write(data, strlen(data)); f->Destroy(); - f = TFile::Create("quotes.ini", TMODE_READONLY); + f = TFile::Create("quotes.ini", TMODE_READONLY); TFileLexerUTF8 lexer = TFileLexerUTF8(f, 2); REQUIRE(lexer.Expect(TFileLexer::TOKEN_STRING)); TFileLexerUTF8::Token token = lexer.GetLastToken(); @@ -49,11 +49,11 @@ TEST_CASE("String", "[TFileLexer]") TEST_CASE("Numerics", "[TFileLexer]") { - TFile* f = TFile::Create("numerics.ini", TMODE_CREATE); + TFile* f = TFile::Create("numerics.ini", TMODE_CREATE); TPCCHAR data = "1.0f\n5e+1\n20u\n0x20"; f->Write(data, strlen(data)); f->Destroy(); - f = TFile::Create("numerics.ini", TMODE_READONLY); + f = TFile::Create("numerics.ini", TMODE_READONLY); TFileLexerUTF8 lexer = TFileLexerUTF8(f, 2); REQUIRE(lexer.Expect(TFileLexer::TOKEN_FLOAT)); @@ -75,6 +75,6 @@ TEST_CASE("Numerics", "[TFileLexer]") token = lexer.GetLastToken(); REQUIRE(token.GetInteger() == 0x20); REQUIRE(token.GetLine() == 4); - + f->Destroy(); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TFile_Tests.cpp b/Tools/UnitTests/Source/TKernel/TFile_Tests.cpp index 3c598dd..f56d73a 100644 --- a/Tools/UnitTests/Source/TKernel/TFile_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TFile_Tests.cpp @@ -13,4 +13,4 @@ TEST_CASE("Create File", "[TFile]") f->Destroy(); std::ifstream f2("Test.txt"); REQUIRE(f2.good()); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TKernelInterface_Tests.cpp b/Tools/UnitTests/Source/TKernel/TKernelInterface_Tests.cpp index e941ead..600be17 100644 --- a/Tools/UnitTests/Source/TKernel/TKernelInterface_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TKernelInterface_Tests.cpp @@ -5,7 +5,7 @@ TOSHI_NAMESPACE_USING TEST_CASE("DumpInfo", "[TKernelInterface]") { - + //TKernelInterface ki = TKernelInterface(0, (TPCHAR*)"", TTRUE); //ki.DumpInfo(); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TKernel/TManagedPointer_Tests.cpp b/Tools/UnitTests/Source/TKernel/TManagedPointer_Tests.cpp index b004650..d26b772 100644 --- a/Tools/UnitTests/Source/TKernel/TManagedPointer_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TManagedPointer_Tests.cpp @@ -3,18 +3,24 @@ TOSHI_NAMESPACE_USING -struct Test +struct ManagedPtrTest : public TRefCounted { - int m_iTest; + int m_iTest = 1; }; TEST_CASE("Test Managed Pointer", "[TManagedPtr]") { - TManagedPtr testptr(new Test{1}); + ManagedPtrTest *pTest = new ManagedPtrTest; + pTest->m_iTest = 1; + + TManagedPtr testptr(pTest); REQUIRE(testptr->m_iTest == 1); REQUIRE(testptr.GetRefCount() == 1); - TManagedPtr testptr2 = testptr; + + TManagedPtr testptr2 = testptr; REQUIRE(testptr->m_iTest == 1); REQUIRE(testptr.GetRefCount() == 2); + + testptr = TNULL; REQUIRE(testptr2.GetRefCount() == 1); } diff --git a/Tools/UnitTests/Source/TKernel/TObject_Tests.cpp b/Tools/UnitTests/Source/TKernel/TObject_Tests.cpp index b842c0b..0ac9cec 100644 --- a/Tools/UnitTests/Source/TKernel/TObject_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TObject_Tests.cpp @@ -45,4 +45,4 @@ TEST_CASE("Create Object", "[TObject]") REQUIRE(obj != TNULL); REQUIRE(obj->IsA(TGetClass(Test2))); } -*/ \ No newline at end of file +*/ diff --git a/Tools/UnitTests/Source/TKernel/TUser_Tests.cpp b/Tools/UnitTests/Source/TKernel/TUser_Tests.cpp index 7abaeb3..beeca0b 100644 --- a/Tools/UnitTests/Source/TKernel/TUser_Tests.cpp +++ b/Tools/UnitTests/Source/TKernel/TUser_Tests.cpp @@ -9,7 +9,7 @@ static TUser testUser2("AdventureT"); TEST_CASE("Register User", "[TUser]") { TSHORT iUserID = testUser.Register(); - + REQUIRE(iUserID != -1); REQUIRE(TUserHandler::GetSingleton().FindUser("Test")); REQUIRE(testUser.IsRegistered()); @@ -39,4 +39,4 @@ TEST_CASE("Deregister User", "[TUser]") REQUIRE(TUserHandler::GetSingleton().FindUser("Toshi")); // This user is created in the ctor of TKernelInterface // The Users are still present, but not Registered REQUIRE(TUserHandler::GetSingleton().GetUserCount() == 3); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/TRender/TResource_Tests.cpp b/Tools/UnitTests/Source/TRender/TResource_Tests.cpp index c2a9a7f..503534b 100644 --- a/Tools/UnitTests/Source/TRender/TResource_Tests.cpp +++ b/Tools/UnitTests/Source/TRender/TResource_Tests.cpp @@ -9,4 +9,4 @@ TEST_CASE("SetName", "[TResource]") res.SetName(TNULL); REQUIRE(strcmp(res.GetName(), "res:0") == 0); -} \ No newline at end of file +} diff --git a/Tools/UnitTests/Source/main.cpp b/Tools/UnitTests/Source/main.cpp index 2226c78..6642de2 100644 --- a/Tools/UnitTests/Source/main.cpp +++ b/Tools/UnitTests/Source/main.cpp @@ -19,7 +19,7 @@ class AApplication : public Toshi::TApplication static AApplication g_oTheApp; -int main(int argc, char* argv[]) +int main(int argc, char* argv[]) { int result = 0; if (g_oTheApp.Create("UnitTests", argc, argv)) { @@ -30,4 +30,4 @@ int main(int argc, char* argv[]) g_oTheApp.Destroy(); return result; -} \ No newline at end of file +} diff --git a/Tools/UnitTests/premake5.lua b/Tools/UnitTests/premake5.lua index 20f27b7..cf7ba64 100644 --- a/Tools/UnitTests/premake5.lua +++ b/Tools/UnitTests/premake5.lua @@ -10,9 +10,8 @@ end project "UnitTests" + kind "ConsoleApp" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -41,7 +40,7 @@ project "UnitTests" defines { - "TOSHI_USER_CLIENT", + "TOSHI_USER_CLIENT" } postbuildcommands @@ -52,51 +51,20 @@ project "UnitTests" } filter "system:windows" - systemversion "latest" - - defines - { - "TOSHI_CONSOLE", - "TOSHI_SKU_WINDOWS" - } + defines "TOSHI_CONSOLE" filter "configurations:Debug" - kind "ConsoleApp" - runtime "Debug" - defines "TOSHI_DEBUG" - symbols "On" - ExtractLib { dbg = "d" } - links - { - "Catch2d.lib" - } + links "Catch2d.lib" filter "configurations:Release" - kind "ConsoleApp" - runtime "Release" - defines "TOSHI_RELEASE" - optimize "On" - - ExtractLib { dbg = ""} + ExtractLib { dbg = "" } - links - { - "Catch2.lib" - } + links "Catch2.lib" filter "configurations:Final" - kind "ConsoleApp" - runtime "Release" - defines "TOSHI_FINAL" - optimize "On" - ExtractLib { dbg = "" } - links - { - "Catch2.lib" - } - + links "Catch2.lib" \ No newline at end of file diff --git a/Toshi/Include/TApplication/Defines.h b/Toshi/Include/TApplication/Defines.h index 9f6d04c..0c2eb7c 100644 --- a/Toshi/Include/TApplication/Defines.h +++ b/Toshi/Include/TApplication/Defines.h @@ -3,14 +3,14 @@ #ifndef TAPPLICATION_STATIC_LINKING -#ifdef TAPPLICATION -#define TAPPLICATION_EXPORTS DLL_CLASS_EXPORT -#else -#define TAPPLICATION_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef TAPPLICATION +# define TAPPLICATION_EXPORTS DLL_CLASS_EXPORT +# else +# define TAPPLICATION_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !TAPPLICATION_STATIC_LINKING +#else // !TAPPLICATION_STATIC_LINKING -#define TAPPLICATION_EXPORTS +# define TAPPLICATION_EXPORTS -#endif // TAPPLICATION_STATIC_LINKING \ No newline at end of file +#endif // TAPPLICATION_STATIC_LINKING diff --git a/Toshi/Include/TApplication/TApplication.h b/Toshi/Include/TApplication/TApplication.h index 427f86b..840856c 100644 --- a/Toshi/Include/TApplication/TApplication.h +++ b/Toshi/Include/TApplication/TApplication.h @@ -4,7 +4,7 @@ #include #ifdef TOSHI_SKU_WINDOWS -#include +# include #endif TOSHI_NAMESPACE_BEGIN @@ -15,16 +15,15 @@ class TAPPLICATION_EXPORTS TApplication private: enum TApplicationFlag { - TApplicationFlag_Created = BITFIELD(0), + TApplicationFlag_Created = BITFIELD(0), TApplicationFlag_Destroyed = BITFIELD(1), }; public: - TApplication(); virtual ~TApplication(); - TBOOL Create(TPCCHAR a_pcName, TINT argc, TPCHAR* const argv); + TBOOL Create(TPCCHAR a_pcName, TINT argc, TPCHAR *const argv); TBOOL Execute(); TBOOL IsCreated() @@ -38,7 +37,11 @@ class TAPPLICATION_EXPORTS TApplication } TBOOL ShowConsole(TBOOL a_bShowConsole); - TBOOL ToggleConsole() { ShowConsole(!m_bShowConsole); return m_bShowConsole; } + TBOOL ToggleConsole() + { + ShowConsole(!m_bShowConsole); + return m_bShowConsole; + } void Destroy() { @@ -50,7 +53,7 @@ class TAPPLICATION_EXPORTS TApplication MessageBox(*m_hConsole, a_oErrorMessage.GetString(), "Error", 0); } - virtual TBOOL OnCreate(TINT argc, TPCHAR* const argv) + virtual TBOOL OnCreate(TINT argc, TPCHAR *const argv) { m_uiState |= TApplicationFlag_Created; return TTRUE; @@ -66,15 +69,15 @@ class TAPPLICATION_EXPORTS TApplication return (m_uiState & TApplicationFlag_Destroyed) == 0; } - TKernelInterface* GetKernel() { return m_pKernel; } + TKernelInterface *GetKernel() { return m_pKernel; } private: - TKernelInterface* m_pKernel; // 0x4 - TCString m_pcName; // 0x8 - TINT m_uiState; // 0x10 - TBOOL m_bVerbose; // 0x14 - TBOOL m_bShowConsole; // 0x15 - HWND* m_hConsole; // 0x18 + TKernelInterface *m_pKernel; // 0x4 + TCString m_pcName; // 0x8 + TINT m_uiState; // 0x10 + TBOOL m_bVerbose; // 0x14 + TBOOL m_bShowConsole; // 0x15 + HWND *m_hConsole; // 0x18 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TGui/Defines.h b/Toshi/Include/TGui/Defines.h index 3f428f0..829e474 100644 --- a/Toshi/Include/TGui/Defines.h +++ b/Toshi/Include/TGui/Defines.h @@ -3,14 +3,14 @@ #ifndef TGUIINTERFACE_STATIC_LINKING -#ifdef TGUIINTERFACE -#define TGUIINTERFACE_EXPORTS DLL_CLASS_EXPORT -#else -#define TGUIINTERFACE_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef TGUIINTERFACE +# define TGUIINTERFACE_EXPORTS DLL_CLASS_EXPORT +# else +# define TGUIINTERFACE_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !TGUIINTERFACE_STATIC_LINKING +#else // !TGUIINTERFACE_STATIC_LINKING -#define TGUIINTERFACE_EXPORTS +# define TGUIINTERFACE_EXPORTS -#endif // TGUIINTERFACE_STATIC_LINKING \ No newline at end of file +#endif // TGUIINTERFACE_STATIC_LINKING diff --git a/Toshi/Include/TGui/TGUIActionMap.h b/Toshi/Include/TGui/TGUIActionMap.h index c7187c0..e600750 100644 --- a/Toshi/Include/TGui/TGUIActionMap.h +++ b/Toshi/Include/TGui/TGUIActionMap.h @@ -13,4 +13,4 @@ class TGUIINTERFACE_EXPORTS TGUIActionMap : public TObject void AddActionMapping(TINT a_iDoodad, TUINT a_uiAction); }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TGui/TGUIDeserialisable.h b/Toshi/Include/TGui/TGUIDeserialisable.h index 0e62d8a..4349fd8 100644 --- a/Toshi/Include/TGui/TGUIDeserialisable.h +++ b/Toshi/Include/TGui/TGUIDeserialisable.h @@ -9,4 +9,4 @@ class TGUIINTERFACE_EXPORTS TGUIDeserialisable : public TObject DECLARE_DYNAMIC(TGUIDeserialisable) }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TGui/TGUIInterface.h b/Toshi/Include/TGui/TGUIInterface.h index 75ac1cd..9cc10e8 100644 --- a/Toshi/Include/TGui/TGUIInterface.h +++ b/Toshi/Include/TGui/TGUIInterface.h @@ -1,11 +1,14 @@ #pragma once #include "Defines.h" #include "TKernel/TObject.h" +#include "TKernel/TRefCounted.h" #include "TGUIActionMap.h" TOSHI_NAMESPACE_BEGIN -class TGUIINTERFACE_EXPORTS TGUIInterface : public TObject +class TGUIINTERFACE_EXPORTS TGUIInterface + : public TObject + , public TRefCounted { DECLARE_DYNAMIC(TGUIInterface) @@ -16,4 +19,4 @@ class TGUIINTERFACE_EXPORTS TGUIInterface : public TObject TGUIActionMap m_oActionMap; // 0x84 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TGui/TGUIMemory.h b/Toshi/Include/TGui/TGUIMemory.h index 0e3f9a8..36b6f9a 100644 --- a/Toshi/Include/TGui/TGUIMemory.h +++ b/Toshi/Include/TGui/TGUIMemory.h @@ -13,8 +13,8 @@ class TGUIINTERFACE_EXPORTS TGUIMemory static TPile ms_oMemoryPile; }; -void* TOSHI_API TGUINew(TUINT a_uiSize); -void* TOSHI_API TGUIDelete(void* a_pMemory); -void TOSHI_API TGUISetUseMemoryPile(TBOOL a_bEnable); +void *TOSHI_API TGUINew(TUINT a_uiSize); +void *TOSHI_API TGUIDelete(void *a_pMemory); +void TOSHI_API TGUISetUseMemoryPile(TBOOL a_bEnable); -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TGui/TGUIScreen.h b/Toshi/Include/TGui/TGUIScreen.h index 3b8a84b..2554795 100644 --- a/Toshi/Include/TGui/TGUIScreen.h +++ b/Toshi/Include/TGui/TGUIScreen.h @@ -8,4 +8,4 @@ class TGUIINTERFACE_EXPORTS TGUIScreen : public TGUIWidget DECLARE_DYNAMIC(TGUIScreen) }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TGui/TGuiWidget.h b/Toshi/Include/TGui/TGuiWidget.h index 0c624a6..b1cc539 100644 --- a/Toshi/Include/TGui/TGuiWidget.h +++ b/Toshi/Include/TGui/TGuiWidget.h @@ -5,18 +5,19 @@ TOSHI_NAMESPACE_BEGIN -class TGUIINTERFACE_EXPORTS TGUIWidget : public TGUIDeserialisable, public TNodeList::TNode +class TGUIINTERFACE_EXPORTS TGUIWidget : public TGUIDeserialisable + , public TNodeList::TNode { DECLARE_DYNAMIC(TGUIWidget) enum State { - STATE_ENABLED = BITFIELD(0), - STATE_FOCUSED = BITFIELD(1), - STATE_VISIBLE = BITFIELD(2), + STATE_ENABLED = BITFIELD(0), + STATE_FOCUSED = BITFIELD(1), + STATE_VISIBLE = BITFIELD(2), STATE_ROLLOVER = BITFIELD(3), STATE_SELECTED = BITFIELD(4), }; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/Defines.h b/Toshi/Include/TKernel/Defines.h index d349c2c..c7ea251 100644 --- a/Toshi/Include/TKernel/Defines.h +++ b/Toshi/Include/TKernel/Defines.h @@ -3,14 +3,14 @@ #ifndef TKERNELINTERFACE_STATIC_LINKING -#ifdef TKERNELINTERFACE -#define TKERNELINTERFACE_EXPORTS DLL_CLASS_EXPORT -#else -#define TKERNELINTERFACE_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef TKERNELINTERFACE +# define TKERNELINTERFACE_EXPORTS DLL_CLASS_EXPORT +# else +# define TKERNELINTERFACE_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !TKERNELINTERFACE_STATIC_LINKING +#else // !TKERNELINTERFACE_STATIC_LINKING -#define TKERNELINTERFACE_EXPORTS +# define TKERNELINTERFACE_EXPORTS -#endif // TKERNELINTERFACE_STATIC_LINKING \ No newline at end of file +#endif // TKERNELINTERFACE_STATIC_LINKING diff --git a/Toshi/Include/TKernel/T2Iterator.h b/Toshi/Include/TKernel/T2Iterator.h index 23454cd..643138a 100644 --- a/Toshi/Include/TKernel/T2Iterator.h +++ b/Toshi/Include/TKernel/T2Iterator.h @@ -2,100 +2,101 @@ #include #define T2_FOREACH(vecName, iteratorName) \ - for (auto iteratorName = vecName.Begin(); iteratorName != vecName.End(); iteratorName++) + for (auto iteratorName = vecName.Begin(); iteratorName != vecName.End(); iteratorName++) #define T2_FOREACH_BACK(vecName, iteratorName) \ for (auto iteratorName = vecName.Tail(); iteratorName != vecName.End(); iteratorName--) #define T2_FOREACH_ARRAY(arrName, iteratorName) \ - for (TINT iteratorName = 0; iteratorName < TARRAYSIZE(arrName); iteratorName++) + for (TINT iteratorName = 0; iteratorName < TARRAYSIZE(arrName); iteratorName++) #define T2_FOREACH_ARRAY_BACK(arrName, iteratorName) \ for (TINT iteratorName = TARRAYSIZE(arrName) - 1; iteratorName >= 0; iteratorName--) #define T2_DEFINE_ITERATOR_FRIEND() \ - template friend class Toshi::T2Iterator + template friend class Toshi::T2Iterator #define T2_DEFINE_ITERATOR(TYPE, NODE_TYPE) \ using Iterator_t = Toshi::T2Iterator -namespace Toshi { +namespace Toshi +{ - template - class T2Iterator +template +class T2Iterator +{ +public: + //TSTATICASSERT(std::is_base_of::value); + + T2Iterator() + { + m_pPtr = TNULL; + } + + T2Iterator(Node *pPtr) + { + m_pPtr = static_cast(pPtr); + } + + T2Iterator(T *pPtr) + { + m_pPtr = pPtr; + } + + void operator=(const T2Iterator &other) + { + m_pPtr = other.m_pPtr; + } + + void operator=(T *pPtr) { - public: - //TSTATICASSERT(std::is_base_of::value); - - T2Iterator() - { - m_pPtr = TNULL; - } - - T2Iterator(Node* pPtr) - { - m_pPtr = static_cast(pPtr); - } - - T2Iterator(T* pPtr) - { - m_pPtr = pPtr; - } - - void operator=(const T2Iterator& other) - { - m_pPtr = other.m_pPtr; - } - - void operator=(T* pPtr) - { - m_pPtr = pPtr; - } - - T* operator->() const - { - TASSERT(m_pPtr != TNULL); - return m_pPtr; - } - - operator T* () const - { - TASSERT(m_pPtr != TNULL); - return static_cast(m_pPtr); - } - - T2Iterator operator++(TINT) - { - TASSERT(m_pPtr != TNULL); - T2Iterator old = m_pPtr; - m_pPtr = static_cast(m_pPtr->Next()); - return old; - } - - T2Iterator operator--(TINT) - { - TASSERT(m_pPtr != TNULL); - T2Iterator old = m_pPtr; - m_pPtr = static_cast(m_pPtr->Prev()); - return old; - } - - T2Iterator operator++() - { - TASSERT(m_pPtr != TNULL); - m_pPtr = static_cast(m_pPtr->Next()); - return T2Iterator{ m_pPtr }; - } - - T2Iterator operator--() - { - TASSERT(m_pPtr != TNULL); - m_pPtr = static_cast(m_pPtr->Prev()); - return T2Iterator{ m_pPtr }; - } - - private: - T* m_pPtr; - }; - -} \ No newline at end of file + m_pPtr = pPtr; + } + + T *operator->() const + { + TASSERT(m_pPtr != TNULL); + return m_pPtr; + } + + operator T *() const + { + TASSERT(m_pPtr != TNULL); + return static_cast(m_pPtr); + } + + T2Iterator operator++(TINT) + { + TASSERT(m_pPtr != TNULL); + T2Iterator old = m_pPtr; + m_pPtr = static_cast(m_pPtr->Next()); + return old; + } + + T2Iterator operator--(TINT) + { + TASSERT(m_pPtr != TNULL); + T2Iterator old = m_pPtr; + m_pPtr = static_cast(m_pPtr->Prev()); + return old; + } + + T2Iterator operator++() + { + TASSERT(m_pPtr != TNULL); + m_pPtr = static_cast(m_pPtr->Next()); + return T2Iterator{ m_pPtr }; + } + + T2Iterator operator--() + { + TASSERT(m_pPtr != TNULL); + m_pPtr = static_cast(m_pPtr->Prev()); + return T2Iterator{ m_pPtr }; + } + +private: + T *m_pPtr; +}; + +} // namespace Toshi diff --git a/Toshi/Include/TKernel/TArray.h b/Toshi/Include/TKernel/TArray.h index 2d8c600..6e609ed 100644 --- a/Toshi/Include/TKernel/TArray.h +++ b/Toshi/Include/TKernel/TArray.h @@ -21,25 +21,25 @@ class TArray public: Iterator() { - m_iIndex = 0; + m_iIndex = 0; m_poArray = TNULL; } - Iterator(const Iterator& other) + Iterator(const Iterator &other) { m_poArray = other.m_poArray; - m_iIndex = 0; + m_iIndex = 0; } - Iterator(Storage& a_poArray) + Iterator(Storage &a_poArray) { - m_iIndex = 0; + m_iIndex = 0; m_poArray = &a_poArray; } - Iterator(TINT a_iIndex, Storage& a_poArray) + Iterator(TINT a_iIndex, Storage &a_poArray) { - m_iIndex = a_iIndex; + m_iIndex = a_iIndex; m_poArray = &a_poArray; } @@ -55,7 +55,7 @@ class TArray return m_iIndex; } - TINT& IncrementSafe() + TINT &IncrementSafe() { m_iIndex++; TASSERT(m_poArray); @@ -67,13 +67,13 @@ class TArray return m_iIndex; } - void Push(const T& element) + void Push(const T &element) { TASSERT(m_poArray); m_poArray->Push(element); } - T* operator->() const + T *operator->() const { TASSERT(m_iIndex >= 0); TASSERT(m_poArray); @@ -81,7 +81,7 @@ class TArray return &m_poArray->m_pData[m_iIndex]; } - T& Get() + T &Get() { TASSERT(m_iIndex >= 0); TASSERT(m_poArray); @@ -94,7 +94,7 @@ class TArray return (m_iIndex >= m_poArray->GetNumElements() || m_iIndex == -1); } - const T& Get() const + const T &Get() const { TASSERT(m_iIndex >= 0); TASSERT(m_poArray); @@ -102,7 +102,7 @@ class TArray return m_poArray->m_pData[m_iIndex]; } - Iterator& operator++() + Iterator &operator++() { m_iIndex++; return *this; @@ -115,7 +115,7 @@ class TArray return temp; } - Iterator& operator--() + Iterator &operator--() { m_iIndex--; return *this; @@ -139,25 +139,24 @@ class TArray } private: - TINT m_iIndex; // 0x0 - Storage* m_poArray; // 0x4 + TINT m_iIndex; // 0x0 + Storage *m_poArray; // 0x4 }; public: - - TArray() : TArray(10, 0) + TArray() + : TArray(10, 0) { - } TArray(TINT a_iGrowSize, TINT a_iSize) { - m_iGrowSize = a_iGrowSize; + m_iGrowSize = a_iGrowSize; m_iNumAllocElements = a_iSize; - m_iNumElements = 0; + m_iNumElements = 0; if (m_iNumAllocElements > 0) { - m_pData = TSTATICCAST(T*, tmemalign(alignof(T), m_iNumAllocElements * sizeof(T))); + m_pData = TSTATICCAST(T *, tmemalign(alignof(T), m_iNumAllocElements * sizeof(T))); } else { TASSERT(m_iGrowSize != 0); @@ -216,28 +215,28 @@ class TArray m_iGrowSize = a_iGrowSize; } - T* Push(const T& element) + T *Push(const T &element) { GrowBy(1); - T* current = &m_pData[m_iNumElements++]; + T *current = &m_pData[m_iNumElements++]; memcpy(current, &element, sizeof(T)); return current; } - T& Pop() + T &Pop() { TASSERT(m_iNumElements >= 1); return m_pData[--m_iNumElements]; } - T& operator[](TINT a_iIndex) + T &operator[](TINT a_iIndex) { TASSERT(a_iIndex >= 0); TASSERT(a_iIndex < m_iNumElements); return m_pData[a_iIndex]; } - const T& operator[](TINT a_iIndex) const + const T &operator[](TINT a_iIndex) const { TASSERT(a_iIndex >= 0); TASSERT(a_iIndex < m_iNumElements); @@ -258,7 +257,7 @@ class TArray void Resize(TINT a_iNewSize) { if (a_iNewSize != 0) { - T* pNewBuffer = TSTATICCAST(T*, tmemalign(alignof(T), a_iNewSize * sizeof(T))); + T *pNewBuffer = TSTATICCAST(T *, tmemalign(alignof(T), a_iNewSize * sizeof(T))); size_t uiCopySize = TMIN(m_iNumElements, a_iNewSize); TSystem::MemCopy(pNewBuffer, m_pData, sizeof(T) * uiCopySize); @@ -271,9 +270,9 @@ class TArray } else { if (m_pData) tfree(m_pData); - m_pData = TNULL; + m_pData = TNULL; m_iNumAllocElements = 0; - m_iNumElements = 0; + m_iNumElements = 0; } } @@ -281,7 +280,7 @@ class TArray TINT m_iGrowSize; // 0x0 TINT m_iNumElements; // 0x4 TINT m_iNumAllocElements; // 0x8 - T* m_pData; // 0xC + T *m_pData; // 0xC }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TCString.h b/Toshi/Include/TKernel/TCString.h index 52616a9..38d56bc 100644 --- a/Toshi/Include/TKernel/TCString.h +++ b/Toshi/Include/TKernel/TCString.h @@ -9,11 +9,10 @@ TOSHI_NAMESPACE_BEGIN class TPCString; class TWString; -class TKERNELINTERFACE_EXPORTS TCString +class TKERNELINTERFACE_EXPORTS TCString { public: - - friend TCString TKERNELINTERFACE_EXPORTS TOSHI_API operator+(TPCCHAR a_pLHS, const TCString& a_rRHS); + friend TCString TKERNELINTERFACE_EXPORTS TOSHI_API operator+(TPCCHAR a_pLHS, const TCString &a_rRHS); // $TKernelInterface: FUNCTION 1000a5a0 COMPLETED TCString() @@ -22,51 +21,51 @@ class TKERNELINTERFACE_EXPORTS TCString AllocBuffer(0); } - // $TKernelInterface: FUNCTION 1000a5d0 COMPLETED + // $TKernelInterface: FUNCTION 1000a5d0 COMPLETED TCString(TINT a_iLength) { Reset(); AllocBuffer(a_iLength); } - // $TKernelInterface: FUNCTION 1000b9f0 COMPLETED + // $TKernelInterface: FUNCTION 1000b9f0 COMPLETED TCString(const TCString &a_rOther) { Reset(); Copy(a_rOther); } - // $TKernelInterface: FUNCTION 1000b9c0 COMPLETED + // $TKernelInterface: FUNCTION 1000b9c0 COMPLETED TCString(const TWString &a_rOther) { Reset(); Copy(a_rOther); } - // $TKernelInterface: FUNCTION 1000ba50 COMPLETED + // $TKernelInterface: FUNCTION 1000ba50 COMPLETED TCString(TPCCHAR a_pcString) { Reset(); Copy(a_pcString); } - // $TKernelInterface: FUNCTION 1000b9b0 COMPLETED + // $TKernelInterface: FUNCTION 1000b9b0 COMPLETED ~TCString() { FreeBuffer(); } - TCString& Concat(TCString const& a_rString, TINT a_iLength = -1); - TCString& Concat(TPCCHAR a_String, TINT a_iLength = -1); - TINT Compare(TPCCHAR a_pcString, int a_iLength = -1) const; + TCString &Concat(TCString const &a_rString, TINT a_iLength = -1); + TCString &Concat(TPCCHAR a_String, TINT a_iLength = -1); + TINT Compare(TPCCHAR a_pcString, int a_iLength = -1) const; - void Copy(const TCString& a_rOther, TINT a_iLength = -1); + void Copy(const TCString &a_rOther, TINT a_iLength = -1); void Copy(const TWString &a_rOther, TINT a_iLength = -1); void Copy(TPCCHAR a_pcString, TINT a_iLength = -1); - TCString& TOSHI_CALLBACKAPI Format(TPCCHAR a_pcFormat, ...); - TINT Find(TCHAR a_cFind, TINT a_iIndex = 0) const; - TINT FindReverse(TCHAR a_cFind, TINT a_iIndex = -1) const; + TCString &TOSHI_CALLBACKAPI Format(TPCCHAR a_pcFormat, ...); + TINT Find(TCHAR a_cFind, TINT a_iIndex = 0) const; + TINT FindReverse(TCHAR a_cFind, TINT a_iIndex = -1) const; TCString Mid(TINT a_iFirst, TINT a_iCount) const; @@ -92,7 +91,7 @@ class TKERNELINTERFACE_EXPORTS TCString return Compare(a_pcString) != 0; } - bool operator!=(const TCString& a_rOther) const + bool operator!=(const TCString &a_rOther) const { return Compare(a_rOther.m_pBuffer) != 0; } @@ -102,18 +101,18 @@ class TKERNELINTERFACE_EXPORTS TCString return Compare(a_pcString) == 0; } - bool operator==(const TCString& a_rOther) const + bool operator==(const TCString &a_rOther) const { return Compare(a_rOther.m_pBuffer) == 0; } - TCString& operator=(TPCCHAR a_pcString) + TCString &operator=(TPCCHAR a_pcString) { Copy(a_pcString); return *this; } - TCString& operator=(TCString& a_rOther) + TCString &operator=(TCString &a_rOther) { Copy(a_rOther); return *this; @@ -137,33 +136,33 @@ class TKERNELINTERFACE_EXPORTS TCString return str.Concat(a_rRHS); } - TCString& operator+=(TPCCHAR a_pcString) + TCString &operator+=(TPCCHAR a_pcString) { Concat(a_pcString); return *this; } - TCString& operator+=(const TCString &a_rString) + TCString &operator+=(const TCString &a_rString) { Concat(a_rString); return *this; } - TCCHAR& operator[](TINT a_iIndex) const + TCCHAR &operator[](TINT a_iIndex) const { - TASSERT((a_iIndex>=0) && (a_iIndex<=(TINT)m_iStrLen)); + TASSERT((a_iIndex >= 0) && (a_iIndex <= (TINT)m_iStrLen)); return m_pBuffer[a_iIndex]; } - TCHAR& operator[](TINT a_iIndex) + TCHAR &operator[](TINT a_iIndex) { TASSERT((a_iIndex >= 0) && (a_iIndex <= (TINT)m_iStrLen)); return m_pBuffer[a_iIndex]; } - const TCString& Print() const + const TCString &Print() const { - TASSERT(GetString()!=TNULL); + TASSERT(GetString() != TNULL); TDPRINTF("%s", GetString()); return *this; } @@ -186,21 +185,20 @@ class TKERNELINTERFACE_EXPORTS TCString void Reset() { - m_pBuffer = m_aNull; + m_pBuffer = m_aNull; m_iExcessLen = 0; - m_iStrLen = 0; + m_iStrLen = 0; } private: - inline static TCHAR m_aNull[4] = { 0, 0, 0, 0 }; - TPCHAR m_pBuffer; // 0x0 - TINT m_iStrLen : 24 = 0; // 0x4 - TINT m_iExcessLen : 8 = 0; // 0x5 + TPCHAR m_pBuffer; // 0x0 + TINT m_iStrLen : 24 = 0; // 0x4 + TINT m_iExcessLen : 8 = 0; // 0x5 }; -TCString TKERNELINTERFACE_EXPORTS TOSHI_API operator+(TPCCHAR a_pLHS, const TCString& a_rRHS); -TCString TKERNELINTERFACE_EXPORTS TOSHI_API operator+(const TCString& a_rLHS, const TPCString& a_rRHS); +TCString TKERNELINTERFACE_EXPORTS TOSHI_API operator+(TPCCHAR a_pLHS, const TCString &a_rRHS); +TCString TKERNELINTERFACE_EXPORTS TOSHI_API operator+(const TCString &a_rLHS, const TPCString &a_rRHS); TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TDLL.h b/Toshi/Include/TKernel/TDLL.h index 7b78a88..d76f3da 100644 --- a/Toshi/Include/TKernel/TDLL.h +++ b/Toshi/Include/TKernel/TDLL.h @@ -7,7 +7,6 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TDLL { public: - TDLL() { m_pDLL = TNULL; @@ -19,14 +18,15 @@ class TKERNELINTERFACE_EXPORTS TDLL } TPVOID GetAddress(const TCString &a_rProcName); - TBOOL Load(const TCString& a_rFileName); - void Unload(); + TBOOL Load(const TCString &a_rFileName); + void Unload(); + + HMODULE GetDLL() { return m_pDLL; } + const TCString &GetFilename() { return m_szFilename; } - HMODULE GetDLL() { return m_pDLL; } - const TCString& GetFilename() { return m_szFilename; } private: TCString m_szFilename; // 0x4 - HMODULE m_pDLL; // 0xC + HMODULE m_pDLL; // 0xC }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TDList.h b/Toshi/Include/TKernel/TDList.h index 1f32145..20f9df0 100644 --- a/Toshi/Include/TKernel/TDList.h +++ b/Toshi/Include/TKernel/TDList.h @@ -9,31 +9,30 @@ class TKERNELINTERFACE_EXPORTS TGenericDList class TKERNELINTERFACE_EXPORTS TNode { public: - enum TUnititialised { }; - TNode(TUnititialised){} + TNode(TUnititialised) {} TNode() { Reset(); } - TNode* Next() const + TNode *Next() const { return m_pNext; } - TNode* Prev() const + TNode *Prev() const { return m_pPrev; } public: - TNode& operator=(const TNode& a_rNode) + TNode &operator=(const TNode &a_rNode) { m_pNext = a_rNode.m_pNext; m_pPrev = a_rNode.m_pPrev; @@ -41,24 +40,28 @@ class TKERNELINTERFACE_EXPORTS TGenericDList } TBOOL IsLinked() const { return this != m_pNext; } - void Reset() { m_pNext = this; m_pPrev = this; } + void Reset() + { + m_pNext = this; + m_pPrev = this; + } - void InsertAfter(TNode* a_pNode) + void InsertAfter(TNode *a_pNode) { TASSERT(!IsLinked()); - m_pPrev = a_pNode; - m_pNext = a_pNode->m_pNext; + m_pPrev = a_pNode; + m_pNext = a_pNode->m_pNext; a_pNode->m_pNext = this; m_pNext->m_pPrev = this; } - void InsertBefore(TNode* a_pNode) + void InsertBefore(TNode *a_pNode) { TASSERT(!IsLinked()); - m_pNext = a_pNode; - m_pPrev = a_pNode->m_pPrev; + m_pNext = a_pNode; + m_pPrev = a_pNode->m_pPrev; a_pNode->m_pPrev = this; m_pPrev->m_pNext = this; } @@ -71,70 +74,76 @@ class TKERNELINTERFACE_EXPORTS TGenericDList } public: - template friend class TDList; + template friend class TDList; friend TGenericDList; public: - TNode* m_pNext; // 0x0 - TNode* m_pPrev; // 0x4 + TNode *m_pNext; // 0x0 + TNode *m_pPrev; // 0x4 }; protected: - void InsertHead(TNode* a_pNode) { a_pNode->InsertAfter(&m_oRoot); } - void InsertTail(TNode* a_pNode) { a_pNode->InsertBefore(&m_oRoot); } - void RemoveHead() { if (!IsEmpty()) m_oRoot.Next()->Remove(); } - void RemoveTail() { if (!IsEmpty()) m_oRoot.Prev()->Remove(); } - TBOOL IsEmpty() const { return m_oRoot.Next() == &m_oRoot; } - TNode* Head() const { return m_oRoot.Next(); } - TNode* Tail() const { return m_oRoot.Prev(); } - TNode* Begin() const { return m_oRoot.Next(); } - TNode* RBegin() const { return m_oRoot.Prev(); } - const TNode* End() const { return &m_oRoot; } - const TNode* REnd() const { return &m_oRoot; } - - static void TOSHI_API InsertSegmentAfter(TNode* node1, TNode* node2, TNode* node3) + void InsertHead(TNode *a_pNode) { a_pNode->InsertAfter(&m_oRoot); } + void InsertTail(TNode *a_pNode) { a_pNode->InsertBefore(&m_oRoot); } + void RemoveHead() + { + if (!IsEmpty()) m_oRoot.Next()->Remove(); + } + void RemoveTail() { - node1->m_pNext = node3; - node2->m_pPrev = node3->m_pPrev; + if (!IsEmpty()) m_oRoot.Prev()->Remove(); + } + TBOOL IsEmpty() const { return m_oRoot.Next() == &m_oRoot; } + TNode *Head() const { return m_oRoot.Next(); } + TNode *Tail() const { return m_oRoot.Prev(); } + TNode *Begin() const { return m_oRoot.Next(); } + TNode *RBegin() const { return m_oRoot.Prev(); } + const TNode *End() const { return &m_oRoot; } + const TNode *REnd() const { return &m_oRoot; } + + static void TOSHI_API InsertSegmentAfter(TNode *node1, TNode *node2, TNode *node3) + { + node1->m_pNext = node3; + node2->m_pPrev = node3->m_pPrev; node1->m_pNext->m_pPrev = node1; node2->m_pPrev->m_pNext = node2; } - static void TOSHI_API InsertSegmentBefore(TNode* node1, TNode* node2, TNode* node3) + static void TOSHI_API InsertSegmentBefore(TNode *node1, TNode *node2, TNode *node3) { - node2->m_pPrev = node3; - node1->m_pNext = node3->m_pNext; + node2->m_pPrev = node3; + node1->m_pNext = node3->m_pNext; node2->m_pPrev->m_pNext = node2; node1->m_pNext->m_pPrev = node1; } - void InsertSegmentAtHead(TNode* node1, TNode* node2) + void InsertSegmentAtHead(TNode *node1, TNode *node2) { - node1->m_pNext = &m_oRoot; - node2->m_pPrev = m_oRoot.m_pPrev; + node1->m_pNext = &m_oRoot; + node2->m_pPrev = m_oRoot.m_pPrev; node1->m_pNext->m_pPrev = node1; node2->m_pPrev->m_pNext = node2; } - void InsertSegmentAtTail(TNode* node1, TNode* node2) + void InsertSegmentAtTail(TNode *node1, TNode *node2) { - node2->m_pPrev = &m_oRoot; - node1->m_pNext = m_oRoot.m_pNext; + node2->m_pPrev = &m_oRoot; + node1->m_pNext = m_oRoot.m_pNext; node2->m_pPrev->m_pNext = node2; node1->m_pNext->m_pPrev = node1; } - static void TOSHI_API RemoveSegment(TNode* node1, TNode* node2) + static void TOSHI_API RemoveSegment(TNode *node1, TNode *node2) { node1->m_pPrev->m_pNext = node2->m_pNext; node2->m_pNext->m_pPrev = node1->m_pPrev; - node1->m_pPrev = node1; - node2->m_pNext = node2; + node1->m_pPrev = node1; + node2->m_pNext = node2; } void RemoveAll() { - for (TNode* pNode = Begin(); pNode != End(); pNode = m_oRoot.Next()) { + for (TNode *pNode = Begin(); pNode != End(); pNode = m_oRoot.Next()) { pNode->Remove(); } } @@ -154,7 +163,6 @@ class TKERNELINTERFACE_EXPORTS TGenericPriList : public TGenericDList class TKERNELINTERFACE_EXPORTS TNode : public TGenericDList::TNode { public: - enum TUnititialised { @@ -167,22 +175,20 @@ class TKERNELINTERFACE_EXPORTS TGenericPriList : public TGenericDList TNode(TUnititialised) { - } public: - - TNode* Next() const + TNode *Next() const { - return (TNode*)m_pNext; + return (TNode *)m_pNext; } - TNode* Prev() const + TNode *Prev() const { - return (TNode*)m_pPrev; + return (TNode *)m_pPrev; } - TNode& operator=(const TNode& node) + TNode &operator=(const TNode &node) { m_pNext = node.m_pNext; m_pPrev = node.m_pPrev; @@ -217,7 +223,7 @@ class TKERNELINTERFACE_EXPORTS TGenericPriList : public TGenericDList } public: - template friend class TPriList; + template friend class TPriList; friend TGenericPriList; private: @@ -225,44 +231,41 @@ class TKERNELINTERFACE_EXPORTS TGenericPriList : public TGenericDList }; public: - - void Insert(TNode* node, int iPriority) + void Insert(TNode *node, int iPriority) { node->SetPriority(iPriority); Insert(node); } - void Insert(TNode* node) + void Insert(TNode *node) { - TINT priority = node->m_iPriority; - TNode* curNode; + TINT priority = node->m_iPriority; + TNode *curNode; if (priority < 0) { - for (curNode = (TNode*)m_oRoot.Next(); curNode != &m_oRoot && curNode->m_iPriority <= priority; curNode = curNode->Next()) { - + for (curNode = (TNode *)m_oRoot.Next(); curNode != &m_oRoot && curNode->m_iPriority <= priority; curNode = curNode->Next()) { } node->InsertBefore(curNode); } else { - for (curNode = (TNode*)m_oRoot.Prev(); curNode != &m_oRoot && priority < curNode->m_iPriority; curNode = curNode->Prev()) { - + for (curNode = (TNode *)m_oRoot.Prev(); curNode != &m_oRoot && priority < curNode->m_iPriority; curNode = curNode->Prev()) { } node->InsertAfter(curNode); } } - void InsertHead(TNode* a_pNode) + void InsertHead(TNode *a_pNode) { a_pNode->m_iPriority = -0x8000; - a_pNode->InsertAfter(&m_oRoot); + a_pNode->InsertAfter(&m_oRoot); } - void InsertTail(TNode* a_pNode) + void InsertTail(TNode *a_pNode) { a_pNode->m_iPriority = 0x7FFF; - a_pNode->InsertBefore(&m_oRoot); + a_pNode->InsertBefore(&m_oRoot); } protected: - void SetPriority(TNode* a_pNode, int priority) + void SetPriority(TNode *a_pNode, int priority) { a_pNode->Remove(); Insert(a_pNode); @@ -276,7 +279,6 @@ class TKERNELINTERFACE_EXPORTS TGenericPriList : public TGenericDList protected: TGenericPriList() { - } ~TGenericPriList() { RemoveAll(); } @@ -286,18 +288,17 @@ template class TPriList : public TGenericPriList { public: - TPriList() { } + TPriList() {} class Iterator { public: - Iterator() { m_pPtr = TNULL; } - Iterator(T* pPtr) + Iterator(T *pPtr) { m_pPtr = pPtr; } @@ -324,101 +325,99 @@ class TPriList : public TGenericPriList return m_pPtr == rIt.m_pPtr; } - TBOOL operator!=(Iterator& rIt) const + TBOOL operator!=(Iterator &rIt) const { return m_pPtr != rIt.m_pPtr; } - Iterator& operator=(const Iterator& other) + Iterator &operator=(const Iterator &other) { m_pPtr = other.m_pPtr; return *this; } - T* operator->() const + T *operator->() const { TASSERT(m_pPtr != TNULL); return m_pPtr; } - T& operator*() const + T &operator*() const { TASSERT(m_pPtr != TNULL); return *m_pPtr; } - operator T* () const + operator T *() const { TASSERT(m_pPtr != TNULL); return m_pPtr; } - operator TGenericPriList::TNode* () const + operator TGenericPriList::TNode *() const { TASSERT(m_pPtr != TNULL); - return (TGenericPriList::TNode*)m_pPtr; + return (TGenericPriList::TNode *)m_pPtr; } Iterator operator++(int) { TASSERT(m_pPtr != TNULL); Iterator old = m_pPtr; - m_pPtr = (T*)m_pPtr->Next(); + m_pPtr = (T *)m_pPtr->Next(); return old; } - Iterator& operator++(void) + Iterator &operator++(void) { TASSERT(m_pPtr != TNULL); - m_pPtr = (T*)m_pPtr->Next(); + m_pPtr = (T *)m_pPtr->Next(); return *this; } - Iterator& operator--() + Iterator &operator--() { TASSERT(m_pPtr != TNULL); - m_pPtr = (T*)m_pPtr->Prev(); + m_pPtr = (T *)m_pPtr->Prev(); return *this; } private: - T* m_pPtr; + T *m_pPtr; }; - T* Head() { return static_cast(TGenericPriList::Head()); } - T* Tail() { return static_cast(TGenericPriList::Tail()); } - Iterator Begin() { return static_cast(TGenericPriList::Begin()); } - const T* End() const { return static_cast(TGenericPriList::End()); } - TBOOL IsEmpty() { return TGenericPriList::IsEmpty(); } - TBOOL IsLinked() { return m_oRoot.IsLinked(); } - void RemoveHead() { TGenericPriList::RemoveHead(); } - void RemoveTail() { TGenericPriList::RemoveTail(); } - void InsertHead(TNode* a_pNode) { TGenericPriList::InsertHead(a_pNode); } - void InsertTail(TNode* a_pNode) { TGenericPriList::InsertTail(a_pNode); } + T *Head() { return static_cast(TGenericPriList::Head()); } + T *Tail() { return static_cast(TGenericPriList::Tail()); } + Iterator Begin() { return static_cast(TGenericPriList::Begin()); } + const T *End() const { return static_cast(TGenericPriList::End()); } + TBOOL IsEmpty() { return TGenericPriList::IsEmpty(); } + TBOOL IsLinked() { return m_oRoot.IsLinked(); } + void RemoveHead() { TGenericPriList::RemoveHead(); } + void RemoveTail() { TGenericPriList::RemoveTail(); } + void InsertHead(TNode *a_pNode) { TGenericPriList::InsertHead(a_pNode); } + void InsertTail(TNode *a_pNode) { TGenericPriList::InsertTail(a_pNode); } }; template class TDList : public TGenericDList { public: - - TDList() { } + TDList() {} class Iterator { public: - Iterator() { m_pPtr = TNULL; } - Iterator(T* pPtr) + Iterator(T *pPtr) { m_pPtr = pPtr; } - Iterator(const Iterator& rIt) + Iterator(const Iterator &rIt) { m_pPtr = rIt.m_pPtr; } @@ -435,35 +434,35 @@ class TDList : public TGenericDList return IsNull(); } - TBOOL operator==(Iterator& rIt) const + TBOOL operator==(Iterator &rIt) const { return m_pPtr == rIt.m_pPtr; } - TBOOL operator!=(Iterator& rIt) const + TBOOL operator!=(Iterator &rIt) const { return m_pPtr != rIt.m_pPtr; } - Iterator& operator=(const Iterator& other) + Iterator &operator=(const Iterator &other) { m_pPtr = other.m_pPtr; return *this; } - T* operator->() const + T *operator->() const { TASSERT(m_pPtr != TNULL); return m_pPtr; } - T& operator*() const + T &operator*() const { TASSERT(m_pPtr != TNULL); return *m_pPtr; } - operator T* () const + operator T *() const { TASSERT(m_pPtr != TNULL); return m_pPtr; @@ -473,39 +472,39 @@ class TDList : public TGenericDList { TASSERT(m_pPtr != TNULL); Iterator old = m_pPtr; - m_pPtr = (T*)m_pPtr->Next(); + m_pPtr = (T *)m_pPtr->Next(); return old; } - Iterator& operator++(void) + Iterator &operator++(void) { TASSERT(m_pPtr != TNULL); - m_pPtr = (T*)m_pPtr->Next(); + m_pPtr = (T *)m_pPtr->Next(); return *this; } - Iterator& operator--() + Iterator &operator--() { TASSERT(m_pPtr != TNULL); - m_pPtr = (T*)m_pPtr->Prev(); + m_pPtr = (T *)m_pPtr->Prev(); return *this; } private: - T* m_pPtr; + T *m_pPtr; }; - T* Head() { return static_cast(TGenericDList::Head()); } - T* Tail() { return static_cast(TGenericDList::Tail()); } - Iterator Begin() { return (T*)(TGenericDList::Begin()); } - Iterator End() const { return (T*)(TGenericDList::End()); } - TBOOL IsEmpty() { return TGenericDList::IsEmpty(); } - TBOOL IsLinked() { return m_oRoot.IsLinked(); } - void RemoveHead() { TGenericDList::RemoveHead(); } - void RemoveTail() { TGenericDList::RemoveTail(); } - void InsertHead(TNode* a_pNode) { TGenericDList::InsertHead(a_pNode); } - void InsertTail(TNode* a_pNode) { TGenericDList::InsertTail(a_pNode); } + T *Head() { return static_cast(TGenericDList::Head()); } + T *Tail() { return static_cast(TGenericDList::Tail()); } + Iterator Begin() { return (T *)(TGenericDList::Begin()); } + Iterator End() const { return (T *)(TGenericDList::End()); } + TBOOL IsEmpty() { return TGenericDList::IsEmpty(); } + TBOOL IsLinked() { return m_oRoot.IsLinked(); } + void RemoveHead() { TGenericDList::RemoveHead(); } + void RemoveTail() { TGenericDList::RemoveTail(); } + void InsertHead(TNode *a_pNode) { TGenericDList::InsertHead(a_pNode); } + void InsertTail(TNode *a_pNode) { TGenericDList::InsertTail(a_pNode); } }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TDebug.h b/Toshi/Include/TKernel/TDebug.h index 2bd8638..b69d462 100644 --- a/Toshi/Include/TKernel/TDebug.h +++ b/Toshi/Include/TKernel/TDebug.h @@ -4,29 +4,29 @@ #ifdef TOSHI_NOTFINAL -#define COMBINE1(X,Y) X##Y // helper macro -#define COMBINE(X,Y) COMBINE1(X,Y) -#define TFIREFLAG_CREATE(line) static TBOOL COMBINE(IGNOREALL, line) = TFALSE -#define TFIREFLAG(line) COMBINE(IGNOREALL, line) - -#define TASSERT(expression) \ - TFIREFLAG_CREATE(__LINE__); \ - if (!(expression)) { \ - if (Toshi::TDebug::AssertHandler(const_cast(#expression), const_cast(__FILE__), __LINE__, TFIREFLAG(__LINE__))) { \ - __debugbreak(); \ - } \ - } - -#define TDPRINTF(format, ...) Toshi::TDebug_Printf(format, __VA_ARGS__) -#define TWARNING(format, ...) Toshi::TDebug_PrintWarning(format, __VA_ARGS__) -#define TERROR(format, ...) Toshi::TDebug_PrintError(format, __VA_ARGS__) -#define TVALIDADDRESS(expression) TASSERT(Toshi::TDebug::IsValidAddress(expression)) +# define COMBINE1(X, Y) X##Y // helper macro +# define COMBINE(X, Y) COMBINE1(X, Y) +# define TFIREFLAG_CREATE(line) static TBOOL COMBINE(IGNOREALL, line) = TFALSE +# define TFIREFLAG(line) COMBINE(IGNOREALL, line) + +# define TASSERT(expression) \ + TFIREFLAG_CREATE(__LINE__); \ + if (!(expression)) { \ + if (Toshi::TDebug::AssertHandler(const_cast(#expression), const_cast(__FILE__), __LINE__, TFIREFLAG(__LINE__))) { \ + __debugbreak(); \ + } \ + } + +# define TDPRINTF(format, ...) Toshi::TDebug_Printf(format, __VA_ARGS__) +# define TWARNING(format, ...) Toshi::TDebug_PrintWarning(format, __VA_ARGS__) +# define TERROR(format, ...) Toshi::TDebug_PrintError(format, __VA_ARGS__) +# define TVALIDADDRESS(expression) TASSERT(Toshi::TDebug::IsValidAddress(expression)) TOSHI_NAMESPACE_BEGIN enum TDebug_Flags : TUINT { - FLAG_UNK = 0, + FLAG_UNK = 0, FLAG_UNK1 = BITFIELD(0), FLAG_UNK2 = BITFIELD(1), FLAG_UNK3 = BITFIELD(2) @@ -35,26 +35,29 @@ enum TDebug_Flags : TUINT class TKERNELINTERFACE_EXPORTS TDebug { public: - enum MSGLEVEL { }; - static TBOOL TOSHI_API AssertHandler(TPCHAR a_pcExpression, TPCHAR a_pcFile, TINT a_iLine, TBOOL& a_bUnk); - static void TOSHI_API PrintIndent(); - static void TOSHI_API DebugFilePrintString(TPCHAR a_pcString); + static TBOOL TOSHI_API AssertHandler(TPCHAR a_pcExpression, TPCHAR a_pcFile, TINT a_iLine, TBOOL &a_bUnk); + static void TOSHI_API PrintIndent(); + static void TOSHI_API DebugFilePrintString(TPCHAR a_pcString); - static TBOOL TOSHI_API EnableDebugFile(TBOOL a_bEnable) { TBOOL previous = m_bEnableDebugFile; m_bEnableDebugFile = a_bEnable; return previous; } + static TBOOL TOSHI_API EnableDebugFile(TBOOL a_bEnable) + { + TBOOL previous = m_bEnableDebugFile; + m_bEnableDebugFile = a_bEnable; + return previous; + } static TBOOL TOSHI_API IsDebugFileEnabled() { return m_bEnableDebugFile; } static TBOOL TOSHI_API IsValidAddress(TPCVOID a_pMem) { return a_pMem && a_pMem != (TPCVOID)0xCDCDCDCD && a_pMem >= (TPCVOID)80; } - inline static TINT s_iLogIndent = 0; - inline static TCHAR s_sSixteenSpace[16] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; - inline static TPVOID m_pDebugFile = TNULL; - inline static TBOOL m_bEnableDebugFile = TFALSE; - inline static TINT s_iMessageLevel = 0; - + inline static TINT s_iLogIndent = 0; + inline static TCHAR s_sSixteenSpace[16] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; + inline static TPVOID m_pDebugFile = TNULL; + inline static TBOOL m_bEnableDebugFile = TFALSE; + inline static TINT s_iMessageLevel = 0; }; void TKERNELINTERFACE_EXPORTS TOSHI_API TDebug_VPrintfDirect(TUINT a_uiFlags, TPCCHAR a_pcFormat, va_list a_vargs); @@ -80,17 +83,17 @@ TOSHI_NAMESPACE_END #else -#define TASSERT(expression) -#define TDPRINTF(format, ...) -#define TWARNING(format, ...) -#define TERROR(format, ...) -#define TVALIDADDRESS(expression) +# define TASSERT(expression) +# define TDPRINTF(format, ...) +# define TWARNING(format, ...) +# define TERROR(format, ...) +# define TVALIDADDRESS(expression) TOSHI_NAMESPACE_BEGIN enum TDebug_Flags : TUINT { - FLAG_UNK = 0, + FLAG_UNK = 0, FLAG_UNK1 = BITFIELD(0), FLAG_UNK2 = BITFIELD(1), FLAG_UNK3 = BITFIELD(2) @@ -99,7 +102,6 @@ enum TDebug_Flags : TUINT class TKERNELINTERFACE_EXPORTS TDebug { public: - enum MSGLEVEL { @@ -107,16 +109,20 @@ class TKERNELINTERFACE_EXPORTS TDebug static void TOSHI_API DebugFilePrintString(TPCHAR a_pcString); - static TBOOL EnableDebugFile(TBOOL a_bEnable) { TBOOL previous = m_bEnableDebugFile; m_bEnableDebugFile = a_bEnable; return previous; } + static TBOOL EnableDebugFile(TBOOL a_bEnable) + { + TBOOL previous = m_bEnableDebugFile; + m_bEnableDebugFile = a_bEnable; + return previous; + } static TBOOL IsDebugFileEnabled() { return m_bEnableDebugFile; } static TBOOL IsValidAddress(TPCVOID a_pMem) { return a_pMem && a_pMem != (TPCVOID)0xCDCDCDCD && a_pMem >= (TPCVOID)80; } - inline static TINT s_iLogIndent = 0; - inline static TCHAR s_sSixteenSpace[16] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; - inline static TPVOID m_pDebugFile = TNULL; - inline static TBOOL m_bEnableDebugFile = TFALSE; - inline static TINT s_iMessageLevel = 0; - + inline static TINT s_iLogIndent = 0; + inline static TCHAR s_sSixteenSpace[16] = { ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ' }; + inline static TPVOID m_pDebugFile = TNULL; + inline static TBOOL m_bEnableDebugFile = TFALSE; + inline static TINT s_iMessageLevel = 0; }; void TKERNELINTERFACE_EXPORTS TOSHI_CALLBACKAPI TDebug_Message(TDebug::MSGLEVEL a_eMsgLevel, TPCCHAR a_pcFormat, ...); @@ -124,6 +130,3 @@ void TKERNELINTERFACE_EXPORTS TOSHI_CALLBACKAPI TDebug_Message(TDebug::MSGLEVEL TOSHI_NAMESPACE_END #endif // TOSHI_DEBUG - - - diff --git a/Toshi/Include/TKernel/TEvent.h b/Toshi/Include/TKernel/TEvent.h index beb57bc..6a6a13c 100644 --- a/Toshi/Include/TKernel/TEvent.h +++ b/Toshi/Include/TKernel/TEvent.h @@ -8,16 +8,16 @@ class TGenericEmitter; class TKERNELINTERFACE_EXPORTS TGenericListener : public TPriList::TNode { public: - using t_Callback = TBOOL(*)(void* a_pCaller, void* a_pOwner, void* a_pData); + using t_Callback = TBOOL (*)(void *a_pCaller, void *a_pOwner, void *a_pData); friend class TGenericEmitter; public: TGenericListener() { - m_pCaller = TNULL; + m_pCaller = TNULL; m_pCallback = TNULL; } - TGenericListener(TGenericEmitter* a_pEmitter, void* a_pCaller, t_Callback a_pCallback, int a_iPriority) + TGenericListener(TGenericEmitter *a_pEmitter, void *a_pCaller, t_Callback a_pCallback, int a_iPriority) { Connect(a_pEmitter, a_pCaller, a_pCallback, a_iPriority); } @@ -26,18 +26,17 @@ class TKERNELINTERFACE_EXPORTS TGenericListener : public TPriListm_pCallback(it->m_pCaller, m_pOwner, a_pData); } } - void Create(void* a_pOwner) + void Create(void *a_pOwner) { m_pOwner = a_pOwner; } @@ -78,7 +77,7 @@ class TKERNELINTERFACE_EXPORTS TGenericEmitter private: TPriList m_Listeners; - void* m_pOwner; + void *m_pOwner; }; template @@ -86,12 +85,13 @@ class TEmitter : public TGenericEmitter { public: TEmitter() = default; - TEmitter(Owner* owner) : TGenericEmitter(owner) {} + TEmitter(Owner *owner) + : TGenericEmitter(owner) {} - void Throw(Data* pData) { TGenericEmitter::Throw(pData); } - void Throw(Data&& data) { TGenericEmitter::Throw(&data); } + void Throw(Data *pData) { TGenericEmitter::Throw(pData); } + void Throw(Data &&data) { TGenericEmitter::Throw(&data); } - void Create(Owner* owner) { TGenericEmitter::Create(owner); } + void Create(Owner *owner) { TGenericEmitter::Create(owner); } void Destroy() { TGenericEmitter::Destroy(); } }; @@ -99,18 +99,17 @@ template class TListener : public TGenericListener { public: - using t_CallerCallback = TBOOL(*)(Caller* a_pCaller, Owner* a_pOwner, Data* a_pData); + using t_CallerCallback = TBOOL (*)(Caller *a_pCaller, Owner *a_pOwner, Data *a_pData); public: - void Connect(TGenericEmitter& a_rEmitter, Caller* a_pCaller, t_CallerCallback a_pCallback, int a_iPriority) + void Connect(TGenericEmitter &a_rEmitter, Caller *a_pCaller, t_CallerCallback a_pCallback, int a_iPriority) { TGenericListener::Connect( a_rEmitter, a_pCaller, (t_Callback)a_pCallback, - a_iPriority - ); + a_iPriority); } }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TFile.h b/Toshi/Include/TKernel/TFile.h index 29be72d..f923c39 100644 --- a/Toshi/Include/TKernel/TFile.h +++ b/Toshi/Include/TKernel/TFile.h @@ -4,7 +4,7 @@ #include "TThread.h" #ifdef CreateFile -#undef CreateFile +# undef CreateFile #endif TOSHI_NAMESPACE_BEGIN @@ -14,184 +14,185 @@ class TFile; class TKERNELINTERFACE_EXPORTS TFileSystem : public TDList::TNode { public: - TFileSystem(TPCCHAR a_pcName) : TNode() - { - m_sName = TCString(a_pcName); - } - - TFileSystem(const TFileSystem &a_rOther) - { - m_pNext = a_rOther.m_pNext; - m_pPrev = a_rOther.m_pPrev; - m_sName = TCString(a_rOther.m_sName); - m_sPrefix = TCString(a_rOther.m_sPrefix); - } - - virtual ~TFileSystem() = default; - virtual TFile* CreateFile(const TCString &a_rsFileName, TUINT a_uiMode) = 0; - virtual void DestroyFile(TFile* a_pFile) = 0; - virtual TBOOL RemoveFile(const TCString& a_rsFilename) { return TTRUE; } - virtual TCString MakeInternalPath(const TCString &a_rsPath) = 0; - virtual TBOOL GetFirstFile(const TCString& a_rFolder, TCString& a_rFilename, TUINT a_uiMode) { return TFALSE; } - virtual TBOOL GetNextFile(const TCString& a_rsFileName, TUINT a_uiMode) { return TFALSE; }; - virtual void SetPrefix(const TCString& a_rPrefix); - - TFileSystem& operator=(TFileSystem& a_rOther) - { - m_pNext = a_rOther.m_pNext ? a_rOther.m_pNext : TNULL; - m_pPrev = a_rOther.m_pPrev; - m_sName = a_rOther.m_sName; - m_sPrefix = a_rOther.m_sPrefix; - return *this; - } - - const TCString& GetPrefix() const { return m_sPrefix; } - const TCString& GetName() const { return m_sName; } + TFileSystem(TPCCHAR a_pcName) + : TNode() + { + m_sName = TCString(a_pcName); + } + + TFileSystem(const TFileSystem &a_rOther) + { + m_pNext = a_rOther.m_pNext; + m_pPrev = a_rOther.m_pPrev; + m_sName = TCString(a_rOther.m_sName); + m_sPrefix = TCString(a_rOther.m_sPrefix); + } + + virtual ~TFileSystem() = default; + virtual TFile *CreateFile(const TCString &a_rsFileName, TUINT a_uiMode) = 0; + virtual void DestroyFile(TFile *a_pFile) = 0; + virtual TBOOL RemoveFile(const TCString &a_rsFilename) { return TTRUE; } + virtual TCString MakeInternalPath(const TCString &a_rsPath) = 0; + virtual TBOOL GetFirstFile(const TCString &a_rFolder, TCString &a_rFilename, TUINT a_uiMode) { return TFALSE; } + virtual TBOOL GetNextFile(const TCString &a_rsFileName, TUINT a_uiMode) { return TFALSE; }; + virtual void SetPrefix(const TCString &a_rPrefix); + + TFileSystem &operator=(TFileSystem &a_rOther) + { + m_pNext = a_rOther.m_pNext ? a_rOther.m_pNext : TNULL; + m_pPrev = a_rOther.m_pPrev; + m_sName = a_rOther.m_sName; + m_sPrefix = a_rOther.m_sPrefix; + return *this; + } + + const TCString &GetPrefix() const { return m_sPrefix; } + const TCString &GetName() const { return m_sName; } private: - TCString m_sName; // 0x8 - TCString m_sPrefix; // 0xC + TCString m_sName; // 0x8 + TCString m_sPrefix; // 0xC }; class TKERNELINTERFACE_EXPORTS TFileManager { public: - class TSysPathIter - { - public: - TSysPathIter(const TCString &a_rsSysPath) - { - m_sSysPath = a_rsSysPath; - m_iPosition = -1; - } - - TSysPathIter(const TSysPathIter &a_rOther) - { - m_sSysPath = a_rOther.m_sSysPath; - m_iPosition = a_rOther.m_iPosition; - } - - TBOOL First(TCString &a_rSysPath) - { - if (m_sSysPath.Length() > 0) { - m_iPosition = m_sSysPath.Find(';', 0); - a_rSysPath.Copy(m_sSysPath, m_iPosition); - return TTRUE; - } - m_iPosition = -1; - return TFALSE; - } - - TBOOL Next(TCString& a_rSysPath) - { - if (m_iPosition >= 0) { - TINT strStart = m_iPosition + 1; - m_iPosition = m_sSysPath.Find(';', strStart); - - a_rSysPath.Copy( - m_sSysPath.GetString(strStart), - (m_iPosition >= 0) ? (m_iPosition - strStart) : -1 - ); - - return TTRUE; - } - return TFALSE; - } - - private: - TCString m_sSysPath; // 0x0 - TINT m_iPosition; // 0x4 - }; - - TFileManager(); - ~TFileManager(); - - TFile* CreateFile(TCString const &a_sName, TUINT a_uiMode); - TFileSystem* FindFileSystem(const TCString& a_rFileSysName); - void MountFileSystem(TFileSystem* a_pFileSystem); - void UnmountFileSystem(TFileSystem* a_pFileSystem); - - TCString MakeAbsolutePath(TCString const& a_rPath); - - static TFileManager* TOSHI_API GetFileManager() { return s_pFileManager; } - void SetSystemPath(TCString const& a_rSysPath) - { - m_pcSystemPath = a_rSysPath; - InvalidateSystemPath(); - } - TCString const& GetWorkingDirectory() const { return m_pcWorkingDirectory; } + class TSysPathIter + { + public: + TSysPathIter(const TCString &a_rsSysPath) + { + m_sSysPath = a_rsSysPath; + m_iPosition = -1; + } + + TSysPathIter(const TSysPathIter &a_rOther) + { + m_sSysPath = a_rOther.m_sSysPath; + m_iPosition = a_rOther.m_iPosition; + } + + TBOOL First(TCString &a_rSysPath) + { + if (m_sSysPath.Length() > 0) { + m_iPosition = m_sSysPath.Find(';', 0); + a_rSysPath.Copy(m_sSysPath, m_iPosition); + return TTRUE; + } + m_iPosition = -1; + return TFALSE; + } + + TBOOL Next(TCString &a_rSysPath) + { + if (m_iPosition >= 0) { + TINT strStart = m_iPosition + 1; + m_iPosition = m_sSysPath.Find(';', strStart); + + a_rSysPath.Copy( + m_sSysPath.GetString(strStart), + (m_iPosition >= 0) ? (m_iPosition - strStart) : -1); + + return TTRUE; + } + return TFALSE; + } + + private: + TCString m_sSysPath; // 0x0 + TINT m_iPosition; // 0x4 + }; + + TFileManager(); + ~TFileManager(); + + TFile *CreateFile(TCString const &a_sName, TUINT a_uiMode); + TFileSystem *FindFileSystem(const TCString &a_rFileSysName); + void MountFileSystem(TFileSystem *a_pFileSystem); + void UnmountFileSystem(TFileSystem *a_pFileSystem); + + TCString MakeAbsolutePath(TCString const &a_rPath); + + static TFileManager *TOSHI_API GetFileManager() { return s_pFileManager; } + void SetSystemPath(TCString const &a_rSysPath) + { + m_pcSystemPath = a_rSysPath; + InvalidateSystemPath(); + } + TCString const &GetWorkingDirectory() const { return m_pcWorkingDirectory; } private: - void ValidateSystemPath(); - void InvalidateSystemPath() { m_bValidated = false; }; - static TFileSystem* TOSHI_API FindFileSystem(TDList& a_rFileSystems, const TCString& a_rFileSysName); + void ValidateSystemPath(); + void InvalidateSystemPath() { m_bValidated = false; }; + static TFileSystem *TOSHI_API FindFileSystem(TDList &a_rFileSystems, const TCString &a_rFileSysName); + private: - inline static TFileManager *s_pFileManager = TNULL; - - TBOOL m_bValidated; // 0x0 - TCString m_pcSystemPath; // 0x4 - TCString m_pcWorkingDirectory; // 0xC - TDList m_aValidated; // 0x14 - TDList m_aInvalidated; // 0x1C - TMutex m_mFileSystem; // 0x24 + inline static TFileManager *s_pFileManager = TNULL; + + TBOOL m_bValidated; // 0x0 + TCString m_pcSystemPath; // 0x4 + TCString m_pcWorkingDirectory; // 0xC + TDList m_aValidated; // 0x14 + TDList m_aInvalidated; // 0x1C + TMutex m_mFileSystem; // 0x24 }; enum TMODE : TUINT { - TMODE_READONLY = BITFIELD(0), - TMODE_WRITEONLY = BITFIELD(1), - TMODE_READWRITE = BITFIELD(2), - TMODE_CREATE = BITFIELD(3), - TMODE_NOBUFFER = BITFIELD(4) + TMODE_READONLY = BITFIELD(0), + TMODE_WRITEONLY = BITFIELD(1), + TMODE_READWRITE = BITFIELD(2), + TMODE_CREATE = BITFIELD(3), + TMODE_NOBUFFER = BITFIELD(4) }; class TKERNELINTERFACE_EXPORTS TFile { protected: - TFile(TFileSystem* a_pFileSystem) - { - m_pFileSystem = a_pFileSystem; - } - virtual ~TFile() = default; -public: + TFile(TFileSystem *a_pFileSystem) + { + m_pFileSystem = a_pFileSystem; + } + virtual ~TFile() = default; - enum TSEEK - { - TSEEK_SET, - TSEEK_CUR, - TSEEK_END - }; - - virtual TINT Read(TPVOID a_pBuffer, TINT m_iSize) = 0; - virtual TINT Write(void const *a_pBuffer, TINT m_iSize) = 0; - virtual TBOOL Seek(TINT a_iOffset, TSEEK a_eSeek) = 0; - virtual TINT Tell() = 0; - virtual TINT GetSize() = 0; - virtual TUINT64 GetDate() { return 0; } - virtual TINT GetCChar() = 0; - virtual TINT GetWChar() = 0; - virtual TINT PutCChar(TCHAR a_cChar) = 0; - virtual TINT PutWChar(TWCHAR a_wcChar) = 0; - virtual TINT VCPrintf(TCHAR const *a_pFormat, va_list a_args) = 0; - virtual TINT VWPrintf(TWCHAR const *a_pFormat, va_list a_args) = 0; - - static TFile* TOSHI_API Create(const TCString& a_sName, TUINT a_uiMode); - static void TOSHI_API Destroy(TFile* a_pFile); - static void TOSHI_API PrintFileAccess(TBOOL a_bFileAccess) { } - - static TCString TOSHI_API ConcatPath(TCString const& a_rPath1, TCString const& a_rPath2); - - // Note: 'const TCString&' and 'TCString const&' are the same thing - // but the first one is the common way of writing it. however, ghidra - // swaps the order to be like in the second option - static TCString TOSHI_API SimplifyPath(const TCString& a_rPath); - - void Destroy(); - TFileSystem* GetFileSystem() const { return m_pFileSystem; } +public: + enum TSEEK + { + TSEEK_SET, + TSEEK_CUR, + TSEEK_END + }; + + virtual TINT Read(TPVOID a_pBuffer, TINT m_iSize) = 0; + virtual TINT Write(void const *a_pBuffer, TINT m_iSize) = 0; + virtual TBOOL Seek(TINT a_iOffset, TSEEK a_eSeek) = 0; + virtual TINT Tell() = 0; + virtual TINT GetSize() = 0; + virtual TUINT64 GetDate() { return 0; } + virtual TINT GetCChar() = 0; + virtual TINT GetWChar() = 0; + virtual TINT PutCChar(TCHAR a_cChar) = 0; + virtual TINT PutWChar(TWCHAR a_wcChar) = 0; + virtual TINT VCPrintf(TCHAR const *a_pFormat, va_list a_args) = 0; + virtual TINT VWPrintf(TWCHAR const *a_pFormat, va_list a_args) = 0; + + static TFile *TOSHI_API Create(const TCString &a_sName, TUINT a_uiMode); + static void TOSHI_API Destroy(TFile *a_pFile); + static void TOSHI_API PrintFileAccess(TBOOL a_bFileAccess) {} + + static TCString TOSHI_API ConcatPath(TCString const &a_rPath1, TCString const &a_rPath2); + + // Note: 'const TCString&' and 'TCString const&' are the same thing + // but the first one is the common way of writing it. however, ghidra + // swaps the order to be like in the second option + static TCString TOSHI_API SimplifyPath(const TCString &a_rPath); + + void Destroy(); + TFileSystem *GetFileSystem() const { return m_pFileSystem; } protected: - // 0x0 vftable - TFileSystem* m_pFileSystem; // 0x4 + // 0x0 vftable + TFileSystem *m_pFileSystem; // 0x4 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TFileLexer.h b/Toshi/Include/TKernel/TFileLexer.h index 826d49c..4af9ffc 100644 --- a/Toshi/Include/TKernel/TFileLexer.h +++ b/Toshi/Include/TKernel/TFileLexer.h @@ -8,11 +8,11 @@ #include "TEvent.h" #if defined(TLEXERUTF8) -#define TLEXERGETCHAR m_pFile->GetCChar +# define TLEXERGETCHAR m_pFile->GetCChar #elif defined(TLEXERUTF16) -#define TLEXERGETCHAR m_pFile->GetWChar +# define TLEXERGETCHAR m_pFile->GetWChar #else -#define TLEXERGETCHAR m_pFile->GetCChar +# define TLEXERGETCHAR m_pFile->GetCChar #endif // This only works with WIN32! Basically floorpow2 // https://github.com/deeplearning4j/deeplearning4j/blob/f9c1faaaf968d6f0e5a5add2627908f7a2565f96/libnd4j/include/loops/type_conversions.h#L97 @@ -50,17 +50,16 @@ class TKERNELINTERFACE_EXPORTS TFileLexer TOKEN_FLOAT, TOKEN_COMMENT }; - + struct ParseError { - TINT m_iLine; // 0x0 + TINT m_iLine; // 0x0 TPCCHAR m_szError; // 0x4 }; public: - TFileLexer(); - TFileLexer(TFile* a_pFile, TINT a_iTokenLookaheadSize); + TFileLexer(TFile *a_pFile, TINT a_iTokenLookaheadSize); ~TFileLexer() { delete[] m_piCharLookahead; @@ -70,7 +69,7 @@ class TKERNELINTERFACE_EXPORTS TFileLexer class TKERNELINTERFACE_EXPORTS Token { public: - void assign(const Token& a_rToken); + void assign(const Token &a_rToken); TFLOAT GetFloat() const { @@ -89,19 +88,19 @@ class TKERNELINTERFACE_EXPORTS TFileLexer return m_iLine; } - const TPCString& GetString() const + const TPCString &GetString() const { - TASSERT(m_type == TFileLexer::TOKEN_IDENT || - m_type == TFileLexer::TOKEN_STRING || - m_type == TFileLexer::TOKEN_COMMENT); + TASSERT(m_type == TFileLexer::TOKEN_IDENT || + m_type == TFileLexer::TOKEN_STRING || + m_type == TFileLexer::TOKEN_COMMENT); return m_szValue; } - TPCString& GetString() + TPCString &GetString() { - TASSERT(m_type == TFileLexer::TOKEN_IDENT || - m_type == TFileLexer::TOKEN_STRING || - m_type == TFileLexer::TOKEN_COMMENT); + TASSERT(m_type == TFileLexer::TOKEN_IDENT || + m_type == TFileLexer::TOKEN_STRING || + m_type == TFileLexer::TOKEN_COMMENT); return m_szValue; } @@ -116,7 +115,7 @@ class TKERNELINTERFACE_EXPORTS TFileLexer return m_uiValue; } - Token& operator=(const Token& a_rToken) + Token &operator=(const Token &a_rToken) { assign(a_rToken); return *this; @@ -124,51 +123,51 @@ class TKERNELINTERFACE_EXPORTS TFileLexer Token(TINT a_iLine, TUINT a_uiValue) { - m_type = TOKEN_UINTEGER; - m_iLine = a_iLine; + m_type = TOKEN_UINTEGER; + m_iLine = a_iLine; m_uiValue = a_uiValue; } Token(TINT a_iLine, TFLOAT a_fValue) { - m_type = TOKEN_FLOAT; - m_iLine = a_iLine; + m_type = TOKEN_FLOAT; + m_iLine = a_iLine; m_fValue = a_fValue; } Token(TINT a_iLine, TINT a_iValue) { - m_type = TOKEN_INTEGER; - m_iLine = a_iLine; + m_type = TOKEN_INTEGER; + m_iLine = a_iLine; m_iValue = a_iValue; } Token(TINT a_iLine) { - m_type = TOKEN_EOF; + m_type = TOKEN_EOF; m_iLine = a_iLine; } - Token(TFileLexer::TokenType a_type, TINT a_iLine, const TPCString& a_rString) + Token(TFileLexer::TokenType a_type, TINT a_iLine, const TPCString &a_rString) { - m_type = a_type; - m_iLine = a_iLine; - m_iValue = 0; + m_type = a_type; + m_iLine = a_iLine; + m_iValue = 0; GetString() = a_rString; } Token(TFileLexer::TokenType a_type, TINT a_iLine) { - m_type = a_type; + m_type = a_type; m_iLine = a_iLine; - TASSERT(m_type != TFileLexer::TOKEN_IDENT || - m_type != TFileLexer::TOKEN_STRING || - m_type != TFileLexer::TOKEN_INTEGER || - m_type != TFileLexer::TOKEN_FLOAT || - m_type != TFileLexer::TOKEN_COMMENT); + TASSERT(m_type != TFileLexer::TOKEN_IDENT || + m_type != TFileLexer::TOKEN_STRING || + m_type != TFileLexer::TOKEN_INTEGER || + m_type != TFileLexer::TOKEN_FLOAT || + m_type != TFileLexer::TOKEN_COMMENT); } - Token(const TFileLexer::Token& a_rToken) + Token(const TFileLexer::Token &a_rToken) { m_type = TOKEN_EOF; assign(a_rToken); @@ -176,15 +175,15 @@ class TKERNELINTERFACE_EXPORTS TFileLexer Token() { - m_type = TOKEN_EOF; + m_type = TOKEN_EOF; m_iLine = 0; } ~Token() { if (m_type == TFileLexer::TOKEN_IDENT || - m_type == TFileLexer::TOKEN_STRING || - m_type == TFileLexer::TOKEN_COMMENT) { + m_type == TFileLexer::TOKEN_STRING || + m_type == TFileLexer::TOKEN_COMMENT) { GetString().~TPCString(); } } @@ -193,23 +192,25 @@ class TKERNELINTERFACE_EXPORTS TFileLexer private: TFileLexer::TokenType m_type; // 0x0 - union { // | - TPCString m_szValue; // | - TINT m_iValue; // -> 0x4 - TUINT m_uiValue; // | - TFLOAT m_fValue; // | - }; // | - TINT m_iLine; // 0x8 + union + { // | + TPCString m_szValue; // | + TINT m_iValue; // -> 0x4 + TUINT m_uiValue; // | + TFLOAT m_fValue; // | + }; // | + TINT m_iLine; // 0x8 }; private: TBOOL ComputePreprocessorAllow(); + public: - void Define(TPCCHAR a_szPreprocessor); + void Define(TPCCHAR a_szPreprocessor); TBOOL IfDef(TPCCHAR a_szDefine); TBOOL Expect(TFileLexer::TokenType a_type); - TBOOL Expect(TFileLexer::TokenType a_type, TFileLexer::Token& a_rToken); + TBOOL Expect(TFileLexer::TokenType a_type, TFileLexer::Token &a_rToken); TFileLexer::Token GetLastToken(); TFileLexer::Token GetNextToken(); @@ -217,7 +218,7 @@ class TKERNELINTERFACE_EXPORTS TFileLexer TFileLexer::Token PeekNextToken(TINT a_iDistance); void SetCharacterLookaheadSize(TINT a_iCharLookaheadSize); - void SetInputStream(TFile* a_pFile); + void SetInputStream(TFile *a_pFile); void SetOutputComments(TBOOL a_bOutputComments) { m_bOutputComments = a_bOutputComments; @@ -232,7 +233,7 @@ class TKERNELINTERFACE_EXPORTS TFileLexer protected: TFileLexer::Token get_next_token(); - void skipWhiteSpace(); + void skipWhiteSpace(); void advance(); void advance(TINT a_dist); @@ -249,30 +250,30 @@ class TKERNELINTERFACE_EXPORTS TFileLexer } private: - TFile* m_pFile; // 0x4 - TBOOL m_bOutputComments; // 0x8 - TINT m_iCharLookaheadSize; // 0xC - TINT m_iCharLookaheadMask; // 0x10 - TINT* m_piCharLookahead; // 0x14 - TINT m_iCharLookaheadBack; // 0x18 - TINT m_iCharLookaheadFront; // 0x1C - - TINT m_iLine; // 0x20 - TINT m_iTokenLookaheadSize; // 0x24 - TINT m_iTokenLookaheadMask; // 0x28 - TFileLexer::Token m_oToken; // 0x2C - TFileLexer::Token* m_pLookaheadTokens; // 0x38 - TINT m_iTokenLookaheadBuffered; // 0x3C - TINT m_iTokenLookaheadFront; // 0x40 - TINT m_iTokenLookaheadBack; // 0x44 - - TINT m_iSomeNum; // 0x48 - TBOOL m_bFlags[32]; // 0x4C - TBOOL m_bAllowPreprocessor; // 0x6C - TBOOL m_bEOF; // 0x6D - TArray m_aDefines; // 0x70 + TFile *m_pFile; // 0x4 + TBOOL m_bOutputComments; // 0x8 + TINT m_iCharLookaheadSize; // 0xC + TINT m_iCharLookaheadMask; // 0x10 + TINT *m_piCharLookahead; // 0x14 + TINT m_iCharLookaheadBack; // 0x18 + TINT m_iCharLookaheadFront; // 0x1C + + TINT m_iLine; // 0x20 + TINT m_iTokenLookaheadSize; // 0x24 + TINT m_iTokenLookaheadMask; // 0x28 + TFileLexer::Token m_oToken; // 0x2C + TFileLexer::Token *m_pLookaheadTokens; // 0x38 + TINT m_iTokenLookaheadBuffered; // 0x3C + TINT m_iTokenLookaheadFront; // 0x40 + TINT m_iTokenLookaheadBack; // 0x44 + + TINT m_iSomeNum; // 0x48 + TBOOL m_bFlags[32]; // 0x4C + TBOOL m_bAllowPreprocessor; // 0x6C + TBOOL m_bEOF; // 0x6D + TArray m_aDefines; // 0x70 //TEmitter m_oEmitter; // 0x80 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TFileLexerUTF8.h b/Toshi/Include/TKernel/TFileLexerUTF8.h index 98c08ba..3ece0fa 100644 --- a/Toshi/Include/TKernel/TFileLexerUTF8.h +++ b/Toshi/Include/TKernel/TFileLexerUTF8.h @@ -5,14 +5,16 @@ TOSHI_NAMESPACE_BEGIN -class TKERNELINTERFACE_EXPORTS TFileLexerUTF8 : public TObject, public TFileLexer +class TKERNELINTERFACE_EXPORTS TFileLexerUTF8 : public TObject + , public TFileLexer { DECLARE_DYNAMIC(TFileLexerUTF8) public: TFileLexerUTF8() {} - TFileLexerUTF8(TFile* a_pFile, TINT a_iTokenLookaheadSize) : TFileLexer(a_pFile, a_iTokenLookaheadSize) {} -private: + TFileLexerUTF8(TFile *a_pFile, TINT a_iTokenLookaheadSize) + : TFileLexer(a_pFile, a_iTokenLookaheadSize) {} +private: }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TFreeList.h b/Toshi/Include/TKernel/TFreeList.h index db814ad..b0ea142 100644 --- a/Toshi/Include/TKernel/TFreeList.h +++ b/Toshi/Include/TKernel/TFreeList.h @@ -6,18 +6,19 @@ //#define DECLARE_FREELIST(class_name) //#define IMPLEMENT_FREELIST(class_name, InitialSize, GrowSize) #if 1 -#define DECLARE_FREELIST(class_name) \ -public: \ -static TPVOID TOSHI_API operator new(TUINT s, TPVOID mem) { return mem; } \ -static TPVOID TOSHI_API operator new(TUINT s) { return ms_oFreeList.New(s); } \ -static TPVOID TOSHI_API operator new(TUINT s, TPCHAR mem, TINT unk) { return ms_oFreeList.New(s); } \ -static void TOSHI_API operator delete(void* ptr) { ms_oFreeList.Delete(ptr); } \ -static Toshi::TFreeList& TOSHI_API GetFreeList() {return ms_oFreeList;} \ -\ -private: static Toshi::TFreeList ms_oFreeList; +# define DECLARE_FREELIST(class_name) \ + public: \ + static TPVOID TOSHI_API operator new(TUINT s, TPVOID mem) { return mem; } \ + static TPVOID TOSHI_API operator new(TUINT s) { return ms_oFreeList.New(s); } \ + static TPVOID TOSHI_API operator new(TUINT s, TPCHAR mem, TINT unk) { return ms_oFreeList.New(s); } \ + static void TOSHI_API operator delete(void *ptr) { ms_oFreeList.Delete(ptr); } \ + static Toshi::TFreeList &TOSHI_API GetFreeList() { return ms_oFreeList; } \ + \ + private: \ + static Toshi::TFreeList ms_oFreeList; -#define IMPLEMENT_FREELIST(class_name, InitialSize, GrowSize) \ -Toshi::TFreeList class_name::ms_oFreeList = Toshi::TFreeList(sizeof(class_name), InitialSize, GrowSize, TNULL); +# define IMPLEMENT_FREELIST(class_name, InitialSize, GrowSize) \ + Toshi::TFreeList class_name::ms_oFreeList = Toshi::TFreeList(sizeof(class_name), InitialSize, GrowSize, TNULL); #endif TOSHI_NAMESPACE_BEGIN @@ -27,42 +28,44 @@ class TKERNELINTERFACE_EXPORTS TFreeList struct TKERNELINTERFACE_EXPORTS Node { friend class TFreeList; + public: - Node& operator=(const Node& a_rNode) + Node &operator=(const Node &a_rNode) { m_pNext = a_rNode.m_pNext; return *this; } + protected: - Node* m_pNext = TNULL; + Node *m_pNext = TNULL; }; TFreeList(TUINT a_uiItemSize, TINT a_iInitialSize, TINT a_iGrowSize, TPCHAR a_pcName); ~TFreeList(); protected: - - Node* Allocate(TINT a_iNumber, TUINT a_uiSize); + Node *Allocate(TINT a_iNumber, TUINT a_uiSize); public: TPVOID New(TUINT a_uiSize); - void Delete(TPVOID a_pData); + void Delete(TPVOID a_pData); void SetCapacity(TINT a_iCapacity); void SetGrowSize(TINT a_iGrowSize); TINT GetCapacity() const { return m_iCapacity; } TINT GetGrowSize() const { return m_iGrowSize; } - TINT GetFreeCount() { return m_iFreeCount; } + TINT GetFreeCount() { return m_iFreeCount; } + private: - TINT m_iFreeCount; // 0x0 - TINT m_iMaxFreeCount; // 0x4 + TINT m_iFreeCount; // 0x0 + TINT m_iMaxFreeCount; // 0x4 TPCHAR m_pcName; // 0x8 - TINT m_iCapacity; // 0xC - TUINT m_uiItemSize; // 0x10 - Node m_oLastNode; // 0x14 - Node m_oRootNode; // 0x18 - TINT m_iGrowSize; // 0x1C + TINT m_iCapacity; // 0xC + TUINT m_uiItemSize; // 0x10 + Node m_oLastNode; // 0x14 + Node m_oRootNode; // 0x18 + TINT m_iGrowSize; // 0x1C }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/THPTimer.h b/Toshi/Include/TKernel/THPTimer.h index bc5c8ee..82be6f6 100644 --- a/Toshi/Include/TKernel/THPTimer.h +++ b/Toshi/Include/TKernel/THPTimer.h @@ -12,17 +12,17 @@ class TKERNELINTERFACE_EXPORTS THPTimer void Reset(); void Update(); - TUINT GetRaw32(); + TUINT GetRaw32(); TUINT64 GetRaw64(); - float GetDelta() { return m_fDelta; } - float GetCurrent() { return m_fCurrent; } + float GetDelta() { return m_fDelta; } + float GetCurrent() { return m_fCurrent; } private: - LARGE_INTEGER m_iFrequency; // 0x0 - TFLOAT m_fCurrent; // 0x8 - LARGE_INTEGER m_iOldTime; // 0x10 - LARGE_INTEGER m_iCurrentTime; // 0x18 - TFLOAT m_fDelta; // 0x20 + LARGE_INTEGER m_iFrequency; // 0x0 + TFLOAT m_fCurrent; // 0x8 + LARGE_INTEGER m_iOldTime; // 0x10 + LARGE_INTEGER m_iCurrentTime; // 0x18 + TFLOAT m_fDelta; // 0x20 }; TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TKernelInterface.h b/Toshi/Include/TKernel/TKernelInterface.h index 52d2f1a..48b5d61 100644 --- a/Toshi/Include/TKernel/TKernelInterface.h +++ b/Toshi/Include/TKernel/TKernelInterface.h @@ -9,41 +9,45 @@ TOSHI_NAMESPACE_BEGIN -class TKERNELINTERFACE_EXPORTS TKernelInterfaceDLL : public TDLL, public TNodeList::TNode +class TKERNELINTERFACE_EXPORTS TKernelInterfaceDLL : public TDLL + , public TNodeList::TNode { public: TKernelInterfaceDLL() { - } virtual ~TKernelInterfaceDLL() = default; }; +template class TNodeList; + class TKERNELINTERFACE_EXPORTS TKernelInterface : public TObject { DECLARE_DYNAMIC(TKernelInterface); + public: - TKernelInterface(TINT argc, TPCHAR* const argv, TBOOL a_bVerbose); - + TKernelInterface(TINT argc, TPCHAR *const argv, TBOOL a_bVerbose); + TBOOL Update(); - void DumpInfo(); - TKernelInterfaceDLL* FindInterface(const TCString& a_rszInterface); - TKernelInterfaceDLL* LoadInterface(const TCString& a_rszInterface); - void UnloadInterface(TKernelInterfaceDLL& a_rInterface); - void UnloadInterface(const TCString& a_rszInterface); + void DumpInfo(); + TKernelInterfaceDLL *FindInterface(const TCString &a_rszInterface); + TKernelInterfaceDLL *LoadInterface(const TCString &a_rszInterface); + void UnloadInterface(TKernelInterfaceDLL &a_rInterface); + void UnloadInterface(const TCString &a_rszInterface); + + THPTimer *GetSystemTimer() { return &m_oSysTimer; } + TScheduler *GetScheduler() const { return m_pScheduler; } - THPTimer* GetSystemTimer() { return &m_oSysTimer; } - TScheduler* GetScheduler() const { return m_pScheduler; } private: - THPTimer m_oSysTimer; // 0x8 + THPTimer m_oSysTimer; // 0x8 // TManagedPtr - TScheduler* m_pScheduler; // 0x30 + TScheduler *m_pScheduler; // 0x30 TNodeList m_Interfaces; // 0x34 - TFLOAT m_fDeltaTime; // 0x44 - TFLOAT m_fAvgFPS; // 0x48 - TBOOL m_bVerbose; // 0x4C + TFLOAT m_fDeltaTime; // 0x44 + TFLOAT m_fAvgFPS; // 0x48 + TBOOL m_bVerbose; // 0x4C }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TLString.h b/Toshi/Include/TKernel/TLString.h index afb795b..b9b22fa 100644 --- a/Toshi/Include/TKernel/TLString.h +++ b/Toshi/Include/TKernel/TLString.h @@ -18,12 +18,12 @@ class TKERNELINTERFACE_EXPORTS TLocale class TKERNELINTERFACE_EXPORTS TLocalisedString { public: - static TFreeList& TOSHI_API GetFreeList() { return m_oFreelist; } + static TFreeList &TOSHI_API GetFreeList() { return m_oFreelist; } private: static TFreeList m_oFreelist; - + TINT m_iIDInt; // 0x4 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TManagedPointer.h b/Toshi/Include/TKernel/TManagedPointer.h index 71a3fc6..7461668 100644 --- a/Toshi/Include/TKernel/TManagedPointer.h +++ b/Toshi/Include/TKernel/TManagedPointer.h @@ -3,91 +3,111 @@ #include "TRefCounted.h" #include "TSystemTools.h" +#include + TOSHI_NAMESPACE_BEGIN -template -class TManagedPtr : public TRefCounted +template +class TManagedPtr { public: - TManagedPtr() : m_pObject(TNULL) - { - - } - - TManagedPtr(T* a_pObject) - { - if (m_pObject) { - m_pObject = a_pObject; - if (m_pObject) { - IncRefCount(); - } - } - } - - TManagedPtr(TManagedPtr& a_source) - { - if (m_pObject != a_source.m_pObject) { - if (m_pObject && DecRefCount() == 0) { - delete m_pObject; - } - m_pObject = a_source.m_pObject; - if (a_source.m_pObject) { - a_source.IncRefCount(); - } - } - } - - ~TManagedPtr() - { - if (m_pObject) { - if (DecRefCount() == 0) { - delete m_pObject; - } - m_pObject = TNULL; - } - } - - TManagedPtr& operator=(T* a_pObject) - { - if (m_pObject) { - m_pObject = a_pObject; - if (m_pObject) { - IncRefCount(); - } - } - return *this; - } - - TManagedPtr& operator=(TManagedPtr& a_source) - { - if (m_pObject != a_source.m_pObject) { - if (m_pObject && DecRefCount() == 0) { - delete m_pObject; - } - m_pObject = a_source.m_pObject; - if (a_source.m_pObject) { - a_source.IncRefCount(); - } - } - return *this; - } - - T& operator*() const - { - TASSERT(m_pObject != TNULL); return *m_pObject; - } - - operator T* () const - { - TASSERT(m_pObject!=TNULL); return m_pObject; - } - - T* operator->() const - { - TASSERT(m_pObject != TNULL); return m_pObject; - } + static_assert(std::is_base_of::value); + + TManagedPtr() + : m_pObject(TNULL) + { + } + + TManagedPtr(T *a_pObject) + : m_pObject( a_pObject ) + { + if (m_pObject) { + m_pObject = a_pObject; + m_pObject->TRefCounted::IncRefCount(); + } + } + + // copy constructor + TManagedPtr(const TManagedPtr &a_source) + { + m_pObject = a_source.m_pObject; + + if (m_pObject) { + m_pObject->TRefCounted::IncRefCount(); + } + } + + // move constructor + TManagedPtr(TManagedPtr &&a_source) + { + m_pObject = a_source.m_pObject; + a_source.m_pObject = TNULL; + } + + ~TManagedPtr() + { + if (m_pObject && m_pObject->TRefCounted::DecRefCount() == 0) { + delete m_pObject; + } + } + + TManagedPtr &operator=(T *a_pObject) + { + if (m_pObject != a_pObject) { + Create(a_pObject); + } + + return *this; + } + + TManagedPtr &operator=(const TManagedPtr &a_source) + { + if (m_pObject != a_source.m_pObject) { + Create(a_source.m_pObject); + } + + return *this; + } + + T &operator*() const + { + TASSERT(m_pObject != TNULL); + return *m_pObject; + } + + operator T *() const + { + TASSERT(m_pObject != TNULL); + return m_pObject; + } + + T *operator->() const + { + TASSERT(m_pObject != TNULL); + return m_pObject; + } + + TINT GetRefCount() const + { + return m_pObject ? m_pObject->TRefCounted::GetRefCount() : 0; + } + +private: + void Create(T *a_pObject) + { + if (m_pObject && m_pObject->TRefCounted::DecRefCount() == 0) { + delete m_pObject; + } + + m_pObject = a_pObject; + + if (m_pObject) { + m_pObject->TRefCounted::IncRefCount(); + } + } + private: - T* m_pObject; + T *m_pObject; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TMath.h b/Toshi/Include/TKernel/TMath.h index 4e69b5e..9cd618c 100644 --- a/Toshi/Include/TKernel/TMath.h +++ b/Toshi/Include/TKernel/TMath.h @@ -1,4 +1,4 @@ #pragma once -#define TMIN(a,b) (((a)<(b))?(a):(b)) -#define TMAX(a,b) (((a)>(b))?(a):(b)) \ No newline at end of file +#define TMIN(a, b) (((a) < (b)) ? (a) : (b)) +#define TMAX(a, b) (((a) > (b)) ? (a) : (b)) diff --git a/Toshi/Include/TKernel/TMatrix44.h b/Toshi/Include/TKernel/TMatrix44.h index 477318f..9155ec0 100644 --- a/Toshi/Include/TKernel/TMatrix44.h +++ b/Toshi/Include/TKernel/TMatrix44.h @@ -5,7 +5,6 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TMatrix44 { - }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TMemory.h b/Toshi/Include/TKernel/TMemory.h index efe3236..6f47ccb 100644 --- a/Toshi/Include/TKernel/TMemory.h +++ b/Toshi/Include/TKernel/TMemory.h @@ -5,7 +5,7 @@ #define TMEMORY_ROUNDUP 4 -inline static Toshi::TMutex* g_pMutex = TNULL; +inline static Toshi::TMutex *g_pMutex = TNULL; TOSHI_NAMESPACE_BEGIN @@ -32,7 +32,6 @@ class TKERNELINTERFACE_EXPORTS TMemory class MemNode { - }; @@ -45,31 +44,31 @@ class TKERNELINTERFACE_EXPORTS TMemory class MemBlock { public: - MemBlockSlot* m_pMemBlockSlot; // 0x0 - // 0x4 + MemBlockSlot *m_pMemBlockSlot; // 0x0 + // 0x4 TPVOID m_pMemory; // 0x8 - TUINT m_uiMemorySize; // 0xC + TUINT m_uiMemorySize; // 0xC }; -public: - static TBOOL TOSHI_API Initialise(); - static void TOSHI_API DebugPrintHALMemInfo(TCHAR const* a_pPrint) { }; - static TMemory& TOSHI_API GetMemMangager(); - static MemBlock* TOSHI_API GetGlobalBlock(); - static MemNode* TOSHI_API GetMemNodeFromAddress(TPVOID a_pAddr); - static void TOSHI_API ExtendNodeSize(MemNode* a_pMemNode, TUINT a_iuSize); +public: + static TBOOL TOSHI_API Initialise(); + static void TOSHI_API DebugPrintHALMemInfo(TCHAR const *a_pPrint){}; + static TMemory &TOSHI_API GetMemMangager(); + static MemBlock *TOSHI_API GetGlobalBlock(); + static MemNode *TOSHI_API GetMemNodeFromAddress(TPVOID a_pAddr); + static void TOSHI_API ExtendNodeSize(MemNode *a_pMemNode, TUINT a_iuSize); - TPVOID Alloc(TUINT a_uiSize, TUINT a_uiAlignment, MemBlock* a_pMemBlock, TPCHAR a_pBuffer ,TINT a_iUnk3); - TBOOL Free(TPVOID a_pMem); + TPVOID Alloc(TUINT a_uiSize, TUINT a_uiAlignment, MemBlock *a_pMemBlock, TPCHAR a_pBuffer, TINT a_iUnk3); + TBOOL Free(TPVOID a_pMem); protected: static TUINT TOSHI_API GetFreePhysicalMemory() { return 0x8000000; } private: inline static TBOOL m_bInitialised = TFALSE; - - MemBlock* m_pMemBlock; // 0x224 + + MemBlock *m_pMemBlock; // 0x224 }; inline static TMemory g_oMemManager; @@ -78,4 +77,4 @@ TOSHI_NAMESPACE_END TPVOID TKERNELINTERFACE_EXPORTS TOSHI_API tmalloc(TINT a_iSize, TPCHAR a_pBuffer, TINT a_iUnk); TPVOID TKERNELINTERFACE_EXPORTS TOSHI_API tmemalign(TINT a_iAlign, TINT a_iSize); -void TKERNELINTERFACE_EXPORTS TOSHI_API tfree(TPVOID a_pMem); \ No newline at end of file +void TKERNELINTERFACE_EXPORTS TOSHI_API tfree(TPVOID a_pMem); diff --git a/Toshi/Include/TKernel/TNTree.h b/Toshi/Include/TKernel/TNTree.h index 6fc28d6..d8d412b 100644 --- a/Toshi/Include/TKernel/TNTree.h +++ b/Toshi/Include/TKernel/TNTree.h @@ -9,9 +9,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNTree class TNode { protected: - - - TINT FindChild(TNode const* a_pNode, TINT a_iCount) + TINT FindChild(TNode const *a_pNode, TINT a_iCount) { for (TINT i = 0; i < a_iCount; i++) { if (a_pNode == m_pChildren[i]) { @@ -21,16 +19,15 @@ class TKERNELINTERFACE_EXPORTS TGenericNTree return -1; } - TNode* Child(TINT a_iIndex) const { return m_pChildren[a_iIndex]; } - TNode* Parent() const { return m_pParent; } + TNode *Child(TINT a_iIndex) const { return m_pChildren[a_iIndex]; } + TNode *Parent() const { return m_pParent; } private: - TNode* m_pParent; // 0x0 - TNode** m_pChildren; // 0x4 + TNode *m_pParent; // 0x0 + TNode **m_pChildren; // 0x4 }; protected: - TGenericNTree() { m_pRoot = TNULL; @@ -47,11 +44,12 @@ class TKERNELINTERFACE_EXPORTS TGenericNTree m_pRoot = TNULL; } - TNode* Root() const { return m_pRoot; } + TNode *Root() const { return m_pRoot; } + private: - TNode* m_pRoot; // 0x0 + TNode *m_pRoot; // 0x0 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TNodeList.h b/Toshi/Include/TKernel/TNodeList.h index e93936f..0ed3168 100644 --- a/Toshi/Include/TKernel/TNodeList.h +++ b/Toshi/Include/TKernel/TNodeList.h @@ -10,6 +10,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList class TKERNELINTERFACE_EXPORTS TNode { friend class TGenericNodeList; + public: TNode() { @@ -18,7 +19,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList SetList(TNULL); } - TNode(const TNode& node) + TNode(const TNode &node) { m_pNext = node.m_pNext; m_pPrev = node.m_pPrev; @@ -30,12 +31,12 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList TASSERT(IsLinked() == TFALSE); } - TNode* Next() const + TNode *Next() const { return m_pNext; } - TNode* Prev() const + TNode *Prev() const { return m_pPrev; } @@ -45,35 +46,34 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList return GetList() != TNULL; } - TGenericNodeList* GetList() const + TGenericNodeList *GetList() const { return m_pList; } - TNode& operator=(const TNode& node) + TNode &operator=(const TNode &node) { m_pNext = node.m_pNext; m_pPrev = node.m_pPrev; m_pList = node.m_pList; return *this; } - protected: - void SetList(TGenericNodeList* list) + protected: + void SetList(TGenericNodeList *list) { m_pList = list; } protected: - TGenericNodeList* m_pList; // 0x0 - TNode* m_pNext; // 0x4 - TNode* m_pPrev; // 0x8 + TGenericNodeList *m_pList; // 0x0 + TNode *m_pNext; // 0x4 + TNode *m_pPrev; // 0x8 }; class TKERNELINTERFACE_EXPORTS Iterator { public: - Iterator() { m_pPtr = TNULL; @@ -84,7 +84,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList m_pPtr = a_pNode; } - Iterator(const Iterator& a_rIterator) + Iterator(const Iterator &a_rIterator) { m_pPtr = a_rIterator.m_pPtr; } @@ -92,15 +92,15 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList ~Iterator() = default; TBOOL operator!() { return IsNull(); } - TBOOL operator!=(Iterator& a_rIterator) { return m_pPtr != a_rIterator.m_pPtr; } + TBOOL operator!=(Iterator &a_rIterator) { return m_pPtr != a_rIterator.m_pPtr; } - TNode& operator*() const + TNode &operator*() const { - TASSERT(m_pPtr!=TNULL); + TASSERT(m_pPtr != TNULL); return *m_pPtr; } - Iterator& operator++() + Iterator &operator++() { TASSERT(m_pPtr != TNULL); m_pPtr = m_pPtr->Next(); @@ -111,7 +111,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList { TASSERT(m_pPtr != TNULL); Iterator old = m_pPtr; - m_pPtr = m_pPtr->Next(); + m_pPtr = m_pPtr->Next(); return old; } @@ -122,23 +122,23 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList return *this; } - TNode* operator->() const + TNode *operator->() const { return m_pPtr; } - Iterator& operator=(const Iterator& a_rIterator) + Iterator &operator=(const Iterator &a_rIterator) { m_pPtr = a_rIterator.m_pPtr; return *this; } - TBOOL operator==(Iterator& a_rIterator) const + TBOOL operator==(Iterator &a_rIterator) const { return m_pPtr == a_rIterator.m_pPtr; } - operator TNode* () const + operator TNode *() const { return m_pPtr; } @@ -146,7 +146,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList TBOOL IsNull() { return m_pPtr == TNULL; } private: - TNode* m_pPtr; + TNode *m_pPtr; }; protected: @@ -155,13 +155,14 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList m_iCount = 0; } ~TGenericNodeList() { DeleteAll(); } + private: - TGenericNodeList(TGenericNodeList&) + TGenericNodeList(TGenericNodeList &) { TASSERT(!"Not implemented; don't want the default one!"); } - TGenericNodeList& operator=(TGenericNodeList&) + TGenericNodeList &operator=(TGenericNodeList &) { TASSERT(!"Not implemented; don't want the default one!"); return *this; @@ -173,12 +174,12 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList return m_oRoot.Next() == &m_oRoot; } - TBOOL IsValid(const TNode* pNode) const + TBOOL IsValid(const TNode *pNode) const { return pNode != TNULL && pNode->GetList() == this; } - void Append(TGenericNodeList& a_rList) + void Append(TGenericNodeList &a_rList) { if (a_rList.IsEmpty()) return; for (Iterator i = a_rList.Begin(); i != a_rList.End(); i++) @@ -187,46 +188,46 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList } } - void InsertAfter(TNode& rInsertAfter, TNode& rNewNode) + void InsertAfter(TNode &rInsertAfter, TNode &rNewNode) { TASSERT(!rNewNode.IsLinked()); rNewNode.SetList(this); - rNewNode.m_pNext = rInsertAfter.m_pNext; - rNewNode.m_pPrev = &rInsertAfter; + rNewNode.m_pNext = rInsertAfter.m_pNext; + rNewNode.m_pPrev = &rInsertAfter; rInsertAfter.m_pNext->m_pPrev = &rNewNode; - rInsertAfter.m_pNext = &rNewNode; + rInsertAfter.m_pNext = &rNewNode; m_iCount++; } - void InsertBefore(TNode& rInsertBefore, TNode& rNewNode) + void InsertBefore(TNode &rInsertBefore, TNode &rNewNode) { TASSERT(!rNewNode.IsLinked()); rNewNode.SetList(this); - rNewNode.m_pNext = &rInsertBefore; - rNewNode.m_pPrev = rInsertBefore.m_pPrev; + rNewNode.m_pNext = &rInsertBefore; + rNewNode.m_pPrev = rInsertBefore.m_pPrev; rInsertBefore.m_pPrev->m_pNext = &rNewNode; - rInsertBefore.m_pPrev = &rNewNode; + rInsertBefore.m_pPrev = &rNewNode; m_iCount++; } - void InsertHead(TNode& rNode) + void InsertHead(TNode &rNode) { InsertAfter(m_oRoot, rNode); } - void InsertTail(TNode& rNode) + void InsertTail(TNode &rNode) { InsertBefore(m_oRoot, rNode); } - TNode* Remove(TNode& rNode) + TNode *Remove(TNode &rNode) { - TASSERT(rNode.GetList()==this); + TASSERT(rNode.GetList() == this); rNode.SetList(TNULL); rNode.m_pPrev->m_pNext = rNode.m_pNext; rNode.m_pNext->m_pPrev = rNode.m_pPrev; - rNode.m_pNext = &rNode; - rNode.m_pPrev = &rNode; + rNode.m_pNext = &rNode; + rNode.m_pPrev = &rNode; m_iCount--; return &rNode; } @@ -238,7 +239,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList } } - TNode* RemoveHead() + TNode *RemoveHead() { if (!IsEmpty()) { return Remove(*m_oRoot.Next()); @@ -246,7 +247,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList return TNULL; } - TNode* RemoveTail() + TNode *RemoveTail() { if (!IsEmpty()) { return Remove(*m_oRoot.Prev()); @@ -258,7 +259,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList { Remove(a_rNode); - delete& a_rNode; + delete &a_rNode; } void DeleteAll() @@ -290,7 +291,7 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList Iterator End() const { - return Iterator((TNode*)&m_oRoot); + return Iterator((TNode *)&m_oRoot); } Iterator RBegin() const @@ -300,15 +301,15 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList Iterator REnd() const { - return Iterator((TNode*)&m_oRoot); + return Iterator((TNode *)&m_oRoot); } - TNode* Head() const + TNode *Head() const { return m_oRoot.Next(); } - TNode* Tail() const + TNode *Tail() const { return m_oRoot.Prev(); } @@ -319,26 +320,25 @@ class TKERNELINTERFACE_EXPORTS TGenericNodeList } protected: - TNode m_oRoot; // 0x0 - TINT m_iCount; // 0x10 + TNode m_oRoot; // 0x0 + TINT m_iCount; // 0x10 }; template class T2Iterator { public: - T2Iterator() { m_pPtr = TNULL; } - T2Iterator(Node* pPtr) + T2Iterator(Node *pPtr) { - m_pPtr = static_cast(pPtr); + m_pPtr = static_cast(pPtr); } - T2Iterator(T* pPtr) + T2Iterator(T *pPtr) { m_pPtr = pPtr; } @@ -353,33 +353,33 @@ class T2Iterator return m_pNode != ptr; }*/ - void operator=(const T2Iterator& other) + void operator=(const T2Iterator &other) { m_pPtr = other.m_pPtr; } - void operator=(T* pPtr) + void operator=(T *pPtr) { m_pPtr = pPtr; } - T* operator->() const + T *operator->() const { TASSERT(m_pPtr != TNULL); return m_pPtr; } - operator T* () const + operator T *() const { TASSERT(m_pPtr != TNULL); - return static_cast(m_pPtr); + return static_cast(m_pPtr); } T2Iterator operator++(int) { TASSERT(m_pPtr != TNULL); T2Iterator old = m_pPtr; - m_pPtr = static_cast(m_pPtr->Next()); + m_pPtr = static_cast(m_pPtr->Next()); return old; } @@ -387,26 +387,26 @@ class T2Iterator { TASSERT(m_pPtr != TNULL); T2Iterator old = m_pPtr; - m_pPtr = static_cast(m_pPtr->Prev()); + m_pPtr = static_cast(m_pPtr->Prev()); return old; } T2Iterator operator++() { TASSERT(m_pPtr != TNULL); - m_pPtr = static_cast(m_pPtr->Next()); + m_pPtr = static_cast(m_pPtr->Next()); return T2Iterator{ m_pPtr }; } T2Iterator operator--() { TASSERT(m_pPtr != TNULL); - m_pPtr = static_cast(m_pPtr->Prev()); + m_pPtr = static_cast(m_pPtr->Prev()); return T2Iterator{ m_pPtr }; } private: - T* m_pPtr; + T *m_pPtr; }; //class Iterator @@ -496,7 +496,7 @@ class T2Iterator //private: // T* m_pPtr; -//}; +//}; // For the mean time use this until we probably implemented this template @@ -516,7 +516,7 @@ class TNodeList m_List = TNULL; } - TNode(const TNode& node) + TNode(const TNode &node) { m_Next = node.m_Next; m_Prev = node.m_Prev; @@ -528,12 +528,22 @@ class TNodeList m_List->Remove(*this); } - T* Next() const + T *Next() + { + return m_Next->As(); + } + + T *Prev() + { + return m_Prev->As(); + } + + const T *Next() const { return m_Next->As(); } - T* Prev() const + const T *Prev() const { return m_Prev->As(); } @@ -543,23 +553,29 @@ class TNodeList return m_List != TNULL; } - void SetList(TNodeList* list) + void SetList(TNodeList *list) { m_List = list; } - TNodeList* GetList() const + TNodeList *GetList() const { return m_List; } - template - T* As() + template + T *As() { - return static_cast(this); + return static_cast(this); } - TNode& operator=(const TNode& node) + template + const T *As() const + { + return static_cast(this); + } + + TNode &operator=(const TNode &node) { m_Next = node.m_Next; m_Prev = node.m_Prev; @@ -568,9 +584,9 @@ class TNodeList } protected: - TNodeList* m_List; - TNode* m_Next; - TNode* m_Prev; + TNodeList *m_List; + TNode *m_Next; + TNode *m_Prev; }; public: @@ -584,36 +600,36 @@ class TNodeList DeleteAll(); } - void InsertAfter(TNode& insertAfter, TNode& newNode) + void InsertAfter(TNode &insertAfter, TNode &newNode) { TASSERT(!newNode.IsLinked()); newNode.SetList(this); - newNode.m_Next = insertAfter.m_Next; - newNode.m_Prev = &insertAfter; + newNode.m_Next = insertAfter.m_Next; + newNode.m_Prev = &insertAfter; insertAfter.m_Next->m_Prev = &newNode; - insertAfter.m_Next = &newNode; + insertAfter.m_Next = &newNode; m_Count++; } - void InsertBefore(TNode& insertBefore, TNode& newNode) + void InsertBefore(TNode &insertBefore, TNode &newNode) { TASSERT(!newNode.IsLinked()); newNode.SetList(this); - newNode.m_Next = &insertBefore; - newNode.m_Prev = insertBefore.m_Prev; + newNode.m_Next = &insertBefore; + newNode.m_Prev = insertBefore.m_Prev; insertBefore.m_Prev->m_Next = &newNode; - insertBefore.m_Prev = &newNode; + insertBefore.m_Prev = &newNode; m_Count++; } - TNode* Remove(TNode& rNode) + TNode *Remove(TNode &rNode) { TASSERT(rNode.GetList() == this); rNode.SetList(TNULL); rNode.m_Prev->m_Next = rNode.m_Next; rNode.m_Next->m_Prev = rNode.m_Prev; - rNode.m_Next = &rNode; - rNode.m_Prev = &rNode; + rNode.m_Next = &rNode; + rNode.m_Prev = &rNode; m_Count--; TASSERT(rNode.IsLinked() == TFALSE); return &rNode; @@ -627,7 +643,7 @@ class TNodeList } } - T* RemoveHead() + T *RemoveHead() { if (!IsEmpty()) { @@ -637,7 +653,7 @@ class TNodeList return TNULL; } - T* RemoveTail() + T *RemoveTail() { if (!IsEmpty()) { @@ -649,12 +665,12 @@ class TNodeList void DeleteHead() { - Delete(Head()); + Delete(*Head()); } void DeleteTail() { - Delete(Tail()); + Delete(*Tail()); } void DeleteAll() @@ -665,19 +681,19 @@ class TNodeList } } - void Delete(T& node) + void Delete(T &node) { Remove(node); - delete& node; + delete &node; } - void InsertHead(T& node) + void InsertHead(T &node) { InsertAfter(m_Head, node); } - void InsertTail(T& node) + void InsertTail(T &node) { InsertBefore(m_Head, node); } @@ -687,7 +703,7 @@ class TNodeList return m_Head.Next() == End(); } - TBOOL IsValid(const T* node) const + TBOOL IsValid(const T *node) const { return node != TNULL && node->m_List == this; } @@ -719,7 +735,7 @@ class TNodeList protected: mutable TNode m_Head; - size_t m_Count; + size_t m_Count; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TNodeTree.h b/Toshi/Include/TKernel/TNodeTree.h index 51f998e..b618edb 100644 --- a/Toshi/Include/TKernel/TNodeTree.h +++ b/Toshi/Include/TKernel/TNodeTree.h @@ -18,33 +18,33 @@ class TNodeTree protected: TNode() { - m_Tree = TNULL; - m_Next = (T*)this; - m_Prev = (T*)this; + m_Tree = TNULL; + m_Next = (T *)this; + m_Prev = (T *)this; m_Parent = TNULL; - m_Child = TNULL; + m_Child = TNULL; } public: TBOOL IsChildOfDefaultRoot() const { TASSERT(IsLinked() == TTRUE); - return m_Parent == (T*)(&GetTree()->m_Root); + return m_Parent == (T *)(&GetTree()->m_Root); } - TBOOL IsLinked() const { return m_Tree != TNULL; } - T* Parent() const { return m_Parent; } - T* Next() const { return m_Next; } - T* Prev() const { return m_Prev; } - TNodeTree* GetTree() const { return m_Tree; } - T* Child() const { return m_Child; } + TBOOL IsLinked() const { return m_Tree != TNULL; } + T *Parent() const { return m_Parent; } + T *Next() const { return m_Next; } + T *Prev() const { return m_Prev; } + TNodeTree *GetTree() const { return m_Tree; } + T *Child() const { return m_Child; } protected: - TNodeTree* m_Tree; - T* m_Next; - T* m_Prev; - T* m_Parent; - T* m_Child; + TNodeTree *m_Tree; + T *m_Next; + T *m_Prev; + T *m_Parent; + T *m_Child; }; public: @@ -65,7 +65,7 @@ class TNodeTree * @param parentNode Reference to the parent node. * @param a_rSourceNode Reference to the node you want to insert. */ - void Insert(T* parentNode, T* a_rSourceNode) + void Insert(T *parentNode, T *a_rSourceNode) { // Toshi::TNodeTree::Insert - 00691aa0 TASSERT(a_rSourceNode->IsLinked() == TFALSE); @@ -74,14 +74,14 @@ class TNodeTree Remove(*a_rSourceNode, TFALSE); // Get the first attached to parent node - T* firstAttached = parentNode->Child(); + T *firstAttached = parentNode->Child(); if (firstAttached != TNULL) { // Attach node to other attached nodes - T* lastAttached = firstAttached->Prev(); + T *lastAttached = firstAttached->Prev(); - lastAttached->m_Next = a_rSourceNode; + lastAttached->m_Next = a_rSourceNode; firstAttached->m_Prev = a_rSourceNode; a_rSourceNode->m_Next = firstAttached; @@ -93,7 +93,7 @@ class TNodeTree parentNode->m_Child = a_rSourceNode; } - a_rSourceNode->m_Tree = this; + a_rSourceNode->m_Tree = this; a_rSourceNode->m_Parent = parentNode; m_Count++; } @@ -103,7 +103,7 @@ class TNodeTree * * @param a_rSourceNode Pointer to the node you want to insert. */ - void InsertAtRoot(T* sourceNode) + void InsertAtRoot(T *sourceNode) { Insert(GetRoot(), sourceNode); } @@ -111,7 +111,7 @@ class TNodeTree /** * Tries to remove a_rSourceNode from the tree and inserts it to the parentNode or to the root */ - void ReInsert(T* parentNode, T* sourceNode) + void ReInsert(T *parentNode, T *sourceNode) { Remove(sourceNode, TFALSE); @@ -127,12 +127,12 @@ class TNodeTree Insert(parentNode, sourceNode); } - T* Remove(T& node, TBOOL flag = TFALSE) + T *Remove(T &node, TBOOL flag = TFALSE) { // Toshi::TNodeTree::Remove - 00691e70 - TNodeTree* nodeRoot = node.GetTree(); - T* nodeParent = node.Parent(); - + TNodeTree *nodeRoot = node.GetTree(); + T *nodeParent = node.Parent(); + if (nodeRoot) { // Check if the node belongs to the current tree if (nodeRoot != this) { @@ -143,11 +143,11 @@ class TNodeTree } if (flag) { - T* attachedNode = node.Child(); + T *attachedNode = node.Child(); while (attachedNode) { - TNodeTree* nodeRoot = node.GetTree(); + TNodeTree *nodeRoot = node.GetTree(); Remove(*attachedNode, TFALSE); Insert(node.Parent(), attachedNode); @@ -170,22 +170,22 @@ class TNodeTree node.m_Prev->m_Next = node.m_Next; node.m_Next->m_Prev = node.m_Prev; - node.m_Next = &node; - node.m_Prev = &node; - node.m_Tree = TNULL; + node.m_Next = &node; + node.m_Prev = &node; + node.m_Tree = TNULL; return &node; } - T* Remove(T* node, TBOOL flag = TFALSE) + T *Remove(T *node, TBOOL flag = TFALSE) { return Remove(*node, flag); } - void DeleteRecurse(T* node) + void DeleteRecurse(T *node) { while (node != TNULL) { - T* next = (node->Next() != node) ? node->Next() : TNULL; + T *next = (node->Next() != node) ? node->Next() : TNULL; if (node->Child() != TNULL) { @@ -199,7 +199,7 @@ class TNodeTree if (node->GetTree() == TNULL || node->GetTree() == this) { - T* nodeParent = node->Parent(); + T *nodeParent = node->Parent(); if (nodeParent != TNULL) { @@ -213,10 +213,10 @@ class TNodeTree } node->m_Prev->m_Parent = node->m_Next; - node->m_Next->m_Child = node->m_Prev; - node->m_Next = node; - node->m_Prev = node; - node->m_Tree = TNULL; + node->m_Next->m_Child = node->m_Prev; + node->m_Next = node; + node->m_Prev = node; + node->m_Tree = TNULL; } delete node; @@ -226,7 +226,7 @@ class TNodeTree void DeleteAll() { - T* node = GetRoot()->Child(); + T *node = GetRoot()->Child(); while (node != TNULL) { @@ -238,12 +238,12 @@ class TNodeTree TASSERT(Count() == 0); } - T* GetRoot() + T *GetRoot() { - return TSTATICCAST(T*, &m_Root); + return TSTATICCAST(T *, &m_Root); } - T* ChildOfRoot() + T *ChildOfRoot() { return m_Root.Child(); } @@ -259,8 +259,8 @@ class TNodeTree } protected: - TNode m_Root; // 0x0 + TNode m_Root; // 0x0 size_t m_Count; // 0x14 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TObject.h b/Toshi/Include/TKernel/TObject.h index b8fa71b..595b167 100644 --- a/Toshi/Include/TKernel/TObject.h +++ b/Toshi/Include/TKernel/TObject.h @@ -7,52 +7,52 @@ TOSHI_NAMESPACE_BEGIN // TClassProps definitions -typedef class TObject* (TOSHI_API*t_CreateTObject)(); -typedef class TObject* (TOSHI_API*t_CreateTObjectInPlace)(TPVOID); -typedef void (TOSHI_API*t_InitializeStatic)(); -typedef void (TOSHI_API*t_UninitializeStatic)(); +typedef class TObject *(TOSHI_API *t_CreateTObject)(); +typedef class TObject *(TOSHI_API *t_CreateTObjectInPlace)(TPVOID); +typedef void(TOSHI_API *t_InitializeStatic)(); +typedef void(TOSHI_API *t_UninitializeStatic)(); // RecurseTree definitions -typedef TBOOL (*t_RecurceTreeCheck)(class TClass*, TPCVOID); -typedef TBOOL (*t_RecurceTreeBaseBeginCb)(class TClass*, TPCVOID); -typedef TBOOL (*t_RecurceTreeBaseEndCb)(class TClass*, TPCVOID); +typedef TBOOL (*t_RecurceTreeCheck)(class TClass *, TPCVOID); +typedef TBOOL (*t_RecurceTreeBaseBeginCb)(class TClass *, TPCVOID); +typedef TBOOL (*t_RecurceTreeBaseEndCb)(class TClass *, TPCVOID); -#define TGetClass(X) X::m_sClass +#define TGetClass(X) X::m_sClass #define TFindClass(X, Y) Toshi::TClass::Find(#X, Y) class TKERNELINTERFACE_EXPORTS TClass { public: - TClass(TPCCHAR a_pcName, TClass* a_pParent, t_CreateTObject a_Create, t_CreateTObjectInPlace a_CreateInPlace, t_InitializeStatic a_Init, t_UninitializeStatic a_Uninit, TUINT a_uiVersion); + TClass(TPCCHAR a_pcName, TClass *a_pParent, t_CreateTObject a_Create, t_CreateTObjectInPlace a_CreateInPlace, t_InitializeStatic a_Init, t_UninitializeStatic a_Uninit, TUINT a_uiVersion); ~TClass(); - TObject* CreateObject() const + TObject *CreateObject() const { return m_Create ? m_Create() : TNULL; } - TObject* CreateObjectInPlace(TPVOID a_pMem) const + TObject *CreateObjectInPlace(TPVOID a_pMem) const { return m_CreateInPlace ? m_CreateInPlace(a_pMem) : TNULL; } - void DeinitialiseStatic(); - TBOOL DetachClassFromParent() { return TTRUE; } - static void TOSHI_API DumpObjectClassTree(); - static const TClass* TOSHI_API Find(TPCCHAR a_pcClassName, const TClass* a_pClass); - static const TClass* TOSHI_API FindCommonBaseClass(const TClass& a_rClass, const TClass& a_rBaseClass); - static const TClass* TOSHI_API FindRecurse(TPCCHAR a_pcClassName, const TClass* a_pClass, TBOOL a_bHasPrevious); + void DeinitialiseStatic(); + TBOOL DetachClassFromParent() { return TTRUE; } + static void TOSHI_API DumpObjectClassTree(); + static const TClass *TOSHI_API Find(TPCCHAR a_pcClassName, const TClass *a_pClass); + static const TClass *TOSHI_API FindCommonBaseClass(const TClass &a_rClass, const TClass &a_rBaseClass); + static const TClass *TOSHI_API FindRecurse(TPCCHAR a_pcClassName, const TClass *a_pClass, TBOOL a_bHasPrevious); - TPCCHAR GetName() const { return m_pcName; } - const TClass* GetParent() const { return m_pParent; } - TUINT GetVersion() const { return m_uiVersion; } - TUSHORT GetVersionMajor() const { return m_uiVersion >> 16; } - TUSHORT GetVersionMinor() const { return m_uiVersion & 0xFFFF; } + TPCCHAR GetName() const { return m_pcName; } + const TClass *GetParent() const { return m_pParent; } + TUINT GetVersion() const { return m_uiVersion; } + TUSHORT GetVersionMajor() const { return m_uiVersion >> 16; } + TUSHORT GetVersionMinor() const { return m_uiVersion & 0xFFFF; } - void InitialiseStatic(); + void InitialiseStatic(); TBOOL IsA(const TClass &a_rClass) const; TBOOL IsAttached() const; - TBOOL IsExactly(const TClass& a_rClass) const + TBOOL IsExactly(const TClass &a_rClass) const { return *this == a_rClass; } @@ -61,21 +61,21 @@ class TKERNELINTERFACE_EXPORTS TClass return m_bInitialised; } - TClass& operator=(const TClass& a_rClass) + TClass &operator=(const TClass &a_rClass) { - m_pcName = a_rClass.m_pcName; - m_Create = a_rClass.m_Create; + m_pcName = a_rClass.m_pcName; + m_Create = a_rClass.m_Create; m_CreateInPlace = a_rClass.m_CreateInPlace; - m_Initialize = a_rClass.m_Initialize; - m_Uninitialize = a_rClass.m_Uninitialize; - m_pParent = a_rClass.m_pParent; - m_pPrevious = a_rClass.m_pPrevious; + m_Initialize = a_rClass.m_Initialize; + m_Uninitialize = a_rClass.m_Uninitialize; + m_pParent = a_rClass.m_pParent; + m_pPrevious = a_rClass.m_pPrevious; m_pLastAttached = a_rClass.m_pLastAttached; - m_uiVersion = a_rClass.m_uiVersion; - m_bInitialised = TFALSE; + m_uiVersion = a_rClass.m_uiVersion; + m_bInitialised = TFALSE; return *this; } - TBOOL operator==(const TClass& a_rClass) const + TBOOL operator==(const TClass &a_rClass) const { return m_pcName == a_rClass.m_pcName; } @@ -86,80 +86,93 @@ class TKERNELINTERFACE_EXPORTS TClass TBOOL AttachClassToParent(); private: - TPCCHAR m_pcName; // 0x00 - t_CreateTObject m_Create; // 0x04 + TPCCHAR m_pcName; // 0x00 + t_CreateTObject m_Create; // 0x04 t_CreateTObjectInPlace m_CreateInPlace; // 0x08 - t_InitializeStatic m_Initialize; // 0x0C - t_UninitializeStatic m_Uninitialize; // 0x10 - TClass* m_pParent; // 0x14 - TClass* m_pPrevious; // 0x18 - TClass* m_pLastAttached; // 0x1C - TUINT m_uiVersion; // 0x20 - TBOOL m_bInitialised; // 0x24 + t_InitializeStatic m_Initialize; // 0x0C + t_UninitializeStatic m_Uninitialize; // 0x10 + TClass *m_pParent; // 0x14 + TClass *m_pPrevious; // 0x18 + TClass *m_pLastAttached; // 0x1C + TUINT m_uiVersion; // 0x20 + TBOOL m_bInitialised; // 0x24 }; -#define DECLARE_DYNAMIC(class_name) \ -public: \ - virtual Toshi::TClass& GetClass() const; \ - static Toshi::TClass m_sClass; \ -private: \ - static Toshi::TObject* TOSHI_API CreateObject(); \ - static Toshi::TObject* TOSHI_API CreateObjectInPlace(TPVOID a_pMem); \ - static void TOSHI_API DeinitialiseStatic(); \ - static void TOSHI_API InitialiseStatic(); +#define DECLARE_DYNAMIC(class_name) \ +public: \ + virtual Toshi::TClass &GetClass() const; \ + static Toshi::TClass m_sClass; \ + \ +private: \ + static Toshi::TObject *TOSHI_API CreateObject(); \ + static Toshi::TObject *TOSHI_API CreateObjectInPlace(TPVOID a_pMem); \ + static void TOSHI_API DeinitialiseStatic(); \ + static void TOSHI_API InitialiseStatic(); #define IMPLEMENT_RUNTIMECLASS(class_name, base_class_name, pfnCreateObject, pfnCreateObjectInPlace, version) \ - Toshi::TClass& class_name::GetClass() const \ - { return class_name::m_sClass; } \ - void TOSHI_API class_name::DeinitialiseStatic() \ - { } \ - void TOSHI_API class_name::InitialiseStatic() \ - { } \ - Toshi::TClass class_name::m_sClass = { \ - #class_name, &TGetClass(base_class_name), pfnCreateObject, pfnCreateObjectInPlace, \ - class_name::InitialiseStatic, class_name::DeinitialiseStatic, version }; \ - -#define IMPLEMENT_DYNCREATE(class_name, base_class_name) \ - Toshi::TObject* TOSHI_API class_name::CreateObject() \ - { return new class_name; } \ - Toshi::TObject* TOSHI_API class_name::CreateObjectInPlace(TPVOID a_pMem) \ - { return new (a_pMem) class_name; } \ + Toshi::TClass &class_name::GetClass() const \ + { \ + return class_name::m_sClass; \ + } \ + void TOSHI_API class_name::DeinitialiseStatic() \ + {} \ + void TOSHI_API class_name::InitialiseStatic() \ + {} \ + Toshi::TClass class_name::m_sClass = { \ + #class_name, &TGetClass(base_class_name), pfnCreateObject, pfnCreateObjectInPlace, \ + class_name::InitialiseStatic, class_name::DeinitialiseStatic, version \ + }; + +#define IMPLEMENT_DYNCREATE(class_name, base_class_name) \ + Toshi::TObject *TOSHI_API class_name::CreateObject() \ + { \ + return new class_name; \ + } \ + Toshi::TObject *TOSHI_API class_name::CreateObjectInPlace(TPVOID a_pMem) \ + { \ + return new (a_pMem) class_name; \ + } \ IMPLEMENT_RUNTIMECLASS(class_name, base_class_name, class_name::CreateObject, class_name::CreateObjectInPlace, 1) -#define IMPLEMENT_DYNAMIC(class_name, base_class_name) \ - Toshi::TObject* TOSHI_API class_name::CreateObject() \ - { TASSERT(!"This class does not support dynamic creation!"); return TNULL; } \ - Toshi::TObject* TOSHI_API class_name::CreateObjectInPlace(TPVOID a_pMem) \ - { TASSERT(!"This class does not support dynamic creation!"); return TNULL; } \ +#define IMPLEMENT_DYNAMIC(class_name, base_class_name) \ + Toshi::TObject *TOSHI_API class_name::CreateObject() \ + { \ + TASSERT(!"This class does not support dynamic creation!"); \ + return TNULL; \ + } \ + Toshi::TObject *TOSHI_API class_name::CreateObjectInPlace(TPVOID a_pMem) \ + { \ + TASSERT(!"This class does not support dynamic creation!"); \ + return TNULL; \ + } \ IMPLEMENT_RUNTIMECLASS(class_name, base_class_name, class_name::CreateObject, class_name::CreateObjectInPlace, 1) class TKERNELINTERFACE_EXPORTS TObject -{ -private: - static TObject* TOSHI_API CreateObject() +{ +private: + static TObject *TOSHI_API CreateObject() { return new TObject; } - static TObject* TOSHI_API CreateObjectInPlace(TPVOID a_pMem) + static TObject *TOSHI_API CreateObjectInPlace(TPVOID a_pMem) { return new (a_pMem) TObject; } static void TOSHI_API DeinitialiseStatic() {} static void TOSHI_API InitialiseStatic() {} - + public: virtual void Delete() { delete this; } - TBOOL IsA(const TClass& a_rClass) const { return GetClass().IsA(a_rClass); } - TBOOL IsExactly(const TClass& a_rClass) const { return GetClass().IsExactly(a_rClass); } + TBOOL IsA(const TClass &a_rClass) const { return GetClass().IsA(a_rClass); } + TBOOL IsExactly(const TClass &a_rClass) const { return GetClass().IsExactly(a_rClass); } - virtual TClass& GetClass() const { return m_sClass; } + virtual TClass &GetClass() const { return m_sClass; } inline static TClass m_sClass = TClass("TObject", TNULL, TObject::CreateObject, TObject::CreateObjectInPlace, TObject::InitialiseStatic, TObject::DeinitialiseStatic, 1); protected: TObject() {} virtual ~TObject() = default; - }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TPCString.h b/Toshi/Include/TKernel/TPCString.h index 53f6d5e..432e913 100644 --- a/Toshi/Include/TKernel/TPCString.h +++ b/Toshi/Include/TKernel/TPCString.h @@ -20,16 +20,16 @@ class TKERNELINTERFACE_EXPORTS TPooledCString : public TRefCounted private: TPooledCString(); - TPooledCString(TPCCHAR a_szString, TCStringPool* a_pStringPool); - + TPooledCString(TPCCHAR a_szString, TCStringPool *a_pStringPool); + void Delete(); ~TPooledCString(); private: // 0x0 base (m_iRefCount) - TCString m_oString; // 0x4 - TCStringPool* m_pCStringPool; // 0xC + TCString m_oString; // 0x4 + TCStringPool *m_pCStringPool; // 0xC }; class TKERNELINTERFACE_EXPORTS TPCString @@ -43,7 +43,8 @@ class TKERNELINTERFACE_EXPORTS TPCString m_pPCS = TNULL; } - TPCString(const TPCString& a_rPCS) : TPCString() + TPCString(const TPCString &a_rPCS) + : TPCString() { if (a_rPCS.m_pPCS) { m_pPCS = a_rPCS.m_pPCS; @@ -61,7 +62,7 @@ class TKERNELINTERFACE_EXPORTS TPCString } } - TINT Compare(const TPCString& a_rString) const + TINT Compare(const TPCString &a_rString) const { if (!GetPtr() && a_rString.GetPtr()) { return -1; @@ -83,32 +84,32 @@ class TKERNELINTERFACE_EXPORTS TPCString return GetCString().IsEmpty(); } - TBOOL operator!=(const TPCString& a_rString) const + TBOOL operator!=(const TPCString &a_rString) const { return GetPtr() != a_rString.GetPtr(); } - const TCString& operator*() const + const TCString &operator*() const { return m_pPCS ? m_pPCS->m_oString : ms_sEmpty; } - const TCString* operator->() const + const TCString *operator->() const { return m_pPCS ? &m_pPCS->m_oString : &ms_sEmpty; } - TBOOL operator<(const TPCString& a_rString) const + TBOOL operator<(const TPCString &a_rString) const { return Compare(a_rString) == 0; } - TBOOL operator==(const TPCString& a_rString) const + TBOOL operator==(const TPCString &a_rString) const { return GetPtr() == a_rString.GetPtr(); } - TPCString& operator=(const TPCString& a_rString) + TPCString &operator=(const TPCString &a_rString) { if (GetPtr() != a_rString.GetPtr()) { if (GetPtr() && GetPtr()->DecRefCount() == 0) { @@ -120,27 +121,27 @@ class TKERNELINTERFACE_EXPORTS TPCString return *this; } - operator const TCString* () const + operator const TCString *() const { return GetPtr() ? &GetPtr()->m_oString : &ms_sEmpty; } - TPooledCString* GetPtr() const + TPooledCString *GetPtr() const { return m_pPCS; } - const TCString& GetCString() const + const TCString &GetCString() const { return GetPtr() ? GetPtr()->m_oString : ms_sEmpty; } - TCStringPool* GetStringPool() const + TCStringPool *GetStringPool() const { return GetPtr()->m_pCStringPool; } - TCString& GetVolatileCString() const + TCString &GetVolatileCString() const { TASSERT(GetPtr() != TNULL); TASSERT(GetPtr()->m_pCStringPool == TNULL); @@ -148,35 +149,36 @@ class TKERNELINTERFACE_EXPORTS TPCString } private: - - TPCString(TPooledCString* a_pPCS) + TPCString(TPooledCString *a_pPCS) { m_pPCS = a_pPCS; if (a_pPCS) { a_pPCS->IncRefCount(); } } - - TPooledCString* m_pPCS; + + TPooledCString *m_pPCS; }; class TKERNELINTERFACE_EXPORTS TCStringPool { friend class TPooledCString; -public: - TCStringPool() : TCStringPool(0x400, 0) {} +public: + TCStringPool() + : TCStringPool(0x400, 0) {} TCStringPool(TINT a_iMaxSize, TINT a_iInitialSize); TPCString Get(TPCCHAR a_szString); TPCString Get(TINT a_iInt); + protected: - void Remove(TPooledCString& a_rPooledCString); + void Remove(TPooledCString &a_rPooledCString); private: - TINT m_iMaxSize; // 0x0 + TINT m_iMaxSize; // 0x0 TArray m_oPooledCStrings; // 0x4 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TPile.h b/Toshi/Include/TKernel/TPile.h index 1bff346..6702262 100644 --- a/Toshi/Include/TKernel/TPile.h +++ b/Toshi/Include/TKernel/TPile.h @@ -6,7 +6,6 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TPile { public: - enum PileFlags { PILEFLAG_MALLOC = BITFIELD(0) @@ -14,8 +13,8 @@ class TKERNELINTERFACE_EXPORTS TPile TPile(TINT a_iPileSize, TINT a_iBlockSize, TUINT a_iFlags); - void* RawAlloc(TINT a_iSize, TINT a_iAlignment); - TBOOL RawIsInside(void* a_pRaw); + void *RawAlloc(TINT a_iSize, TINT a_iAlignment); + TBOOL RawIsInside(void *a_pRaw); void Free(); @@ -33,14 +32,14 @@ class TKERNELINTERFACE_EXPORTS TPile } private: - TINT m_iPileSize; // 0x0 - TINT m_iBlockSize; // 0x4 - TUINT m_iFlags; // 0x8 - TINT m_iNumBlocks; // 0xC - TINT* m_pNextBlock; // 0x14 - void** m_ppBlocks; // 0x1C - TINT m_iNumAllocs; // 0x24 - TINT m_iWastedSpace; // 0x28 + TINT m_iPileSize; // 0x0 + TINT m_iBlockSize; // 0x4 + TUINT m_iFlags; // 0x8 + TINT m_iNumBlocks; // 0xC + TINT *m_pNextBlock; // 0x14 + void **m_ppBlocks; // 0x1C + TINT m_iNumAllocs; // 0x24 + TINT m_iWastedSpace; // 0x28 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TProfiler.h b/Toshi/Include/TKernel/TProfiler.h index de529b3..6694003 100644 --- a/Toshi/Include/TKernel/TProfiler.h +++ b/Toshi/Include/TKernel/TProfiler.h @@ -19,4 +19,4 @@ class TKERNELINTERFACE_EXPORTS TProfiler LARGE_INTEGER m_iStartTime; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TQList.h b/Toshi/Include/TKernel/TQList.h index 81c2ab8..9d51762 100644 --- a/Toshi/Include/TKernel/TQList.h +++ b/Toshi/Include/TKernel/TQList.h @@ -16,16 +16,16 @@ class TQList public: TNode() { - m_pNext = TSTATICCAST(T*, this); - m_pPrev = TSTATICCAST(T*, this); + m_pNext = TSTATICCAST(T *, this); + m_pPrev = TSTATICCAST(T *, this); } ~TNode() { m_pPrev->m_pNext = m_pNext; m_pNext->m_pPrev = m_pPrev; - m_pNext = TSTATICCAST(T*, this); - m_pPrev = TSTATICCAST(T*, this); + m_pNext = TSTATICCAST(T *, this); + m_pPrev = TSTATICCAST(T *, this); } TBOOL IsLinked() const @@ -33,63 +33,62 @@ class TQList return this != m_pNext; } - T* Next() const + T *Next() const { return m_pNext; } - T* Prev() const + T *Prev() const { return m_pPrev; } private: - void InsertAfter(TNode* a_pNode) + void InsertAfter(TNode *a_pNode) { TASSERT(TFALSE == IsLinked()); - m_pPrev = TSTATICCAST(T*, a_pNode); - m_pNext = a_pNode->m_pNext; - a_pNode->m_pNext = TSTATICCAST(T*, this); - m_pNext->m_pPrev = TSTATICCAST(T*, this); + m_pPrev = TSTATICCAST(T *, a_pNode); + m_pNext = a_pNode->m_pNext; + a_pNode->m_pNext = TSTATICCAST(T *, this); + m_pNext->m_pPrev = TSTATICCAST(T *, this); } - void InsertBefore(TNode* a_pNode) + void InsertBefore(TNode *a_pNode) { TASSERT(TFALSE == IsLinked()); - m_pNext = TSTATICCAST(T*, a_pNode); - m_pPrev = a_pNode->m_pPrev; - a_pNode->m_pPrev = TSTATICCAST(T*, this); - m_pPrev->m_pNext = TSTATICCAST(T*, this); + m_pNext = TSTATICCAST(T *, a_pNode); + m_pPrev = a_pNode->m_pPrev; + a_pNode->m_pPrev = TSTATICCAST(T *, this); + m_pPrev->m_pNext = TSTATICCAST(T *, this); } void Remove() { m_pPrev->m_pNext = m_pNext; m_pNext->m_pPrev = m_pPrev; - m_pNext = TSTATICCAST(T*, this); - m_pPrev = TSTATICCAST(T*, this); + m_pNext = TSTATICCAST(T *, this); + m_pPrev = TSTATICCAST(T *, this); } private: - T* m_pNext; - T* m_pPrev; + T *m_pNext; + T *m_pPrev; }; class Iterator { public: - Iterator() { m_pPtr = TNULL; } - Iterator(TNode* pPtr) + Iterator(TNode *pPtr) { - m_pPtr = static_cast(pPtr); + m_pPtr = static_cast(pPtr); } - Iterator(T* pPtr) + Iterator(T *pPtr) { m_pPtr = pPtr; } @@ -104,33 +103,33 @@ class TQList return m_pNode != ptr; }*/ - void operator=(const Iterator& other) + void operator=(const Iterator &other) { m_pPtr = other.m_pPtr; } - void operator=(T* pPtr) + void operator=(T *pPtr) { m_pPtr = pPtr; } - T* operator->() const + T *operator->() const { TASSERT(m_pPtr != TNULL); return m_pPtr; } - operator T* () const + operator T *() const { TASSERT(m_pPtr != TNULL); - return static_cast(m_pPtr); + return static_cast(m_pPtr); } Iterator operator++(int) { TASSERT(m_pPtr != TNULL); Iterator old = m_pPtr; - m_pPtr = static_cast(m_pPtr->Next()); + m_pPtr = static_cast(m_pPtr->Next()); return old; } @@ -138,26 +137,26 @@ class TQList { TASSERT(m_pPtr != TNULL); Iterator old = m_pPtr; - m_pPtr = static_cast(m_pPtr->Prev()); + m_pPtr = static_cast(m_pPtr->Prev()); return old; } Iterator operator++() { TASSERT(m_pPtr != TNULL); - m_pPtr = static_cast(m_pPtr->Next()); + m_pPtr = static_cast(m_pPtr->Next()); return Iterator{ m_pPtr }; } Iterator operator--() { TASSERT(m_pPtr != TNULL); - m_pPtr = static_cast(m_pPtr->Prev()); + m_pPtr = static_cast(m_pPtr->Prev()); return Iterator{ m_pPtr }; } private: - T* m_pPtr; + T *m_pPtr; }; public: @@ -165,17 +164,17 @@ class TQList ~TQList() { TASSERT(IsEmpty()); } - void PushFront(T* a_pNode) + void PushFront(T *a_pNode) { a_pNode->InsertAfter(&m_oRoot); } - void Push(T* a_pNode) + void Push(T *a_pNode) { a_pNode->InsertBefore(&m_oRoot); } - T* Pop() + T *Pop() { auto pFirstElement = m_oRoot.m_pNext; pFirstElement->Remove(); @@ -192,7 +191,7 @@ class TQList return m_oRoot.m_pNext; } - const TNode* End() const + const TNode *End() const { return &m_oRoot; } @@ -205,7 +204,7 @@ class TQList } } - void Remove(T* a_pNode) + void Remove(T *a_pNode) { a_pNode->Remove(); } @@ -219,4 +218,4 @@ class TQList TNode m_oRoot; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TQuaternion.h b/Toshi/Include/TKernel/TQuaternion.h index 9640eab..07eba0f 100644 --- a/Toshi/Include/TKernel/TQuaternion.h +++ b/Toshi/Include/TKernel/TQuaternion.h @@ -13,4 +13,4 @@ class TKERNELINTERFACE_EXPORTS TQuaternion TFLOAT m_fW; // 0xC }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TRefCounted.h b/Toshi/Include/TKernel/TRefCounted.h index 9fbed3f..5d59f14 100644 --- a/Toshi/Include/TKernel/TRefCounted.h +++ b/Toshi/Include/TKernel/TRefCounted.h @@ -6,7 +6,6 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TRefCounted { public: - TINT DecRefCount(TPVOID a_pData = TNULL) { return --m_iRefCount; @@ -23,19 +22,17 @@ class TKERNELINTERFACE_EXPORTS TRefCounted } private: - - TRefCounted& operator=(const TRefCounted& a_rRefCounted) + TRefCounted &operator=(const TRefCounted &a_rRefCounted) { return *this; } - TRefCounted(const TRefCounted& a_rRefCounted) + TRefCounted(const TRefCounted &a_rRefCounted) { m_iRefCount = 0; } public: - TRefCounted() { m_iRefCount = 0; @@ -45,4 +42,4 @@ class TKERNELINTERFACE_EXPORTS TRefCounted TINT m_iRefCount; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TScheduler.h b/Toshi/Include/TKernel/TScheduler.h index c8c3eb3..bd10fb8 100644 --- a/Toshi/Include/TKernel/TScheduler.h +++ b/Toshi/Include/TKernel/TScheduler.h @@ -9,14 +9,14 @@ TOSHI_NAMESPACE_BEGIN class TKernelInterface; -#define ApplicationCreateTask(taskclass, parenttask) (taskclass*)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(taskclass), parenttask) +#define ApplicationCreateTask(taskclass, parenttask) (taskclass *)g_oTheApp.GetKernel()->GetScheduler()->CreateTask(TGetClass(taskclass), parenttask) class TKERNELINTERFACE_EXPORTS TScheduler : public TObject { DECLARE_DYNAMIC(TScheduler); -public: - TScheduler(TKernelInterface* a_pKernel); +public: + TScheduler(TKernelInterface *a_pKernel); virtual ~TScheduler() { @@ -24,16 +24,16 @@ class TKERNELINTERFACE_EXPORTS TScheduler : public TObject DestroyAllTasks(); } - TTask* CreateTask(TClass const& a_rTaskClass, TTask* a_pTask); - void Update(); - void DestroyDyingTasks(TTask *a_pTask); - void DestroyAllTasks(); - void DestroyTask(TTask &a_rTask); + TTask *CreateTask(TClass const &a_rTaskClass, TTask *a_pTask); + void Update(); + void DestroyDyingTasks(TTask *a_pTask); + void DestroyAllTasks(); + void DestroyTask(TTask &a_rTask); void SetDebugSlowTime(TBOOL a_bEnable) { m_fDebugSlowTime = a_bEnable ? 0.01f : 1.0f; } // $TKernelInterface: FUNCTION 1002d690 - TKernelInterface* GetKernelInterface() + TKernelInterface *GetKernelInterface() { return m_pKernel; } @@ -44,14 +44,15 @@ class TKERNELINTERFACE_EXPORTS TScheduler : public TObject void DeleteTask(TTask *a_pTask); void DeleteTaskRecurse(TTask *a_pTask); void DeleteTaskAtomic(TTask *a_pTask); + private: - TTask *m_pCurrentTask; // 0x4 - TKernelInterface *m_pKernel; // 0x8 - TNodeTree m_oTaskTree; // 0xC - TFLOAT m_fCurrentTimeDelta; // 0x24 - TFLOAT m_fTotalTime; // 0x28 - TFLOAT m_fDebugSlowTime; // 0x2C - TFLOAT m_iFrameCount; // 0x30 + TTask *m_pCurrentTask; // 0x4 + TKernelInterface *m_pKernel; // 0x8 + TNodeTree m_oTaskTree; // 0xC + TFLOAT m_fCurrentTimeDelta; // 0x24 + TFLOAT m_fTotalTime; // 0x28 + TFLOAT m_fDebugSlowTime; // 0x2C + TFLOAT m_iFrameCount; // 0x30 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TSphere.h b/Toshi/Include/TKernel/TSphere.h index 559ed7b..a27dfc8 100644 --- a/Toshi/Include/TKernel/TSphere.h +++ b/Toshi/Include/TKernel/TSphere.h @@ -7,7 +7,7 @@ class TKERNELINTERFACE_EXPORTS TSphere { private: TVector3 m_Origin; - TFLOAT m_fRadius; + TFLOAT m_fRadius; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TSystemTools.h b/Toshi/Include/TKernel/TSystemTools.h index 30b9e11..53156a2 100644 --- a/Toshi/Include/TKernel/TSystemTools.h +++ b/Toshi/Include/TKernel/TSystemTools.h @@ -8,24 +8,25 @@ class TCStringPool; class TKERNELINTERFACE_EXPORTS TSystem { public: - static TPCCHAR TOSHI_API StringUnicodeToChar(TPCHAR a_CharString, TPCWCHAR a_UnicodeString, TINT a_iLength); - static TPCWCHAR TOSHI_API StringCharToUnicode(TPWCHAR a_UnicodeString, TPCCHAR a_CharString, TINT a_iLength); - static TPCCHAR TOSHI_API StringIntToString(TINT a_iInt, TPCHAR a_szString, TINT a_iRadix); - static TINT TOSHI_API StringLength(TPCCHAR a_String); - static TINT TOSHI_API StringLength(TPCWCHAR a_String); - static TINT TOSHI_API StringCompareNoCase(TPCCHAR a_String1, TPCCHAR a_String2, TINT a_uiSize); - static TCHAR const* TOSHI_API StringCopy(TPCHAR a_DestinationString, TCHAR const* a_SourceString, TINT a_iCount); - static TPCWCHAR TOSHI_API StringCopy(TPWCHAR a_DestinationString, TPCWCHAR a_SourceString, TINT a_iCount); - static TPVOID TOSHI_API MemCopy(TPVOID a_dest, TPCVOID a_src, TUINT a_iSize); - static TPVOID TOSHI_API MemSet(TPVOID a_dest, TINT a_iValue, TINT m_iSize); + static TPCCHAR TOSHI_API StringUnicodeToChar(TPCHAR a_CharString, TPCWCHAR a_UnicodeString, TINT a_iLength); + static TPCWCHAR TOSHI_API StringCharToUnicode(TPWCHAR a_UnicodeString, TPCCHAR a_CharString, TINT a_iLength); + static TPCCHAR TOSHI_API StringIntToString(TINT a_iInt, TPCHAR a_szString, TINT a_iRadix); + static TINT TOSHI_API StringLength(TPCCHAR a_String); + static TINT TOSHI_API StringLength(TPCWCHAR a_String); + static TINT TOSHI_API StringCompareNoCase(TPCCHAR a_String1, TPCCHAR a_String2, TINT a_uiSize); + static TCHAR const *TOSHI_API StringCopy(TPCHAR a_DestinationString, TCHAR const *a_SourceString, TINT a_iCount); + static TPCWCHAR TOSHI_API StringCopy(TPWCHAR a_DestinationString, TPCWCHAR a_SourceString, TINT a_iCount); + static TPVOID TOSHI_API MemCopy(TPVOID a_dest, TPCVOID a_src, TUINT a_iSize); + static TPVOID TOSHI_API MemSet(TPVOID a_dest, TINT a_iValue, TINT m_iSize); + + static TCStringPool *TOSHI_API GetCStringPool(); + static TPBYTE GetScratchMem() { return ms_aScratchMem; } + static TPCWCHAR GetTempWString() { return (TPCWCHAR)ms_aScratchMem; } + static TPCHAR GetTempCString() { return (TPCHAR)ms_aScratchMem; } - static TCStringPool* TOSHI_API GetCStringPool(); - static TPBYTE GetScratchMem() { return ms_aScratchMem; } - static TPCWCHAR GetTempWString() { return (TPCWCHAR)ms_aScratchMem; } - static TPCHAR GetTempCString() { return (TPCHAR)ms_aScratchMem; } private: - inline static TBYTE ms_aScratchMem[1024] = {}; - inline static TCStringPool* ms_poTCStringPool = TNULL; + inline static TBYTE ms_aScratchMem[1024] = {}; + inline static TCStringPool *ms_poTCStringPool = TNULL; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TTask.h b/Toshi/Include/TKernel/TTask.h index 25f3f31..14d72eb 100644 --- a/Toshi/Include/TKernel/TTask.h +++ b/Toshi/Include/TKernel/TTask.h @@ -7,25 +7,25 @@ TOSHI_NAMESPACE_BEGIN //class TScheduler; -class TKERNELINTERFACE_EXPORTS TTask : public TObject, public TNodeTree::TNode +class TKERNELINTERFACE_EXPORTS TTask : public TObject + , public TNodeTree::TNode { DECLARE_DYNAMIC(TTask); enum State { State_Created = BITFIELD(0), - State_Active = BITFIELD(1), - State_Dying = BITFIELD(2), + State_Active = BITFIELD(1), + State_Dying = BITFIELD(2), }; friend class TScheduler; public: - // $TKernelInterface: FUNCTION 1002e7a0 INCOMPLETE TTask() { - m_Flags = 0; + m_Flags = 0; m_pScheduler = TNULL; } @@ -33,11 +33,11 @@ class TKERNELINTERFACE_EXPORTS TTask : public TObject, public TNodeTree:: virtual TBOOL CreateFailed(); virtual TBOOL OnCreate() { return TTRUE; } virtual TBOOL OnUpdate(TFLOAT a_fDeltaTime) { return TTRUE; } - virtual void OnDestroy() {} - virtual TBOOL OnChildDying(TTask* child) { return TTRUE; } - virtual void OnChildDied(TClass* a_pClass, TTask* a_pDeletedTask) {} - virtual void OnActivate() {} - virtual void OnDeactivate() {} + virtual void OnDestroy() {} + virtual TBOOL OnChildDying(TTask *child) { return TTRUE; } + virtual void OnChildDied(TClass *a_pClass, TTask *a_pDeletedTask) {} + virtual void OnActivate() {} + virtual void OnDeactivate() {} void Activate(TBOOL a_bActivate); void DestroyTask(); @@ -46,11 +46,11 @@ class TKERNELINTERFACE_EXPORTS TTask : public TObject, public TNodeTree:: TBOOL IsActive() const { return HASFLAG(m_Flags & State_Active); } TBOOL IsDying() const { return HASFLAG(m_Flags & State_Dying); } - TScheduler* GetScheduler(); + TScheduler *GetScheduler(); private: - TINT m_Flags; - TScheduler* m_pScheduler; // 0x20 + TINT m_Flags; + TScheduler *m_pScheduler; // 0x20 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TThread.h b/Toshi/Include/TKernel/TThread.h index b57d414..a01df44 100644 --- a/Toshi/Include/TKernel/TThread.h +++ b/Toshi/Include/TKernel/TThread.h @@ -1,13 +1,15 @@ #pragma once #include "TDebug.h" -#include TOSHI_MULTIPLATFORM(TThread) + +#ifdef TOSHI_SKU_WINDOWS +# include "Win/TThreadWin.h" +#endif // TOSHI_SKU_WINDOWS TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TMutexLock { public: - TMutexLock() { m_pMutex = TNULL; @@ -27,7 +29,7 @@ class TKERNELINTERFACE_EXPORTS TMutexLock void Destroy(); private: - TMutex* m_pMutex; // 0x0 + TMutex *m_pMutex; // 0x0 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TUser.h b/Toshi/Include/TKernel/TUser.h index d15b6f2..6b1df4d 100644 --- a/Toshi/Include/TKernel/TUser.h +++ b/Toshi/Include/TKernel/TUser.h @@ -9,21 +9,22 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TUser { friend class TUserHandler; + public: - TUser(TCHAR const* a_sName); + TUser(TCHAR const *a_sName); - TBOOL IsRegistered() { return m_iUserID != -1; } + TBOOL IsRegistered() { return m_iUserID != -1; } TSHORT Register(); - void Deregister(); + void Deregister(); - TSHORT GetUserID() { return m_iUserID; } - TSHORT GetNameLength() { return m_iNameLen; } - TCHAR const* GetName() { return m_sName; } + TSHORT GetUserID() { return m_iUserID; } + TSHORT GetNameLength() { return m_iNameLen; } + TCHAR const *GetName() { return m_sName; } private: - TCHAR const* m_sName; // 0x0 - TSHORT m_iNameLen; // 0x4 - TSHORT m_iUserID; // 0x6 + TCHAR const *m_sName; // 0x0 + TSHORT m_iNameLen; // 0x4 + TSHORT m_iUserID; // 0x6 }; class TKERNELINTERFACE_EXPORTS TUserHandler @@ -31,20 +32,21 @@ class TKERNELINTERFACE_EXPORTS TUserHandler protected: TUserHandler(); ~TUserHandler() = default; + public: TSHORT RegisterUser(TUser &a_rUser); - void DeregisterUser(TUser &a_rUser); - TUser* FindUser(TCHAR const* a_sName); + void DeregisterUser(TUser &a_rUser); + TUser *FindUser(TCHAR const *a_sName); - TINT GetUserCount() { return m_iUserCount; } - TUser* GetUser(TINT a_iUserID) { return m_pUsers[a_iUserID]; } - static TUserHandler& TOSHI_API GetSingleton(); + TINT GetUserCount() { return m_iUserCount; } + TUser *GetUser(TINT a_iUserID) { return m_pUsers[a_iUserID]; } + static TUserHandler &TOSHI_API GetSingleton(); private: static TUserHandler ms_oSingleton; - TINT m_iUserCount; // 0x0 - TUser* m_pUsers[MAX_USERS]; // 0x4 + TINT m_iUserCount; // 0x0 + TUser *m_pUsers[MAX_USERS]; // 0x4 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TVector2.h b/Toshi/Include/TKernel/TVector2.h index 25e9352..43f8930 100644 --- a/Toshi/Include/TKernel/TVector2.h +++ b/Toshi/Include/TKernel/TVector2.h @@ -7,10 +7,8 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TVector2 { public: - TVector2() { - } TVector2(TFLOAT a_fX, TFLOAT a_fY) @@ -50,9 +48,10 @@ class TKERNELINTERFACE_EXPORTS TVector2 static const TVector2 VEC_POSY; static const TVector2 VEC_NEGX; static const TVector2 VEC_NEGY; + private: TFLOAT m_fX; // 0x0 TFLOAT m_fY; // 0x4 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TVector3.h b/Toshi/Include/TKernel/TVector3.h index 1b74c3c..5920cb1 100644 --- a/Toshi/Include/TKernel/TVector3.h +++ b/Toshi/Include/TKernel/TVector3.h @@ -23,4 +23,4 @@ class TKERNELINTERFACE_EXPORTS TVector3 TFLOAT m_fZ; // 0x8 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TVector4.h b/Toshi/Include/TKernel/TVector4.h index 955324a..b35e53f 100644 --- a/Toshi/Include/TKernel/TVector4.h +++ b/Toshi/Include/TKernel/TVector4.h @@ -8,18 +8,16 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TVector4 { public: - - void Set(const TVector3& a_rVec3) + void Set(const TVector3 &a_rVec3) { - } - TFLOAT const& operator()(TUINT a_iIndex) const + TFLOAT const &operator()(TUINT a_iIndex) const { return (&m_fX)[a_iIndex]; } - TFLOAT& operator()(TUINT a_iIndex) + TFLOAT &operator()(TUINT a_iIndex) { return (&m_fX)[a_iIndex]; } @@ -31,4 +29,4 @@ class TKERNELINTERFACE_EXPORTS TVector4 TFLOAT m_fW; // 0xC }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/TWString.h b/Toshi/Include/TKernel/TWString.h index 00c5bd4..87311ba 100644 --- a/Toshi/Include/TKernel/TWString.h +++ b/Toshi/Include/TKernel/TWString.h @@ -11,7 +11,6 @@ TOSHI_NAMESPACE_BEGIN class TKERNELINTERFACE_EXPORTS TWString { public: - TWString() { Reset(); @@ -24,7 +23,7 @@ class TKERNELINTERFACE_EXPORTS TWString AllocBuffer(a_iLength); } - TWString(const TWString& a_rOther) + TWString(const TWString &a_rOther) { Reset(); Copy(a_rOther); @@ -47,16 +46,16 @@ class TKERNELINTERFACE_EXPORTS TWString FreeBuffer(); } - TWString& Concat(TWString const& a_rString, TINT a_iLength = -1); - TWString& Concat(TPCWCHAR a_String, TINT a_iLength = -1); - TINT Compare(TPCWCHAR a_pcString, int a_iLength = -1) const; + TWString &Concat(TWString const &a_rString, TINT a_iLength = -1); + TWString &Concat(TPCWCHAR a_String, TINT a_iLength = -1); + TINT Compare(TPCWCHAR a_pcString, int a_iLength = -1) const; - void Copy(const TWString& a_rOther, TINT a_iLength = -1); + void Copy(const TWString &a_rOther, TINT a_iLength = -1); void Copy(TPCWCHAR a_pcString, TINT a_iLength = -1); void Copy(TPCCHAR a_pcString, TINT a_iLength = -1); - TWString& TOSHI_CALLBACKAPI Format(TPCWCHAR a_pcFormat, ...); - TINT Find(TWCHAR a_cFind, TINT a_iIndex = 0) const; + TWString &TOSHI_CALLBACKAPI Format(TPCWCHAR a_pcFormat, ...); + TINT Find(TWCHAR a_cFind, TINT a_iIndex = 0) const; void Truncate(TINT a_iLength); @@ -75,7 +74,7 @@ class TKERNELINTERFACE_EXPORTS TWString return Compare(a_pcString) != 0; } - bool operator!=(const TWString& a_rOther) const + bool operator!=(const TWString &a_rOther) const { return Compare(a_rOther.m_pBuffer) != 0; } @@ -85,18 +84,18 @@ class TKERNELINTERFACE_EXPORTS TWString return Compare(a_pcString) == 0; } - bool operator==(const TWString& a_rOther) const + bool operator==(const TWString &a_rOther) const { return Compare(a_rOther.m_pBuffer) == 0; } - TWString& operator=(TPCWCHAR a_pcString) + TWString &operator=(TPCWCHAR a_pcString) { Copy(a_pcString); return *this; } - TWString& operator=(TWString& a_rOther) + TWString &operator=(TWString &a_rOther) { Copy(a_rOther); return *this; @@ -107,31 +106,31 @@ class TKERNELINTERFACE_EXPORTS TWString return m_pBuffer; } - TWString& operator+=(TPCWCHAR a_pcString) + TWString &operator+=(TPCWCHAR a_pcString) { Concat(a_pcString); return *this; } - TWString& operator+=(TWString const& a_rString) + TWString &operator+=(TWString const &a_rString) { Concat(a_rString); return *this; } - TWCHAR& operator[](TINT a_iIndex) const + TWCHAR &operator[](TINT a_iIndex) const { - TASSERT(a_iIndex <= (int) m_iStrLen); + TASSERT(a_iIndex <= (int)m_iStrLen); return m_pBuffer[a_iIndex]; } - TWCHAR& operator[](TINT a_iIndex) + TWCHAR &operator[](TINT a_iIndex) { TASSERT(a_iIndex <= (int)m_iStrLen); return m_pBuffer[a_iIndex]; } - const TWString& Print() const + const TWString &Print() const { TASSERT(GetString() != TNULL); TDPRINTF("%s", TSystem::StringUnicodeToChar(TSystem::GetTempCString(), GetString(), 0x400)); @@ -142,7 +141,6 @@ class TKERNELINTERFACE_EXPORTS TWString TINT Length() const { return m_iStrLen; } private: - TBOOL AllocBuffer(TINT a_iLength, TBOOL a_bClear = TTRUE); void FreeBuffer() @@ -156,18 +154,17 @@ class TKERNELINTERFACE_EXPORTS TWString void Reset() { - m_pBuffer = m_aNull; + m_pBuffer = m_aNull; m_iExcessLen = 0; - m_iStrLen = 0; + m_iStrLen = 0; } private: - inline static TWCHAR m_aNull[4] = { 0, 0, 0, 0 }; - TPWCHAR m_pBuffer; // 0x0 - TINT m_iExcessLen : 8 = 0; // 0x4 - TINT m_iStrLen : 24 = 0; // 0x5 + TPWCHAR m_pBuffer; // 0x0 + TINT m_iExcessLen : 8 = 0; // 0x4 + TINT m_iStrLen : 24 = 0; // 0x5 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/Win/TNativeFileWin.h b/Toshi/Include/TKernel/Win/TNativeFileWin.h index 9420400..c9b138a 100644 --- a/Toshi/Include/TKernel/Win/TNativeFileWin.h +++ b/Toshi/Include/TKernel/Win/TNativeFileWin.h @@ -10,10 +10,10 @@ class TKERNELINTERFACE_EXPORTS TNativeFileSystem : public TFileSystem public: TNativeFileSystem(TPCCHAR a_pcName); - virtual TFile* CreateFile(Toshi::TCString const& a_rFilename, TUINT a_uiMode) override; - virtual void DestroyFile(TFile* a_pFile) override; - virtual TBOOL RemoveFile(TCString const& a_rFilename) override; - virtual TCString MakeInternalPath(TCString const& a_rsPath) override; + virtual TFile *CreateFile(Toshi::TCString const &a_rFilename, TUINT a_uiMode) override; + virtual void DestroyFile(TFile *a_pFile) override; + virtual TBOOL RemoveFile(TCString const &a_rFilename) override; + virtual TCString MakeInternalPath(TCString const &a_rsPath) override; private: HANDLE m_hFileSystem; // 0x1C @@ -21,49 +21,48 @@ class TKERNELINTERFACE_EXPORTS TNativeFileSystem : public TFileSystem class TKERNELINTERFACE_EXPORTS TNativeFileManager : public TFileManager { - }; class TKERNELINTERFACE_EXPORTS TNativeFile : public TFile { friend class TNativeFileSystem; -public: - virtual TINT Read(TPVOID a_pBuffer, TINT a_iSize) override; - virtual TINT Write(void const* a_pBuffer, TINT a_iSize) override; - virtual TBOOL Seek(TINT a_iOffset, TSEEK a_eSeek) override; - virtual TINT Tell() override { return m_iPosition; } - virtual TINT GetSize() override; +public: + virtual TINT Read(TPVOID a_pBuffer, TINT a_iSize) override; + virtual TINT Write(void const *a_pBuffer, TINT a_iSize) override; + virtual TBOOL Seek(TINT a_iOffset, TSEEK a_eSeek) override; + virtual TINT Tell() override { return m_iPosition; } + virtual TINT GetSize() override; virtual TUINT64 GetDate() override; - virtual TINT GetCChar() override; - virtual TINT GetWChar() override; - virtual TINT PutCChar(TCHAR a_cChar) override; - virtual TINT PutWChar(TWCHAR a_wcChar) override; - virtual TINT VCPrintf(TCHAR const* a_pFormat, va_list a_args) override; - virtual TINT VWPrintf(TWCHAR const* a_pFormat, va_list a_args) override; + virtual TINT GetCChar() override; + virtual TINT GetWChar() override; + virtual TINT PutCChar(TCHAR a_cChar) override; + virtual TINT PutWChar(TWCHAR a_wcChar) override; + virtual TINT VCPrintf(TCHAR const *a_pFormat, va_list a_args) override; + virtual TINT VWPrintf(TWCHAR const *a_pFormat, va_list a_args) override; protected: TNativeFile(TNativeFileSystem *a_pFileManager); virtual ~TNativeFile() = default; TBOOL Open(const TCString &a_rFileName, TUINT a_uiMode); - void Close(); + void Close(); private: - TINT ReadUnbuffered(TPVOID a_pBuffer, TINT a_iSize); + TINT ReadUnbuffered(TPVOID a_pBuffer, TINT a_iSize); TBOOL LoadBuffer(TINT a_iBufferPos); - TINT FlushWriteBuffer(); + TINT FlushWriteBuffer(); private: - HANDLE m_hFile; // 0x8 - TINT m_iPosition; // 0xC - TINT m_iBufferPosition; // 0x10 - TINT m_iPrevBufferPos; // 0x14 - TINT m_iLastBufferSize; // 0x18 - TPVOID m_pBuffer; // 0x1C - TPVOID m_pWriteBuffer; // 0x20 - TINT m_iWriteBufferUsed; // 0x24 - TBOOL m_bWriteBuffered; // 0x28 + HANDLE m_hFile; // 0x8 + TINT m_iPosition; // 0xC + TINT m_iBufferPosition; // 0x10 + TINT m_iPrevBufferPos; // 0x14 + TINT m_iLastBufferSize; // 0x18 + TPVOID m_pBuffer; // 0x1C + TPVOID m_pWriteBuffer; // 0x20 + TINT m_iWriteBufferUsed; // 0x24 + TBOOL m_bWriteBuffered; // 0x28 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TKernel/Win/TThreadWin.h b/Toshi/Include/TKernel/Win/TThreadWin.h index 258dbb4..ed2a351 100644 --- a/Toshi/Include/TKernel/Win/TThreadWin.h +++ b/Toshi/Include/TKernel/Win/TThreadWin.h @@ -26,13 +26,14 @@ class TKERNELINTERFACE_EXPORTS TMutex TBOOL Lock(TUINT a_uiFlags); TBOOL Unlock(); - TMutex& operator=(const TMutex& a_rOther) + TMutex &operator=(const TMutex &a_rOther) { m_hMutexHnd = a_rOther.m_hMutexHnd; return *this; } + private: HANDLE m_hMutexHnd; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/Defines.h b/Toshi/Include/TRender/Defines.h index 32debc2..fd2a862 100644 --- a/Toshi/Include/TRender/Defines.h +++ b/Toshi/Include/TRender/Defines.h @@ -3,14 +3,14 @@ #ifndef TRENDERINTERFACE_STATIC_LINKING -#ifdef TRENDERINTERFACE -#define TRENDERINTERFACE_EXPORTS DLL_CLASS_EXPORT -#else -#define TRENDERINTERFACE_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef TRENDERINTERFACE +# define TRENDERINTERFACE_EXPORTS DLL_CLASS_EXPORT +# else +# define TRENDERINTERFACE_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !TRENDERINTERFACE_STATIC_LINKING +#else // !TRENDERINTERFACE_STATIC_LINKING -#define TRENDERINTERFACE_EXPORTS +# define TRENDERINTERFACE_EXPORTS -#endif // TRENDERINTERFACE_STATIC_LINKING \ No newline at end of file +#endif // TRENDERINTERFACE_STATIC_LINKING diff --git a/Toshi/Include/TRender/TDBase.h b/Toshi/Include/TRender/TDBase.h index 8750b7a..d1ac2de 100644 --- a/Toshi/Include/TRender/TDBase.h +++ b/Toshi/Include/TRender/TDBase.h @@ -6,11 +6,10 @@ TOSHI_NAMESPACE_BEGIN class TRENDERINTERFACE_EXPORTS TDBase { public: - class TRENDERINTERFACE_EXPORTS TKeyFrame { public: - void Get(TFLOAT& a_rTime); + void Get(TFLOAT &a_rTime); }; TFLOAT GetTransDeviation() { return s_fDeltaTransDeviation; } @@ -20,7 +19,7 @@ class TRENDERINTERFACE_EXPORTS TDBase TFLOAT SetTransEpsilon(TFLOAT a_fDeltaTransEpsilon) { s_fDeltaTransEpsilon = a_fDeltaTransEpsilon; } static inline TFLOAT s_fDeltaTransDeviation = 0.05f; - static inline TFLOAT s_fDeltaTransEpsilon = 0.05f / 5.0f; + static inline TFLOAT s_fDeltaTransEpsilon = 0.05f / 5.0f; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TMaterialLibrary.h b/Toshi/Include/TRender/TMaterialLibrary.h index 3dc05dd..1a69d12 100644 --- a/Toshi/Include/TRender/TMaterialLibrary.h +++ b/Toshi/Include/TRender/TMaterialLibrary.h @@ -8,10 +8,11 @@ TOSHI_NAMESPACE_BEGIN class TRENDERINTERFACE_EXPORTS TMaterialLibrary : public TNodeList::TNode { friend class TMaterialLibraryManager; + protected: - TMaterial* GetMaterial(TPCCHAR a_szMaterial); -private: + TMaterial *GetMaterial(TPCCHAR a_szMaterial); +private: }; class TRENDERINTERFACE_EXPORTS TMaterialLibraryManager @@ -22,16 +23,16 @@ class TRENDERINTERFACE_EXPORTS TMaterialLibraryManager // $TRenderInterface: FUNCTION 100110a0 void Destroy(); // $TRenderInterface: FUNCTION 1000b0d0 - TMaterial* GetInvalidMaterial() + TMaterial *GetInvalidMaterial() { return m_pInvalidMaterial; } // $TRenderInterface: FUNCTION 10011290 - TMaterial* GetMaterial(TPCCHAR a_szMaterial); + TMaterial *GetMaterial(TPCCHAR a_szMaterial); private: - TNodeList m_oLibraries; // 0x0 - TMaterial* m_pInvalidMaterial; // 0x10 + TNodeList m_oLibraries; // 0x0 + TMaterial *m_pInvalidMaterial; // 0x10 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TModel.h b/Toshi/Include/TRender/TModel.h index 1386fc1..cc5c2f3 100644 --- a/Toshi/Include/TRender/TModel.h +++ b/Toshi/Include/TRender/TModel.h @@ -6,28 +6,26 @@ TOSHI_NAMESPACE_BEGIN class TRENDERINTERFACE_EXPORTS TModelLOD { - }; class TRENDERINTERFACE_EXPORTS TModel { - #define MAX_NUM_LODS 5 +#define MAX_NUM_LODS 5 enum Flags { - Flags_None = 0, + Flags_None = 0, Flags_Created = BITFIELD(0), - Flags_Loaded = BITFIELD(1), + Flags_Loaded = BITFIELD(1), }; public: - TUINT GetFlags() { return m_uiFlags; } - TModelLOD& GetLOD(TINT a_iLODLevel) + TModelLOD &GetLOD(TINT a_iLODLevel) { TASSERT(a_iLODLevel < m_iLODCount); return m_LODs[a_iLODLevel]; @@ -39,10 +37,10 @@ class TRENDERINTERFACE_EXPORTS TModel } private: - TUINT m_uiFlags; // 0x4 - TINT m_iInstanceCount; // 0x8 - TINT m_iLODCount; // 0xC + TUINT m_uiFlags; // 0x4 + TINT m_iInstanceCount; // 0x8 + TINT m_iLODCount; // 0xC TModelLOD m_LODs[MAX_NUM_LODS]; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TNullResource.h b/Toshi/Include/TRender/TNullResource.h index 9999437..d0dc6c3 100644 --- a/Toshi/Include/TRender/TNullResource.h +++ b/Toshi/Include/TRender/TNullResource.h @@ -10,4 +10,4 @@ class TRENDERINTERFACE_EXPORTS TNullResource : public TResource DECLARE_DYNAMIC(TNullResource) }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TRenderAdapter.h b/Toshi/Include/TRender/TRenderAdapter.h index bc67297..c8fad36 100644 --- a/Toshi/Include/TRender/TRenderAdapter.h +++ b/Toshi/Include/TRender/TRenderAdapter.h @@ -16,16 +16,16 @@ class TRENDERINTERFACE_EXPORTS TRenderAdapter : public TNodeList class TRENDERINTERFACE_EXPORTS Device : public TNodeList::TNode { public: - Device() = default; + Device() = default; virtual ~Device() = default; - virtual Mode* GetMode() const = 0; - virtual TUINT GetDeviceIndex() const = 0; - virtual TPCCHAR GetTypeString() const = 0; - virtual TBOOL IsSoftware() const = 0; - virtual TBOOL CanRenderWindowed() const = 0; - virtual TBOOL SupportsHardwareTransfomations() const = 0; - virtual TBOOL IsDepthStencilFormatSupported(TUINT a_iIndex) const = 0; + virtual Mode *GetMode() const = 0; + virtual TUINT GetDeviceIndex() const = 0; + virtual TPCCHAR GetTypeString() const = 0; + virtual TBOOL IsSoftware() const = 0; + virtual TBOOL CanRenderWindowed() const = 0; + virtual TBOOL SupportsHardwareTransfomations() const = 0; + virtual TBOOL IsDepthStencilFormatSupported(TUINT a_iIndex) const = 0; }; public: @@ -33,35 +33,35 @@ class TRENDERINTERFACE_EXPORTS TRenderAdapter : public TNodeList virtual ~Mode() = default; - virtual TRenderAdapter* GetAdapter() const = 0; - virtual TUINT GetModeIndex() const = 0; - virtual TUINT GetWidth() const = 0; - virtual TUINT GetHeight() const = 0; - virtual TBOOL Is32Bit() const = 0; - virtual TBOOL Is16Bit() const = 0; - virtual TUINT GetRefreshRate() const = 0; - virtual TRenderAdapter::Mode::Device* GetDevice(TUINT a_iDevice) = 0; + virtual TRenderAdapter *GetAdapter() const = 0; + virtual TUINT GetModeIndex() const = 0; + virtual TUINT GetWidth() const = 0; + virtual TUINT GetHeight() const = 0; + virtual TBOOL Is32Bit() const = 0; + virtual TBOOL Is16Bit() const = 0; + virtual TUINT GetRefreshRate() const = 0; + virtual TRenderAdapter::Mode::Device *GetDevice(TUINT a_iDevice) = 0; }; public: - TRenderAdapter() = default; + TRenderAdapter() = default; virtual ~TRenderAdapter() = default; // TODO: complete vftable - virtual TUINT GetAdapterIndex() const = 0; - virtual const TCString& GetDriver() const = 0; - virtual const TCString& GetDriverDescription() const = 0; - virtual TUSHORT GetProductID() const = 0; - virtual TUSHORT GetVersion() const = 0; - virtual TUSHORT GetSubVersion() const = 0; - virtual TUSHORT GetBuild() const = 0; - virtual const GUID& GetDeviceIdentifier() const = 0; - virtual TUINT GetNumSupportedDevices() const = 0; + virtual TUINT GetAdapterIndex() const = 0; + virtual const TCString &GetDriver() const = 0; + virtual const TCString &GetDriverDescription() const = 0; + virtual TUSHORT GetProductID() const = 0; + virtual TUSHORT GetVersion() const = 0; + virtual TUSHORT GetSubVersion() const = 0; + virtual TUSHORT GetBuild() const = 0; + virtual const GUID &GetDeviceIdentifier() const = 0; + virtual TUINT GetNumSupportedDevices() const = 0; - TNodeList* GetModeList() { return &m_Modes; } + TNodeList *GetModeList() { return &m_Modes; } private: TNodeList m_Modes; // 0x10 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TRenderCapture.h b/Toshi/Include/TRender/TRenderCapture.h index 6eb16bc..4274374 100644 --- a/Toshi/Include/TRender/TRenderCapture.h +++ b/Toshi/Include/TRender/TRenderCapture.h @@ -7,7 +7,6 @@ TOSHI_NAMESPACE_BEGIN class TRENDERINTERFACE_EXPORTS TRenderCapture { public: - enum FORMAT { FORMAT_RGBA32, @@ -16,14 +15,14 @@ class TRENDERINTERFACE_EXPORTS TRenderCapture TRenderCapture() = default; - virtual ~TRenderCapture() = default; - virtual TBOOL Create(FORMAT a_eFormat, TINT a_iWidth, TINT a_iHeight) = 0; - virtual void Destroy() = 0; - virtual TBOOL Request() = 0; - virtual TBOOL Wait() = 0; - virtual TBOOL Poll() = 0; - virtual TPVOID ObtainBuffer() = 0; - virtual void ReleaseBuffer() = 0; + virtual ~TRenderCapture() = default; + virtual TBOOL Create(FORMAT a_eFormat, TINT a_iWidth, TINT a_iHeight) = 0; + virtual void Destroy() = 0; + virtual TBOOL Request() = 0; + virtual TBOOL Wait() = 0; + virtual TBOOL Poll() = 0; + virtual TPVOID ObtainBuffer() = 0; + virtual void ReleaseBuffer() = 0; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TRenderContext.h b/Toshi/Include/TRender/TRenderContext.h index f824179..6f80064 100644 --- a/Toshi/Include/TRender/TRenderContext.h +++ b/Toshi/Include/TRender/TRenderContext.h @@ -10,7 +10,7 @@ class TRenderInterface; class TRENDERINTERFACE_EXPORTS TRenderContext { private: - TRenderInterface* m_pRenderInterface; // 0x4 + TRenderInterface *m_pRenderInterface; // 0x4 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TRenderInterface.h b/Toshi/Include/TRender/TRenderInterface.h index 3b239cf..5418a26 100644 --- a/Toshi/Include/TRender/TRenderInterface.h +++ b/Toshi/Include/TRender/TRenderInterface.h @@ -2,7 +2,8 @@ #include "TKernel/TObject.h" #include "TKernel/TKernelInterface.h" -#include "TRenderContext.h" +#include "TKernel/TRefCounted.h" +#include "TRenderContext.h" #include "TResource.h" #include "TRenderAdapter.h" #include "TTextureFactory.h" @@ -14,24 +15,25 @@ TOSHI_NAMESPACE_BEGIN -class TRENDERINTERFACE_EXPORTS TRenderInterface : public TObject +class TRENDERINTERFACE_EXPORTS TRenderInterface + : public TObject + , public TRefCounted { DECLARE_DYNAMIC(TRenderInterface) public: - enum FLAG { - FLAG_DIRTY = BITFIELD(0), - FLAG_FOG = BITFIELD(1), - FLAG_HAS_MODELWORLDMATRIX = BITFIELD(2), - FLAG_HAS_VIEWWORLDMATRIX = BITFIELD(3), - FLAG_UNK3 = BITFIELD(4), - FLAG_UNK4 = BITFIELD(5), - FLAG_HAS_WORLDPLANES = BITFIELD(6), - FLAG_UNK6 = BITFIELD(7), + FLAG_DIRTY = BITFIELD(0), + FLAG_FOG = BITFIELD(1), + FLAG_HAS_MODELWORLDMATRIX = BITFIELD(2), + FLAG_HAS_VIEWWORLDMATRIX = BITFIELD(3), + FLAG_UNK3 = BITFIELD(4), + FLAG_UNK4 = BITFIELD(5), + FLAG_HAS_WORLDPLANES = BITFIELD(6), + FLAG_UNK6 = BITFIELD(7), FLAG_DIRTY_WORLDMODELMATRIX = BITFIELD(8), - FLAG_DIRTY_VIEWMODELMATRIX = BITFIELD(9), + FLAG_DIRTY_VIEWMODELMATRIX = BITFIELD(9), }; enum SYSRESOURCES @@ -64,94 +66,92 @@ class TRENDERINTERFACE_EXPORTS TRenderInterface : public TObject TUINT32 uiHeight; TUINT32 uiColourDepth; TUINT32 eDepthStencilFormat; - TBOOL bWindowed; + TBOOL bWindowed; }; public: - TRenderInterface(); public: - virtual TBOOL CreateDisplay(const DisplayParams& a_rParams) = 0; - virtual TBOOL DestroyDisplay() = 0; - virtual TBOOL Update(float a_fDeltaTime) = 0; - virtual TBOOL BeginScene() = 0; - virtual TBOOL EndScene() = 0; - virtual TRenderAdapter::Mode::Device* GetCurrentDevice() = 0; - virtual DisplayParams* GetCurrentDisplayParams() = 0; - virtual TBOOL Create(TKernelInterface* pKernelInterface); - virtual TBOOL Destroy(); - virtual void RenderIndexPrimitive(int param_2, int param_3, int param_4, int param_5, int param_6, int param_7); - virtual void DumpStats(); - virtual void GetScreenOffset(TVector2& a_rVec); - virtual void SetScreenOffset(const TVector2& a_rVec); - virtual float GetScreenAspectRatio(); - virtual float GetPixelAspectRatio(); - virtual TBOOL SetPixelAspectRatio(float a_fPixelAspectRatio); - virtual TBOOL IsTextureFormatSupported(TTEXTURERESOURCEFORMAT a_eTextureFormat) { return TTRUE; } - virtual TBOOL Supports32BitTextures() { return TFALSE; } - virtual TRenderContext* CreateRenderContext() = 0; - virtual TRenderCapture* CreateCapture() = 0; - virtual void DestroyCapture(TRenderCapture* a_pRenderCapture) = 0; - virtual void SetLightDirectionMatrix(const TMatrix44& a_rMatrix); - virtual void SetLightColourMatrix(const TMatrix44& a_rMatrix); - virtual void ConnectDefaultViewportHandelrs(TViewport& a_pViewport); - virtual TModel* CreateModel(TPCCHAR a_szName, TINT a_iUnk1); - virtual TBOOL CreateSystemResources(); - virtual void DestroySystemResources(); + virtual TBOOL CreateDisplay(const DisplayParams &a_rParams) = 0; + virtual TBOOL DestroyDisplay() = 0; + virtual TBOOL Update(float a_fDeltaTime) = 0; + virtual TBOOL BeginScene() = 0; + virtual TBOOL EndScene() = 0; + virtual TRenderAdapter::Mode::Device *GetCurrentDevice() = 0; + virtual DisplayParams *GetCurrentDisplayParams() = 0; + virtual TBOOL Create(TKernelInterface *pKernelInterface); + virtual TBOOL Destroy(); + virtual void RenderIndexPrimitive(int param_2, int param_3, int param_4, int param_5, int param_6, int param_7); + virtual void DumpStats(); + virtual void GetScreenOffset(TVector2 &a_rVec); + virtual void SetScreenOffset(const TVector2 &a_rVec); + virtual float GetScreenAspectRatio(); + virtual float GetPixelAspectRatio(); + virtual TBOOL SetPixelAspectRatio(float a_fPixelAspectRatio); + virtual TBOOL IsTextureFormatSupported(TTEXTURERESOURCEFORMAT a_eTextureFormat) { return TTRUE; } + virtual TBOOL Supports32BitTextures() { return TFALSE; } + virtual TRenderContext *CreateRenderContext() = 0; + virtual TRenderCapture *CreateCapture() = 0; + virtual void DestroyCapture(TRenderCapture *a_pRenderCapture) = 0; + virtual void SetLightDirectionMatrix(const TMatrix44 &a_rMatrix); + virtual void SetLightColourMatrix(const TMatrix44 &a_rMatrix); + virtual void ConnectDefaultViewportHandelrs(TViewport &a_pViewport); + virtual TModel *CreateModel(TPCCHAR a_szName, TINT a_iUnk1); + virtual TBOOL CreateSystemResources(); + virtual void DestroySystemResources(); public: - TResource* CreateResource(const TClass* a_pClass, TPCCHAR a_szResName, TResource* a_pResource); + TResource *CreateResource(const TClass *a_pClass, TPCCHAR a_szResName, TResource *a_pResource); - const TRenderAdapter::Mode::Device* FindDevice(const DisplayParams* a_pDisplayParams); + const TRenderAdapter::Mode::Device *FindDevice(const DisplayParams *a_pDisplayParams); void FlushDyingResources(); - TResource* GetSystemResource(SYSRESOURCES a_SystemResource) + TResource *GetSystemResource(SYSRESOURCES a_SystemResource) { TASSERT(a_SystemResource < TRenderInterface::SYSRESOURCES_NUMOF); - TASSERT(m_aSysResources[a_SystemResource]!=TNULL); + TASSERT(m_aSysResources[a_SystemResource] != TNULL); return m_aSysResources[a_SystemResource]; } - TRenderContext* SetCurrentRenderContext(TRenderContext* a_pRenderContext) + TRenderContext *SetCurrentRenderContext(TRenderContext *a_pRenderContext) { - TRenderContext* pLastRenderContext = m_pCurrentRenderContext; - m_pCurrentRenderContext = a_pRenderContext; + TRenderContext *pLastRenderContext = m_pCurrentRenderContext; + m_pCurrentRenderContext = a_pRenderContext; return pLastRenderContext; } TBOOL IsCreated() { return m_bIsCreated; } TBOOL IsDisplayCreated() { return m_bIsDiplayCreated; } // $TRenderInterface: FUNCTION 1000f230 - TBOOL IsInScene() { return m_bInScene; } - TNodeList* GetAdapterList() { return &m_pAdapterList; }; + TBOOL IsInScene() { return m_bInScene; } + TNodeList *GetAdapterList() { return &m_pAdapterList; }; - static TRenderInterface* TOSHI_API GetRenderer() { return s_Interface; } + static TRenderInterface *TOSHI_API GetRenderer() { return s_Interface; } private: + void DestroyDyingResources(TResource *a_pResource); + void DeleteResource(TResource *a_pResource); + void DeleteResourceRecurse(TResource *a_pResource); + void DeleteResourceAtomic(TResource *a_pResource); - void DestroyDyingResources(TResource* a_pResource); - void DeleteResource(TResource* a_pResource); - void DeleteResourceRecurse(TResource* a_pResource); - void DeleteResourceAtomic(TResource* a_pResource); + static TRenderInterface *s_Interface; - static TRenderInterface* s_Interface; protected: - - TBOOL m_bInScene; // 0x8 - TBOOL m_bIsCreated; // 0x9 - TBOOL m_bIsDiplayCreated; // 0xA - TRenderContext* m_pCurrentRenderContext; // 0x1C - TRenderContext* m_pDefaultRenderContext; // 0x20 - TKernelInterface* m_pKernel; // 0x24 - TResource* m_aSysResources[SYSRESOURCES_NUMOF]; // 0x28 - TNodeList m_pAdapterList; // 0xFC - TINT m_iResourceCount; // 0x124 - TNodeTree m_Resources; // 0x128??? - TINT m_iSceneCount; // 0x128 - TBOOL m_bHasDyingResources; // 0x12C + TBOOL m_bInScene; // 0x8 + TBOOL m_bIsCreated; // 0x9 + TBOOL m_bIsDiplayCreated; // 0xA + TRenderContext *m_pCurrentRenderContext; // 0x1C + TRenderContext *m_pDefaultRenderContext; // 0x20 + TKernelInterface *m_pKernel; // 0x24 + TResource *m_aSysResources[SYSRESOURCES_NUMOF]; // 0x28 + TNodeList m_pAdapterList; // 0xFC + TINT m_iResourceCount; // 0x124 + TNodeTree m_Resources; // 0x128??? + TINT m_iSceneCount; // 0x128 + TBOOL m_bHasDyingResources; // 0x12C }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TResource.h b/Toshi/Include/TRender/TResource.h index a791198..cbfbc33 100644 --- a/Toshi/Include/TRender/TResource.h +++ b/Toshi/Include/TRender/TResource.h @@ -9,38 +9,39 @@ TOSHI_NAMESPACE_BEGIN class TRenderInterface; -class TRENDERINTERFACE_EXPORTS TResource : public TObject, public TNodeTree::TNode +class TRENDERINTERFACE_EXPORTS TResource + : public TObject + , public TNodeTree::TNode { DECLARE_DYNAMIC(TResource) public: - using t_RecurseCb = TBOOL(*)(TResource* a_pResource, void* a_pUserData); + using t_RecurseCb = TBOOL (*)(TResource *a_pResource, void *a_pUserData); enum FLAGS { - FLAGS_VALID = BITFIELD(0), - FLAGS_CREATED = BITFIELD(1), - FLAGS_DYING = BITFIELD(2), - FLAGS_EXTERNAL = BITFIELD(3), - FLAGS_DEAD = BITFIELD(4), + FLAGS_VALID = BITFIELD(0), + FLAGS_CREATED = BITFIELD(1), + FLAGS_DYING = BITFIELD(2), + FLAGS_EXTERNAL = BITFIELD(3), + FLAGS_DEAD = BITFIELD(4), FLAGS_SCENEOBJECT = BITFIELD(5), }; public: - TResource(); - + virtual ~TResource(); virtual TBOOL Create(); virtual TBOOL Validate(); - virtual void Invalidate(); - virtual void DestroyResource(); - virtual void OnDestroy(); + virtual void Invalidate(); + virtual void DestroyResource(); + virtual void OnDestroy(); void SetParent(TResource *a_pParent); void SetName(TPCCHAR a_strName); - void RecurseSimple(t_RecurseCb a_pfnCallback, TResource* a_pResource, TPVOID a_pUserData); + void RecurseSimple(t_RecurseCb a_pfnCallback, TResource *a_pResource, TPVOID a_pUserData); TBOOL IsCreated() const { return m_Flags & FLAGS_CREATED; } TBOOL IsDying() const { return m_Flags & FLAGS_DYING; } @@ -48,15 +49,15 @@ class TRENDERINTERFACE_EXPORTS TResource : public TObject, public TNodeTree::TNode { public: - NameEntry(TPCCHAR a_szName, TTextureResource* a_pTexture) + NameEntry(TPCCHAR a_szName, TTextureResource *a_pTexture) { m_pTexture = a_pTexture; @@ -43,43 +43,39 @@ class TRENDERINTERFACE_EXPORTS TTextureFactory : public TResource } ~NameEntry() { - TASSERT(IsLinked()==TFALSE); + TASSERT(IsLinked() == TFALSE); } - TPCCHAR GetName() const { return m_szName; } - TTextureResource* GetTexture() { return m_pTexture; } + TPCCHAR GetName() const { return m_szName; } + TTextureResource *GetTexture() { return m_pTexture; } private: - static constexpr TUINT32 MAX_TEXTURENAMELEN = 50; - TCHAR m_szName[MAX_TEXTURENAMELEN]; - TTextureResource* m_pTexture; + TCHAR m_szName[MAX_TEXTURENAMELEN]; + TTextureResource *m_pTexture; }; public: + virtual TTextureResource *CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) = 0; + virtual TTextureResource *CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) = 0; + virtual TTextureResource *CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) = 0; - virtual TTextureResource* CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) = 0; - virtual TTextureResource* CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) = 0; - virtual TTextureResource* CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) = 0; - - static TTextureFactory* TOSHI_API CreateHAL(TRenderInterface* a_pRenderer, TPCCHAR a_szName, TResource* a_pResource); + static TTextureFactory *TOSHI_API CreateHAL(TRenderInterface *a_pRenderer, TPCCHAR a_szName, TResource *a_pResource); - TTextureResource* FindTexture(TPCCHAR a_szName); + TTextureResource *FindTexture(TPCCHAR a_szName); - void DeregisterTexture(TTextureResource* a_pTexture); + void DeregisterTexture(TTextureResource *a_pTexture); protected: - TUINT HashName(TPCCHAR a_szName); - TTextureFactory::NameEntry* RegisterTexture(TPCCHAR a_szName, TTextureResource* a_pResource); + TTextureFactory::NameEntry *RegisterTexture(TPCCHAR a_szName, TTextureResource *a_pResource); private: - static constexpr TUINT32 NUM_LISTS = 1024; TNodeList m_aLists[NUM_LISTS]; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TTextureResource.h b/Toshi/Include/TRender/TTextureResource.h index 4b53e34..175b4d6 100644 --- a/Toshi/Include/TRender/TTextureResource.h +++ b/Toshi/Include/TRender/TTextureResource.h @@ -14,7 +14,6 @@ class TRENDERINTERFACE_EXPORTS TTextureResource : public TResource friend class TTextureFactoryHAL; public: - enum ADDRESSMODE { ADDRESSMODE_UNKNOWN, @@ -24,7 +23,7 @@ class TRENDERINTERFACE_EXPORTS TTextureResource : public TResource struct LOCKSTATE { - TINT Pitch; + TINT Pitch; TPVOID pBits; }; @@ -32,21 +31,20 @@ class TRENDERINTERFACE_EXPORTS TTextureResource : public TResource virtual ~TTextureResource(); - virtual TUINT GetWidth() = 0; + virtual TUINT GetWidth() = 0; virtual TUINT GetHeight() = 0; - virtual TBOOL Lock(LOCKSTATE& a_rLockState); - virtual void Unlock(); + virtual TBOOL Lock(LOCKSTATE &a_rLockState); + virtual void Unlock(); virtual TBOOL Create(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_eTextureFlags, TUINT a_uiWidth, TUINT a_uiHeight) = 0; - virtual TBOOL Create(TPCCHAR a_szFileName, TUINT a_eTextureFlags) = 0; + virtual TBOOL Create(TPCCHAR a_szFileName, TUINT a_eTextureFlags) = 0; virtual TBOOL CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiMipmapFlags); - static TTextureResource* TOSHI_API CreateHAL(TRenderInterface* a_pRenderer, TPCCHAR a_szName, TResource* a_pResource); + static TTextureResource *TOSHI_API CreateHAL(TRenderInterface *a_pRenderer, TPCCHAR a_szName, TResource *a_pResource); public: + TTextureFactory::NameEntry *GetNameEntry() { return m_pNameEntry; } + TUINT GetCreateFlags() { return m_CreateFlags; } - TTextureFactory::NameEntry* GetNameEntry() { return m_pNameEntry; } - TUINT GetCreateFlags() { return m_CreateFlags; } - ADDRESSMODE GetAddressMode() { return m_eAddressMode; @@ -59,9 +57,9 @@ class TRENDERINTERFACE_EXPORTS TTextureResource : public TResource } private: - ADDRESSMODE m_eAddressMode; // 0x30 - TUINT m_CreateFlags; // 0x34 - TTextureFactory::NameEntry* m_pNameEntry; // 0x38 + ADDRESSMODE m_eAddressMode; // 0x30 + TUINT m_CreateFlags; // 0x34 + TTextureFactory::NameEntry *m_pNameEntry; // 0x38 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TVertexFactoryResourceInterface.h b/Toshi/Include/TRender/TVertexFactoryResourceInterface.h index e18d730..4fad367 100644 --- a/Toshi/Include/TRender/TVertexFactoryResourceInterface.h +++ b/Toshi/Include/TRender/TVertexFactoryResourceInterface.h @@ -5,9 +5,9 @@ TOSHI_NAMESPACE_BEGIN struct TRENDERINTERFACE_EXPORTS TVertexStreamFormat { - TUSHORT m_uiUnk = 0; + TUSHORT m_uiUnk = 0; TUSHORT m_uiVertexSize = 0; - TUINT m_Unk = 0; + TUINT m_Unk = 0; }; class TRENDERINTERFACE_EXPORTS TVertexFactoryFormat @@ -15,7 +15,7 @@ class TRENDERINTERFACE_EXPORTS TVertexFactoryFormat public: static constexpr TUINT MAX_NUM_STREAMS = 8; - TUINT m_uiNumStreams = 0; + TUINT m_uiNumStreams = 0; TVertexStreamFormat m_aStreamFormats[MAX_NUM_STREAMS]; TUINT GetNumStreams() const { return m_uiNumStreams; } @@ -28,21 +28,22 @@ class TRENDERINTERFACE_EXPORTS TVertexFactoryResourceInterface : public TResourc DECLARE_DYNAMIC(TVertexFactoryResourceInterface) friend TVertexPoolResourceInterface; + public: TVertexFactoryResourceInterface(); - virtual TBOOL Create(TVertexFactoryFormat* a_pVertexFormat, TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags); - virtual TVertexPoolResourceInterface* CreatePool(TUSHORT a_usMaxStaticVertices, TUINT a_uiFlags); + virtual TBOOL Create(TVertexFactoryFormat *a_pVertexFormat, TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags); + virtual TVertexPoolResourceInterface *CreatePool(TUSHORT a_usMaxStaticVertices, TUINT a_uiFlags); - TVertexFactoryFormat* GetVertexFormat() { return &m_oVertexFormat; } - TUSHORT GetMaxStaticVertices() { return m_usMaxStaticVertices; } - TUINT GetFlags() { return m_uiFlags; } + TVertexFactoryFormat *GetVertexFormat() { return &m_oVertexFormat; } + TUSHORT GetMaxStaticVertices() { return m_usMaxStaticVertices; } + TUINT GetFlags() { return m_uiFlags; } private: - TUINT m_uiNumCreatedVertexPools; // 0x30 - TVertexFactoryFormat m_oVertexFormat; // 0x34 - TUINT m_usMaxStaticVertices; // 0x78 - TUINT m_uiFlags; // 0x7C + TUINT m_uiNumCreatedVertexPools; // 0x30 + TVertexFactoryFormat m_oVertexFormat; // 0x34 + TUINT m_usMaxStaticVertices; // 0x78 + TUINT m_uiFlags; // 0x7C }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TVertexPoolResourceInterface.h b/Toshi/Include/TRender/TVertexPoolResourceInterface.h index 180d326..3a8f9bb 100644 --- a/Toshi/Include/TRender/TVertexPoolResourceInterface.h +++ b/Toshi/Include/TRender/TVertexPoolResourceInterface.h @@ -8,39 +8,37 @@ class TRENDERINTERFACE_EXPORTS TVertexPoolResourceInterface : public TResource DECLARE_DYNAMIC(TVertexPoolResourceInterface) public: - class TRENDERINTERFACE_EXPORTS LockBuffer { LockBuffer(); - TUINT uiNumStreams; - TUINT32 uiOffset; - unsigned char* apStreams[TVertexFactoryFormat::MAX_NUM_STREAMS]; + TUINT uiNumStreams; + TUINT32 uiOffset; + unsigned char *apStreams[TVertexFactoryFormat::MAX_NUM_STREAMS]; }; TVertexPoolResourceInterface(); protected: - virtual void OnDestroy() override; - virtual TBOOL Lock(LockBuffer* a_pLockBuffer) = 0; - virtual void Unlock(TUSHORT a_uiNewNumVertices) = 0; - virtual TBOOL Create(TVertexFactoryResourceInterface* a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags); - -public: + virtual void OnDestroy() override; + virtual TBOOL Lock(LockBuffer *a_pLockBuffer) = 0; + virtual void Unlock(TUSHORT a_uiNewNumVertices) = 0; + virtual TBOOL Create(TVertexFactoryResourceInterface *a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags); - TVertexFactoryResourceInterface* GetFactory() { return m_pFactory; } - TUINT GetFlags() const { return m_usFlags; } - TUINT GetMaxVertices() const { return m_usMaxVertices; } - TUINT GetNumVertices() const { return m_usNumVertices; } - TBOOL IsLocked() const { return m_uiLockCount != 0; } +public: + TVertexFactoryResourceInterface *GetFactory() { return m_pFactory; } + TUINT GetFlags() const { return m_usFlags; } + TUINT GetMaxVertices() const { return m_usMaxVertices; } + TUINT GetNumVertices() const { return m_usNumVertices; } + TBOOL IsLocked() const { return m_uiLockCount != 0; } private: - // TResource base 0x0 -> 0x30 - TVertexFactoryResourceInterface* m_pFactory; // 0x30 - TUSHORT m_usFlags; // 0x34 - TUSHORT m_usMaxVertices; // 0x36 - TUSHORT m_usNumVertices; // 0x38 - TUINT m_uiLockCount; // 0x3A + // TResource base 0x0 -> 0x30 + TVertexFactoryResourceInterface *m_pFactory; // 0x30 + TUSHORT m_usFlags; // 0x34 + TUSHORT m_usMaxVertices; // 0x36 + TUSHORT m_usNumVertices; // 0x38 + TUINT m_uiLockCount; // 0x3A }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRender/TViewport.h b/Toshi/Include/TRender/TViewport.h index 2b24048..9366870 100644 --- a/Toshi/Include/TRender/TViewport.h +++ b/Toshi/Include/TRender/TViewport.h @@ -9,4 +9,4 @@ class TRENDERINTERFACE_EXPORTS TViewport : public TSceneObject DECLARE_DYNAMIC(TViewport) }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/Defines.h b/Toshi/Include/TRenderD3D/Defines.h index ee27efb..6f22ce2 100644 --- a/Toshi/Include/TRenderD3D/Defines.h +++ b/Toshi/Include/TRenderD3D/Defines.h @@ -3,14 +3,14 @@ #ifndef TRENDERINTERFACED3D_STATIC_LINKING -#ifdef TRENDERINTERFACED3D -#define TRENDERINTERFACED3D_EXPORTS DLL_CLASS_EXPORT -#else -#define TRENDERINTERFACED3D_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef TRENDERINTERFACED3D +# define TRENDERINTERFACED3D_EXPORTS DLL_CLASS_EXPORT +# else +# define TRENDERINTERFACED3D_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !TRENDERINTERFACED3D_STATIC_LINKING +#else // !TRENDERINTERFACED3D_STATIC_LINKING -#define TRENDERINTERFACED3D_EXPORTS +# define TRENDERINTERFACED3D_EXPORTS -#endif // TRENDERINTERFACED3D_STATIC_LINKING \ No newline at end of file +#endif // TRENDERINTERFACED3D_STATIC_LINKING diff --git a/Toshi/Include/TRenderD3D/TD3DVertexBlockResource.h b/Toshi/Include/TRenderD3D/TD3DVertexBlockResource.h index 768d477..bb98f91 100644 --- a/Toshi/Include/TRenderD3D/TD3DVertexBlockResource.h +++ b/Toshi/Include/TRenderD3D/TD3DVertexBlockResource.h @@ -16,36 +16,34 @@ class TRENDERINTERFACED3D_EXPORTS TVertexBlockResource : public TResource DECLARE_FREELIST(TVertexBlockResource) public: - struct TRENDERINTERFACED3D_EXPORTS HALBuffer { HALBuffer() { - } - TUINT uiNumStreams; - TUSHORT uiVertexOffset; - IDirect3DVertexBuffer8* apVertexBuffers[TVertexFactoryFormat::MAX_NUM_STREAMS]; + TUINT uiNumStreams; + TUSHORT uiVertexOffset; + IDirect3DVertexBuffer8 *apVertexBuffers[TVertexFactoryFormat::MAX_NUM_STREAMS]; }; - TBOOL Create(TVertexFactoryResource* a_pFactory, TUSHORT a_uiMaxVertices, TUINT a_uiFlags); + TBOOL Create(TVertexFactoryResource *a_pFactory, TUSHORT a_uiMaxVertices, TUINT a_uiFlags); - TBOOL AttachPool(TVertexPoolResource* a_pPool); - TBOOL CanFit(TVertexPoolResource* a_pPoolResource); + TBOOL AttachPool(TVertexPoolResource *a_pPool); + TBOOL CanFit(TVertexPoolResource *a_pPoolResource); - TVertexFactoryResourceInterface* GetFactory() { return m_pFactory; } - TUINT GetFlags() { return m_uiFlags; } + TVertexFactoryResourceInterface *GetFactory() { return m_pFactory; } + TUINT GetFlags() { return m_uiFlags; } private: - TVertexFactoryResourceInterface* m_pFactory; // 0x30 - TUINT m_uiFlags; // 0x34 - TUSHORT m_uiMaxVertices; - TUINT m_uiOffset; - TUINT m_uiVerticesUsed; - TUINT m_uiLockCount; - TUINT m_Unk1; - HALBuffer m_HALBuffer; + TVertexFactoryResourceInterface *m_pFactory; // 0x30 + TUINT m_uiFlags; // 0x34 + TUSHORT m_uiMaxVertices; + TUINT m_uiOffset; + TUINT m_uiVerticesUsed; + TUINT m_uiLockCount; + TUINT m_Unk1; + HALBuffer m_HALBuffer; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TD3DVertexFactoryResource.h b/Toshi/Include/TRenderD3D/TD3DVertexFactoryResource.h index ad17a92..686c4d3 100644 --- a/Toshi/Include/TRenderD3D/TD3DVertexFactoryResource.h +++ b/Toshi/Include/TRenderD3D/TD3DVertexFactoryResource.h @@ -12,10 +12,10 @@ class TRENDERINTERFACED3D_EXPORTS TVertexFactoryResource : public TVertexFactory DECLARE_DYNAMIC(TVertexFactoryResource) public: - virtual TVertexPoolResourceInterface* CreatePoolResource(TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags); + virtual TVertexPoolResourceInterface *CreatePoolResource(TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags); - TVertexBlockResource* FindBlockResource(TVertexPoolResource* a_pResource); - TVertexBlockResource* CreateBlockResource(TUSHORT a_uiMaxVertices, TUINT a_uiFlags); + TVertexBlockResource *FindBlockResource(TVertexPoolResource *a_pResource); + TVertexBlockResource *CreateBlockResource(TUSHORT a_uiMaxVertices, TUINT a_uiFlags); }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TD3DVertexPoolResource.h b/Toshi/Include/TRenderD3D/TD3DVertexPoolResource.h index 1b5c22c..feccf7d 100644 --- a/Toshi/Include/TRenderD3D/TD3DVertexPoolResource.h +++ b/Toshi/Include/TRenderD3D/TD3DVertexPoolResource.h @@ -13,11 +13,11 @@ class TRENDERINTERFACED3D_EXPORTS TVertexPoolResource : public TVertexPoolResour protected: virtual TBOOL Validate() override; - virtual void Invalidate() override; - virtual void OnDestroy() override; - virtual TBOOL Lock(LockBuffer* a_pLockBuffer) override; - virtual void Unlock(TUSHORT a_uiNewNumVertices) override; - virtual TBOOL Create(TVertexFactoryResourceInterface* a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags) override; + virtual void Invalidate() override; + virtual void OnDestroy() override; + virtual TBOOL Lock(LockBuffer *a_pLockBuffer) override; + virtual void Unlock(TUSHORT a_uiNewNumVertices) override; + virtual TBOOL Create(TVertexFactoryResourceInterface *a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags) override; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TMSWindow.h b/Toshi/Include/TRenderD3D/TMSWindow.h index 9e4f4d2..69bd90e 100644 --- a/Toshi/Include/TRenderD3D/TMSWindow.h +++ b/Toshi/Include/TRenderD3D/TMSWindow.h @@ -11,28 +11,27 @@ class TRENDERINTERFACED3D_EXPORTS TMSWindow : public TObject { DECLARE_DYNAMIC(TMSWindow) public: - TMSWindow(); ~TMSWindow(); - TBOOL Create(TRenderD3DInterface* a_pRenderer, TPCCHAR a_szName); - void Destroy(); - void Disable(); - void Enable(); - void Position(TINT X, TINT Y, TINT cx, TINT cy); - void SetFullscreen(); - void SetWindowed(); + TBOOL Create(TRenderD3DInterface *a_pRenderer, TPCCHAR a_szName); + void Destroy(); + void Disable(); + void Enable(); + void Position(TINT X, TINT Y, TINT cx, TINT cy); + void SetFullscreen(); + void SetWindowed(); operator HWND() const { return m_hWnd; } - HWND GetHWND() const { return m_hWnd; } - TRenderD3DInterface* GetD3DInterface() const { return m_pD3DInterface; } + HWND GetHWND() const { return m_hWnd; } + TRenderD3DInterface *GetD3DInterface() const { return m_pD3DInterface; } private: - HWND m_hWnd; // 0x4 + HWND m_hWnd; // 0x4 TRenderD3DInterface *m_pD3DInterface; // 0x8 - TBOOL m_bIsEnabled; // 0xC - TBOOL m_bIsWindowed; // 0xD + TBOOL m_bIsEnabled; // 0xC + TBOOL m_bIsWindowed; // 0xD }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TRenderCaptureD3D.h b/Toshi/Include/TRenderD3D/TRenderCaptureD3D.h index 7c1e138..147092e 100644 --- a/Toshi/Include/TRenderD3D/TRenderCaptureD3D.h +++ b/Toshi/Include/TRenderD3D/TRenderCaptureD3D.h @@ -34,8 +34,8 @@ class TRENDERINTERFACED3D_EXPORTS TRenderCaptureD3D : public TRenderCapture private: TPVOID m_pBuffer; // 0x4 FORMAT m_eFormat; // 0x8 - TINT m_iWidth; // 0xC - TINT m_iHeight; // 0x10 + TINT m_iWidth; // 0xC + TINT m_iHeight; // 0x10 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TRenderContextD3D.h b/Toshi/Include/TRenderD3D/TRenderContextD3D.h index bc1b02f..d7fd51d 100644 --- a/Toshi/Include/TRenderD3D/TRenderContextD3D.h +++ b/Toshi/Include/TRenderD3D/TRenderContextD3D.h @@ -6,7 +6,6 @@ TOSHI_NAMESPACE_BEGIN class TRENDERINTERFACED3D_EXPORTS TRenderContextD3D : public TRenderContext { - }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TRenderD3DAdapter.h b/Toshi/Include/TRenderD3D/TRenderD3DAdapter.h index ba3a21e..ce133ef 100644 --- a/Toshi/Include/TRenderD3D/TRenderD3DAdapter.h +++ b/Toshi/Include/TRenderD3D/TRenderD3DAdapter.h @@ -26,7 +26,7 @@ class TRENDERINTERFACED3D_EXPORTS TD3DAdapter : public TRenderAdapter D3DDEVTYPE_REF }; - static constexpr const char* DEVICETYPESSTRINGS[NUMSUPPORTEDDEVICES] = { + static constexpr const char *DEVICETYPESSTRINGS[NUMSUPPORTEDDEVICES] = { "HAL", "REF" }; @@ -42,105 +42,105 @@ class TRENDERINTERFACED3D_EXPORTS TD3DAdapter : public TRenderAdapter static constexpr TUINT32 NUMDEPTHSTENCILFORMATS = sizeof(DEPTHSTENCILFORMATS) / sizeof(*DEPTHSTENCILFORMATS); public: - virtual TRenderAdapter::Mode* GetMode() const override; - virtual TUINT GetDeviceIndex() const override; - virtual TPCCHAR GetTypeString() const override; - virtual TBOOL IsSoftware() const override; - virtual TBOOL CanRenderWindowed() const override; - virtual TBOOL SupportsHardwareTransfomations() const override; - virtual TBOOL IsDepthStencilFormatSupported(TUINT a_iIndex) const override; - virtual TBOOL SupportsPureDevice() const; - - void SetD3DCaps(const D3DCAPS8& a_rCaps) { m_Caps = a_rCaps; } - void SetOwnerMode(Mode* a_pMode) { m_pOwnerMode = a_pMode; } + virtual TRenderAdapter::Mode *GetMode() const override; + virtual TUINT GetDeviceIndex() const override; + virtual TPCCHAR GetTypeString() const override; + virtual TBOOL IsSoftware() const override; + virtual TBOOL CanRenderWindowed() const override; + virtual TBOOL SupportsHardwareTransfomations() const override; + virtual TBOOL IsDepthStencilFormatSupported(TUINT a_iIndex) const override; + virtual TBOOL SupportsPureDevice() const; + + void SetD3DCaps(const D3DCAPS8 &a_rCaps) { m_Caps = a_rCaps; } + void SetOwnerMode(Mode *a_pMode) { m_pOwnerMode = a_pMode; } void SetDeviceIndex(TUINT32 a_uiIndex) { m_uiDeviceIndex = a_uiIndex; } TUINT32 GetD3DDeviceFlags() const { return m_eFlags; } - D3DCAPS8& GetD3DCaps() { return m_Caps; } - const D3DCAPS8& GetD3DCaps() const { return m_Caps; } + D3DCAPS8 &GetD3DCaps() { return m_Caps; } + const D3DCAPS8 &GetD3DCaps() const { return m_Caps; } private: D3DCAPS8 m_Caps; - TUINT32 m_eFlags; - Mode* m_pOwnerMode; - TUINT32 m_uiDeviceIndex; - TBOOL m_bIsSoftware; - TBOOL m_bCanRenderWindowed; - TBOOL m_bSupportsTransformation; - TBOOL m_bSupportsPureDevice; - TBOOL m_bSupportsNPatches; - TBOOL m_aSupportedDSFormats[NUMDEPTHSTENCILFORMATS]; + TUINT32 m_eFlags; + Mode *m_pOwnerMode; + TUINT32 m_uiDeviceIndex; + TBOOL m_bIsSoftware; + TBOOL m_bCanRenderWindowed; + TBOOL m_bSupportsTransformation; + TBOOL m_bSupportsPureDevice; + TBOOL m_bSupportsNPatches; + TBOOL m_aSupportedDSFormats[NUMDEPTHSTENCILFORMATS]; }; public: - virtual TRenderAdapter* GetAdapter() const override; - virtual TUINT GetModeIndex() const override; - virtual TUINT GetWidth() const override; - virtual TUINT GetHeight() const override; - virtual TBOOL Is32Bit() const override; - virtual TBOOL Is16Bit() const override; - virtual TUINT GetRefreshRate() const override; - virtual TRenderAdapter::Mode::Device* GetDevice(TUINT a_iDevice) override; + virtual TRenderAdapter *GetAdapter() const override; + virtual TUINT GetModeIndex() const override; + virtual TUINT GetWidth() const override; + virtual TUINT GetHeight() const override; + virtual TBOOL Is32Bit() const override; + virtual TBOOL Is16Bit() const override; + virtual TUINT GetRefreshRate() const override; + virtual TRenderAdapter::Mode::Device *GetDevice(TUINT a_iDevice) override; D3DFORMAT GetBackBufferFormat(TUINT a_uiColourDepth); - void SetOwnerAdapter(TD3DAdapter* a_pOwnerAdapter) { m_pOwnerAdapter = a_pOwnerAdapter; } + void SetOwnerAdapter(TD3DAdapter *a_pOwnerAdapter) { m_pOwnerAdapter = a_pOwnerAdapter; } void SetModeIndex(TUINT a_uiModeIndex) { m_uiModeIndex = a_uiModeIndex; } - void SetD3DDisplayMode(const D3DDISPLAYMODE& a_rDisplayMode) { m_DisplayMode = a_rDisplayMode; } - D3DDISPLAYMODE& GetD3DDisplayMode() { return m_DisplayMode; } + void SetD3DDisplayMode(const D3DDISPLAYMODE &a_rDisplayMode) { m_DisplayMode = a_rDisplayMode; } + D3DDISPLAYMODE &GetD3DDisplayMode() { return m_DisplayMode; } private: - TD3DAdapter* m_pOwnerAdapter; + TD3DAdapter *m_pOwnerAdapter; D3DDISPLAYMODE m_DisplayMode; - TUINT32 m_uiModeIndex; - Device m_aDevices[NUMSUPPORTEDDEVICES]; + TUINT32 m_uiModeIndex; + Device m_aDevices[NUMSUPPORTEDDEVICES]; }; public: - virtual TUINT GetAdapterIndex() const override; - virtual const TCString& GetDriver() const override; - virtual const TCString& GetDriverDescription() const override; - virtual TUSHORT GetProductID() const override; - virtual TUSHORT GetVersion() const override; - virtual TUSHORT GetSubVersion() const override; - virtual TUSHORT GetBuild() const override; - virtual const GUID& GetDeviceIdentifier() const override; - virtual TUINT GetNumSupportedDevices() const override; + virtual TUINT GetAdapterIndex() const override; + virtual const TCString &GetDriver() const override; + virtual const TCString &GetDriverDescription() const override; + virtual TUSHORT GetProductID() const override; + virtual TUSHORT GetVersion() const override; + virtual TUSHORT GetSubVersion() const override; + virtual TUSHORT GetBuild() const override; + virtual const GUID &GetDeviceIdentifier() const override; + virtual TUINT GetNumSupportedDevices() const override; void SetAdapterIndex(TUINT a_uiAdapterIndex) { m_uiAdapterIndex = a_uiAdapterIndex; } - void SetDriver(const TCString& a_rDriver) { m_Driver = a_rDriver; } - void SetDescription(const TCString& a_rDescription) { m_Description = a_rDescription; } + void SetDriver(const TCString &a_rDriver) { m_Driver = a_rDriver; } + void SetDescription(const TCString &a_rDescription) { m_Description = a_rDescription; } void SetDriverVersionLowPart(DWORD a_uiDriverVersionLowPart) { m_DriverVersionLowPart = a_uiDriverVersionLowPart; } void SetDriverVersionHighPart(DWORD a_uiDriverVersionHighPart) { m_DriverVersionHighPart = a_uiDriverVersionHighPart; } void SetVendorId(DWORD a_uiVendorId) { m_VendorId = a_uiVendorId; } void SetDeviceId(DWORD a_uiDeviceId) { m_DeviceId = a_uiDeviceId; } void SetSubSysId(DWORD a_uiSubSysId) { m_SubSysId = a_uiSubSysId; } void SetRevision(DWORD a_uiRevision) { m_Revision = a_uiRevision; } - void SetDeviceIdentifier(const GUID& a_rDeviceIdentifier) { m_DeviceIdentifier = a_rDeviceIdentifier; } + void SetDeviceIdentifier(const GUID &a_rDeviceIdentifier) { m_DeviceIdentifier = a_rDeviceIdentifier; } - Mode& GetMode() { return m_Mode; } - const Mode& GetMode() const { return m_Mode; } + Mode &GetMode() { return m_Mode; } + const Mode &GetMode() const { return m_Mode; } - D3DADAPTER_IDENTIFIER8* GetD3DIdentifier8() { return &m_Identifier; } - const D3DADAPTER_IDENTIFIER8* GetD3DIdentifier8() const { return &m_Identifier; } + D3DADAPTER_IDENTIFIER8 *GetD3DIdentifier8() { return &m_Identifier; } + const D3DADAPTER_IDENTIFIER8 *GetD3DIdentifier8() const { return &m_Identifier; } - void EnumerateOutputs(TRenderInterface* a_pRenderer); + void EnumerateOutputs(TRenderInterface *a_pRenderer); private: D3DADAPTER_IDENTIFIER8 m_Identifier; - Mode m_Mode; - TUINT32 m_uiAdapterIndex; - TCString m_Driver; - TCString m_Description; - DWORD m_DriverVersionLowPart; - DWORD m_DriverVersionHighPart; - DWORD m_VendorId; - DWORD m_DeviceId; - DWORD m_SubSysId; - DWORD m_Revision; - GUID m_DeviceIdentifier; + Mode m_Mode; + TUINT32 m_uiAdapterIndex; + TCString m_Driver; + TCString m_Description; + DWORD m_DriverVersionLowPart; + DWORD m_DriverVersionHighPart; + DWORD m_VendorId; + DWORD m_DeviceId; + DWORD m_SubSysId; + DWORD m_Revision; + GUID m_DeviceIdentifier; }; diff --git a/Toshi/Include/TRenderD3D/TRenderD3DInterface.h b/Toshi/Include/TRenderD3D/TRenderD3DInterface.h index b5d7872..30b5e28 100644 --- a/Toshi/Include/TRenderD3D/TRenderD3DInterface.h +++ b/Toshi/Include/TRenderD3D/TRenderD3DInterface.h @@ -11,14 +11,14 @@ TOSHI_NAMESPACE_BEGIN class TMSWindow; -#define TD3DRELEASE(d3d) \ - if (d3d) { \ - d3d->Release(); \ - } \ - else { \ - TASSERT(!"Release called on NULL interface ptr\n"); \ - } \ - d3d = NULL +#define TD3DRELEASE(d3d) \ + if (d3d) { \ + d3d->Release(); \ + } \ + else { \ + TASSERT(!"Release called on NULL interface ptr\n"); \ + } \ + d3d = NULL class TRENDERINTERFACED3D_EXPORTS TRenderD3DInterface : public TRenderInterface { @@ -26,72 +26,68 @@ class TRENDERINTERFACED3D_EXPORTS TRenderD3DInterface : public TRenderInterface DECLARE_DYNAMIC(TRenderD3DInterface) public: - TRenderD3DInterface(); static void TOSHI_API TD3DAssert(HRESULT a_hr, TPCCHAR a_pError); virtual ~TRenderD3DInterface() override; - virtual TBOOL CreateDisplay(const TRenderInterface::DisplayParams& a_rParams) override; - virtual TBOOL DestroyDisplay() override; - virtual TBOOL Update(float a_fDeltaTime) override; - virtual TBOOL BeginScene() override; - virtual TBOOL EndScene() override; - virtual TRenderAdapter::Mode::Device* GetCurrentDevice() override; - virtual TRenderInterface::DisplayParams* GetCurrentDisplayParams() override; - virtual TBOOL Create(TKernelInterface* pKernelInterface) override; - virtual TBOOL Destroy() override; - virtual void RenderIndexPrimitive(int param_2, int param_3, int param_4, int param_5, int param_6, int param_7) override; - virtual TFLOAT GetPixelAspectRatio() override; - virtual TBOOL SetPixelAspectRatio(float a_fPixelAspectRatio) override; - virtual TBOOL IsTextureFormatSupported(TTEXTURERESOURCEFORMAT a_eTextureFormat) override; - virtual TBOOL Supports32BitTextures() override; - virtual TRenderContext* CreateRenderContext() override; - virtual TRenderCapture* CreateCapture() override; - virtual void DestroyCapture(TRenderCapture* a_pRenderCapture) override; - virtual void ConnectDefaultViewportHandelrs(TViewport& a_pViewport) override; - virtual TModel* CreateModel(TPCCHAR a_szName, TINT a_iUnk1) override; + virtual TBOOL CreateDisplay(const TRenderInterface::DisplayParams &a_rParams) override; + virtual TBOOL DestroyDisplay() override; + virtual TBOOL Update(float a_fDeltaTime) override; + virtual TBOOL BeginScene() override; + virtual TBOOL EndScene() override; + virtual TRenderAdapter::Mode::Device *GetCurrentDevice() override; + virtual TRenderInterface::DisplayParams *GetCurrentDisplayParams() override; + virtual TBOOL Create(TKernelInterface *pKernelInterface) override; + virtual TBOOL Destroy() override; + virtual void RenderIndexPrimitive(int param_2, int param_3, int param_4, int param_5, int param_6, int param_7) override; + virtual TFLOAT GetPixelAspectRatio() override; + virtual TBOOL SetPixelAspectRatio(float a_fPixelAspectRatio) override; + virtual TBOOL IsTextureFormatSupported(TTEXTURERESOURCEFORMAT a_eTextureFormat) override; + virtual TBOOL Supports32BitTextures() override; + virtual TRenderContext *CreateRenderContext() override; + virtual TRenderCapture *CreateCapture() override; + virtual void DestroyCapture(TRenderCapture *a_pRenderCapture) override; + virtual void ConnectDefaultViewportHandelrs(TViewport &a_pViewport) override; + virtual TModel *CreateModel(TPCCHAR a_szName, TINT a_iUnk1) override; virtual TBOOL IsCapableColourCorrection(); - virtual void EnableColourCorrection(TBOOL a_bEnable); + virtual void EnableColourCorrection(TBOOL a_bEnable); TBOOL IsTextureFormatSupported(D3DFORMAT a_eFormat); - void Exit() { m_bIsExited = TTRUE; } + void Exit() { m_bIsExited = TTRUE; } private: - void BuildAdapterDatabase(); void CreateAcceleratorTableA(); void DestroyAcceleratorTable(); protected: - TBOOL LoadShaders(); - void SetDefaultRenderStates(); + void SetDefaultRenderStates(); public: - - IDirect3DDevice8* GetD3DDevice() { return m_pD3DDevice; } - IDirect3D8* GetD3DInterface() { return m_pD3DInterface; } - TMSWindow* GetMSWindow() { return &m_pMSWindow; } - HACCEL GetAcceleratorTable() { return m_hAccel; } + IDirect3DDevice8 *GetD3DDevice() { return m_pD3DDevice; } + IDirect3D8 *GetD3DInterface() { return m_pD3DInterface; } + TMSWindow *GetMSWindow() { return &m_pMSWindow; } + HACCEL GetAcceleratorTable() { return m_hAccel; } private: - TTextureResource* m_pInvalidTexture; // 0xF8 - IDirect3D8* m_pD3DInterface; // 0x17C - IDirect3DDevice8* m_pD3DDevice; // 0x180 - D3DPRESENT_PARAMETERS m_oPresentParams; // 0x18C - D3DSURFACE_DESC m_oSurfaceDesk; // 0x1B8 - HACCEL m_hAccel; // 0x1DC - TD3DAdapter::Mode::Device* m_pCurrentDevice; // 0x1E0 - TRenderInterface::DisplayParams m_oDisplayParams; // 0x1E4 - TMSWindow m_pMSWindow; // 0x1F8 - TBOOL m_bIsExited; // 0x208 - TBOOL m_bUsingColorCorrection; // 0x21C - TBOOL m_bCheckedCapableColourCorrection; // 0x21D - TBOOL m_bCapableColourCorrection; // 0x21E - TBOOL m_bEnableColourCorrection; // 0x21F + TTextureResource *m_pInvalidTexture; // 0xF8 + IDirect3D8 *m_pD3DInterface; // 0x17C + IDirect3DDevice8 *m_pD3DDevice; // 0x180 + D3DPRESENT_PARAMETERS m_oPresentParams; // 0x18C + D3DSURFACE_DESC m_oSurfaceDesk; // 0x1B8 + HACCEL m_hAccel; // 0x1DC + TD3DAdapter::Mode::Device *m_pCurrentDevice; // 0x1E0 + TRenderInterface::DisplayParams m_oDisplayParams; // 0x1E4 + TMSWindow m_pMSWindow; // 0x1F8 + TBOOL m_bIsExited; // 0x208 + TBOOL m_bUsingColorCorrection; // 0x21C + TBOOL m_bCheckedCapableColourCorrection; // 0x21D + TBOOL m_bCapableColourCorrection; // 0x21E + TBOOL m_bEnableColourCorrection; // 0x21F }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TTextureFactoryD3D.h b/Toshi/Include/TRenderD3D/TTextureFactoryD3D.h index 8bc4da2..b339be4 100644 --- a/Toshi/Include/TRenderD3D/TTextureFactoryD3D.h +++ b/Toshi/Include/TRenderD3D/TTextureFactoryD3D.h @@ -10,11 +10,9 @@ class TRENDERINTERFACED3D_EXPORTS TTextureFactoryHAL : public TTextureFactory DECLARE_DYNAMIC(TTextureFactoryHAL) public: - - virtual TTextureResource* CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) override; - virtual TTextureResource* CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) override; - virtual TTextureResource* CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) override; - + virtual TTextureResource *CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) override; + virtual TTextureResource *CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) override; + virtual TTextureResource *CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) override; }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TRenderD3D/TTextureResourceD3D.h b/Toshi/Include/TRenderD3D/TTextureResourceD3D.h index 192cf86..c0b1adc 100644 --- a/Toshi/Include/TRenderD3D/TTextureResourceD3D.h +++ b/Toshi/Include/TRenderD3D/TTextureResourceD3D.h @@ -17,23 +17,26 @@ class TRENDERINTERFACED3D_EXPORTS TTextureResourceHAL : public TTextureResource }; public: - virtual ~TTextureResourceHAL() = default; virtual TBOOL Validate() override; - virtual void Invalidate() override; + virtual void Invalidate() override; virtual TUINT GetWidth() override; virtual TUINT GetHeight() override; - virtual TBOOL Lock(TTextureResource::LOCKSTATE& a_rLockState) override; - virtual void Unlock() override; + virtual TBOOL Lock(TTextureResource::LOCKSTATE &a_rLockState) override; + virtual void Unlock() override; virtual TBOOL Create(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_eTextureFlags, TUINT a_uiWidth, TUINT a_uiHeight) override; virtual TBOOL Create(TPCCHAR a_szFileName, TUINT a_eTextureFlags) override; virtual TBOOL CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiMipmapFlags) override; private: - TBOOL CreateFromFormat(); - TBOOL CreateFromPPM(TPCCHAR) { TASSERT(!"SLS: Yet to do!\n"); return TFALSE; } + TBOOL CreateFromFormat(); + TBOOL CreateFromPPM(TPCCHAR) + { + TASSERT(!"SLS: Yet to do!\n"); + return TFALSE; + } TBOOL CreateFromMemory8888(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData); TBOOL CreateFromMemory888(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData); TBOOL CreateFromMemory5551(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData); @@ -41,26 +44,24 @@ class TRENDERINTERFACED3D_EXPORTS TTextureResourceHAL : public TTextureResource TBOOL CreateFromMemory4444(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData); protected: - TBOOL IsPPM(TPCCHAR a_pFileName); public: - - IDirect3DTexture8* GetD3DTexture() { return m_pD3DTexture; } + IDirect3DTexture8 *GetD3DTexture() { return m_pD3DTexture; } private: - TUINT m_eTextureFlags; // 0x34 - TUINT m_uiLockCount; // 0x3C - TINT m_iLoadFromMemory; // 0x40 - TPVOID m_pData; // 0x44 - TUINT m_uiDataSize; // 0x48 - TUINT m_uiWidth; // 0x4C - TUINT m_uiHeight; // 0x50 - TINT m_uiMipLevels; // 0x54 - TUINT m_uiMipmapFlags; // 0x58 + TUINT m_eTextureFlags; // 0x34 + TUINT m_uiLockCount; // 0x3C + TINT m_iLoadFromMemory; // 0x40 + TPVOID m_pData; // 0x44 + TUINT m_uiDataSize; // 0x48 + TUINT m_uiWidth; // 0x4C + TUINT m_uiHeight; // 0x50 + TINT m_uiMipLevels; // 0x54 + TUINT m_uiMipmapFlags; // 0x58 TTEXTURERESOURCEFORMAT m_eResourceFormat; // 0x5C - IDirect3DTexture8* m_pD3DTexture; // 0x60 - D3DXIMAGE_INFO m_oImageInfo; // 0x64 + IDirect3DTexture8 *m_pD3DTexture; // 0x60 + D3DXIMAGE_INFO m_oImageInfo; // 0x64 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/TTerrain/Defines.h b/Toshi/Include/TTerrain/Defines.h index 38c5253..c3ad02e 100644 --- a/Toshi/Include/TTerrain/Defines.h +++ b/Toshi/Include/TTerrain/Defines.h @@ -3,14 +3,14 @@ #ifndef TTERRAININTERFACE_STATIC_LINKING -#ifdef TTERRAININTERFACE -#define TTERRAININTERFACE_EXPORTS DLL_CLASS_EXPORT -#else -#define TTERRAININTERFACE_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef TTERRAININTERFACE +# define TTERRAININTERFACE_EXPORTS DLL_CLASS_EXPORT +# else +# define TTERRAININTERFACE_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !TTERRAININTERFACE_STATIC_LINKING +#else // !TTERRAININTERFACE_STATIC_LINKING -#define TTERRAININTERFACE_EXPORTS +# define TTERRAININTERFACE_EXPORTS -#endif // TTERRAININTERFACE_STATIC_LINKING \ No newline at end of file +#endif // TTERRAININTERFACE_STATIC_LINKING diff --git a/Toshi/Include/TTerrain/TTerrainInterface.h b/Toshi/Include/TTerrain/TTerrainInterface.h index 24d8e47..0182bb7 100644 --- a/Toshi/Include/TTerrain/TTerrainInterface.h +++ b/Toshi/Include/TTerrain/TTerrainInterface.h @@ -26,11 +26,11 @@ class TTERRAININTERFACE_EXPORTS TTerrainInterface : public TObject static TFLOAT sm_fLev1MountLODDist; static TFLOAT sm_fMountainBounds; static TFLOAT sm_fWaterHeight; + private: - static TUINT s_ui32TStamp; + static TUINT s_ui32TStamp; static TTerrainInterface *ms_pTerrainInterface; - static TERRAINLOD sm_eLOD; + static TERRAINLOD sm_eLOD; }; TOSHI_NAMESPACE_END - diff --git a/Toshi/Include/TTerrain/TTerrainSection.h b/Toshi/Include/TTerrain/TTerrainSection.h index 1da0fb1..c6b3dd4 100644 --- a/Toshi/Include/TTerrain/TTerrainSection.h +++ b/Toshi/Include/TTerrain/TTerrainSection.h @@ -9,11 +9,10 @@ class TTERRAININTERFACE_EXPORTS TTerrainSection { public: - - #define CLIPFLAG_GRASS 0x100 - #define CLIPFLAG_DIRTY 0x200 - #define CLIPFLAG_UNK 0x400 - #define USERBITSFLAGMASK -(0x400) +#define CLIPFLAG_GRASS 0x100 +#define CLIPFLAG_DIRTY 0x200 +#define CLIPFLAG_UNK 0x400 +#define USERBITSFLAGMASK -(0x400) void ComputeBounds(); @@ -50,13 +49,13 @@ class TTERRAININTERFACE_EXPORTS TTerrainSection void SetSystemFlags(TUINT a_ui32ClipFlags); private: - TTerrainSection* m_pNextSection; // 0x14 - TUINT m_ui32ClipFlags; // 0x1C - TUINT m_uiTimeStamp; // 0x20 - TCHAR m_cBoundX; // 0x30 - TCHAR m_cBoundY; // 0x31 - TCHAR m_cPosX; // 0x32 - TCHAR m_cPosY; // 0x33 + TTerrainSection *m_pNextSection; // 0x14 + TUINT m_ui32ClipFlags; // 0x1C + TUINT m_uiTimeStamp; // 0x20 + TCHAR m_cBoundX; // 0x30 + TCHAR m_cBoundY; // 0x31 + TCHAR m_cPosX; // 0x32 + TCHAR m_cPosY; // 0x33 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Include/Toshi/Defines.h b/Toshi/Include/Toshi/Defines.h index 12ee7ec..321063f 100644 --- a/Toshi/Include/Toshi/Defines.h +++ b/Toshi/Include/Toshi/Defines.h @@ -1,64 +1,66 @@ #pragma once -#define TNULL nullptr -#define TFALSE false -#define TTRUE true +#define TNULL nullptr +#define TFALSE false +#define TTRUE true #define BITFIELD(x) (1 << (x)) #if defined(TOSHI_RELEASE) || defined(TOSHI_DEBUG) - #define TOSHI_NOTFINAL +# define TOSHI_NOTFINAL #endif // TOSHI_RELEASE || TOSHI_DEBUG #define STRINGIFY2(X) #X -#define STRINGIFY(X) STRINGIFY2(X) +#define STRINGIFY(X) STRINGIFY2(X) -#define STRCAT2(X, Y) X##Y -#define STRCAT(X, Y) STRCAT2(X, Y) -#define STRCAT_2 CAT -#define STRCAT_3(X, Y, Z) STRCAT(X, STRCAT(Y, Z)) +#define STRCAT2(X, Y) X##Y +#define STRCAT(X, Y) STRCAT2(X, Y) +#define STRCAT_2 CAT +#define STRCAT_3(X, Y, Z) STRCAT(X, STRCAT(Y, Z)) #define STRCAT_4(A, X, Y, Z) STRCAT(A, STRCAT_3(X, Y, Z)) #define HASFLAG(flag) ((flag) != 0) #ifdef TOSHI_SKU_WINDOWS - // [7/8/2024 InfiniteC0re] - // Note: such includes aren't supported by other compilers so - // perhaps it's better to get rid of this macro +// [7/8/2024 InfiniteC0re] +// Note: such includes aren't supported by other compilers so +// perhaps it's better to get rid of this macro - #define TOSHI_MULTIPLATFORM(FILENAME) STRINGIFY(STRCAT_3(Win/, FILENAME, Win.h)) +//# define TOSHI_MULTIPLATFORM(FILENAME) STRINGIFY(STRCAT_3(Win/, FILENAME, Win.h)) #endif // TOSHI_SKU_WINDOWS // Move these to platform.h? [7/8/2024 InfiniteC0re] #define TOSHI_API __stdcall #define TOSHI_CALLBACKAPI __cdecl -#define TOSHI_NAMESPACE_BEGIN namespace Toshi { -#define TOSHI_NAMESPACE_END } +#define TOSHI_NAMESPACE_BEGIN \ + namespace Toshi \ + { +#define TOSHI_NAMESPACE_END } #define TOSHI_NAMESPACE_USING using namespace Toshi; #define TSTATICCAST(type, value) static_cast(value) #define _TS8(str) #str -typedef bool TBOOL; -typedef int TINT; -typedef unsigned int TUINT; -typedef unsigned int TUINT32; -typedef unsigned __int64 TUINT64; -typedef short TSHORT; -typedef unsigned short TUSHORT; -typedef wchar_t TWCHAR; -typedef wchar_t* TPWCHAR; -typedef const wchar_t* TPCWCHAR; -typedef const char* TPCCHAR; -typedef char* TPCHAR; -typedef char TCHAR; -typedef const char TCCHAR; -typedef char TINT8; -typedef unsigned char TUINT8; -typedef unsigned char TBYTE; -typedef unsigned char* TPBYTE; -typedef void* TPVOID; -typedef const void* TPCVOID; -typedef float TFLOAT; -typedef const float TCFLOAT; \ No newline at end of file +typedef bool TBOOL; +typedef int TINT; +typedef unsigned int TUINT; +typedef unsigned int TUINT32; +typedef unsigned __int64 TUINT64; +typedef short TSHORT; +typedef unsigned short TUSHORT; +typedef wchar_t TWCHAR; +typedef wchar_t *TPWCHAR; +typedef const wchar_t *TPCWCHAR; +typedef const char *TPCCHAR; +typedef char *TPCHAR; +typedef char TCHAR; +typedef const char TCCHAR; +typedef char TINT8; +typedef unsigned char TUINT8; +typedef unsigned char TBYTE; +typedef unsigned char *TPBYTE; +typedef void *TPVOID; +typedef const void *TPCVOID; +typedef float TFLOAT; +typedef const float TCFLOAT; diff --git a/Toshi/Include/Toshi/Platform.h b/Toshi/Include/Toshi/Platform.h index c7cd0f9..bb87f34 100644 --- a/Toshi/Include/Toshi/Platform.h +++ b/Toshi/Include/Toshi/Platform.h @@ -1,23 +1,23 @@ #pragma once #if defined(_MSC_VER) -#define COMPILER_MSVC +# define COMPILER_MSVC #endif #if defined(TOSHI_SKU_WINDOWS) && defined(COMPILER_MSVC) -#define DLL_EXPORT extern "c" __declspec(dllexport) -#define DLL_IMPORT extern "c" __declspec(dllimport) -#define DLL_CLASS_EXPORT __declspec(dllexport) -#define DLL_CLASS_IMPORT __declspec(dllimport) -#define FORCEINLINE __forceinline +# define DLL_EXPORT extern "c" __declspec(dllexport) +# define DLL_IMPORT extern "c" __declspec(dllimport) +# define DLL_CLASS_EXPORT __declspec(dllexport) +# define DLL_CLASS_IMPORT __declspec(dllimport) +# define FORCEINLINE __forceinline #else // TOSHI_SKU_WINDOWS && _MSC_VER -#define DLL_EXPORT -#define DLL_IMPORT -#define DLL_CLASS_EXPORT -#define DLL_CLASS_IMPORT -#define FORCEINLINE +# define DLL_EXPORT +# define DLL_IMPORT +# define DLL_CLASS_EXPORT +# define DLL_CLASS_IMPORT +# define FORCEINLINE #endif // !TOSHI_SKU_WINDOWS || !_MSC_VER diff --git a/Toshi/Plugins/Include/Defines.h b/Toshi/Plugins/Include/Defines.h index 0fe5671..f69fa1e 100644 --- a/Toshi/Plugins/Include/Defines.h +++ b/Toshi/Plugins/Include/Defines.h @@ -3,14 +3,14 @@ #ifndef PPROPERTYPARSER_STATIC_LINKING -#ifdef PPROPERTYPARSER -#define PPROPERTYPARSER_EXPORTS DLL_CLASS_EXPORT -#else -#define PPROPERTYPARSER_EXPORTS DLL_CLASS_IMPORT -#endif +# ifdef PPROPERTYPARSER +# define PPROPERTYPARSER_EXPORTS DLL_CLASS_EXPORT +# else +# define PPROPERTYPARSER_EXPORTS DLL_CLASS_IMPORT +# endif -#else // !PPROPERTYPARSER_STATIC_LINKING +#else // !PPROPERTYPARSER_STATIC_LINKING -#define PPROPERTYPARSER_EXPORTS +# define PPROPERTYPARSER_EXPORTS -#endif // PPROPERTYPARSER_STATIC_LINKING \ No newline at end of file +#endif // PPROPERTYPARSER_STATIC_LINKING diff --git a/Toshi/Plugins/Include/PPropertyParser/PProperties.h b/Toshi/Plugins/Include/PPropertyParser/PProperties.h index 971f202..0753a7b 100644 --- a/Toshi/Plugins/Include/PPropertyParser/PProperties.h +++ b/Toshi/Plugins/Include/PPropertyParser/PProperties.h @@ -16,12 +16,12 @@ class PPROPERTYPARSER_EXPORTS PProperties : Toshi::TObject class PPROPERTYPARSER_EXPORTS PProperty : public Toshi::TQList::TNode { DECLARE_FREELIST(PProperty) - + public: // $PPropertyParser: FUNCTION 10001e30 COMPLETED PProperty(const PPropertyName &a_rName, const PPropertyValue &a_rValue) { - m_oName = PPropertyName(a_rName); + m_oName = PPropertyName(a_rName); m_oValue = PPropertyValue(a_rValue); } // $PPropertyParser: FUNCTION 10001e70 COMPLETED @@ -33,7 +33,6 @@ class PPROPERTYPARSER_EXPORTS PProperties : Toshi::TObject // $PPropertyParser: FUNCTION 10002910 COMPLETED ~PProperty() { - } // $PPropertyParser: FUNCTION 100029b0 COMPLETED void SetComment(const Toshi::TPCString &a_rComment) @@ -41,9 +40,9 @@ class PPROPERTYPARSER_EXPORTS PProperties : Toshi::TObject m_sComment = a_rComment; } // $PPropertyParser: FUNCTION 10002a20 COMPLETED - void SetLine(TINT a_iLine) - { - m_iLine = a_iLine; + void SetLine(TINT a_iLine) + { + m_iLine = a_iLine; } // $PPropertyParser: FUNCTION 10002a30 COMPLETED void SetValue(const PPropertyValue &a_rValue) @@ -51,32 +50,32 @@ class PPROPERTYPARSER_EXPORTS PProperties : Toshi::TObject m_oValue = a_rValue; } // $PPropertyParser: FUNCTION 100029f0 COMPLETED - Toshi::TPCString GetComment() const - { - return m_sComment; + Toshi::TPCString GetComment() const + { + return m_sComment; } // $PPropertyParser: FUNCTION 10002a10 COMPLETED - TINT GetLine() const - { - return m_iLine; + TINT GetLine() const + { + return m_iLine; } // $PPropertyParser: FUNCTION 10002a60 COMPLETED - const PPropertyName &GetName() const - { - return m_oName; + const PPropertyName &GetName() const + { + return m_oName; } // $PPropertyParser: FUNCTION 10002a50 COMPLETED - const PPropertyValue &GetValue() const - { - return m_oValue; + const PPropertyValue &GetValue() const + { + return m_oValue; } private: // 0x0 m_pNext // 0x4 m_pPrev - PPropertyName m_oName; // 0x8 - PPropertyValue m_oValue; // 0x10 - TINT m_iLine; // 0x18 + PPropertyName m_oName; // 0x8 + PPropertyValue m_oValue; // 0x10 + TINT m_iLine; // 0x18 Toshi::TPCString m_sComment; // 0x1C }; @@ -84,13 +83,13 @@ class PPROPERTYPARSER_EXPORTS PProperties : Toshi::TObject PProperties() { m_pParentProps = TNULL; - m_iPropCount = 0; + m_iPropCount = 0; } // $PPropertyParser: FUNCTION 100010c0 PProperties(PProperties *a_pParentProps) { m_pParentProps = a_pParentProps; - m_iPropCount = 0; + m_iPropCount = 0; } // $PPropertyParser: FUNCTION 10002b50 @@ -150,7 +149,7 @@ class PPROPERTYPARSER_EXPORTS PProperties : Toshi::TObject const PProperty *FindProperty(const Toshi::TPCString &a_szProperty, Toshi::TQList::Iterator &a_oProperties); - PProperties *m_pParentProps; // 0x8 - Toshi::TQList m_oPropSet; // 0xC - TINT m_iPropCount; // 0x14 + PProperties *m_pParentProps; // 0x8 + Toshi::TQList m_oPropSet; // 0xC + TINT m_iPropCount; // 0x14 }; diff --git a/Toshi/Plugins/Include/PPropertyParser/PPropertyBlock.h b/Toshi/Plugins/Include/PPropertyParser/PPropertyBlock.h index f915477..c24646e 100644 --- a/Toshi/Plugins/Include/PPropertyParser/PPropertyBlock.h +++ b/Toshi/Plugins/Include/PPropertyParser/PPropertyBlock.h @@ -5,34 +5,34 @@ class PPROPERTYPARSER_EXPORTS PPropertyBlock : public Toshi::TObject { - DECLARE_DYNAMIC(PPropertyBlock); + DECLARE_DYNAMIC(PPropertyBlock); public: - enum Priority - { + enum Priority + { - }; + }; - PPropertyBlock(const Toshi::TPCString &a_rName, Priority a_ePriority) - { - m_oName = a_rName; - m_ePriority = a_ePriority; - } + PPropertyBlock(const Toshi::TPCString &a_rName, Priority a_ePriority) + { + m_oName = a_rName; + m_ePriority = a_ePriority; + } - void SetName(const Toshi::TPCString &a_rName) - { - m_oName = a_rName; - } - const Toshi::TPCString &GetName() - { - return m_oName; - } - Priority GetPriority() const - { - return m_ePriority; - } + void SetName(const Toshi::TPCString &a_rName) + { + m_oName = a_rName; + } + const Toshi::TPCString &GetName() + { + return m_oName; + } + Priority GetPriority() const + { + return m_ePriority; + } private: - Toshi::TPCString m_oName; // 0x8 - Priority m_ePriority; // 0xC -}; \ No newline at end of file + Toshi::TPCString m_oName; // 0x8 + Priority m_ePriority; // 0xC +}; diff --git a/Toshi/Plugins/Include/PPropertyParser/PPropertyName.h b/Toshi/Plugins/Include/PPropertyParser/PPropertyName.h index f9bcfee..6864f19 100644 --- a/Toshi/Plugins/Include/PPropertyParser/PPropertyName.h +++ b/Toshi/Plugins/Include/PPropertyParser/PPropertyName.h @@ -5,10 +5,8 @@ class PPROPERTYPARSER_EXPORTS PPropertyName { public: - PPropertyName() { - } PPropertyName(const Toshi::TPCString &a_rName) { @@ -16,7 +14,7 @@ class PPROPERTYPARSER_EXPORTS PPropertyName } PPropertyName(const Toshi::TPCString &a_rName, const Toshi::TPCString &a_rSubName) { - m_oName = a_rName; + m_oName = a_rName; m_oSubName = a_rSubName; } @@ -52,6 +50,7 @@ class PPROPERTYPARSER_EXPORTS PPropertyName } TBOOL operator<(const PPropertyName &a_rPropName) const { + // Is this actually TBOOL? [4/14/2025 InfiniteC0re] TBOOL ret = m_oName.Compare(a_rPropName.GetName()) == 0; if (ret < 0) { return TTRUE; @@ -76,6 +75,7 @@ class PPROPERTYPARSER_EXPORTS PPropertyName } return m_oSubName.Compare(a_rPropName.GetSubName()) > 0; } + protected: void Split(const Toshi::TPCString &a_rString); diff --git a/Toshi/Plugins/Include/PPropertyParser/PPropertyReader.h b/Toshi/Plugins/Include/PPropertyParser/PPropertyReader.h index b5d915a..2b8a2ff 100644 --- a/Toshi/Plugins/Include/PPropertyParser/PPropertyReader.h +++ b/Toshi/Plugins/Include/PPropertyParser/PPropertyReader.h @@ -14,25 +14,25 @@ class PPROPERTYPARSER_EXPORTS PPropertyReader : public Toshi::TObject void Error(const Toshi::TCString &a_sMsg); void Error(const Toshi::TFileLexer::Token &a_rToken, const Toshi::TCString &a_sMsg); - TBOOL GetValue(PPropertyValue &a_rValue); + TBOOL GetValue(PPropertyValue &a_rValue); PPropertyValue Token2Value(const Toshi::TFileLexer::Token &a_rToken); - TBOOL LoadProperty(PProperties *a_pProperty); - TBOOL LoadPropertyBlock(PProperties &a_rProperty); + TBOOL LoadProperty(PProperties *a_pProperty); + TBOOL LoadPropertyBlock(PProperties &a_rProperty); PProperties *LoadPropertyBlock(); - TBOOL LoadPropertyName(Toshi::TPCString &a_rName, Toshi::TPCString &a_rSubName); + TBOOL LoadPropertyName(Toshi::TPCString &a_rName, Toshi::TPCString &a_rSubName); virtual ~PPropertyReader() { Close(); } - virtual TBOOL Open(const Toshi::TCString& a_rFileName, Toshi::TFile* a_pFile); - virtual TBOOL Open(const Toshi::TCString& a_rFileName); + virtual TBOOL Open(const Toshi::TCString &a_rFileName, Toshi::TFile *a_pFile); + virtual TBOOL Open(const Toshi::TCString &a_rFileName); - void Warning(const Toshi::TCString& a_sMsg); + void Warning(const Toshi::TCString &a_sMsg); private: - Toshi::TCString m_szFileName; // 0x4 - Toshi::TFile *m_pFile; // 0xC - Toshi::TFileLexerUTF8 *m_pLexer; // 0x10 - TBOOL m_bLoadComments; // 0x24 - TBOOL m_bAssertOnError; // 0x25 + Toshi::TCString m_szFileName; // 0x4 + Toshi::TFile *m_pFile; // 0xC + Toshi::TFileLexerUTF8 *m_pLexer; // 0x10 + TBOOL m_bLoadComments; // 0x24 + TBOOL m_bAssertOnError; // 0x25 Toshi::TArray m_oPropertyBlock; // 0x28 -}; \ No newline at end of file +}; diff --git a/Toshi/Plugins/Include/PPropertyParser/PPropertyValue.h b/Toshi/Plugins/Include/PPropertyParser/PPropertyValue.h index 2368f3d..00b20db 100644 --- a/Toshi/Plugins/Include/PPropertyParser/PPropertyValue.h +++ b/Toshi/Plugins/Include/PPropertyParser/PPropertyValue.h @@ -14,148 +14,148 @@ class PPropertyValueArray; class PPROPERTYPARSER_EXPORTS PPropertyValue { public: - PPropertyValue(); - PPropertyValue(TINT a_int); - PPropertyValue(TUINT a_uint); - PPropertyValue(TFLOAT a_float); - PPropertyValue(const Toshi::TPCString &a_rPCString); - PPropertyValue(const PPropertyName &a_rPropname); - PPropertyValue(PProperties *props); - PPropertyValue(const PPropertyValue &a_rOther); - ~PPropertyValue(); + PPropertyValue(); + PPropertyValue(TINT a_int); + PPropertyValue(TUINT a_uint); + PPropertyValue(TFLOAT a_float); + PPropertyValue(const Toshi::TPCString &a_rPCString); + PPropertyValue(const PPropertyName &a_rPropname); + PPropertyValue(PProperties *props); + PPropertyValue(const PPropertyValue &a_rOther); + ~PPropertyValue(); protected: - void Assign(const PPropertyValue &a_rValue); - TBOOL ChangeType(const Toshi::TClass *a_pType); + void Assign(const PPropertyValue &a_rValue); + TBOOL ChangeType(const Toshi::TClass *a_pType); public: - TBOOL CanBeType(const Toshi::TClass *a_type) const; - - const Toshi::TClass *GetType() const - { - return m_type; - } - void SetInteger(TINT a_valueInt) - { - ChangeType(TYPE_INT); - m_valueInt = a_valueInt; - } - TINT GetInteger() const; - TUINT GetUINT32() const; - TFLOAT GetFloat() const; - TBOOL GetBoolean() const; - Toshi::TObject *GetTObject() const; - const Toshi::TPCString &GetTPCString() const; - Toshi::TPCString &GetTPCString(); - PProperties *GetProperties() - { - if (m_type != TYPE_PROPS) { - return TNULL; - } - return m_valueProps; - } - void SetPropertyName(const PPropertyName &a_rName); - const PPropertyName &GetPropertyName() const; - PProperties *GetProperties() const - { - return m_type == TYPE_PROPS ? m_valueProps : TNULL; - } - void SetArray(PPropertyValueArray *a_pArray); - PPropertyValueArray *GetArray() const - { - TASSERT(m_type == TYPE_ARRAY); - return m_valueArray; - } - static TPCCHAR TOSHI_API ToString(const Toshi::TClass *a_pClass) - { - if (a_pClass != TYPE_UNDEF) { - return a_pClass->GetName(); - } - return _TS8(TNULL); - } - - TBOOL IsDefined() const - { - return m_type != TYPE_UNDEF; - } + TBOOL CanBeType(const Toshi::TClass *a_type) const; + + const Toshi::TClass *GetType() const + { + return m_type; + } + void SetInteger(TINT a_valueInt) + { + ChangeType(TYPE_INT); + m_valueInt = a_valueInt; + } + TINT GetInteger() const; + TUINT GetUINT32() const; + TFLOAT GetFloat() const; + TBOOL GetBoolean() const; + Toshi::TObject *GetTObject() const; + const Toshi::TPCString &GetTPCString() const; + Toshi::TPCString &GetTPCString(); + PProperties *GetProperties() + { + if (m_type != TYPE_PROPS) { + return TNULL; + } + return m_valueProps; + } + void SetPropertyName(const PPropertyName &a_rName); + const PPropertyName &GetPropertyName() const; + PProperties *GetProperties() const + { + return m_type == TYPE_PROPS ? m_valueProps : TNULL; + } + void SetArray(PPropertyValueArray *a_pArray); + PPropertyValueArray *GetArray() const + { + TASSERT(m_type == TYPE_ARRAY); + return m_valueArray; + } + static TPCCHAR TOSHI_API ToString(const Toshi::TClass *a_pClass) + { + if (a_pClass != TYPE_UNDEF) { + return a_pClass->GetName(); + } + return _TS8(TNULL); + } + + TBOOL IsDefined() const + { + return m_type != TYPE_UNDEF; + } protected: - // Toshi::TManagedPtr - PProperties *GetPropertiesMP() - { - TASSERT(TYPE_PROPS == m_type); - //Toshi::TManagedPtr value(m_valueProps); - return m_valueProps; - } - // Toshi::TManagedPtr - PPropertyValueArray *GetPropArrayMP() - { - TASSERT(TYPE_ARRAY == m_type); - //Toshi::TManagedPtr &value(*m_valueArray); - return m_valueArray; - } + // Toshi::TManagedPtr + PProperties *GetPropertiesMP() + { + TASSERT(TYPE_PROPS == m_type); + //Toshi::TManagedPtr value(m_valueProps); + return m_valueProps; + } + // Toshi::TManagedPtr + PPropertyValueArray *GetPropArrayMP() + { + TASSERT(TYPE_ARRAY == m_type); + //Toshi::TManagedPtr &value(*m_valueArray); + return m_valueArray; + } public: - PPropertyValue &operator=(const PPropertyValue &a_rValue) - { - Assign(a_rValue); - return *this; - } - - PPropertyValue &operator=(PPropertyValueArray *a_pValue) - { - SetArray(a_pValue); - return *this; - } + PPropertyValue &operator=(const PPropertyValue &a_rValue) + { + Assign(a_rValue); + return *this; + } + + PPropertyValue &operator=(PPropertyValueArray *a_pValue) + { + SetArray(a_pValue); + return *this; + } public: - static const Toshi::TClass *TYPE_INT; - static const Toshi::TClass *TYPE_UINT32; - static const Toshi::TClass *TYPE_FLOAT; - static const Toshi::TClass *TYPE_BOOL; - static const Toshi::TClass *TYPE_TPCSTRING; - static const Toshi::TClass *TYPE_TPWSTRING; - static const Toshi::TClass *TYPE_TLSTRING; - static const Toshi::TClass *TYPE_PROPNAME; - static const Toshi::TClass *TYPE_ARRAY; - static const Toshi::TClass *TYPE_PROPS; - static const Toshi::TClass *TYPE_UNDEF; + static const Toshi::TClass *TYPE_INT; + static const Toshi::TClass *TYPE_UINT32; + static const Toshi::TClass *TYPE_FLOAT; + static const Toshi::TClass *TYPE_BOOL; + static const Toshi::TClass *TYPE_TPCSTRING; + static const Toshi::TClass *TYPE_TPWSTRING; + static const Toshi::TClass *TYPE_TLSTRING; + static const Toshi::TClass *TYPE_PROPNAME; + static const Toshi::TClass *TYPE_ARRAY; + static const Toshi::TClass *TYPE_PROPS; + static const Toshi::TClass *TYPE_UNDEF; private: - const Toshi::TClass *m_type; // 0x0 - union - { - PProperties *m_valueProps; - PPropertyName *m_valueName; - PPropertyValueArray *m_valueArray; - Toshi::TPCString m_PCString; - Toshi::TObject *m_pObject; - TINT m_valueInt; - TUINT m_valueUInt; - TFLOAT m_valueFloat; - BOOL m_valueBool; - }; // 0x4 + const Toshi::TClass *m_type; // 0x0 + union + { + PProperties *m_valueProps; + PPropertyName *m_valueName; + PPropertyValueArray *m_valueArray; + Toshi::TPCString m_PCString; + Toshi::TObject *m_pObject; + TINT m_valueInt; + TUINT m_valueUInt; + TFLOAT m_valueFloat; + BOOL m_valueBool; + }; // 0x4 }; class PPROPERTYPARSER_EXPORTS PPropertyValueArray { public: + PPropertyValueArray(); + PPropertyValueArray(TINT a_iCount); + PPropertyValueArray(PPropertyValue *a_pValues, TINT a_iCount); - PPropertyValueArray(); - PPropertyValueArray(TINT a_iCount); - PPropertyValueArray(PPropertyValue *a_pValues, TINT a_iCount); + TBOOL CanBeTypeArray(const Toshi::TClass *a_type, TINT a_iIndex) const; - TBOOL CanBeTypeArray(const Toshi::TClass *a_type, TINT a_iIndex) const; + TBOOL GetTQuaternion(Toshi::TQuaternion &a_rQuat) const; + TBOOL GetTVector2(Toshi::TVector2 &a_rVec2) const; + TBOOL GetTVector3(Toshi::TVector3 &a_rVec3) const; - TBOOL GetTQuaternion(Toshi::TQuaternion &a_rQuat) const; - TBOOL GetTVector2(Toshi::TVector2 &a_rVec2) const; - TBOOL GetTVector3(Toshi::TVector3 &a_rVec3) const; + void Delete() + { + delete this; + } - void Delete() - { - delete this; - } public: - TINT m_iReferenceCount; // 0x0 - Toshi::TArray m_oValues; // 0x4 -}; \ No newline at end of file + TINT m_iReferenceCount; // 0x0 + Toshi::TArray m_oValues; // 0x4 +}; diff --git a/Toshi/Plugins/Source/PPropertyParser/PProperties.cpp b/Toshi/Plugins/Source/PPropertyParser/PProperties.cpp index 2682ce3..2a33caf 100644 --- a/Toshi/Plugins/Source/PPropertyParser/PProperties.cpp +++ b/Toshi/Plugins/Source/PPropertyParser/PProperties.cpp @@ -182,4 +182,4 @@ const PPropertyValue *PProperties::GetProperty(const TPCString &a_rPropertyName, const PPropertyValue *PProperties::GetProperty(const TPCString &a_rPropertyName) const { return GetProperty(PPropertyName(a_rPropertyName)); -} \ No newline at end of file +} diff --git a/Toshi/Plugins/Source/PPropertyParser/PPropertyBlock.cpp b/Toshi/Plugins/Source/PPropertyParser/PPropertyBlock.cpp index e35e0e1..ab3e831 100644 --- a/Toshi/Plugins/Source/PPropertyParser/PPropertyBlock.cpp +++ b/Toshi/Plugins/Source/PPropertyParser/PPropertyBlock.cpp @@ -3,4 +3,3 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNAMIC(PPropertyBlock, TObject); - diff --git a/Toshi/Plugins/Source/PPropertyParser/PPropertyName.cpp b/Toshi/Plugins/Source/PPropertyParser/PPropertyName.cpp index 4212e61..b82d4c0 100644 --- a/Toshi/Plugins/Source/PPropertyParser/PPropertyName.cpp +++ b/Toshi/Plugins/Source/PPropertyParser/PPropertyName.cpp @@ -5,24 +5,24 @@ TOSHI_NAMESPACE_USING Toshi::TPCString PPropertyName::GetString() const { - TWString string(m_oName->GetString()); - if (!m_oSubName->IsEmpty()) { - string += TWString("[" + m_oSubName + "]"); - } - return Toshi::TSystem::GetCStringPool()->Get(TCString(string)); + TWString string(m_oName->GetString()); + if (!m_oSubName->IsEmpty()) { + string += TWString("[" + m_oSubName + "]"); + } + return Toshi::TSystem::GetCStringPool()->Get(TCString(string)); } // Example: a_rString = Name[SubName] void PPropertyName::Split(const Toshi::TPCString &a_rString) { - TINT indexOpenSQR = a_rString->Find('['); - if (indexOpenSQR == -1) { - return; - } - m_oName = Toshi::TSystem::GetCStringPool()->Get(a_rString->Mid(0, indexOpenSQR)); - TINT indexCloseSQR = a_rString->Find(']'); - if (indexCloseSQR == -1) { - return; - } - m_oSubName = Toshi::TSystem::GetCStringPool()->Get(a_rString->Mid(indexOpenSQR + 1, (indexCloseSQR - indexOpenSQR) - 1)); + TINT indexOpenSQR = a_rString->Find('['); + if (indexOpenSQR == -1) { + return; + } + m_oName = Toshi::TSystem::GetCStringPool()->Get(a_rString->Mid(0, indexOpenSQR)); + TINT indexCloseSQR = a_rString->Find(']'); + if (indexCloseSQR == -1) { + return; + } + m_oSubName = Toshi::TSystem::GetCStringPool()->Get(a_rString->Mid(indexOpenSQR + 1, (indexCloseSQR - indexOpenSQR) - 1)); } diff --git a/Toshi/Plugins/Source/PPropertyParser/PPropertyReader.cpp b/Toshi/Plugins/Source/PPropertyParser/PPropertyReader.cpp index b71c30c..9a4dc32 100644 --- a/Toshi/Plugins/Source/PPropertyParser/PPropertyReader.cpp +++ b/Toshi/Plugins/Source/PPropertyParser/PPropertyReader.cpp @@ -2,9 +2,9 @@ PPropertyReader::PPropertyReader() { - m_pFile = TNULL; - m_pLexer = TNULL; - m_bLoadComments = TFALSE; + m_pFile = TNULL; + m_pLexer = TNULL; + m_bLoadComments = TFALSE; m_bAssertOnError = TTRUE; } @@ -20,7 +20,7 @@ void PPropertyReader::Close() } } -void PPropertyReader::Error(const Toshi::TCString& a_sMsg) +void PPropertyReader::Error(const Toshi::TCString &a_sMsg) { TDPRINTF("%s : error: %s\n", m_szFileName.GetString(), a_sMsg.GetString()); if (m_bAssertOnError) { @@ -99,7 +99,7 @@ TBOOL PPropertyReader::GetValue(PPropertyValue &a_rValue) PPropertyValue PPropertyReader::Token2Value(const Toshi::TFileLexer::Token &a_rToken) { - static TINT s_boolFlags = 0; + static TINT s_boolFlags = 0; static Toshi::TPCString s_true; static Toshi::TPCString s_false; // PENDING: true and false is unicode @@ -139,8 +139,8 @@ TBOOL PPropertyReader::LoadProperty(PProperties *a_pProperty) { TASSERT(m_pLexer != TNULL); do { - Toshi::TFileLexer::Token token = m_pLexer->PeekNextToken(0); - Toshi::TFileLexer::TokenType type = token.GetType(); + Toshi::TFileLexer::Token token = m_pLexer->PeekNextToken(0); + Toshi::TFileLexer::TokenType type = token.GetType(); if (type == Toshi::TFileLexer::TOKEN_CLOSEBRACE) { if (m_oPropertyBlock.GetNumElements() > 0) { m_oPropertyBlock.Pop(); @@ -156,13 +156,13 @@ TBOOL PPropertyReader::LoadProperty(PProperties *a_pProperty) } return TFALSE; } - if (type != Toshi::TFileLexer::TOKEN_IDENT && - type != Toshi::TFileLexer::TOKEN_STRING && - type != Toshi::TFileLexer::TOKEN_COMMENT) { + if (type != Toshi::TFileLexer::TOKEN_IDENT && + type != Toshi::TFileLexer::TOKEN_STRING && + type != Toshi::TFileLexer::TOKEN_COMMENT) { return TTRUE; } Toshi::TFileLexer::Token commentToken = token; - Toshi::TPCString comment; + Toshi::TPCString comment; while (commentToken.GetType() == Toshi::TFileLexer::TOKEN_COMMENT) { comment = commentToken.GetString(); m_pLexer->GetNextToken(); @@ -173,8 +173,8 @@ TBOOL PPropertyReader::LoadProperty(PProperties *a_pProperty) if (!LoadPropertyName(name, subName)) { return TFALSE; } - PPropertyName propertyName = PPropertyName(name, subName); - Toshi::TFileLexer::Token nextToken = m_pLexer->GetNextToken(); + PPropertyName propertyName = PPropertyName(name, subName); + Toshi::TFileLexer::Token nextToken = m_pLexer->GetNextToken(); if (nextToken.GetType() == Toshi::TFileLexer::TOKEN_OPENBRACE) { m_oPropertyBlock.Push(a_pProperty); PProperties *prop = new PProperties(a_pProperty); @@ -239,9 +239,9 @@ TBOOL PPropertyReader::LoadPropertyName(Toshi::TPCString &a_rName, Toshi::TPCStr { TASSERT(m_pLexer != TNULL); Toshi::TFileLexer::Token nextToken = m_pLexer->GetNextToken(); - Toshi::TFileLexer::Token curToken = m_pLexer->PeekNextToken(0); + Toshi::TFileLexer::Token curToken = m_pLexer->PeekNextToken(0); if (nextToken.GetType() != Toshi::TFileLexer::TOKEN_IDENT && - nextToken.GetType() != Toshi::TFileLexer::TOKEN_STRING) { + nextToken.GetType() != Toshi::TFileLexer::TOKEN_STRING) { Error("Expecting property name to be identifer"); return TFALSE; } @@ -255,7 +255,7 @@ TBOOL PPropertyReader::LoadPropertyName(Toshi::TPCString &a_rName, Toshi::TPCStr return TFALSE; } if (tokenSubName.GetType() == Toshi::TFileLexer::TOKEN_IDENT || - tokenSubName.GetType() == Toshi::TFileLexer::TOKEN_STRING) { + tokenSubName.GetType() == Toshi::TFileLexer::TOKEN_STRING) { a_rSubName = tokenSubName.GetString(); } else { @@ -269,17 +269,17 @@ TBOOL PPropertyReader::LoadPropertyName(Toshi::TPCString &a_rName, Toshi::TPCStr return TTRUE; } -TBOOL PPropertyReader::Open(const Toshi::TCString& a_rFileName, Toshi::TFile* a_pFile) +TBOOL PPropertyReader::Open(const Toshi::TCString &a_rFileName, Toshi::TFile *a_pFile) { m_szFileName = a_rFileName; Close(); - m_pFile = a_pFile; + m_pFile = a_pFile; m_pLexer = new Toshi::TFileLexerUTF8(m_pFile, 2); m_pLexer->SetOutputComments(m_bLoadComments); return TTRUE; } -TBOOL PPropertyReader::Open(const Toshi::TCString& a_rFileName) +TBOOL PPropertyReader::Open(const Toshi::TCString &a_rFileName) { m_szFileName = a_rFileName; Close(); @@ -293,7 +293,7 @@ TBOOL PPropertyReader::Open(const Toshi::TCString& a_rFileName) return TTRUE; } -void PPropertyReader::Warning(const Toshi::TCString& a_sMsg) +void PPropertyReader::Warning(const Toshi::TCString &a_sMsg) { TDPRINTF("%s : warning: %s\n", m_szFileName.GetString(), a_sMsg.GetString()); } diff --git a/Toshi/Plugins/Source/PPropertyParser/PPropertyValue.cpp b/Toshi/Plugins/Source/PPropertyParser/PPropertyValue.cpp index db3e72c..053a360 100644 --- a/Toshi/Plugins/Source/PPropertyParser/PPropertyValue.cpp +++ b/Toshi/Plugins/Source/PPropertyParser/PPropertyValue.cpp @@ -17,433 +17,433 @@ const TClass *PPropertyValue::TYPE_UNDEF = TNULL; PPropertyValue::PPropertyValue() { - m_type = TYPE_UNDEF; + m_type = TYPE_UNDEF; } PPropertyValue::PPropertyValue(TINT a_int) { - m_type = TYPE_INT; - m_valueInt = a_int; + m_type = TYPE_INT; + m_valueInt = a_int; } PPropertyValue::PPropertyValue(TUINT a_uint) { - m_type = TYPE_UINT32; - m_valueUInt = a_uint; + m_type = TYPE_UINT32; + m_valueUInt = a_uint; } PPropertyValue::PPropertyValue(TFLOAT a_float) { - m_type = TYPE_FLOAT; - m_valueFloat = a_float; + m_type = TYPE_FLOAT; + m_valueFloat = a_float; } PPropertyValue::PPropertyValue(const Toshi::TPCString &a_rPCString) { - m_type = TYPE_TPCSTRING; - m_valueInt = 0; - GetTPCString() = a_rPCString; + m_type = TYPE_TPCSTRING; + m_valueInt = 0; + GetTPCString() = a_rPCString; } PPropertyValue::PPropertyValue(const PPropertyName &a_rPropname) { - m_type = TYPE_PROPNAME; - m_valueName = new PPropertyName(a_rPropname); + m_type = TYPE_PROPNAME; + m_valueName = new PPropertyName(a_rPropname); } PPropertyValue::PPropertyValue(PProperties *props) { - m_type = TYPE_PROPS; - m_valueProps = TNULL; - m_valueProps = props; + m_type = TYPE_PROPS; + m_valueProps = TNULL; + m_valueProps = props; } PPropertyValue::PPropertyValue(const PPropertyValue &a_rOther) { - m_type = TYPE_UNDEF; - Assign(a_rOther); + m_type = TYPE_UNDEF; + Assign(a_rOther); } PPropertyValue::~PPropertyValue() { - if (m_type == TYPE_TPCSTRING) { - GetTPCString().~TPCString(); - } - else if (m_type == TYPE_PROPS) { - delete GetPropertiesMP(); - } + if (m_type == TYPE_TPCSTRING) { + GetTPCString().~TPCString(); + } + else if (m_type == TYPE_PROPS) { + delete GetPropertiesMP(); + } } void PPropertyValue::Assign(const PPropertyValue &a_rValue) { - ChangeType(a_rValue.m_type); - if (m_type == TYPE_TPCSTRING) { - GetTPCString() = a_rValue.GetTPCString(); - } - else if (m_type == TYPE_INT) { - m_valueInt = a_rValue.GetInteger(); - } - else if (m_type == TYPE_UINT32) { - m_valueUInt = a_rValue.GetUINT32(); - } - else if (m_type == TYPE_FLOAT) { - m_valueFloat = a_rValue.GetFloat(); - } - else if (m_type == TYPE_BOOL) { - m_valueBool = a_rValue.GetBoolean(); - } - else if (m_type == TYPE_PROPS) { - PProperties *props = GetPropertiesMP(); - PProperties *otherProps = a_rValue.m_type == TYPE_PROPS ? a_rValue.m_valueProps : TNULL; - if (props != otherProps) { - if (props) { - delete props; - } - props = otherProps; - if (otherProps) { - //otherProps->m_iPropCount++; - } - } - } - else if (m_type == TYPE_PROPNAME) { - m_valueName = new PPropertyName(a_rValue.GetPropertyName()); - } - else if (m_type == TYPE_ARRAY) { - PPropertyValueArray *arr = GetPropArrayMP(); - PPropertyValueArray *otherArr = a_rValue.GetArray(); - if (arr != otherArr) { - if (arr) { - arr->Delete(); - } - arr = otherArr; - if (otherArr) { - otherArr->m_iReferenceCount++; - } - } - } + ChangeType(a_rValue.m_type); + if (m_type == TYPE_TPCSTRING) { + GetTPCString() = a_rValue.GetTPCString(); + } + else if (m_type == TYPE_INT) { + m_valueInt = a_rValue.GetInteger(); + } + else if (m_type == TYPE_UINT32) { + m_valueUInt = a_rValue.GetUINT32(); + } + else if (m_type == TYPE_FLOAT) { + m_valueFloat = a_rValue.GetFloat(); + } + else if (m_type == TYPE_BOOL) { + m_valueBool = a_rValue.GetBoolean(); + } + else if (m_type == TYPE_PROPS) { + PProperties *props = GetPropertiesMP(); + PProperties *otherProps = a_rValue.m_type == TYPE_PROPS ? a_rValue.m_valueProps : TNULL; + if (props != otherProps) { + if (props) { + delete props; + } + props = otherProps; + if (otherProps) { + //otherProps->m_iPropCount++; + } + } + } + else if (m_type == TYPE_PROPNAME) { + m_valueName = new PPropertyName(a_rValue.GetPropertyName()); + } + else if (m_type == TYPE_ARRAY) { + PPropertyValueArray *arr = GetPropArrayMP(); + PPropertyValueArray *otherArr = a_rValue.GetArray(); + if (arr != otherArr) { + if (arr) { + arr->Delete(); + } + arr = otherArr; + if (otherArr) { + otherArr->m_iReferenceCount++; + } + } + } } TBOOL PPropertyValue::ChangeType(const TClass *a_pType) { - if (m_type == a_pType) { - return TFALSE; - } - if (m_type == TYPE_TPCSTRING) { - GetTPCString().~TPCString(); - } - else if (m_type == TYPE_PROPS) { - delete GetPropertiesMP(); - } - else if (m_type == TYPE_ARRAY) { - delete GetPropArrayMP(); - } - else if (m_type == TYPE_PROPNAME) { - delete m_valueName; - } - if (a_pType == TYPE_TPCSTRING) { - m_valueInt = 0; - } - else if (a_pType == TYPE_PROPS) { - m_valueProps = TNULL; - } - else if (a_pType == TYPE_ARRAY) { - m_valueArray = TNULL; - } - else if (a_pType == TYPE_PROPNAME) { - m_valueName = TNULL; - } - // TODO implement all types - m_type = a_pType; - return TTRUE; + if (m_type == a_pType) { + return TFALSE; + } + if (m_type == TYPE_TPCSTRING) { + GetTPCString().~TPCString(); + } + else if (m_type == TYPE_PROPS) { + delete GetPropertiesMP(); + } + else if (m_type == TYPE_ARRAY) { + delete GetPropArrayMP(); + } + else if (m_type == TYPE_PROPNAME) { + delete m_valueName; + } + if (a_pType == TYPE_TPCSTRING) { + m_valueInt = 0; + } + else if (a_pType == TYPE_PROPS) { + m_valueProps = TNULL; + } + else if (a_pType == TYPE_ARRAY) { + m_valueArray = TNULL; + } + else if (a_pType == TYPE_PROPNAME) { + m_valueName = TNULL; + } + // TODO implement all types + m_type = a_pType; + return TTRUE; } TBOOL PPropertyValue::CanBeType(const TClass *a_type) const { - return TBOOL(); + return TBOOL(); } TINT PPropertyValue::GetInteger() const { - if (m_type == TYPE_INT) { - return m_valueInt; - } - if (m_type != TYPE_UINT32) { - if (m_type != TYPE_FLOAT) { - return 0; - } - return m_valueFloat; - } - return m_valueInt; + if (m_type == TYPE_INT) { + return m_valueInt; + } + if (m_type != TYPE_UINT32) { + if (m_type != TYPE_FLOAT) { + return 0; + } + return m_valueFloat; + } + return m_valueInt; } TUINT PPropertyValue::GetUINT32() const { - if (m_type == TYPE_INT) { - return m_valueInt; - } - if (m_type != TYPE_UINT32) { - if (m_type != TYPE_FLOAT) { - return 0; - } - return m_valueFloat; - } - return m_valueUInt; + if (m_type == TYPE_INT) { + return m_valueInt; + } + if (m_type != TYPE_UINT32) { + if (m_type != TYPE_FLOAT) { + return 0; + } + return m_valueFloat; + } + return m_valueUInt; } TFLOAT PPropertyValue::GetFloat() const { - if (m_type == TYPE_INT) { - return m_valueInt; - } - if (m_type != TYPE_UINT32) { - if (m_type != TYPE_FLOAT) { - return 0.0f; - } - return m_valueFloat; - } - return TMAX(m_valueFloat, 0.0f); + if (m_type == TYPE_INT) { + return m_valueInt; + } + if (m_type != TYPE_UINT32) { + if (m_type != TYPE_FLOAT) { + return 0.0f; + } + return m_valueFloat; + } + return TMAX(m_valueFloat, 0.0f); } TBOOL PPropertyValue::GetBoolean() const { - if (m_type == TYPE_INT) { - return m_valueInt != 0; - } - if (m_type == TYPE_UINT32) { - return m_valueUInt != 0; - } - if (m_type == TYPE_FLOAT) { - return m_valueFloat != 0.0f; - } - if (m_type != TYPE_BOOL) { - return TFALSE; - } - return m_valueBool; + if (m_type == TYPE_INT) { + return m_valueInt != 0; + } + if (m_type == TYPE_UINT32) { + return m_valueUInt != 0; + } + if (m_type == TYPE_FLOAT) { + return m_valueFloat != 0.0f; + } + if (m_type != TYPE_BOOL) { + return TFALSE; + } + return m_valueBool; } Toshi::TObject *PPropertyValue::GetTObject() const { - TASSERT(m_type != TYPE_INT && m_type != TYPE_UINT32 && - m_type != TYPE_FLOAT && m_type != TYPE_BOOL && - m_type != TYPE_TPCSTRING && m_type != TYPE_TPWSTRING && - m_type != TYPE_TLSTRING && m_type != TYPE_PROPS && - m_type != TYPE_PROPNAME && m_type != TYPE_ARRAY); - if (m_type != TYPE_UNDEF) { - return m_pObject; - } - return TNULL; + TASSERT(m_type != TYPE_INT && m_type != TYPE_UINT32 && + m_type != TYPE_FLOAT && m_type != TYPE_BOOL && + m_type != TYPE_TPCSTRING && m_type != TYPE_TPWSTRING && + m_type != TYPE_TLSTRING && m_type != TYPE_PROPS && + m_type != TYPE_PROPNAME && m_type != TYPE_ARRAY); + if (m_type != TYPE_UNDEF) { + return m_pObject; + } + return TNULL; } const Toshi::TPCString &PPropertyValue::GetTPCString() const { - static TBYTE s_firstTime = 0; - static TPCString s_pEmptyString; - if ((s_firstTime & 1) == 0) { - s_firstTime |= 1; - s_pEmptyString = TPCString(); - } - if (m_type != TYPE_TPCSTRING) { - return s_pEmptyString; - } - return m_PCString; + static TBYTE s_firstTime = 0; + static TPCString s_pEmptyString; + if ((s_firstTime & 1) == 0) { + s_firstTime |= 1; + s_pEmptyString = TPCString(); + } + if (m_type != TYPE_TPCSTRING) { + return s_pEmptyString; + } + return m_PCString; } Toshi::TPCString &PPropertyValue::GetTPCString() { - static TBYTE s_firstTime = 0; - static TPCString s_pEmptyString; - if ((s_firstTime & 1) == 0) { - s_firstTime |= 1; - s_pEmptyString = TPCString(); - } - if (m_type != TYPE_TPCSTRING) { - return s_pEmptyString; - } - return m_PCString; + static TBYTE s_firstTime = 0; + static TPCString s_pEmptyString; + if ((s_firstTime & 1) == 0) { + s_firstTime |= 1; + s_pEmptyString = TPCString(); + } + if (m_type != TYPE_TPCSTRING) { + return s_pEmptyString; + } + return m_PCString; } void PPropertyValue::SetPropertyName(const PPropertyName &a_rName) { - ChangeType(TYPE_PROPNAME); - m_valueName = new PPropertyName(a_rName); + ChangeType(TYPE_PROPNAME); + m_valueName = new PPropertyName(a_rName); } const PPropertyName &PPropertyValue::GetPropertyName() const { - TASSERT(m_type == TYPE_PROPNAME); - return *m_valueName; + TASSERT(m_type == TYPE_PROPNAME); + return *m_valueName; } void PPropertyValue::SetArray(PPropertyValueArray *a_pArray) { - ChangeType(TYPE_ARRAY); - m_valueArray = a_pArray; + ChangeType(TYPE_ARRAY); + m_valueArray = a_pArray; } PPropertyValueArray::PPropertyValueArray() { - m_iReferenceCount = 0; + m_iReferenceCount = 0; } PPropertyValueArray::PPropertyValueArray(TINT a_iCount) { - m_iReferenceCount = 0; - m_oValues = TArray(a_iCount, a_iCount); + m_iReferenceCount = 0; + m_oValues = TArray(a_iCount, a_iCount); } PPropertyValueArray::PPropertyValueArray(PPropertyValue *a_pValues, TINT a_iCount) { - m_iReferenceCount = 0; - m_oValues = TArray(a_iCount, 0); - for (int i = 0; i < a_iCount; i++) { - m_oValues.Push(a_pValues[i]); - } + m_iReferenceCount = 0; + m_oValues = TArray(a_iCount, 0); + for (int i = 0; i < a_iCount; i++) { + m_oValues.Push(a_pValues[i]); + } } TBOOL PPropertyValueArray::CanBeTypeArray(const TClass *a_type, TINT a_iCount) const { - if (a_iCount != -1 && m_oValues.GetNumAllocElements() != a_iCount) { - return TFALSE; - } - for (TINT i = 0; i < m_oValues.GetNumAllocElements(); i++) { - if (!m_oValues[i].CanBeType(a_type)) { - return TFALSE; - } - } - return TTRUE; + if (a_iCount != -1 && m_oValues.GetNumAllocElements() != a_iCount) { + return TFALSE; + } + for (TINT i = 0; i < m_oValues.GetNumAllocElements(); i++) { + if (!m_oValues[i].CanBeType(a_type)) { + return TFALSE; + } + } + return TTRUE; } TBOOL PPropertyValueArray::GetTQuaternion(TQuaternion &a_rQuat) const { - if (!CanBeTypeArray(PPropertyValue::TYPE_FLOAT, 4)) { - return TFALSE; - } - const TClass *type = m_oValues[0].GetType(); - TFLOAT fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[0].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[0].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[0].GetFloat(); - } - //a_rQuat[0] = fValue; - type = m_oValues[1].GetType(); - fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[1].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[1].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[1].GetFloat(); - } - //a_rQuat[1] = fValue; - type = m_oValues[2].GetType(); - fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[2].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[2].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[2].GetFloat(); - } - //a_rQuat[2] = fValue; - type = m_oValues[3].GetType(); - fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[3].GetInteger(); - } - else if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[3].GetUINT32(); - } - else if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[3].GetFloat(); - } - else { - fValue = 0.0f; - } - //a_rQuat[3] = fValue; - return TTRUE; + if (!CanBeTypeArray(PPropertyValue::TYPE_FLOAT, 4)) { + return TFALSE; + } + const TClass *type = m_oValues[0].GetType(); + TFLOAT fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[0].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[0].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[0].GetFloat(); + } + //a_rQuat[0] = fValue; + type = m_oValues[1].GetType(); + fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[1].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[1].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[1].GetFloat(); + } + //a_rQuat[1] = fValue; + type = m_oValues[2].GetType(); + fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[2].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[2].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[2].GetFloat(); + } + //a_rQuat[2] = fValue; + type = m_oValues[3].GetType(); + fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[3].GetInteger()); + } + else if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[3].GetUINT32()); + } + else if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[3].GetFloat(); + } + else { + fValue = 0.0f; + } + //a_rQuat[3] = fValue; + return TTRUE; } TBOOL PPropertyValueArray::GetTVector2(Toshi::TVector2 &a_rVec2) const { - if (!CanBeTypeArray(PPropertyValue::TYPE_FLOAT, 2)) { - return TFALSE; - } - const TClass *type = m_oValues[0].GetType(); - TFLOAT fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[0].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[0].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[0].GetFloat(); - } - a_rVec2(0) = fValue; - type = m_oValues[1].GetType(); - fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[1].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[1].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[1].GetFloat(); - } - a_rVec2(1) = fValue; - return TTRUE; + if (!CanBeTypeArray(PPropertyValue::TYPE_FLOAT, 2)) { + return TFALSE; + } + const TClass *type = m_oValues[0].GetType(); + TFLOAT fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[0].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[0].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[0].GetFloat(); + } + a_rVec2(0) = fValue; + type = m_oValues[1].GetType(); + fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[1].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[1].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[1].GetFloat(); + } + a_rVec2(1) = fValue; + return TTRUE; } TBOOL PPropertyValueArray::GetTVector3(Toshi::TVector3 &a_rVec3) const { - if (!CanBeTypeArray(PPropertyValue::TYPE_FLOAT, 3)) { - return TFALSE; - } - const TClass *type = m_oValues[0].GetType(); - TFLOAT fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[0].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[0].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[0].GetFloat(); - } - a_rVec3(0) = fValue; - type = m_oValues[1].GetType(); - fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[1].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[1].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[1].GetFloat(); - } - a_rVec3(1) = fValue; - type = m_oValues[2].GetType(); - fValue = 0.0f; - if (type == PPropertyValue::TYPE_INT) { - fValue = m_oValues[2].GetInteger(); - } - if (type == PPropertyValue::TYPE_UINT32) { - fValue = m_oValues[2].GetUINT32(); - } - if (type == PPropertyValue::TYPE_FLOAT) { - fValue = m_oValues[2].GetFloat(); - } - a_rVec3(2) = fValue; - return TTRUE; + if (!CanBeTypeArray(PPropertyValue::TYPE_FLOAT, 3)) { + return TFALSE; + } + const TClass *type = m_oValues[0].GetType(); + TFLOAT fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[0].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[0].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[0].GetFloat(); + } + a_rVec3(0) = fValue; + type = m_oValues[1].GetType(); + fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[1].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[1].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[1].GetFloat(); + } + a_rVec3(1) = fValue; + type = m_oValues[2].GetType(); + fValue = 0.0f; + if (type == PPropertyValue::TYPE_INT) { + fValue = TFLOAT(m_oValues[2].GetInteger()); + } + if (type == PPropertyValue::TYPE_UINT32) { + fValue = TFLOAT(m_oValues[2].GetUINT32()); + } + if (type == PPropertyValue::TYPE_FLOAT) { + fValue = m_oValues[2].GetFloat(); + } + a_rVec3(2) = fValue; + return TTRUE; } diff --git a/Toshi/Plugins/premake5.lua b/Toshi/Plugins/premake5.lua index ffbbe28..c830bb8 100644 --- a/Toshi/Plugins/premake5.lua +++ b/Toshi/Plugins/premake5.lua @@ -19,40 +19,13 @@ project ("PPropertyParser") defines { - "PPROPERTYPARSER", - "_CRT_SECURE_NO_WARNINGS" + "PPROPERTYPARSER" } - - - filter "files:**.c" - flags { "NoPCH" } filter "system:windows" - systemversion "latest" - files { "Include/*.h", "Include/PPropertyParser/**.h", "Source/PPropertyParser/**.cpp" } - - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" \ No newline at end of file diff --git a/Toshi/Source/TApplication/TApplication.cpp b/Toshi/Source/TApplication/TApplication.cpp index a102cbc..7fbb2e2 100644 --- a/Toshi/Source/TApplication/TApplication.cpp +++ b/Toshi/Source/TApplication/TApplication.cpp @@ -5,9 +5,9 @@ TOSHI_NAMESPACE_USING HWND GetConsoleHandle() { - HWND hwnd; - TCHAR pszWindowTitle[512]; - TCHAR time[24]; + HWND hwnd; + TCHAR pszWindowTitle[512]; + TCHAR time[24]; TCString szWindowTitle("{1B5D8052-529A-4c88-9DDE-EE523D440B00}"); _ultoa(timeGetTime(), time, 16); szWindowTitle += time; @@ -21,12 +21,12 @@ HWND GetConsoleHandle() TApplication::TApplication() { - m_pKernel = TNULL; - m_uiState = 0; - m_bVerbose = TTRUE; + m_pKernel = TNULL; + m_uiState = 0; + m_bVerbose = TTRUE; m_bShowConsole = TTRUE; - m_hConsole = new HWND(); - *m_hConsole = GetConsoleHandle(); + m_hConsole = new HWND(); + *m_hConsole = GetConsoleHandle(); } TApplication::~TApplication() @@ -38,7 +38,7 @@ TApplication::~TApplication() #endif } -TBOOL TApplication::Create(TPCCHAR a_pcName, TINT argc, TPCHAR* const argv) +TBOOL TApplication::Create(TPCCHAR a_pcName, TINT argc, TPCHAR *const argv) { m_pcName = a_pcName; #ifdef TOSHI_NOTFINAL @@ -50,7 +50,7 @@ TBOOL TApplication::Create(TPCCHAR a_pcName, TINT argc, TPCHAR* const argv) TDPRINTF("Command line parameters: %d.\n", argc); for (TINT i = 0; i < argc; i++) { - TDPRINTF(" Arg[%d]: \"%s\"\n", i, argv[i+1]); + TDPRINTF(" Arg[%d]: \"%s\"\n", i, argv[i + 1]); } } } @@ -61,7 +61,7 @@ TBOOL TApplication::Create(TPCCHAR a_pcName, TINT argc, TPCHAR* const argv) TBOOL TApplication::Execute() { - TASSERT(TTRUE==TApplication::IsCreated()); + TASSERT(TTRUE == TApplication::IsCreated()); while (m_pKernel->Update()) { if (!OnUpdate(m_pKernel->GetSystemTimer()->GetDelta()) || HASFLAG(m_uiState & TApplicationFlag_Destroyed)) break; @@ -73,7 +73,7 @@ TBOOL TApplication::ShowConsole(TBOOL a_bShowConsole) { ShowWindow(*m_hConsole, a_bShowConsole); UpdateWindow(*m_hConsole); - TBOOL show = m_bShowConsole; + TBOOL show = m_bShowConsole; m_bShowConsole = a_bShowConsole; return show; } diff --git a/Toshi/Source/TGui/TGUIActionMap.cpp b/Toshi/Source/TGui/TGUIActionMap.cpp index 559b2bc..dd94c54 100644 --- a/Toshi/Source/TGui/TGUIActionMap.cpp +++ b/Toshi/Source/TGui/TGUIActionMap.cpp @@ -12,4 +12,4 @@ void TGUIActionMap::AddActionMapping(TINT a_iDoodad, TUINT a_uiAction) { } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TGui/TGUIDeserialisable.cpp b/Toshi/Source/TGui/TGUIDeserialisable.cpp index 2d3b1f5..db7e547 100644 --- a/Toshi/Source/TGui/TGUIDeserialisable.cpp +++ b/Toshi/Source/TGui/TGUIDeserialisable.cpp @@ -6,4 +6,4 @@ IMPLEMENT_DYNAMIC(TGUIDeserialisable, TObject); -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TGui/TGUIInterface.cpp b/Toshi/Source/TGui/TGUIInterface.cpp index e51b49f..7e31e96 100644 --- a/Toshi/Source/TGui/TGUIInterface.cpp +++ b/Toshi/Source/TGui/TGUIInterface.cpp @@ -36,4 +36,4 @@ void TGUIInterface::Create() m_oActionMap.AddActionMapping(0x20005, 2); } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TGui/TGUIMemory.cpp b/Toshi/Source/TGui/TGUIMemory.cpp index 1412090..7ee4a33 100644 --- a/Toshi/Source/TGui/TGUIMemory.cpp +++ b/Toshi/Source/TGui/TGUIMemory.cpp @@ -4,16 +4,16 @@ TOSHI_NAMESPACE_BEGIN TBOOL TGUIMemory::ms_bAllocUsePile = TTRUE; -TPile TGUIMemory::ms_oMemoryPile = TPile(0x8000, 0x100000, 0); +TPile TGUIMemory::ms_oMemoryPile = TPile(0x8000, 0x100000, 0); -void* TOSHI_API TGUINew(TUINT a_uiSize) +void *TOSHI_API TGUINew(TUINT a_uiSize) { if (TGUIMemory::ms_bAllocUsePile) { } return tmalloc(a_uiSize, TNULL, -1); } -void* TOSHI_API TGUIDelete(void* a_pMemory) +void *TOSHI_API TGUIDelete(void *a_pMemory) { return TNULL; } @@ -23,4 +23,4 @@ void TOSHI_API TGUISetUseMemoryPile(TBOOL a_bEnable) TGUIMemory::ms_bAllocUsePile = a_bEnable; } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TGui/TGUIScreen.cpp b/Toshi/Source/TGui/TGUIScreen.cpp index 01a7b04..16c4567 100644 --- a/Toshi/Source/TGui/TGUIScreen.cpp +++ b/Toshi/Source/TGui/TGUIScreen.cpp @@ -6,4 +6,4 @@ IMPLEMENT_DYNAMIC(TGUIScreen, TGUIWidget); -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TGui/TGuiWidget.cpp b/Toshi/Source/TGui/TGuiWidget.cpp index c78a449..643cb5b 100644 --- a/Toshi/Source/TGui/TGuiWidget.cpp +++ b/Toshi/Source/TGui/TGuiWidget.cpp @@ -6,4 +6,4 @@ IMPLEMENT_DYNAMIC(TGUIWidget, TGUIDeserialisable); -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TKernel/TCString.cpp b/Toshi/Source/TKernel/TCString.cpp index 17523a9..b24c4f7 100644 --- a/Toshi/Source/TKernel/TCString.cpp +++ b/Toshi/Source/TKernel/TCString.cpp @@ -17,8 +17,8 @@ TBOOL TCString::AllocBuffer(TINT a_iLength, TBOOL a_bClear) if (a_iLength == 0) { if (a_bClear) tfree(m_pBuffer); - m_pBuffer = m_aNull; - hasChanged = TTRUE; + m_pBuffer = m_aNull; + hasChanged = TTRUE; m_iExcessLen = 0; } else { @@ -26,15 +26,15 @@ TBOOL TCString::AllocBuffer(TINT a_iLength, TBOOL a_bClear) if (newExcessLen < 0 || newExcessLen > 0xFF) { if (m_iStrLen != 0 && a_bClear) tfree(m_pBuffer); - - m_pBuffer = (TPCHAR)tmalloc(a_iLength + 1, TNULL, -1); + + m_pBuffer = (TPCHAR)tmalloc(a_iLength + 1, TNULL, -1); m_iExcessLen = 0; - TASSERT(m_pBuffer!=TNULL); + TASSERT(m_pBuffer != TNULL); hasChanged = TTRUE; } else { m_iExcessLen = newExcessLen; - hasChanged = TFALSE; + hasChanged = TFALSE; } } m_iStrLen = a_iLength; @@ -43,15 +43,15 @@ TBOOL TCString::AllocBuffer(TINT a_iLength, TBOOL a_bClear) return hasChanged; } -TCString& TCString::Concat(TCString const& a_rString, TINT a_iLength) +TCString &TCString::Concat(TCString const &a_rString, TINT a_iLength) { TINT len = a_rString.Length(); if (len < a_iLength || a_iLength == -1) { a_iLength = len; } TPCHAR pBuffer = m_pBuffer; - len = Length(); - TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); + len = Length(); + TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); if (ret) { TSystem::StringCopy(m_pBuffer, pBuffer, -1); } @@ -63,15 +63,15 @@ TCString& TCString::Concat(TCString const& a_rString, TINT a_iLength) return *this; } -TCString& TCString::Concat(TPCCHAR a_String, TINT a_iLength) +TCString &TCString::Concat(TPCCHAR a_String, TINT a_iLength) { TINT len = TSystem::StringLength(a_String); if (len < a_iLength || a_iLength == -1) { a_iLength = len; } TPCHAR pBuffer = m_pBuffer; - len = Length(); - TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); + len = Length(); + TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); if (ret) { TSystem::StringCopy(m_pBuffer, pBuffer, -1); } @@ -85,8 +85,8 @@ TCString& TCString::Concat(TPCCHAR a_String, TINT a_iLength) TINT TCString::Compare(TPCCHAR a_pcString, int a_iLength) const { - TASSERT(a_pcString!=TNULL); - TASSERT(GetString()!=TNULL); + TASSERT(a_pcString != TNULL); + TASSERT(GetString() != TNULL); if (a_iLength != -1) { return strncmp(GetString(), a_pcString, a_iLength); @@ -94,7 +94,7 @@ TINT TCString::Compare(TPCCHAR a_pcString, int a_iLength) const return strcmp(GetString(), a_pcString); } -void TCString::Copy(const TCString& a_rOther, TINT a_iLength) +void TCString::Copy(const TCString &a_rOther, TINT a_iLength) { if (*this != a_rOther) { if (a_rOther.m_iStrLen < a_iLength || a_iLength == -1) a_iLength = a_rOther.m_iStrLen; @@ -123,9 +123,9 @@ void TCString::Copy(TPCCHAR a_pcString, TINT a_iLength) } } -TCString& TOSHI_CALLBACKAPI TCString::Format(TPCCHAR a_pcFormat, ...) +TCString &TOSHI_CALLBACKAPI TCString::Format(TPCCHAR a_pcFormat, ...) { - char buffer[0x400]; + char buffer[0x400]; va_list vargs; va_start(vargs, a_pcFormat); _vsnprintf(buffer, sizeof(buffer), a_pcFormat, vargs); @@ -150,7 +150,7 @@ void TCString::Truncate(TINT a_iLength) a_iLength = len; } TPCHAR pBuffer = m_pBuffer; - TBOOL ret = AllocBuffer(a_iLength, TFALSE); + TBOOL ret = AllocBuffer(a_iLength, TFALSE); if (ret) { TSystem::StringCopy(m_pBuffer, pBuffer, a_iLength); } @@ -168,28 +168,28 @@ TINT TCString::FindReverse(TCHAR a_cFind, TINT a_iIndex /*= -1*/) const else if (!IsIndexValid(a_iIndex)) { return -1; } - + if (a_iIndex < 0) { return -1; } - TINT iBytesLeft = a_iIndex; - const TCHAR* pchString = GetString(0); + TINT iBytesLeft = a_iIndex; + const TCHAR *pchString = GetString(0); // Look for the character by checking 5 bytes sequences for (; iBytesLeft > 5; iBytesLeft -= 5) { - if ( pchString[iBytesLeft - 0] == a_cFind ) return iBytesLeft - 0; - if ( pchString[iBytesLeft - 1] == a_cFind ) return iBytesLeft - 1; - if ( pchString[iBytesLeft - 2] == a_cFind ) return iBytesLeft - 2; - if ( pchString[iBytesLeft - 3] == a_cFind ) return iBytesLeft - 3; - if ( pchString[iBytesLeft - 4] == a_cFind ) return iBytesLeft - 4; + if (pchString[iBytesLeft - 0] == a_cFind) return iBytesLeft - 0; + if (pchString[iBytesLeft - 1] == a_cFind) return iBytesLeft - 1; + if (pchString[iBytesLeft - 2] == a_cFind) return iBytesLeft - 2; + if (pchString[iBytesLeft - 3] == a_cFind) return iBytesLeft - 3; + if (pchString[iBytesLeft - 4] == a_cFind) return iBytesLeft - 4; } // Check the left bytes for (; iBytesLeft > 0; iBytesLeft--) { - if ( pchString[iBytesLeft] == a_cFind ) + if (pchString[iBytesLeft] == a_cFind) return iBytesLeft; } @@ -217,16 +217,16 @@ TCString TCString::Mid(TINT a_iFirst, TINT a_iCount) const return strResult; } -TCString TOSHI_API operator+(TPCCHAR a_pLHS, const TCString& a_rRHS) +TCString TOSHI_API operator+(TPCCHAR a_pLHS, const TCString &a_rRHS) { TCString str(a_pLHS); TASSERT(a_pLHS); return str.Concat(a_rRHS); } -TCString TOSHI_API operator+(const TCString& a_rLHS, const TPCString& a_rRHS) +TCString TOSHI_API operator+(const TCString &a_rLHS, const TPCString &a_rRHS) { return TCString(a_rLHS) += a_rRHS.GetCString(); } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TKernel/TDLL.cpp b/Toshi/Source/TKernel/TDLL.cpp index f4c0deb..1950ab6 100644 --- a/Toshi/Source/TKernel/TDLL.cpp +++ b/Toshi/Source/TKernel/TDLL.cpp @@ -2,18 +2,18 @@ TOSHI_NAMESPACE_USING -TPVOID TDLL::GetAddress(const TCString& a_rProcName) +TPVOID TDLL::GetAddress(const TCString &a_rProcName) { FARPROC pAddress = GetProcAddress(m_pDLL, a_rProcName); - TASSERT(pAddress!=TNULL); + TASSERT(pAddress != TNULL); return pAddress; } -TBOOL TDLL::Load(const TCString& a_rFileName) +TBOOL TDLL::Load(const TCString &a_rFileName) { m_szFilename = a_rFileName; - m_pDLL = LoadLibrary(a_rFileName.GetString()); - TASSERT(m_pDLL!=TNULL); + m_pDLL = LoadLibrary(a_rFileName.GetString()); + TASSERT(m_pDLL != TNULL); return m_pDLL != TNULL; } @@ -22,6 +22,6 @@ void TDLL::Unload() if (m_pDLL != TNULL) { FreeLibrary(m_pDLL); m_szFilename = ""; - m_pDLL = TNULL; + m_pDLL = TNULL; } } diff --git a/Toshi/Source/TKernel/TDList.cpp b/Toshi/Source/TKernel/TDList.cpp index c1d2d86..d4910dc 100644 --- a/Toshi/Source/TKernel/TDList.cpp +++ b/Toshi/Source/TKernel/TDList.cpp @@ -1 +1 @@ -#include "TDList.h" \ No newline at end of file +#include "TDList.h" diff --git a/Toshi/Source/TKernel/TDebug.cpp b/Toshi/Source/TKernel/TDebug.cpp index 3fb6e96..d2b5439 100644 --- a/Toshi/Source/TKernel/TDebug.cpp +++ b/Toshi/Source/TKernel/TDebug.cpp @@ -5,7 +5,7 @@ #ifdef TOSHI_NOTFINAL -#include "../resource.h" +# include "../resource.h" TOSHI_NAMESPACE_BEGIN @@ -131,77 +131,76 @@ void TOSHI_CALLBACKAPI TDebug_PrintWarning(TPCCHAR a_pcFormat, ...) static TPCCHAR g_szAssertIgnored = ""; static TPCCHAR g_szAssertFilename; -static TINT g_uiAssertLineNumber; +static TINT g_uiAssertLineNumber; static TPCCHAR g_szAssertExpression; INT_PTR CALLBACK AssertionDlgProc(HWND hwnd, UINT Message, WPARAM wParam, LPARAM lParam) { switch (Message) { - case WM_INITDIALOG: - { - if (!g_szAssertFilename) - g_szAssertFilename = "***INVALID***"; + case WM_INITDIALOG: { + if (!g_szAssertFilename) + g_szAssertFilename = "***INVALID***"; - if (!g_szAssertExpression) - g_szAssertExpression = "***INVALID***"; + if (!g_szAssertExpression) + g_szAssertExpression = "***INVALID***"; - SetDlgItemTextA(hwnd, IDC_FILE, g_szAssertFilename); - SetDlgItemInt(hwnd, IDC_LINE, g_uiAssertLineNumber, TRUE); - SetDlgItemTextA(hwnd, IDC_EXPRESSION, g_szAssertExpression); - return TRUE; - } - case WM_COMMAND: - switch (LOWORD(wParam)) - { - case IDC_QUIT: // Quit - case IDC_DEBUG: // Debug - case IDC_IGNORE: // Ignore - case IDC_IGNOREALL: // IgnoreAll - EndDialog(hwnd, wParam); - break; + SetDlgItemTextA(hwnd, IDC_FILE, g_szAssertFilename); + SetDlgItemInt(hwnd, IDC_LINE, g_uiAssertLineNumber, TRUE); + SetDlgItemTextA(hwnd, IDC_EXPRESSION, g_szAssertExpression); + return TRUE; } - break; - default: - return FALSE; + case WM_COMMAND: + switch (LOWORD(wParam)) + { + case IDC_QUIT: // Quit + case IDC_DEBUG: // Debug + case IDC_IGNORE: // Ignore + case IDC_IGNOREALL: // IgnoreAll + EndDialog(hwnd, wParam); + break; + } + break; + default: + return FALSE; } return TRUE; } -TBOOL TDebug::AssertHandler(TPCHAR a_pcExpression, TPCHAR a_pcFile, TINT a_iLine, TBOOL& a_bIgnoreAll) +TBOOL TDebug::AssertHandler(TPCHAR a_pcExpression, TPCHAR a_pcFile, TINT a_iLine, TBOOL &a_bIgnoreAll) { TPCCHAR str = a_bIgnoreAll ? "(IGNORED)" : g_szAssertIgnored; TDebug_Printf("TASSERT \"%s\" failed: file \"%s\", line %d %s\n", a_pcExpression, a_pcFile, a_iLine, str); if (a_bIgnoreAll) return TFALSE; g_szAssertExpression = a_pcExpression; - g_szAssertFilename = a_pcFile; + g_szAssertFilename = a_pcFile; g_uiAssertLineNumber = a_iLine; - HWND hWnd = GetActiveWindow(); + HWND hWnd = GetActiveWindow(); if (hWnd) hWnd = GetLastActivePopup(hWnd); - INT_PTR res = DialogBoxParamA(GetModuleHandleA("TKernelInterface"), MAKEINTRESOURCE(IDD_ASSERT), hWnd, AssertionDlgProc, 0); + INT_PTR res = DialogBoxParamA(GetModuleHandleA("TKernelInterface"), MAKEINTRESOURCE(IDD_ASSERT), hWnd, AssertionDlgProc, 0); g_szAssertExpression = TNULL; - g_szAssertFilename = TNULL; + g_szAssertFilename = TNULL; g_uiAssertLineNumber = -1; - TBOOL bRes = TTRUE; + TBOOL bRes = TTRUE; if (res != -1) { switch (LOWORD(res)) { - case IDC_QUIT: // Quit - ExitProcess(1); - break; - case IDC_DEBUG: // Debug - bRes = TTRUE; - break; - case IDC_IGNORE: // Ignore - bRes = TFALSE; - break; - case IDC_IGNOREALL: // Ignore All - bRes = TFALSE; - a_bIgnoreAll = TTRUE; - break; + case IDC_QUIT: // Quit + ExitProcess(1); + break; + case IDC_DEBUG: // Debug + bRes = TTRUE; + break; + case IDC_IGNORE: // Ignore + bRes = TFALSE; + break; + case IDC_IGNOREALL: // Ignore All + bRes = TFALSE; + a_bIgnoreAll = TTRUE; + break; } } return bRes; @@ -210,18 +209,17 @@ TBOOL TDebug::AssertHandler(TPCHAR a_pcExpression, TPCHAR a_pcFile, TINT a_iLine void TOSHI_API TDebug::PrintIndent() { TINT i; - for (i = s_iLogIndent * 2; i >= 16; i-=16) { + for (i = s_iLogIndent * 2; i >= 16; i -= 16) { DebugFilePrintString(s_sSixteenSpace); } if (i > 0) { - DebugFilePrintString(&s_sSixteenSpace[16-i]); + DebugFilePrintString(&s_sSixteenSpace[16 - i]); } } void TOSHI_API TDebug::DebugFilePrintString(TPCHAR a_pcString) { if (m_pDebugFile && m_bEnableDebugFile) { - } else { printf("%s", a_pcString); @@ -247,7 +245,6 @@ void TOSHI_CALLBACKAPI TDebug_Message(TDebug::MSGLEVEL a_eMsgLevel, TPCCHAR a_pc void TOSHI_API TDebug::DebugFilePrintString(TPCHAR a_pcString) { if (m_pDebugFile && m_bEnableDebugFile) { - } else { printf("%s", a_pcString); @@ -257,4 +254,3 @@ void TOSHI_API TDebug::DebugFilePrintString(TPCHAR a_pcString) TOSHI_NAMESPACE_END #endif - diff --git a/Toshi/Source/TKernel/TEvent.cpp b/Toshi/Source/TKernel/TEvent.cpp index 05a6252..8652e91 100644 --- a/Toshi/Source/TKernel/TEvent.cpp +++ b/Toshi/Source/TKernel/TEvent.cpp @@ -2,10 +2,10 @@ TOSHI_NAMESPACE_BEGIN -void TGenericListener::Connect(TGenericEmitter* a_pEmitter, void* a_pCaller, t_Callback a_pCallback, int a_iPriority) +void TGenericListener::Connect(TGenericEmitter *a_pEmitter, void *a_pCaller, t_Callback a_pCallback, int a_iPriority) { TASSERT(IsLinked() == TFALSE); - m_pCaller = a_pCaller; + m_pCaller = a_pCaller; m_pCallback = a_pCallback; SetPriority(a_iPriority); a_pEmitter->m_Listeners.Insert(this); @@ -14,8 +14,8 @@ void TGenericListener::Connect(TGenericEmitter* a_pEmitter, void* a_pCaller, t_C void TGenericListener::Disconnect() { Remove(); - m_pCaller = TNULL; + m_pCaller = TNULL; m_pCallback = TNULL; } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TKernel/TFile.cpp b/Toshi/Source/TKernel/TFile.cpp index a492c3b..7e923bd 100644 --- a/Toshi/Source/TKernel/TFile.cpp +++ b/Toshi/Source/TKernel/TFile.cpp @@ -2,14 +2,14 @@ TOSHI_NAMESPACE_USING -TFile* TOSHI_API TFile::Create(const TCString& a_sName, TUINT a_uiMode) +TFile *TOSHI_API TFile::Create(const TCString &a_sName, TUINT a_uiMode) { TFileManager *pFileManager = TFileManager::GetFileManager(); TVALIDADDRESS(pFileManager); return pFileManager->CreateFile(a_sName, a_uiMode); } -void TOSHI_API TFile::Destroy(TFile* a_pFile) +void TOSHI_API TFile::Destroy(TFile *a_pFile) { TFileManager *pFileManager = TFileManager::GetFileManager(); TVALIDADDRESS(pFileManager); @@ -18,7 +18,7 @@ void TOSHI_API TFile::Destroy(TFile* a_pFile) } } -TCString TOSHI_API TFile::ConcatPath(TCString const& a_rcPath1, TCString const& a_rcPath2) +TCString TOSHI_API TFile::ConcatPath(TCString const &a_rcPath1, TCString const &a_rcPath2) { TCString strResult; @@ -27,94 +27,94 @@ TCString TOSHI_API TFile::ConcatPath(TCString const& a_rcPath1, TCString const& // Copy filesystem/volume name from a_rcPath1 or a_rcPath2 // prioritizing the one in a_rcPath2 - TINT iColonPos = a_rcPath2.FindReverse( ':' ); + TINT iColonPos = a_rcPath2.FindReverse(':'); - if ( iColonPos == -1 ) + if (iColonPos == -1) { - iColonPos = a_rcPath1.FindReverse( ':' ); + iColonPos = a_rcPath1.FindReverse(':'); - if ( iColonPos > -1 ) + if (iColonPos > -1) { // Copy volume/filesystem name from the first path iPath1StartPos = iColonPos + 1; - strResult.Concat( a_rcPath1, iPath1StartPos ); + strResult.Concat(a_rcPath1, iPath1StartPos); } } else { // Copy volume/filesystem name from the second path iPath2StartPos = iColonPos + 1; - strResult.Concat( a_rcPath2, iPath2StartPos ); + strResult.Concat(a_rcPath2, iPath2StartPos); // Ignore everything before the ':' character in the first path - iPath1StartPos = a_rcPath1.FindReverse( ':' ) + 1; + iPath1StartPos = a_rcPath1.FindReverse(':') + 1; } TINT iPath1Length = a_rcPath1.Length(); TINT iPath2Length = a_rcPath2.Length(); - if ( iPath2StartPos < iPath2Length && - ( a_rcPath2[ iPath2StartPos ] == '/' || a_rcPath2[ iPath2StartPos ] == '\\' ) ) + if (iPath2StartPos < iPath2Length && + (a_rcPath2[iPath2StartPos] == '/' || a_rcPath2[iPath2StartPos] == '\\')) { // The second path starts from a filesystem/volume root so ignore the first path - strResult += a_rcPath2.GetString( iPath2StartPos ); + strResult += a_rcPath2.GetString(iPath2StartPos); } else { // Concat the first path with the second one trimming parts like 'C:' or 'native:' and etc. - strResult += a_rcPath1.GetString( iPath1StartPos ); - if ( iPath1StartPos < iPath1Length && iPath2StartPos < iPath2Length && - a_rcPath1[ iPath1Length - 1 ] != '/' && a_rcPath1[ iPath1Length - 1 ] != '\\' ) + strResult += a_rcPath1.GetString(iPath1StartPos); + if (iPath1StartPos < iPath1Length && iPath2StartPos < iPath2Length && + a_rcPath1[iPath1Length - 1] != '/' && a_rcPath1[iPath1Length - 1] != '\\') { strResult += "/"; } - strResult += a_rcPath2.GetString( iPath2StartPos ); + strResult += a_rcPath2.GetString(iPath2StartPos); } - return SimplifyPath( strResult ); + return SimplifyPath(strResult); } -TCString TOSHI_API TFile::SimplifyPath( const TCString& a_rcPath ) +TCString TOSHI_API TFile::SimplifyPath(const TCString &a_rcPath) { TCString strPath = a_rcPath; // Fix path slashes to make it easier to read the path - for ( TUINT i = 0; i < strPath.Length(); i++ ) + for (TINT i = 0; i < strPath.Length(); i++) { - if ( strPath[ i ] == '\\' ) - strPath[ i ] = '/'; + if (strPath[i] == '\\') + strPath[i] = '/'; } - TINT iPos = 0; + TINT iPos = 0; TCString strResult; // Keep filesystem/volume/protocol name in the simplified path and leave it as it is - TINT iColonPos = strPath.FindReverse( ':' ); - if ( iColonPos > -1 ) + TINT iColonPos = strPath.FindReverse(':'); + if (iColonPos > -1) { iPos = iColonPos + 1; - strResult.Concat( strPath, iPos ); + strResult.Concat(strPath, iPos); } - if ( strPath[ iPos ] == '/' ) + if (strPath[iPos] == '/') { iPos += 1; strResult += "/"; } TINT iInitialResultLength = strResult.Length(); - TINT iResultLength = iInitialResultLength; + TINT iResultLength = iInitialResultLength; strPath += "/"; - TINT iSlashPos = strPath.Find( '/', iPos ); + TINT iSlashPos = strPath.Find('/', iPos); - while ( iSlashPos >= 0 ) + while (iSlashPos >= 0) { - if ( !strncmp( strPath.GetString( iPos ), "../", 3 ) ) + if (!strncmp(strPath.GetString(iPos), "../", 3)) { - if ( iResultLength == strResult.Length() ) + if (iResultLength == strResult.Length()) { // Can't go back to a previous dir since it's the only one strResult += "../"; @@ -125,29 +125,29 @@ TCString TOSHI_API TFile::SimplifyPath( const TCString& a_rcPath ) // Truncate the path removing the current dir TINT iTruncateTo; - if ( strResult.Length() > 1 && ( iTruncateTo = strResult.FindReverse( '/', strResult.Length() - 2 ), iResultLength <= iTruncateTo ) ) + if (strResult.Length() > 1 && (iTruncateTo = strResult.FindReverse('/', strResult.Length() - 2), iResultLength <= iTruncateTo)) { - strResult.Truncate( iTruncateTo + 1 ); + strResult.Truncate(iTruncateTo + 1); } else { - strResult.Truncate( iResultLength ); + strResult.Truncate(iResultLength); } } } // Add anything except './' - else if ( strncmp( strPath.GetString( iPos ), "./", 2 ) != 0 ) + else if (strncmp(strPath.GetString(iPos), "./", 2) != 0) { - strResult.Concat( strPath.GetString( iPos ), ( iSlashPos - iPos ) + 1 ); + strResult.Concat(strPath.GetString(iPos), (iSlashPos - iPos) + 1); } - iPos = iSlashPos + 1; - iSlashPos = strPath.Find( '/', iPos ); + iPos = iSlashPos + 1; + iSlashPos = strPath.Find('/', iPos); } - if ( iInitialResultLength < strResult.Length() ) + if (iInitialResultLength < strResult.Length()) { - strResult.Truncate( strResult.Length() - 1 ); + strResult.Truncate(strResult.Length() - 1); } return strResult; @@ -158,7 +158,8 @@ void TFile::Destroy() Destroy(this); } -TFileManager::TFileManager() : m_pcWorkingDirectory("/") +TFileManager::TFileManager() + : m_pcWorkingDirectory("/") { m_bValidated = false; TASSERT(s_pFileManager == TNULL); @@ -168,11 +169,11 @@ TFileManager::TFileManager() : m_pcWorkingDirectory("/") TFileManager::~TFileManager() { - TASSERT(s_pFileManager!=TNULL); + TASSERT(s_pFileManager != TNULL); s_pFileManager = TNULL; } -TFile* TFileManager::CreateFile(TCString const& a_sName, TUINT a_uiMode) +TFile *TFileManager::CreateFile(TCString const &a_sName, TUINT a_uiMode) { TASSERT(a_sName.Length() > 0); ValidateSystemPath(); @@ -184,7 +185,7 @@ TFile* TFileManager::CreateFile(TCString const& a_sName, TUINT a_uiMode) str1.Copy(a_sName, pos); str2.Copy(a_sName.GetString(pos + 1)); - TFileSystem* fs = FindFileSystem(str1); + TFileSystem *fs = FindFileSystem(str1); if (fs != TNULL) { return fs->CreateFile(str2, a_uiMode); @@ -192,16 +193,16 @@ TFile* TFileManager::CreateFile(TCString const& a_sName, TUINT a_uiMode) } for (auto pNode = m_aValidated.Begin(); pNode != m_aValidated.End(); pNode++) { - TFile* pFile = pNode->CreateFile(a_sName, a_uiMode); + TFile *pFile = pNode->CreateFile(a_sName, a_uiMode); if (pFile != TNULL) return pFile; } return TNULL; } -TFileSystem* TFileManager::FindFileSystem(const TCString& a_rFileSysName) +TFileSystem *TFileManager::FindFileSystem(const TCString &a_rFileSysName) { - TFileSystem* pFileSystem = TFileManager::FindFileSystem(m_aValidated, a_rFileSysName); + TFileSystem *pFileSystem = TFileManager::FindFileSystem(m_aValidated, a_rFileSysName); if (!pFileSystem) { pFileSystem = TFileManager::FindFileSystem(m_aInvalidated, a_rFileSysName); @@ -210,26 +211,26 @@ TFileSystem* TFileManager::FindFileSystem(const TCString& a_rFileSysName) return pFileSystem; } -void TFileManager::MountFileSystem(TFileSystem* a_pFileSystem) +void TFileManager::MountFileSystem(TFileSystem *a_pFileSystem) { TASSERT(FindFileSystem(a_pFileSystem->GetName()) == TNULL); m_aInvalidated.InsertTail(a_pFileSystem); InvalidateSystemPath(); } -void TFileManager::UnmountFileSystem(TFileSystem* a_pFileSystem) +void TFileManager::UnmountFileSystem(TFileSystem *a_pFileSystem) { TASSERT(FindFileSystem(a_pFileSystem->GetName()) == TNULL); a_pFileSystem->Remove(); InvalidateSystemPath(); } -TCString TFileManager::MakeAbsolutePath(TCString const& a_rPath) +TCString TFileManager::MakeAbsolutePath(TCString const &a_rPath) { return TFile::ConcatPath(a_rPath, GetWorkingDirectory()); } -TFileSystem* TOSHI_API TFileManager::FindFileSystem(TDList& a_rFileSystems, const TCString& a_rFileSysName) +TFileSystem *TOSHI_API TFileManager::FindFileSystem(TDList &a_rFileSystems, const TCString &a_rFileSysName) { for (auto pNode = a_rFileSystems.Begin(); pNode != a_rFileSystems.End(); pNode++) { if (pNode->GetName() == a_rFileSysName) return pNode; @@ -246,11 +247,11 @@ void TFileManager::ValidateSystemPath() m_aInvalidated.InsertHead(pNode); } - TCString fsName; + TCString fsName; TSysPathIter pathIter(m_pcSystemPath); for (TBOOL hasPath = pathIter.First(fsName); hasPath; hasPath = pathIter.Next(fsName)) { - TFileSystem* pFS = FindFileSystem(m_aInvalidated, fsName); + TFileSystem *pFS = FindFileSystem(m_aInvalidated, fsName); if (pFS) { pFS->Remove(); m_aValidated.InsertTail(pFS); @@ -261,7 +262,7 @@ void TFileManager::ValidateSystemPath() } } -void TFileSystem::SetPrefix(const TCString& a_rPrefix) +void TFileSystem::SetPrefix(const TCString &a_rPrefix) { m_sPrefix = a_rPrefix; diff --git a/Toshi/Source/TKernel/TFileLexer.cpp b/Toshi/Source/TKernel/TFileLexer.cpp index 970c45d..75b7c3f 100644 --- a/Toshi/Source/TKernel/TFileLexer.cpp +++ b/Toshi/Source/TKernel/TFileLexer.cpp @@ -3,28 +3,28 @@ TOSHI_NAMESPACE_USING -void TFileLexer::Token::assign(const Token& a_rToken) +void TFileLexer::Token::assign(const Token &a_rToken) { this->~Token(); m_iValue = 0; - m_type = a_rToken.GetType(); - m_iLine = a_rToken.m_iLine; + m_type = a_rToken.GetType(); + m_iLine = a_rToken.m_iLine; switch (a_rToken.GetType()) { - case Toshi::TFileLexer::TOKEN_IDENT: - case Toshi::TFileLexer::TOKEN_STRING: - case Toshi::TFileLexer::TOKEN_COMMENT: - m_szValue = a_rToken.GetString(); - break; - case Toshi::TFileLexer::TOKEN_INTEGER: - m_iValue = a_rToken.GetInteger(); - break; - case Toshi::TFileLexer::TOKEN_UINTEGER: - m_uiValue = a_rToken.GetUInteger(); - break; - case Toshi::TFileLexer::TOKEN_FLOAT: - m_fValue = a_rToken.GetFloat(); - break; + case Toshi::TFileLexer::TOKEN_IDENT: + case Toshi::TFileLexer::TOKEN_STRING: + case Toshi::TFileLexer::TOKEN_COMMENT: + m_szValue = a_rToken.GetString(); + break; + case Toshi::TFileLexer::TOKEN_INTEGER: + m_iValue = a_rToken.GetInteger(); + break; + case Toshi::TFileLexer::TOKEN_UINTEGER: + m_uiValue = a_rToken.GetUInteger(); + break; + case Toshi::TFileLexer::TOKEN_FLOAT: + m_fValue = a_rToken.GetFloat(); + break; } } @@ -33,47 +33,47 @@ TCString TFileLexer::Token::tostring() const TCString tokenType; switch (GetType()) { - case Toshi::TFileLexer::TOKEN_IDENT: - tokenType = "IDENT:" + GetString(); - break; - case Toshi::TFileLexer::TOKEN_STRING: - tokenType += "STRING:" + GetString(); - break; - case Toshi::TFileLexer::TOKEN_INTEGER: - tokenType.Format("%sINTEGER:%d", tokenType.GetString(), m_iValue); - break; - case Toshi::TFileLexer::TOKEN_UINTEGER: - tokenType.Format("%sUINTEGER:%d", tokenType.GetString(), m_uiValue); - break; - case Toshi::TFileLexer::TOKEN_FLOAT: - tokenType.Format("%sFLOAT:%f", tokenType.GetString(), m_fValue); - break; - default: - tokenType = TFileLexer::tostring(GetType()); - break; + case Toshi::TFileLexer::TOKEN_IDENT: + tokenType = "IDENT:" + GetString(); + break; + case Toshi::TFileLexer::TOKEN_STRING: + tokenType += "STRING:" + GetString(); + break; + case Toshi::TFileLexer::TOKEN_INTEGER: + tokenType.Format("%sINTEGER:%d", tokenType.GetString(), m_iValue); + break; + case Toshi::TFileLexer::TOKEN_UINTEGER: + tokenType.Format("%sUINTEGER:%d", tokenType.GetString(), m_uiValue); + break; + case Toshi::TFileLexer::TOKEN_FLOAT: + tokenType.Format("%sFLOAT:%f", tokenType.GetString(), m_fValue); + break; + default: + tokenType = TFileLexer::tostring(GetType()); + break; } return TCString().Format("Token[Line: %d, %s]", GetLine(), tokenType.GetString()); } TFileLexer::TFileLexer() { - m_pFile = TNULL; - m_bOutputComments = TFALSE; - m_iCharLookaheadSize = 0; - m_iCharLookaheadMask = 0; - m_piCharLookahead = TNULL; - m_iCharLookaheadBack = 0; - m_iCharLookaheadFront = 0; - m_iLine = 0; - m_iTokenLookaheadSize = 1; - m_iTokenLookaheadMask = 1; - m_pLookaheadTokens = new Token(); + m_pFile = TNULL; + m_bOutputComments = TFALSE; + m_iCharLookaheadSize = 0; + m_iCharLookaheadMask = 0; + m_piCharLookahead = TNULL; + m_iCharLookaheadBack = 0; + m_iCharLookaheadFront = 0; + m_iLine = 0; + m_iTokenLookaheadSize = 1; + m_iTokenLookaheadMask = 1; + m_pLookaheadTokens = new Token(); m_iTokenLookaheadBuffered = 0; - m_iTokenLookaheadFront = 0; - m_iTokenLookaheadBack = 0; - m_iSomeNum = 0; - m_bAllowPreprocessor = TTRUE; - m_bEOF = TFALSE; + m_iTokenLookaheadFront = 0; + m_iTokenLookaheadBack = 0; + m_iSomeNum = 0; + m_bAllowPreprocessor = TTRUE; + m_bEOF = TFALSE; //m_oEmitter = TEmitter(this); #if defined(TOSHI_SKU_WINDOWS) Define("TOSHI_SKU_WINDOWS"); @@ -84,25 +84,25 @@ TFileLexer::TFileLexer() #endif } -TFileLexer::TFileLexer(TFile* a_pFile, TINT a_iTokenLookaheadSize) +TFileLexer::TFileLexer(TFile *a_pFile, TINT a_iTokenLookaheadSize) { - m_pFile = a_pFile; - m_bOutputComments = TFALSE; - m_iCharLookaheadSize = 0; - m_iCharLookaheadMask = 0; - m_piCharLookahead = TNULL; - m_iCharLookaheadBack = 0; - m_iCharLookaheadFront = 0; - m_iLine = 0; - m_iTokenLookaheadSize = 1; - m_iTokenLookaheadMask = 1; - m_pLookaheadTokens = new Token[a_iTokenLookaheadSize]; + m_pFile = a_pFile; + m_bOutputComments = TFALSE; + m_iCharLookaheadSize = 0; + m_iCharLookaheadMask = 0; + m_piCharLookahead = TNULL; + m_iCharLookaheadBack = 0; + m_iCharLookaheadFront = 0; + m_iLine = 0; + m_iTokenLookaheadSize = 1; + m_iTokenLookaheadMask = 1; + m_pLookaheadTokens = new Token[a_iTokenLookaheadSize]; m_iTokenLookaheadBuffered = 0; - m_iTokenLookaheadFront = 0; - m_iTokenLookaheadBack = 0; - m_iTokenLookaheadSize = TGETLOOKAHEADSIZE(a_iTokenLookaheadSize); - m_iTokenLookaheadMask = TMAX(1, m_iTokenLookaheadSize - 1); - m_bEOF = TFALSE; + m_iTokenLookaheadFront = 0; + m_iTokenLookaheadBack = 0; + m_iTokenLookaheadSize = TGETLOOKAHEADSIZE(a_iTokenLookaheadSize); + m_iTokenLookaheadMask = TMAX(1, m_iTokenLookaheadSize - 1); + m_bEOF = TFALSE; TASSERT(a_pFile != TNULL); SetInputStream(a_pFile); //m_oEmitter = TEmitter(this); @@ -120,7 +120,7 @@ TBOOL TFileLexer::Expect(TFileLexer::TokenType a_type) return a_type == GetNextToken().GetType(); } -TBOOL TFileLexer::Expect(TFileLexer::TokenType a_type, TFileLexer::Token& a_rToken) +TBOOL TFileLexer::Expect(TFileLexer::TokenType a_type, TFileLexer::Token &a_rToken) { a_rToken.assign(GetNextToken()); return a_type == a_rToken.GetType(); @@ -203,23 +203,23 @@ void TFileLexer::SetCharacterLookaheadSize(TINT a_iCharLookaheadSize) TASSERT(m_pFile != TNULL); TASSERT(m_piCharLookahead == TNULL); - m_iCharLookaheadSize = TGETLOOKAHEADSIZE(a_iCharLookaheadSize); - m_iCharLookaheadMask = m_iCharLookaheadSize - 1; - m_iCharLookaheadBack = 0; + m_iCharLookaheadSize = TGETLOOKAHEADSIZE(a_iCharLookaheadSize); + m_iCharLookaheadMask = m_iCharLookaheadSize - 1; + m_iCharLookaheadBack = 0; m_iCharLookaheadFront = 0; - m_piCharLookahead = new int[m_iCharLookaheadSize]; + m_piCharLookahead = new int[m_iCharLookaheadSize]; for (TINT i = 0; i < m_iCharLookaheadSize; i++) { m_piCharLookahead[i] = TLEXERGETCHAR(); } } -void TFileLexer::SetInputStream(TFile* a_pFile) +void TFileLexer::SetInputStream(TFile *a_pFile) { - m_pFile = a_pFile; - m_iLine = 1; - m_iSomeNum = 0; - m_bFlags[0] = TTRUE; + m_pFile = a_pFile; + m_iLine = 1; + m_iSomeNum = 0; + m_bFlags[0] = TTRUE; m_bAllowPreprocessor = ComputePreprocessorAllow(); SetCharacterLookaheadSize(3); } @@ -228,38 +228,38 @@ TPCCHAR TOSHI_API TFileLexer::tostring(TokenType a_type) { switch (a_type) { - case Toshi::TFileLexer::TOKEN_EOF: - return "EOF"; - case Toshi::TFileLexer::TOKEN_SEMI: - return "SEMI"; - case Toshi::TFileLexer::TOKEN_COLON: - return "COLON"; - case Toshi::TFileLexer::TOKEN_COMMA: - return "COMMA"; - case Toshi::TFileLexer::TOKEN_DOT: - return "DOT"; - case Toshi::TFileLexer::TOKEN_DOLLAR: - return "DOLLAR"; - case Toshi::TFileLexer::TOKEN_OPENSQR: - return "OPENSQR"; - case Toshi::TFileLexer::TOKEN_CLOSESQR: - return "CLOSESQR"; - case Toshi::TFileLexer::TOKEN_OPENBRACE: - return "OPENBRACE"; - case Toshi::TFileLexer::TOKEN_CLOSEBRACE: - return "CLOSEBRACE"; - case Toshi::TFileLexer::TOKEN_OPENPAREN: - return "OPENPAREN"; - case Toshi::TFileLexer::TOKEN_CLOSEPAREN: - return "CLOSEPAREN"; - case Toshi::TFileLexer::TOKEN_LESSTHAN: - return "LESSTHAN"; - case Toshi::TFileLexer::TOKEN_GREATERTHAN: - return "GREATERTHAN"; - case Toshi::TFileLexer::TOKEN_EQUAL: - return "EQUAL"; - default: - return "?????"; + case Toshi::TFileLexer::TOKEN_EOF: + return "EOF"; + case Toshi::TFileLexer::TOKEN_SEMI: + return "SEMI"; + case Toshi::TFileLexer::TOKEN_COLON: + return "COLON"; + case Toshi::TFileLexer::TOKEN_COMMA: + return "COMMA"; + case Toshi::TFileLexer::TOKEN_DOT: + return "DOT"; + case Toshi::TFileLexer::TOKEN_DOLLAR: + return "DOLLAR"; + case Toshi::TFileLexer::TOKEN_OPENSQR: + return "OPENSQR"; + case Toshi::TFileLexer::TOKEN_CLOSESQR: + return "CLOSESQR"; + case Toshi::TFileLexer::TOKEN_OPENBRACE: + return "OPENBRACE"; + case Toshi::TFileLexer::TOKEN_CLOSEBRACE: + return "CLOSEBRACE"; + case Toshi::TFileLexer::TOKEN_OPENPAREN: + return "OPENPAREN"; + case Toshi::TFileLexer::TOKEN_CLOSEPAREN: + return "CLOSEPAREN"; + case Toshi::TFileLexer::TOKEN_LESSTHAN: + return "LESSTHAN"; + case Toshi::TFileLexer::TOKEN_GREATERTHAN: + return "GREATERTHAN"; + case Toshi::TFileLexer::TOKEN_EQUAL: + return "EQUAL"; + default: + return "?????"; } } @@ -330,7 +330,7 @@ TFileLexer::Token TFileLexer::get_next_token() } else if (peek() == '"') { // Handle strings - TINT len = 0; + TINT len = 0; TINT prev = peek(); advance(); do { @@ -363,64 +363,64 @@ TFileLexer::Token TFileLexer::get_next_token() } // Handle special characters switch (peek()) { - case '$': - advance(); - return Token(TOKEN_DOLLAR, m_iLine); - case '(': - advance(); - return Token(TOKEN_OPENPAREN, m_iLine); - case ')': - advance(); - return Token(TOKEN_CLOSEPAREN, m_iLine); - case '*': - advance(); - return Token(TOKEN_ASTERISK, m_iLine); - case ',': - advance(); - return Token(TOKEN_COMMA, m_iLine); - case '.': - advance(); - return Token(TOKEN_DOT, m_iLine); - case ':': - advance(); - return Token(TOKEN_COLON, m_iLine); - case ';': - advance(); - return Token(TOKEN_SEMI, m_iLine); - case '<': - advance(); - return Token(TOKEN_LESSTHAN, m_iLine); - case '=': - advance(); - return Token(TOKEN_EQUAL, m_iLine); - case '>': - advance(); - return Token(TOKEN_GREATERTHAN, m_iLine); - case '[': - advance(); - return Token(TOKEN_OPENSQR, m_iLine); - case ']': - advance(); - return Token(TOKEN_CLOSESQR, m_iLine); - case '{': - advance(); - return Token(TOKEN_OPENBRACE, m_iLine); - case '}': - advance(); - return Token(TOKEN_CLOSEBRACE, m_iLine); - default: - ThrowError("Invalid character"); - return Token(); + case '$': + advance(); + return Token(TOKEN_DOLLAR, m_iLine); + case '(': + advance(); + return Token(TOKEN_OPENPAREN, m_iLine); + case ')': + advance(); + return Token(TOKEN_CLOSEPAREN, m_iLine); + case '*': + advance(); + return Token(TOKEN_ASTERISK, m_iLine); + case ',': + advance(); + return Token(TOKEN_COMMA, m_iLine); + case '.': + advance(); + return Token(TOKEN_DOT, m_iLine); + case ':': + advance(); + return Token(TOKEN_COLON, m_iLine); + case ';': + advance(); + return Token(TOKEN_SEMI, m_iLine); + case '<': + advance(); + return Token(TOKEN_LESSTHAN, m_iLine); + case '=': + advance(); + return Token(TOKEN_EQUAL, m_iLine); + case '>': + advance(); + return Token(TOKEN_GREATERTHAN, m_iLine); + case '[': + advance(); + return Token(TOKEN_OPENSQR, m_iLine); + case ']': + advance(); + return Token(TOKEN_CLOSESQR, m_iLine); + case '{': + advance(); + return Token(TOKEN_OPENBRACE, m_iLine); + case '}': + advance(); + return Token(TOKEN_CLOSEBRACE, m_iLine); + default: + ThrowError("Invalid character"); + return Token(); } } HandleNumerics: - TINT len = 0; - TBOOL isFloat = TFALSE; + TINT len = 0; + TBOOL isFloat = TFALSE; TBOOL isUnsigned = TFALSE; - TBOOL isHex = TFALSE; + TBOOL isHex = TFALSE; if (peek() == '.') { - isFloat = TTRUE; + isFloat = TTRUE; s_Buffer[len++] = '0'; } s_Buffer[len++] = peek(); @@ -517,9 +517,9 @@ TFileLexer::Token TFileLexer::get_next_token() } // This is basically atoi without hex support - TBOOL isNegative = TFALSE; - TINT value = 0; - TPCCHAR num = s_Buffer; + TBOOL isNegative = TFALSE; + TINT value = 0; + TPCCHAR num = s_Buffer; if (num[0] == '-') { isNegative = TTRUE; num++; @@ -624,9 +624,9 @@ void TFileLexer::skipWhiteSpace() void TFileLexer::advance() { - m_iCharLookaheadBack = (m_iCharLookaheadBack + 1) & m_iCharLookaheadMask; + m_iCharLookaheadBack = (m_iCharLookaheadBack + 1) & m_iCharLookaheadMask; m_piCharLookahead[m_iCharLookaheadFront] = TLEXERGETCHAR(); - m_iCharLookaheadFront = m_iCharLookaheadBack; + m_iCharLookaheadFront = m_iCharLookaheadBack; } void TFileLexer::advance(TINT a_dist) @@ -640,7 +640,7 @@ void TFileLexer::fillLookAhead() { while (m_iCharLookaheadFront != m_iCharLookaheadBack) { m_piCharLookahead[m_iCharLookaheadFront] = TLEXERGETCHAR(); - m_iCharLookaheadFront = (m_iCharLookaheadFront + 1) & m_iCharLookaheadMask; + m_iCharLookaheadFront = (m_iCharLookaheadFront + 1) & m_iCharLookaheadMask; } } diff --git a/Toshi/Source/TKernel/TFileLexerUTF8.cpp b/Toshi/Source/TKernel/TFileLexerUTF8.cpp index a7ac0c1..261aa5a 100644 --- a/Toshi/Source/TKernel/TFileLexerUTF8.cpp +++ b/Toshi/Source/TKernel/TFileLexerUTF8.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -IMPLEMENT_DYNCREATE(TFileLexerUTF8, TObject) \ No newline at end of file +IMPLEMENT_DYNCREATE(TFileLexerUTF8, TObject) diff --git a/Toshi/Source/TKernel/TFreeList.cpp b/Toshi/Source/TKernel/TFreeList.cpp index b5cc7c5..2717cb9 100644 --- a/Toshi/Source/TKernel/TFreeList.cpp +++ b/Toshi/Source/TKernel/TFreeList.cpp @@ -4,11 +4,11 @@ TOSHI_NAMESPACE_USING TFreeList::TFreeList(TUINT a_uiItemSize, TINT a_iInitialSize, TINT a_iGrowSize, TPCHAR a_pcName) { - m_iFreeCount = 0; + m_iFreeCount = 0; m_iMaxFreeCount = 0; - m_pcName = a_pcName; - m_iCapacity = 0; - m_uiItemSize = a_uiItemSize; + m_pcName = a_pcName; + m_iCapacity = 0; + m_uiItemSize = a_uiItemSize; //m_oLastNode = TNULL; //m_oRootNode = TNULL; TASSERT(m_iGrowSize >= 0); @@ -19,32 +19,32 @@ TFreeList::TFreeList(TUINT a_uiItemSize, TINT a_iInitialSize, TINT a_iGrowSize, TFreeList::~TFreeList() { - for (Node* pNode = m_oRootNode.m_pNext; pNode != TNULL; pNode = m_oRootNode.m_pNext) { + for (Node *pNode = m_oRootNode.m_pNext; pNode != TNULL; pNode = m_oRootNode.m_pNext) { m_oRootNode.m_pNext = pNode->m_pNext; delete[] pNode; } } -TFreeList::Node* TFreeList::Allocate(TINT a_iNumber, TUINT a_uiSize) +TFreeList::Node *TFreeList::Allocate(TINT a_iNumber, TUINT a_uiSize) { m_iCapacity += a_iNumber; m_iFreeCount += a_iNumber; m_iMaxFreeCount = m_iMaxFreeCount <= m_iFreeCount ? m_iFreeCount : m_iMaxFreeCount; - const int len = a_uiSize * a_iNumber + sizeof(Node); - Node* pNewNode = (Node*)tmalloc(len, TNULL, -1); + const int len = a_uiSize * a_iNumber + sizeof(Node); + Node *pNewNode = (Node *)tmalloc(len, TNULL, -1); - pNewNode->m_pNext = m_oRootNode.m_pNext; + pNewNode->m_pNext = m_oRootNode.m_pNext; m_oRootNode.m_pNext = pNewNode; - Node* pData = pNewNode + 1; - Node* pNext = TNULL; + Node *pData = pNewNode + 1; + Node *pNext = TNULL; for (TINT i = a_iNumber - 1; i != 0; i--) { pData->m_pNext = pNext; - pNext = pData; - - pData = (Node*)((TBYTE*)pData + a_uiSize); + pNext = pData; + + pData = (Node *)((TBYTE *)pData + a_uiSize); } m_oLastNode.m_pNext = pNext; @@ -54,10 +54,10 @@ TFreeList::Node* TFreeList::Allocate(TINT a_iNumber, TUINT a_uiSize) TPVOID TFreeList::New(TUINT a_uiSize) { if (a_uiSize != m_uiItemSize) { - return operator new (a_uiSize); + return operator new(a_uiSize); } - Node* pLastNode = m_oLastNode.m_pNext; + Node *pLastNode = m_oLastNode.m_pNext; if (pLastNode != TNULL) { m_iFreeCount--; @@ -72,15 +72,15 @@ TPVOID TFreeList::New(TUINT a_uiSize) void TFreeList::Delete(TPVOID a_pData) { - Node* pNode = (Node*)a_pData; + Node *pNode = (Node *)a_pData; if (m_oLastNode.m_pNext != TNULL) { - pNode->m_pNext = m_oLastNode.m_pNext; + pNode->m_pNext = m_oLastNode.m_pNext; m_oLastNode.m_pNext = pNode; } else { m_oLastNode.m_pNext = pNode; - pNode->m_pNext = TNULL; + pNode->m_pNext = TNULL; } m_iFreeCount++; @@ -90,8 +90,8 @@ void TFreeList::Delete(TPVOID a_pData) void TFreeList::SetCapacity(TINT a_iCapacity) { if (a_iCapacity <= m_iCapacity) return; - Node* pNode = Allocate(a_iCapacity - m_iCapacity, m_uiItemSize); - pNode->m_pNext = m_oLastNode.m_pNext; + Node *pNode = Allocate(a_iCapacity - m_iCapacity, m_uiItemSize); + pNode->m_pNext = m_oLastNode.m_pNext; m_oLastNode.m_pNext = pNode; } diff --git a/Toshi/Source/TKernel/THPTimer.cpp b/Toshi/Source/TKernel/THPTimer.cpp index eb8ff9d..0e4c330 100644 --- a/Toshi/Source/TKernel/THPTimer.cpp +++ b/Toshi/Source/TKernel/THPTimer.cpp @@ -16,7 +16,7 @@ void THPTimer::Reset() QueryPerformanceCounter(&m_iCurrentTime); QueryPerformanceFrequency(&m_iFrequency); m_iOldTime = m_iCurrentTime; - m_fDelta = 0; + m_fDelta = 0; } void THPTimer::Update() @@ -25,8 +25,8 @@ void THPTimer::Update() QueryPerformanceCounter(&m_iCurrentTime); TCFLOAT ratio = 1.0f / m_iFrequency.QuadPart; - m_fDelta = (m_iCurrentTime.QuadPart - m_iOldTime.QuadPart) * ratio; - m_fCurrent = m_iCurrentTime.QuadPart * ratio; + m_fDelta = (m_iCurrentTime.QuadPart - m_iOldTime.QuadPart) * ratio; + m_fCurrent = m_iCurrentTime.QuadPart * ratio; } TUINT THPTimer::GetRaw32() diff --git a/Toshi/Source/TKernel/TKernelInterface.cpp b/Toshi/Source/TKernel/TKernelInterface.cpp index 6791f11..2940151 100644 --- a/Toshi/Source/TKernel/TKernelInterface.cpp +++ b/Toshi/Source/TKernel/TKernelInterface.cpp @@ -1,29 +1,33 @@ #include "TKernelInterface.h" +#include "TUser.h" + +#ifdef TOSHI_SKU_WINDOWS +# include "Win/TNativeFileWin.h" +#endif // TOSHI_SKU_WINDOWS + #include #include // _getcwd #include -#include TOSHI_MULTIPLATFORM(TNativeFile) -#include "TUser.h" TOSHI_NAMESPACE_USING IMPLEMENT_DYNAMIC(TKernelInterface, TObject); -static TUINT s_iFlagUser = 0; -static TKernelInterface* s_pKernel; +static TUINT s_iFlagUser = 0; +static TKernelInterface *s_pKernel; -TKernelInterface::TKernelInterface(TINT argc, TPCHAR* const argv, TBOOL a_bVerbose) +TKernelInterface::TKernelInterface(TINT argc, TPCHAR *const argv, TBOOL a_bVerbose) { TWARNING("TKernelInterface::TKernelInterface() not implemented\n"); m_pScheduler = TNULL; m_fDeltaTime = 0.0f; - m_fAvgFPS = 0.0f; - m_bVerbose = a_bVerbose; + m_fAvgFPS = 0.0f; + m_bVerbose = a_bVerbose; if (!HASFLAG(s_iFlagUser & 1)) { s_iFlagUser |= 1; static TUser s_oUser = TUser("Toshi"); - s_pKernel = TNULL; + s_pKernel = TNULL; s_oUser.Register(); } s_pKernel = this; @@ -32,7 +36,7 @@ TKernelInterface::TKernelInterface(TINT argc, TPCHAR* const argv, TBOOL a_bVerbo TDPRINTF("Creating TKernelInterface\n"); } - TCHAR pPath[260]; + TCHAR pPath[260]; TPCHAR pBuffer = _getcwd(pPath, sizeof(pPath)); TVALIDADDRESS(pBuffer); TFileManager *pFileManager = new TFileManager(); @@ -71,7 +75,7 @@ TBOOL TKernelInterface::Update() static int GetProcessorSpeed() { LARGE_INTEGER qwFreq, qwStart, qwStop; - BOOL bSuccess = QueryPerformanceFrequency(&qwFreq); + BOOL bSuccess = QueryPerformanceFrequency(&qwFreq); if (bSuccess == FALSE) return 0; QueryPerformanceCounter(&qwStart); unsigned __int64 Start = __rdtsc(); @@ -93,7 +97,7 @@ void TKernelInterface::DumpInfo() if (!bSuccess) { osvi.dwOSVersionInfoSize = sizeof(OSVERSIONINFO); - bSuccess = GetVersionExA((LPOSVERSIONINFO)&osvi); + bSuccess = GetVersionExA((LPOSVERSIONINFO)&osvi); if (!bSuccess) goto skipPlatform; } TPCCHAR system; @@ -111,12 +115,12 @@ void TKernelInterface::DumpInfo() } if (!bSuccess) { TDPRINTF("Windows version: %s version %d.%d (Build %d)\n", system, osvi.dwMajorVersion, - osvi.dwMinorVersion, osvi.dwBuildNumber); + osvi.dwMinorVersion, osvi.dwBuildNumber); } else { TDPRINTF("Windows version: %s version %d.%d (Build %d) Service Pack %d.%d\n", system, osvi.dwMajorVersion, - osvi.dwMinorVersion, osvi.dwBuildNumber, - osvi.wServicePackMajor, osvi.wServicePackMinor); + osvi.dwMinorVersion, osvi.dwBuildNumber, + osvi.wServicePackMajor, osvi.wServicePackMinor); } skipPlatform: @@ -143,7 +147,7 @@ void TKernelInterface::DumpInfo() TDPRINTF("<\n"); } -TKernelInterfaceDLL* TKernelInterface::FindInterface(const TCString& a_rszInterface) +TKernelInterfaceDLL *TKernelInterface::FindInterface(const TCString &a_rszInterface) { for (auto i = m_Interfaces.Begin(); i != m_Interfaces.End(); i++) { if (i->GetFilename() == a_rszInterface) { @@ -153,9 +157,9 @@ TKernelInterfaceDLL* TKernelInterface::FindInterface(const TCString& a_rszInterf return TNULL; } -TKernelInterfaceDLL* TKernelInterface::LoadInterface(const TCString& a_rszInterface) +TKernelInterfaceDLL *TKernelInterface::LoadInterface(const TCString &a_rszInterface) { - TKernelInterfaceDLL* pInterface = FindInterface(a_rszInterface); + TKernelInterfaceDLL *pInterface = FindInterface(a_rszInterface); if (pInterface) { return pInterface; } @@ -167,15 +171,15 @@ TKernelInterfaceDLL* TKernelInterface::LoadInterface(const TCString& a_rszInterf return pInterface; } -void TKernelInterface::UnloadInterface(TKernelInterfaceDLL& a_rInterface) +void TKernelInterface::UnloadInterface(TKernelInterfaceDLL &a_rInterface) { a_rInterface.Unload(); m_Interfaces.Delete(a_rInterface); } -void TKernelInterface::UnloadInterface(const TCString& a_rszInterface) +void TKernelInterface::UnloadInterface(const TCString &a_rszInterface) { - TKernelInterfaceDLL* pInterface = FindInterface(a_rszInterface); + TKernelInterfaceDLL *pInterface = FindInterface(a_rszInterface); if (pInterface) { UnloadInterface(*pInterface); } diff --git a/Toshi/Source/TKernel/TLString.cpp b/Toshi/Source/TKernel/TLString.cpp index c4dffd3..642a11a 100644 --- a/Toshi/Source/TKernel/TLString.cpp +++ b/Toshi/Source/TKernel/TLString.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -TFreeList TLocalisedString::m_oFreelist = TFreeList(sizeof(TLocalisedString), 0, 2000, (char*)""); \ No newline at end of file +TFreeList TLocalisedString::m_oFreelist = TFreeList(sizeof(TLocalisedString), 0, 2000, (char *)""); diff --git a/Toshi/Source/TKernel/TMatrix44.cpp b/Toshi/Source/TKernel/TMatrix44.cpp index 53a6b1a..ec9f163 100644 --- a/Toshi/Source/TKernel/TMatrix44.cpp +++ b/Toshi/Source/TKernel/TMatrix44.cpp @@ -1 +1 @@ -#include "TMatrix44.h" \ No newline at end of file +#include "TMatrix44.h" diff --git a/Toshi/Source/TKernel/TMemory.cpp b/Toshi/Source/TKernel/TMemory.cpp index 3ed15ee..e99331b 100644 --- a/Toshi/Source/TKernel/TMemory.cpp +++ b/Toshi/Source/TKernel/TMemory.cpp @@ -1,47 +1,47 @@ #include "TMemory.h" #include -void* __CRTDECL operator new(size_t size) +void *__CRTDECL operator new(size_t size) { return tmalloc(size, TNULL, -1); } -void* __CRTDECL operator new(size_t size, ::std::nothrow_t const&) noexcept +void *__CRTDECL operator new(size_t size, ::std::nothrow_t const &) noexcept { return tmalloc(size, TNULL, -1); } -void* __CRTDECL operator new[](size_t size) +void *__CRTDECL operator new[](size_t size) { return tmalloc(size, TNULL, -1); } -void* __CRTDECL operator new[](size_t size, ::std::nothrow_t const&) noexcept +void *__CRTDECL operator new[](size_t size, ::std::nothrow_t const &) noexcept { return tmalloc(size, TNULL, -1); } -void __CRTDECL operator delete(void* ptr) noexcept +void __CRTDECL operator delete(void *ptr) noexcept { tfree(ptr); } -void __CRTDECL operator delete(void* ptr, ::std::nothrow_t const&) noexcept +void __CRTDECL operator delete(void *ptr, ::std::nothrow_t const &) noexcept { tfree(ptr); } -void __CRTDECL operator delete[](void* ptr) noexcept +void __CRTDECL operator delete[](void *ptr) noexcept { tfree(ptr); } -void __CRTDECL operator delete[](void* ptr, ::std::nothrow_t const&) noexcept +void __CRTDECL operator delete[](void *ptr, ::std::nothrow_t const &) noexcept { tfree(ptr); } -void __CRTDECL operator delete[](void* ptr, size_t _Size) noexcept +void __CRTDECL operator delete[](void *ptr, size_t _Size) noexcept { tfree(ptr); } @@ -56,34 +56,33 @@ TBOOL TOSHI_API TMemory::Initialise() #endif // TOSHI_NOTFINAL if (!m_bInitialised) { - } TWARNING("Implement TMemory::Initialise()"); return TTRUE; } -TMemory& TOSHI_API TMemory::GetMemMangager() +TMemory &TOSHI_API TMemory::GetMemMangager() { - Initialise(); + Initialise(); return g_oMemManager; } -TMemory::MemBlock* TOSHI_API TMemory::GetGlobalBlock() +TMemory::MemBlock *TOSHI_API TMemory::GetGlobalBlock() { - Initialise(); + Initialise(); return g_oMemManager.m_pMemBlock; } -TMemory::MemNode* TOSHI_API TMemory::GetMemNodeFromAddress(TPVOID a_pAddr) +TMemory::MemNode *TOSHI_API TMemory::GetMemNodeFromAddress(TPVOID a_pAddr) { return TNULL; } -void TOSHI_API TMemory::ExtendNodeSize(MemNode* a_pMemNode, TUINT a_uiSize) +void TOSHI_API TMemory::ExtendNodeSize(MemNode *a_pMemNode, TUINT a_uiSize) { } -TPVOID TMemory::Alloc(TUINT a_uiSize, TUINT a_uiAlignment, MemBlock* a_pMemBlock, TPCHAR a_pBuffer, TINT a_iUnk3) +TPVOID TMemory::Alloc(TUINT a_uiSize, TUINT a_uiAlignment, MemBlock *a_pMemBlock, TPCHAR a_pBuffer, TINT a_iUnk3) { // Let's just use malloc until i implemented this return malloc(a_uiSize); @@ -92,14 +91,13 @@ TPVOID TMemory::Alloc(TUINT a_uiSize, TUINT a_uiAlignment, MemBlock* a_pMemBlock lock.Create(g_pMutex); if (a_uiSize < 8) a_uiSize = 8; if (a_uiAlignment < TMEMORY_ROUNDUP) { - TASSERT(a_uiAlignment>=TMEMORY_ROUNDUP); + TASSERT(a_uiAlignment >= TMEMORY_ROUNDUP); TDPRINTF("MEMORY ERROR: CANT ALLOC Alignment(%d)RecurseTree(DumpObjectClassTree_BaseBegin, DumpObjectClassTree_BaseEnd, DumpObjectClassTree_Check, TNULL); } -const TClass* TOSHI_API TClass::Find(TPCCHAR a_pcClassName, const TClass* a_pClass) +const TClass *TOSHI_API TClass::Find(TPCCHAR a_pcClassName, const TClass *a_pClass) { - TASSERT(a_pcClassName[1]!=0); + TASSERT(a_pcClassName[1] != 0); if (a_pClass == TNULL) a_pClass = &TGetClass(TObject); return FindRecurse(a_pcClassName, a_pClass, TFALSE); } -const TClass* TOSHI_API TClass::FindCommonBaseClass(const TClass& a_rClass, const TClass& a_rBaseClass) +const TClass *TOSHI_API TClass::FindCommonBaseClass(const TClass &a_rClass, const TClass &a_rBaseClass) { return nullptr; } -const TClass* TOSHI_API TClass::FindRecurse(TPCCHAR a_pcClassName, const TClass* a_pClass, TBOOL a_bHasPrevious) +const TClass *TOSHI_API TClass::FindRecurse(TPCCHAR a_pcClassName, const TClass *a_pClass, TBOOL a_bHasPrevious) { while (a_pClass) { - TClass* pPrevious = a_bHasPrevious ? a_pClass->m_pPrevious : TNULL; - int difference = TSystem::StringCompareNoCase(a_pClass->GetName(), a_pcClassName, -1); + TClass *pPrevious = a_bHasPrevious ? a_pClass->m_pPrevious : TNULL; + int difference = TSystem::StringCompareNoCase(a_pClass->GetName(), a_pcClassName, -1); if (difference == 0) return a_pClass; if (a_pClass->m_pLastAttached) { - const TClass* result = FindRecurse(a_pcClassName, a_pClass->m_pLastAttached, TTRUE); + const TClass *result = FindRecurse(a_pcClassName, a_pClass->m_pLastAttached, TTRUE); if (result) return result; } a_pClass = pPrevious; @@ -108,9 +108,9 @@ void TClass::InitialiseStatic() } } -TBOOL TClass::IsA(const TClass& a_rClass) const +TBOOL TClass::IsA(const TClass &a_rClass) const { - for (const TClass* pClass = this; pClass != TNULL; pClass = pClass->m_pParent) { + for (const TClass *pClass = this; pClass != TNULL; pClass = pClass->m_pParent) { if (pClass->IsExactly(a_rClass)) return TTRUE; } return TFALSE; @@ -128,7 +128,7 @@ void TClass::RecurseTree(t_RecurceTreeBaseBeginCb a_BaseBegin, t_RecurceTreeBase void TClass::RecurseTree2(t_RecurceTreeBaseBeginCb a_BaseBegin, t_RecurceTreeBaseEndCb a_BaseEnd, t_RecurceTreeCheck a_Check, TPCVOID a_pMem) { - for (TClass* pClass = m_pLastAttached; pClass != TNULL; pClass = pClass->m_pPrevious) { + for (TClass *pClass = m_pLastAttached; pClass != TNULL; pClass = pClass->m_pPrevious) { if (a_Check) a_Check(pClass, a_pMem); if (pClass->m_pLastAttached) { if (a_BaseBegin) a_BaseBegin(pClass, a_pMem); @@ -141,7 +141,7 @@ void TClass::RecurseTree2(t_RecurceTreeBaseBeginCb a_BaseBegin, t_RecurceTreeBas TBOOL TClass::AttachClassToParent() { if (m_pParent && !IsAttached()) { - m_pPrevious = m_pParent->m_pLastAttached; + m_pPrevious = m_pParent->m_pLastAttached; m_pParent->m_pLastAttached = this; return TTRUE; } @@ -151,7 +151,7 @@ TBOOL TClass::AttachClassToParent() TBOOL TClass::IsAttached() const { if (m_pParent) { - for (TClass* i = m_pParent->m_pLastAttached; i!=TNULL; i = i->m_pPrevious) { + for (TClass *i = m_pParent->m_pLastAttached; i != TNULL; i = i->m_pPrevious) { if (i == this) return TTRUE; } } diff --git a/Toshi/Source/TKernel/TPCString.cpp b/Toshi/Source/TKernel/TPCString.cpp index 245b677..b92ee13 100644 --- a/Toshi/Source/TKernel/TPCString.cpp +++ b/Toshi/Source/TKernel/TPCString.cpp @@ -6,7 +6,7 @@ IMPLEMENT_FREELIST(TPooledCString, 0, 8) TCStringPool::TCStringPool(TINT a_iMaxSize, TINT a_iInitialSize) { - m_iMaxSize = a_iMaxSize; + m_iMaxSize = a_iMaxSize; m_oPooledCStrings = TArray(a_iMaxSize, a_iInitialSize); } @@ -22,7 +22,7 @@ TPCString TCStringPool::Get(TPCCHAR a_szString) return TPCString(&m_oPooledCStrings[i]); } } - TPooledCString* string = new TPooledCString(a_szString, this); + TPooledCString *string = new TPooledCString(a_szString, this); m_oPooledCStrings.Push(*string); return TPCString(string); } @@ -32,7 +32,7 @@ TPCString TCStringPool::Get(TINT a_iInt) return Get(TCString().Format("%d", a_iInt)); } -void TCStringPool::Remove(TPooledCString& a_rPooledCString) +void TCStringPool::Remove(TPooledCString &a_rPooledCString) { TASSERT(a_rPooledCString.GetRefCount() == 0); //auto iter = TArray::Iterator(-1, a_rPooledCString); @@ -45,9 +45,9 @@ TPooledCString::TPooledCString() m_pCStringPool = TNULL; } -TPooledCString::TPooledCString(TPCCHAR a_szString, TCStringPool* a_pStringPool) +TPooledCString::TPooledCString(TPCCHAR a_szString, TCStringPool *a_pStringPool) { - m_oString = TCString(a_szString); + m_oString = TCString(a_szString); m_pCStringPool = a_pStringPool; } diff --git a/Toshi/Source/TKernel/TPile.cpp b/Toshi/Source/TKernel/TPile.cpp index 5c7782c..9a246ad 100644 --- a/Toshi/Source/TKernel/TPile.cpp +++ b/Toshi/Source/TKernel/TPile.cpp @@ -4,31 +4,30 @@ TOSHI_NAMESPACE_BEGIN TPile::TPile(TINT a_iPileSize, TINT a_iSize, TUINT a_iFlags) { - m_iPileSize = a_iPileSize; - m_iBlockSize = a_iSize / a_iPileSize; - m_iFlags = a_iFlags; - m_iNumBlocks = 0; - m_iNumAllocs = 0; + m_iPileSize = a_iPileSize; + m_iBlockSize = a_iSize / a_iPileSize; + m_iFlags = a_iFlags; + m_iNumBlocks = 0; + m_iNumAllocs = 0; m_iWastedSpace = 0; } -void* TPile::RawAlloc(TINT a_iSize, TINT a_iAlignment) +void *TPile::RawAlloc(TINT a_iSize, TINT a_iAlignment) { m_iNumAllocs++; return nullptr; } -TBOOL TPile::RawIsInside(void* a_pRaw) +TBOOL TPile::RawIsInside(void *a_pRaw) { return TBOOL(); } void TPile::Free() { - for (void* it = m_ppBlocks[0]; it != TNULL; it) + for (void *it = m_ppBlocks[0]; it != TNULL; it) { - } } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TKernel/TProfiler.cpp b/Toshi/Source/TKernel/TProfiler.cpp index 5b6221a..709f820 100644 --- a/Toshi/Source/TKernel/TProfiler.cpp +++ b/Toshi/Source/TKernel/TProfiler.cpp @@ -11,7 +11,6 @@ void TProfiler::Start() void TProfiler::Stop() { m_sProfilerStopped = TTRUE; - } void TProfiler::PrintSummary() diff --git a/Toshi/Source/TKernel/TQList.cpp b/Toshi/Source/TKernel/TQList.cpp index 4ad1ae2..72e9f91 100644 --- a/Toshi/Source/TKernel/TQList.cpp +++ b/Toshi/Source/TKernel/TQList.cpp @@ -1 +1 @@ -#include "TQList.h" \ No newline at end of file +#include "TQList.h" diff --git a/Toshi/Source/TKernel/TScheduler.cpp b/Toshi/Source/TKernel/TScheduler.cpp index fdeb1cd..17f604b 100644 --- a/Toshi/Source/TKernel/TScheduler.cpp +++ b/Toshi/Source/TKernel/TScheduler.cpp @@ -5,25 +5,25 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNAMIC(TScheduler, TObject); -TBOOL Profiler_Control_ParentStart = TFALSE; -TBOOL Profiler_Control_ParentStop = TFALSE; +TBOOL Profiler_Control_ParentStart = TFALSE; +TBOOL Profiler_Control_ParentStop = TFALSE; TProfiler Profiler_Program; -TScheduler::TScheduler(TKernelInterface* a_pKernel) +TScheduler::TScheduler(TKernelInterface *a_pKernel) { - m_pCurrentTask = TNULL; - m_pKernel = a_pKernel; + m_pCurrentTask = TNULL; + m_pKernel = a_pKernel; m_fCurrentTimeDelta = 0.0f; - m_fTotalTime = 0.0f; - m_fDebugSlowTime = 1.0f; - m_iFrameCount = 0; + m_fTotalTime = 0.0f; + m_fDebugSlowTime = 1.0f; + m_iFrameCount = 0; TDPRINTF("Creating TScheduler.\n"); } -TTask* TScheduler::CreateTask(TClass const& a_rTaskClass, TTask* a_pTask) +TTask *TScheduler::CreateTask(TClass const &a_rTaskClass, TTask *a_pTask) { TASSERT(a_rTaskClass.IsA(TGetClass(TTask)) == TTRUE); - TTask *pTask = static_cast(a_rTaskClass.CreateObject()); + TTask *pTask = static_cast(a_rTaskClass.CreateObject()); TASSERT(pTask != TNULL); m_oTaskTree.InsertAtRoot(pTask); if (a_pTask) { @@ -65,15 +65,15 @@ void TScheduler::Update() UpdateActiveTasks(m_oTaskTree.ChildOfRoot()); } -void TScheduler::DestroyDyingTasks(TTask* a_pTask) +void TScheduler::DestroyDyingTasks(TTask *a_pTask) { if (a_pTask != TNULL) { - TTask* currentTask = a_pTask->Prev(); + TTask *currentTask = a_pTask->Prev(); while (currentTask != TNULL) { - TTask* nextTask = (currentTask->Prev() != a_pTask) ? currentTask->Prev() : TNULL; + TTask *nextTask = (currentTask->Prev() != a_pTask) ? currentTask->Prev() : TNULL; if (!currentTask->IsDying()) { @@ -104,9 +104,9 @@ void TScheduler::DestroyDyingTasks(TTask* a_pTask) }*/ } -void TScheduler::DestroyTaskRecurse(TTask* a_pTask) +void TScheduler::DestroyTaskRecurse(TTask *a_pTask) { - for (TTask* pTask = a_pTask; pTask != TNULL; pTask = (pTask->Next() != a_pTask) ? a_pTask->Next() : TNULL) { + for (TTask *pTask = a_pTask; pTask != TNULL; pTask = (pTask->Next() != a_pTask) ? a_pTask->Next() : TNULL) { pTask->m_Flags |= TTask::State_Dying; if (pTask->Child() != TNULL) { @@ -115,13 +115,13 @@ void TScheduler::DestroyTaskRecurse(TTask* a_pTask) } } -void TScheduler::UpdateActiveTasks(TTask* a_pTask) +void TScheduler::UpdateActiveTasks(TTask *a_pTask) { - TTask* currentTask = a_pTask; + TTask *currentTask = a_pTask; while (currentTask != TNULL) { - TTask* nextTask = (currentTask->Next() != a_pTask) ? currentTask->Next() : TNULL; + TTask *nextTask = (currentTask->Next() != a_pTask) ? currentTask->Next() : TNULL; TBOOL recurse = TTRUE; if (a_pTask->IsCreated() && a_pTask->IsActive()) @@ -150,14 +150,14 @@ void TScheduler::UpdateActiveTasks(TTask* a_pTask) void TScheduler::DestroyAllTasks() { - TTask* pAttached = m_oTaskTree.ChildOfRoot(); + TTask *pAttached = m_oTaskTree.ChildOfRoot(); if (pAttached) { DestroyTask(*pAttached); DeleteTaskAtomic(pAttached); } } -void TScheduler::DestroyTask(TTask& a_rTask) +void TScheduler::DestroyTask(TTask &a_rTask) { if (!a_rTask.IsDying()) { a_rTask.m_Flags |= TTask::State_Dying; @@ -165,24 +165,24 @@ void TScheduler::DestroyTask(TTask& a_rTask) } } -void TScheduler::DeleteTask(TTask* a_pTask) +void TScheduler::DeleteTask(TTask *a_pTask) { DeleteTaskRecurse(a_pTask->Child()); DeleteTaskAtomic(a_pTask); } -void TScheduler::DeleteTaskRecurse(TTask* a_pTask) +void TScheduler::DeleteTaskRecurse(TTask *a_pTask) { if (!a_pTask) return; - for (TTask* pTask = a_pTask->Prev(); pTask != TNULL; pTask = (pTask->Prev() != a_pTask) ? a_pTask->Prev() : TNULL) { + for (TTask *pTask = a_pTask->Prev(); pTask != TNULL; pTask = (pTask->Prev() != a_pTask) ? a_pTask->Prev() : TNULL) { DeleteTaskAtomic(pTask); } } -void TScheduler::DeleteTaskAtomic(TTask* a_pTask) +void TScheduler::DeleteTaskAtomic(TTask *a_pTask) { if (!a_pTask) return; - TTask* taskParent = TNULL; + TTask *taskParent = TNULL; if (a_pTask->IsChildOfDefaultRoot() == TFALSE) { taskParent = a_pTask->Parent(); @@ -197,7 +197,7 @@ void TScheduler::DeleteTaskAtomic(TTask* a_pTask) DeleteTaskRecurse(a_pTask->Child()); } - TClass* pClass = &a_pTask->GetClass(); + TClass *pClass = &a_pTask->GetClass(); a_pTask->OnDestroy(); m_oTaskTree.Remove(a_pTask, TFALSE); a_pTask->Delete(); diff --git a/Toshi/Source/TKernel/TSystemTools.cpp b/Toshi/Source/TKernel/TSystemTools.cpp index 90eb021..358caaa 100644 --- a/Toshi/Source/TKernel/TSystemTools.cpp +++ b/Toshi/Source/TKernel/TSystemTools.cpp @@ -8,12 +8,12 @@ TOSHI_NAMESPACE_USING TPCCHAR TOSHI_API TSystem::StringUnicodeToChar(TPCHAR a_CharString, TPCWCHAR a_UnicodeString, TINT a_iLength) { - TASSERT((a_UnicodeString!=TNULL) && (a_CharString!=TNULL)); + TASSERT((a_UnicodeString != TNULL) && (a_CharString != TNULL)); TINT iUnicodeStringLength = StringLength(a_UnicodeString); if (iUnicodeStringLength < a_iLength || a_iLength == -1) { a_iLength = iUnicodeStringLength; } - for (size_t i = 0; i < a_iLength; i++) { + for (TINT i = 0; i < a_iLength; i++) { a_CharString[i] = TSTATICCAST(TCHAR, a_UnicodeString[i]); } a_CharString[a_iLength] = '\0'; @@ -38,7 +38,7 @@ TPCCHAR TOSHI_API TSystem::StringIntToString(TINT a_iInt, TPCHAR a_szString, TIN { if (a_iRadix == 8) { sprintf(a_szString, "%o", a_iInt); - } + } else if (a_iRadix == 10) { sprintf(a_szString, "%d", a_iInt); } @@ -53,7 +53,7 @@ TPCCHAR TOSHI_API TSystem::StringIntToString(TINT a_iInt, TPCHAR a_szString, TIN TINT TOSHI_API TSystem::StringLength(TPCCHAR a_String) { - TASSERT(a_String!=TNULL); + TASSERT(a_String != TNULL); TINT iLength = 0; while (a_String[iLength] != 0) iLength++; return iLength; @@ -67,18 +67,18 @@ TINT TOSHI_API TSystem::StringLength(TPCWCHAR a_String) TINT TOSHI_API TSystem::StringCompareNoCase(TPCCHAR a_String1, TPCCHAR a_String2, TINT a_uiSize) { - TASSERT((a_String1!=TNULL) && (a_String2!=TNULL)); + TASSERT((a_String1 != TNULL) && (a_String2 != TNULL)); return a_uiSize != -1 ? _strnicmp(a_String1, a_String2, a_uiSize) : _stricmp(a_String1, a_String2); } -TCHAR const* TOSHI_API TSystem::StringCopy(TPCHAR a_DestinationString, TCHAR const* a_SourceString, TINT a_iCount) +TCHAR const *TOSHI_API TSystem::StringCopy(TPCHAR a_DestinationString, TCHAR const *a_SourceString, TINT a_iCount) { - TASSERT((a_DestinationString!=TNULL) && (a_SourceString!=TNULL)); + TASSERT((a_DestinationString != TNULL) && (a_SourceString != TNULL)); if (a_iCount != -1) { return strncpy(a_DestinationString, a_SourceString, a_iCount); } - TPCHAR d = a_DestinationString; - TCHAR const* s = a_SourceString; + TPCHAR d = a_DestinationString; + TCHAR const *s = a_SourceString; while (*s != '\0') { *d++ = *s++; } @@ -98,7 +98,7 @@ TPCWCHAR TOSHI_API TSystem::StringCopy(TPWCHAR a_DestinationString, TPCWCHAR a_S TPVOID TOSHI_API TSystem::MemCopy(TPVOID a_dest, TPCVOID a_src, TUINT a_iSize) { // Note: Idk if they used gcclib's memcpy() or their own - TPCHAR d = (TPCHAR)a_dest; + TPCHAR d = (TPCHAR)a_dest; TPCCHAR s = (TPCCHAR)a_src; while (a_iSize--) *d++ = *s++; @@ -113,7 +113,7 @@ TPVOID TOSHI_API TSystem::MemSet(TPVOID a_dest, TINT a_iValue, TINT m_iSize) return a_dest; } -TCStringPool* TOSHI_API TSystem::GetCStringPool() +TCStringPool *TOSHI_API TSystem::GetCStringPool() { if (!ms_poTCStringPool) { ms_poTCStringPool = new TCStringPool(); diff --git a/Toshi/Source/TKernel/TTask.cpp b/Toshi/Source/TKernel/TTask.cpp index 8d1c97f..0423e6b 100644 --- a/Toshi/Source/TKernel/TTask.cpp +++ b/Toshi/Source/TKernel/TTask.cpp @@ -7,7 +7,7 @@ IMPLEMENT_DYNAMIC(TTask, TObject); TBOOL TTask::Create() { - TASSERT(IsCreated()==TFALSE); + TASSERT(IsCreated() == TFALSE); if (!IsCreated()) { if (!OnCreate()) { OnDestroy(); @@ -40,7 +40,7 @@ void TTask::Activate(TBOOL a_bActivate) { TUINT8 oldState = m_Flags; TUINT8 newFlags = a_bActivate ? State_Active : 0; - m_Flags = (m_Flags & ~State_Active) | newFlags; + m_Flags = (m_Flags & ~State_Active) | newFlags; if (oldState != m_Flags) { if (a_bActivate) { @@ -57,7 +57,7 @@ void TTask::DestroyTask() m_pScheduler->DestroyTask(*this); } -TScheduler* TTask::GetScheduler() +TScheduler *TTask::GetScheduler() { return m_pScheduler; } diff --git a/Toshi/Source/TKernel/TThread.cpp b/Toshi/Source/TKernel/TThread.cpp index dc0f4b9..7f4f1a9 100644 --- a/Toshi/Source/TKernel/TThread.cpp +++ b/Toshi/Source/TKernel/TThread.cpp @@ -2,7 +2,7 @@ TOSHI_NAMESPACE_USING -void TMutexLock::Create(TMutex* a_pMutex) +void TMutexLock::Create(TMutex *a_pMutex) { TVALIDADDRESS(a_pMutex); m_pMutex = a_pMutex; diff --git a/Toshi/Source/TKernel/TUser.cpp b/Toshi/Source/TKernel/TUser.cpp index 7f068d2..9e1c761 100644 --- a/Toshi/Source/TKernel/TUser.cpp +++ b/Toshi/Source/TKernel/TUser.cpp @@ -5,9 +5,9 @@ TOSHI_NAMESPACE_USING TUserHandler TUserHandler::ms_oSingleton = TUserHandler(); -TUser::TUser(TCHAR const* a_sName) +TUser::TUser(TCHAR const *a_sName) { - m_sName = a_sName; + m_sName = a_sName; m_iUserID = -1; TVALIDADDRESS(m_sName); m_iNameLen = TSystem::StringLength(m_sName); @@ -19,13 +19,13 @@ TUserHandler::TUserHandler() TSystem::MemSet(m_pUsers, 0, sizeof(m_pUsers)); } -TSHORT TUserHandler::RegisterUser(TUser& a_rUser) +TSHORT TUserHandler::RegisterUser(TUser &a_rUser) { - TASSERT(TFALSE==a_rUser.IsRegistered()); + TASSERT(TFALSE == a_rUser.IsRegistered()); TINT curUserCount = GetUserCount(); if (curUserCount < MAX_USERS) { m_iUserCount++; - a_rUser.m_iUserID = curUserCount; + a_rUser.m_iUserID = curUserCount; m_pUsers[curUserCount] = &a_rUser; return a_rUser.GetUserID(); } @@ -33,7 +33,7 @@ TSHORT TUserHandler::RegisterUser(TUser& a_rUser) return -1; } -void TUserHandler::DeregisterUser(TUser& a_rUser) +void TUserHandler::DeregisterUser(TUser &a_rUser) { if (a_rUser.GetUserID() != -1) { m_pUsers[a_rUser.GetUserID()] = TNULL; @@ -41,20 +41,20 @@ void TUserHandler::DeregisterUser(TUser& a_rUser) a_rUser.m_iUserID = -1; } -TUser* TUserHandler::FindUser(TCHAR const* a_sName) +TUser *TUserHandler::FindUser(TCHAR const *a_sName) { TINT iNameLength = TSystem::StringLength(a_sName); for (TINT i = 0; i < MAX_USERS; i++) { - if (m_pUsers[i] && - m_pUsers[i]->GetNameLength() == iNameLength && - TSystem::StringCompareNoCase(m_pUsers[i]->GetName(), a_sName, -1) == 0) { + if (m_pUsers[i] && + m_pUsers[i]->GetNameLength() == iNameLength && + TSystem::StringCompareNoCase(m_pUsers[i]->GetName(), a_sName, -1) == 0) { return m_pUsers[i]; } } return TNULL; } -TUserHandler& TUserHandler::GetSingleton() +TUserHandler &TUserHandler::GetSingleton() { return ms_oSingleton; } diff --git a/Toshi/Source/TKernel/TVector2.cpp b/Toshi/Source/TKernel/TVector2.cpp index a793a15..8a3b3de 100644 --- a/Toshi/Source/TKernel/TVector2.cpp +++ b/Toshi/Source/TKernel/TVector2.cpp @@ -8,4 +8,4 @@ const TVector2 TVector2::VEC_POSY = { 0, 1 }; const TVector2 TVector2::VEC_NEGX = { -1, 0 }; const TVector2 TVector2::VEC_NEGY = { 0, -1 }; -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TKernel/TVector3.cpp b/Toshi/Source/TKernel/TVector3.cpp index 9b28616..2e46c51 100644 --- a/Toshi/Source/TKernel/TVector3.cpp +++ b/Toshi/Source/TKernel/TVector3.cpp @@ -1 +1 @@ -#include "TVector3.h" \ No newline at end of file +#include "TVector3.h" diff --git a/Toshi/Source/TKernel/TWString.cpp b/Toshi/Source/TKernel/TWString.cpp index b16b582..4fb3181 100644 --- a/Toshi/Source/TKernel/TWString.cpp +++ b/Toshi/Source/TKernel/TWString.cpp @@ -14,8 +14,8 @@ TBOOL TWString::AllocBuffer(TINT a_iLength, TBOOL a_bClear) if (a_iLength == 0) { if (a_bClear) tfree(m_pBuffer); - m_pBuffer = m_aNull; - hasChanged = TTRUE; + m_pBuffer = m_aNull; + hasChanged = TTRUE; m_iExcessLen = 0; } else { @@ -24,14 +24,14 @@ TBOOL TWString::AllocBuffer(TINT a_iLength, TBOOL a_bClear) if (newExcessLen < 0 || newExcessLen > 0xFF) { if (m_iStrLen != 0 && a_bClear) tfree(m_pBuffer); - m_pBuffer = (TPWCHAR)tmalloc((a_iLength + 1) * 2, TNULL, -1); + m_pBuffer = (TPWCHAR)tmalloc((a_iLength + 1) * 2, TNULL, -1); m_iExcessLen = 0; TASSERT(m_pBuffer != TNULL); hasChanged = TTRUE; } else { m_iExcessLen = newExcessLen; - hasChanged = TFALSE; + hasChanged = TFALSE; } } m_iStrLen = a_iLength; @@ -40,15 +40,15 @@ TBOOL TWString::AllocBuffer(TINT a_iLength, TBOOL a_bClear) return hasChanged; } -TWString& TWString::Concat(TWString const& a_rString, TINT a_iLength) +TWString &TWString::Concat(TWString const &a_rString, TINT a_iLength) { TINT len = a_rString.Length(); if (len < a_iLength || a_iLength == -1) { a_iLength = len; } TPWCHAR pBuffer = m_pBuffer; - len = Length(); - TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); + len = Length(); + TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); if (ret) { TSystem::StringCopy(m_pBuffer, pBuffer, -1); } @@ -60,15 +60,15 @@ TWString& TWString::Concat(TWString const& a_rString, TINT a_iLength) return *this; } -TWString& TWString::Concat(TPCWCHAR a_String, TINT a_iLength) +TWString &TWString::Concat(TPCWCHAR a_String, TINT a_iLength) { TINT len = TSystem::StringLength(a_String); if (len < a_iLength || a_iLength == -1) { a_iLength = len; } TPWCHAR pBuffer = m_pBuffer; - len = Length(); - TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); + len = Length(); + TBOOL ret = AllocBuffer(len + a_iLength, TFALSE); if (ret) { TSystem::StringCopy(m_pBuffer, pBuffer, -1); } @@ -91,7 +91,7 @@ TINT TWString::Compare(TPCWCHAR a_pcString, int a_iLength) const return wcscmp(GetString(), a_pcString); } -void TWString::Copy(const TWString& a_rOther, TINT a_iLength) +void TWString::Copy(const TWString &a_rOther, TINT a_iLength) { if (*this != a_rOther) { if (a_rOther.m_iStrLen < a_iLength || a_iLength == -1) a_iLength = a_rOther.m_iStrLen; @@ -123,9 +123,9 @@ void TWString::Copy(TPCCHAR a_pcString, TINT a_iLength) m_pBuffer[a_iLength] = L'\0'; } -TWString& TOSHI_CALLBACKAPI TWString::Format(TPCWCHAR a_pcFormat, ...) +TWString &TOSHI_CALLBACKAPI TWString::Format(TPCWCHAR a_pcFormat, ...) { - TWCHAR buffer[0x400]; + TWCHAR buffer[0x400]; va_list vargs; va_start(vargs, a_pcFormat); _vsnwprintf(buffer, sizeof(buffer), a_pcFormat, vargs); @@ -150,7 +150,7 @@ void TWString::Truncate(TINT a_iLength) a_iLength = len; } TPWCHAR pBuffer = m_pBuffer; - TBOOL ret = AllocBuffer(a_iLength, TFALSE); + TBOOL ret = AllocBuffer(a_iLength, TFALSE); if (ret) { TSystem::StringCopy(m_pBuffer, pBuffer, a_iLength); } @@ -159,4 +159,3 @@ void TWString::Truncate(TINT a_iLength) tfree(pBuffer); } } - diff --git a/Toshi/Source/TKernel/Win/TNativeFileWin.cpp b/Toshi/Source/TKernel/Win/TNativeFileWin.cpp index 088623a..e063385 100644 --- a/Toshi/Source/TKernel/Win/TNativeFileWin.cpp +++ b/Toshi/Source/TKernel/Win/TNativeFileWin.cpp @@ -4,321 +4,323 @@ TOSHI_NAMESPACE_USING -TNativeFileSystem::TNativeFileSystem(TPCCHAR a_pcName) : TFileSystem(a_pcName) +TNativeFileSystem::TNativeFileSystem(TPCCHAR a_pcName) + : TFileSystem(a_pcName) { - m_hFileSystem = INVALID_HANDLE_VALUE; - TFileManager* pFileManager = TFileManager::GetFileManager(); - TVALIDADDRESS(pFileManager); - pFileManager->MountFileSystem(this); + m_hFileSystem = INVALID_HANDLE_VALUE; + TFileManager *pFileManager = TFileManager::GetFileManager(); + TVALIDADDRESS(pFileManager); + pFileManager->MountFileSystem(this); } -TFile* TNativeFileSystem::CreateFile(Toshi::TCString const& a_rFilename, TUINT a_uiMode) +TFile *TNativeFileSystem::CreateFile(Toshi::TCString const &a_rFilename, TUINT a_uiMode) { - TNativeFile* pFile = new TNativeFile(this); + TNativeFile *pFile = new TNativeFile(this); - if (!pFile->Open(a_rFilename, a_uiMode)) { - delete pFile; - return TNULL; - } + if (!pFile->Open(a_rFilename, a_uiMode)) { + delete pFile; + return TNULL; + } - return pFile; + return pFile; } -void TNativeFileSystem::DestroyFile(TFile* a_pFile) +void TNativeFileSystem::DestroyFile(TFile *a_pFile) { - TNativeFile* pFile = static_cast(a_pFile); - if (pFile) { - pFile->Close(); - delete pFile; - } + TNativeFile *pFile = static_cast(a_pFile); + if (pFile) { + pFile->Close(); + delete pFile; + } } -TBOOL TNativeFileSystem::RemoveFile(TCString const& a_rFilename) +TBOOL TNativeFileSystem::RemoveFile(TCString const &a_rFilename) { - return DeleteFile(a_rFilename.GetString()); + return DeleteFile(a_rFilename.GetString()); } -TCString TNativeFileSystem::MakeInternalPath(TCString const& a_rsPath) +TCString TNativeFileSystem::MakeInternalPath(TCString const &a_rsPath) { - TCString prefix = GetPrefix(); - if (prefix.Length() > 0) { - if (prefix[prefix.Length() - 1] == '/' || prefix[prefix.Length() - 1] == '\\') { - prefix.Truncate(prefix.Length() - 1); - } - } - TFileManager *pFileManager = TFileManager::GetFileManager(); - TVALIDADDRESS(pFileManager); - { - TCString empty; - pFileManager->MakeAbsolutePath(empty); - prefix += empty; - } - return TCString(); + TCString prefix = GetPrefix(); + if (prefix.Length() > 0) { + if (prefix[prefix.Length() - 1] == '/' || prefix[prefix.Length() - 1] == '\\') { + prefix.Truncate(prefix.Length() - 1); + } + } + TFileManager *pFileManager = TFileManager::GetFileManager(); + TVALIDADDRESS(pFileManager); + { + TCString empty; + pFileManager->MakeAbsolutePath(empty); + prefix += empty; + } + return TCString(); } TINT TNativeFile::Read(TPVOID a_pBuffer, TINT a_iSize) { - if (a_iSize < 1) { - return 0; - } - if (m_pBuffer == TNULL) { - return ReadUnbuffered(a_pBuffer, a_iSize); - } - - TINT readedCount = 0; - TINT startPos = m_iPosition; - TINT curBufferPos = startPos / BUFFER_SIZE * BUFFER_SIZE; - TINT newBufferPos = curBufferPos + a_iSize; - TPVOID curPosBuffer = a_pBuffer; - - if (curBufferPos != newBufferPos) { - if (curBufferPos == m_iPrevBufferPos) { - TINT readCount = m_iLastBufferSize - (startPos - curBufferPos); - - if (readCount > 0) { - memcpy(a_pBuffer, (TPCHAR)m_pBuffer + startPos - curBufferPos, readCount); - - curPosBuffer = (TPCHAR)m_pBuffer + readCount; - m_iPosition += readCount; - readedCount = readCount; - } - } - TINT toReadCount = newBufferPos - m_iPosition; - curBufferPos = newBufferPos; - - if (toReadCount > 0) { - TINT readed = ReadUnbuffered(curPosBuffer, toReadCount); - curPosBuffer = (TPCHAR)curPosBuffer + readed; - readedCount += readed; - - if (readed != toReadCount) { - // end of file? - return readedCount; - } - } - } - - if (readedCount != a_iSize && LoadBuffer(curBufferPos)) { - a_iSize -= readedCount; - TINT bufferLeftSize = m_iPosition - curBufferPos; - TINT readCount = m_iLastBufferSize - bufferLeftSize; - readCount = TMIN(readCount, a_iSize); - - if (readCount > 0) { - memcpy(curPosBuffer, (TPCHAR)m_pBuffer + bufferLeftSize, readCount); - m_iPosition += readCount; - readedCount += readCount; - } - } - - return readedCount; + if (a_iSize < 1) { + return 0; + } + if (m_pBuffer == TNULL) { + return ReadUnbuffered(a_pBuffer, a_iSize); + } + + TINT readedCount = 0; + TINT startPos = m_iPosition; + TINT curBufferPos = startPos / BUFFER_SIZE * BUFFER_SIZE; + TINT newBufferPos = curBufferPos + a_iSize; + TPVOID curPosBuffer = a_pBuffer; + + if (curBufferPos != newBufferPos) { + if (curBufferPos == m_iPrevBufferPos) { + TINT readCount = m_iLastBufferSize - (startPos - curBufferPos); + + if (readCount > 0) { + memcpy(a_pBuffer, (TPCHAR)m_pBuffer + startPos - curBufferPos, readCount); + + curPosBuffer = (TPCHAR)m_pBuffer + readCount; + m_iPosition += readCount; + readedCount = readCount; + } + } + TINT toReadCount = newBufferPos - m_iPosition; + curBufferPos = newBufferPos; + + if (toReadCount > 0) { + TINT readed = ReadUnbuffered(curPosBuffer, toReadCount); + curPosBuffer = (TPCHAR)curPosBuffer + readed; + readedCount += readed; + + if (readed != toReadCount) { + // end of file? + return readedCount; + } + } + } + + if (readedCount != a_iSize && LoadBuffer(curBufferPos)) { + a_iSize -= readedCount; + TINT bufferLeftSize = m_iPosition - curBufferPos; + TINT readCount = m_iLastBufferSize - bufferLeftSize; + readCount = TMIN(readCount, a_iSize); + + if (readCount > 0) { + memcpy(curPosBuffer, (TPCHAR)m_pBuffer + bufferLeftSize, readCount); + m_iPosition += readCount; + readedCount += readCount; + } + } + + return readedCount; } -TINT TNativeFile::Write(void const* a_pBuffer, TINT a_iSize) +TINT TNativeFile::Write(void const *a_pBuffer, TINT a_iSize) { - if (m_iBufferPosition != m_iPosition) { - m_iBufferPosition = SetFilePointer(m_hFile, m_iPosition, NULL, FILE_BEGIN); - - if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { - return 0; - } - - m_iPosition = m_iBufferPosition; - } - - if (!m_bWriteBuffered) { - DWORD written; - BOOL bRes = WriteFile(m_hFile, a_pBuffer, a_iSize, &written, NULL); - - if (!bRes) { - return 0; - } - - m_iBufferPosition += written; - m_iPosition = m_iBufferPosition; - return written; - } - - // Flush write buffer if data doesn't fit it - if (m_iWriteBufferUsed + a_iSize >= BUFFER_SIZE) { - FlushWriteBuffer(); - } - - if (a_iSize < BUFFER_SIZE) { - // Data fits the write buffer so append it to it - memcpy((TPCHAR)m_pWriteBuffer + m_iWriteBufferUsed, a_pBuffer, a_iSize); - m_iWriteBufferUsed += a_iSize; - return a_iSize; - } - else { - // Data doesn't fit the write buffer at all so write it right now - DWORD written; - BOOL bRes = WriteFile(m_hFile, a_pBuffer, a_iSize, &written, NULL); - - if (bRes) { - m_iBufferPosition += a_iSize; - m_iPosition = m_iBufferPosition; - return written; - } - } - - return 0; + if (m_iBufferPosition != m_iPosition) { + m_iBufferPosition = SetFilePointer(m_hFile, m_iPosition, NULL, FILE_BEGIN); + + if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { + return 0; + } + + m_iPosition = m_iBufferPosition; + } + + if (!m_bWriteBuffered) { + DWORD written; + BOOL bRes = WriteFile(m_hFile, a_pBuffer, a_iSize, &written, NULL); + + if (!bRes) { + return 0; + } + + m_iBufferPosition += written; + m_iPosition = m_iBufferPosition; + return written; + } + + // Flush write buffer if data doesn't fit it + if (m_iWriteBufferUsed + a_iSize >= BUFFER_SIZE) { + FlushWriteBuffer(); + } + + if (a_iSize < BUFFER_SIZE) { + // Data fits the write buffer so append it to it + memcpy((TPCHAR)m_pWriteBuffer + m_iWriteBufferUsed, a_pBuffer, a_iSize); + m_iWriteBufferUsed += a_iSize; + return a_iSize; + } + else { + // Data doesn't fit the write buffer at all so write it right now + DWORD written; + BOOL bRes = WriteFile(m_hFile, a_pBuffer, a_iSize, &written, NULL); + + if (bRes) { + m_iBufferPosition += a_iSize; + m_iPosition = m_iBufferPosition; + return written; + } + } + + return 0; } TBOOL TNativeFile::Seek(TINT a_iOffset, TSEEK a_eSeek) { - if (a_eSeek == TFile::TSEEK_SET) { - m_iPosition = a_iOffset < 0 ? 0 : a_iOffset; - } - else if (a_eSeek == TFile::TSEEK_CUR) { - m_iPosition += a_iOffset < 0 ? 0 : a_iOffset; - } - else if (a_eSeek == TFile::TSEEK_END) { - m_iBufferPosition = SetFilePointer(m_hFile, a_iOffset, TNULL, FILE_END); - if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { - return TFALSE; - } - m_iPosition = m_iBufferPosition; - } + if (a_eSeek == TFile::TSEEK_SET) { + m_iPosition = a_iOffset < 0 ? 0 : a_iOffset; + } + else if (a_eSeek == TFile::TSEEK_CUR) { + m_iPosition += a_iOffset < 0 ? 0 : a_iOffset; + } + else if (a_eSeek == TFile::TSEEK_END) { + m_iBufferPosition = SetFilePointer(m_hFile, a_iOffset, TNULL, FILE_END); + if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { + return TFALSE; + } + m_iPosition = m_iBufferPosition; + } return TTRUE; } TINT TNativeFile::GetSize() { - m_iBufferPosition = SetFilePointer(m_hFile, 0, TNULL, TSEEK_END); - if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { - return 0; - } - return m_iBufferPosition; + m_iBufferPosition = SetFilePointer(m_hFile, 0, TNULL, TSEEK_END); + if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { + return 0; + } + return m_iBufferPosition; } TUINT64 TNativeFile::GetDate() { - _FILETIME fLastWriteTime; - ULARGE_INTEGER lv_Large; + _FILETIME fLastWriteTime; + ULARGE_INTEGER lv_Large; - lv_Large.LowPart = 0; - lv_Large.HighPart = 0; + lv_Large.LowPart = 0; + lv_Large.HighPart = 0; - if (m_hFile != TNULL) { - GetFileTime(m_hFile, NULL, NULL, &fLastWriteTime); - lv_Large.LowPart = fLastWriteTime.dwLowDateTime; - lv_Large.HighPart = fLastWriteTime.dwHighDateTime; - } + if (m_hFile != TNULL) { + GetFileTime(m_hFile, NULL, NULL, &fLastWriteTime); + lv_Large.LowPart = fLastWriteTime.dwLowDateTime; + lv_Large.HighPart = fLastWriteTime.dwHighDateTime; + } - return lv_Large.QuadPart; + return lv_Large.QuadPart; } TINT TNativeFile::GetCChar() { - TCHAR result; - - if (m_pBuffer != TNULL) { - TINT curBufferPos = m_iPosition / BUFFER_SIZE * BUFFER_SIZE; - if ((curBufferPos == m_iPrevBufferPos) && (m_iPosition - curBufferPos <= m_iLastBufferSize - 1)) { - result = ((TPCHAR)m_pBuffer)[m_iPosition - curBufferPos]; - m_iPosition += sizeof(result); - return result; - } - } - - return Read(&result, sizeof(result)) == sizeof(result) ? result : -1; + TCHAR result; + + if (m_pBuffer != TNULL) { + TINT curBufferPos = m_iPosition / BUFFER_SIZE * BUFFER_SIZE; + if ((curBufferPos == m_iPrevBufferPos) && (m_iPosition - curBufferPos <= m_iLastBufferSize - 1)) { + result = ((TPCHAR)m_pBuffer)[m_iPosition - curBufferPos]; + m_iPosition += sizeof(result); + return result; + } + } + + return Read(&result, sizeof(result)) == sizeof(result) ? result : -1; } TINT TNativeFile::GetWChar() { - TWCHAR result; - - if (m_pBuffer != TNULL) { - TINT curBufferPos = m_iPosition / BUFFER_SIZE * BUFFER_SIZE; - if ((curBufferPos == m_iPrevBufferPos) && (m_iPosition - curBufferPos <= m_iLastBufferSize - 2)) { - result = ((TPWCHAR)m_pBuffer)[m_iPosition - curBufferPos]; - m_iPosition += sizeof(result); - return result; - } - } - - return Read(&result, sizeof(result)) == sizeof(result) ? result : -1; + TWCHAR result; + + if (m_pBuffer != TNULL) { + TINT curBufferPos = m_iPosition / BUFFER_SIZE * BUFFER_SIZE; + if ((curBufferPos == m_iPrevBufferPos) && (m_iPosition - curBufferPos <= m_iLastBufferSize - 2)) { + result = ((TPWCHAR)m_pBuffer)[m_iPosition - curBufferPos]; + m_iPosition += sizeof(result); + return result; + } + } + + return Read(&result, sizeof(result)) == sizeof(result) ? result : -1; } TINT TNativeFile::PutCChar(TCHAR a_cChar) { - return Write(&a_cChar, sizeof(a_cChar)) == sizeof(a_cChar) ? sizeof(a_cChar) : -1; + return Write(&a_cChar, sizeof(a_cChar)) == sizeof(a_cChar) ? sizeof(a_cChar) : -1; } TINT TNativeFile::PutWChar(TWCHAR a_wcChar) { - return Write(&a_wcChar, sizeof(a_wcChar)) == sizeof(a_wcChar) ? sizeof(a_wcChar) : -1; + return Write(&a_wcChar, sizeof(a_wcChar)) == sizeof(a_wcChar) ? sizeof(a_wcChar) : -1; } -TINT TNativeFile::VCPrintf(TCHAR const* a_pFormat, va_list a_args) +TINT TNativeFile::VCPrintf(TCHAR const *a_pFormat, va_list a_args) { - va_list args; + va_list args; - va_start(args, a_pFormat); - TCHAR str[0x200]; - TINT iResult = _vsnprintf(str, sizeof(str), a_pFormat, args); - va_end(args); + va_start(args, a_pFormat); + TCHAR str[0x200]; + TINT iResult = _vsnprintf(str, sizeof(str), a_pFormat, args); + va_end(args); - return Write(str, iResult); + return Write(str, iResult); } -TINT TNativeFile::VWPrintf(TWCHAR const* a_pFormat, va_list a_args) +TINT TNativeFile::VWPrintf(TWCHAR const *a_pFormat, va_list a_args) { - va_list args; + va_list args; - va_start(args, a_pFormat); - TWCHAR str[0x200]; - TINT iResult = _vsnwprintf(str, sizeof(str), a_pFormat, args); - va_end(args); + va_start(args, a_pFormat); + TWCHAR str[0x200]; + TINT iResult = _vsnwprintf(str, sizeof(str), a_pFormat, args); + va_end(args); - return Write(str, iResult * 2) > -1 ? iResult * 2 : iResult; + return Write(str, iResult * 2) > -1 ? iResult * 2 : iResult; } -TNativeFile::TNativeFile(TNativeFileSystem* a_pFileManager) : TFile(a_pFileManager) +TNativeFile::TNativeFile(TNativeFileSystem *a_pFileManager) + : TFile(a_pFileManager) { - m_hFile = INVALID_HANDLE_VALUE; - m_iPosition = -1; - m_iBufferPosition = -1; - m_iPrevBufferPos = -1; - m_iLastBufferSize = 0; - m_pBuffer = TNULL; - m_pWriteBuffer = TNULL; - m_iWriteBufferUsed = 0; - m_bWriteBuffered = TTRUE; + m_hFile = INVALID_HANDLE_VALUE; + m_iPosition = -1; + m_iBufferPosition = -1; + m_iPrevBufferPos = -1; + m_iLastBufferSize = 0; + m_pBuffer = TNULL; + m_pWriteBuffer = TNULL; + m_iWriteBufferUsed = 0; + m_bWriteBuffered = TTRUE; } -TBOOL TNativeFile::Open(const TCString& a_rFileName, TUINT a_uiMode) +TBOOL TNativeFile::Open(const TCString &a_rFileName, TUINT a_uiMode) { - m_pFileSystem->MakeInternalPath(a_rFileName); + m_pFileSystem->MakeInternalPath(a_rFileName); - DWORD dwCreationDisposition = 0; - DWORD dwDesiredAccess = 0; + DWORD dwCreationDisposition = 0; + DWORD dwDesiredAccess = 0; - dwDesiredAccess |= HASFLAG(a_uiMode & TMODE_READONLY) ? GENERIC_READ : dwDesiredAccess; - dwDesiredAccess |= HASFLAG(a_uiMode & TMODE_WRITEONLY) ? GENERIC_WRITE : dwDesiredAccess; - dwDesiredAccess |= HASFLAG(a_uiMode & TMODE_READWRITE) ? (GENERIC_READ | GENERIC_WRITE) : dwDesiredAccess; + dwDesiredAccess |= HASFLAG(a_uiMode & TMODE_READONLY) ? GENERIC_READ : dwDesiredAccess; + dwDesiredAccess |= HASFLAG(a_uiMode & TMODE_WRITEONLY) ? GENERIC_WRITE : dwDesiredAccess; + dwDesiredAccess |= HASFLAG(a_uiMode & TMODE_READWRITE) ? (GENERIC_READ | GENERIC_WRITE) : dwDesiredAccess; - if (HASFLAG(a_uiMode & TMODE_CREATE)) { - dwCreationDisposition = CREATE_ALWAYS; - if (dwDesiredAccess == 0) { - TDPRINTF("WARNING: File created with no access mode, assuming WRITEONLY\n"); - dwDesiredAccess = GENERIC_WRITE; - } - } - else { - dwCreationDisposition = OPEN_EXISTING; - } + if (HASFLAG(a_uiMode & TMODE_CREATE)) { + dwCreationDisposition = CREATE_ALWAYS; + if (dwDesiredAccess == 0) { + TDPRINTF("WARNING: File created with no access mode, assuming WRITEONLY\n"); + dwDesiredAccess = GENERIC_WRITE; + } + } + else { + dwCreationDisposition = OPEN_EXISTING; + } - m_hFile = CreateFileA(a_rFileName.GetString(), dwDesiredAccess, 0, NULL, dwCreationDisposition, NULL, NULL); + m_hFile = CreateFileA(a_rFileName.GetString(), dwDesiredAccess, 0, NULL, dwCreationDisposition, NULL, NULL); - if (m_hFile == INVALID_HANDLE_VALUE) { - return TFALSE; - } + if (m_hFile == INVALID_HANDLE_VALUE) { + return TFALSE; + } - m_iPosition = 0; + m_iPosition = 0; m_iBufferPosition = 0; - m_iPrevBufferPos = -1; + m_iPrevBufferPos = -1; m_iLastBufferSize = 0; if (HASFLAG(a_uiMode & TMODE_NOBUFFER)) { @@ -326,103 +328,103 @@ TBOOL TNativeFile::Open(const TCString& a_rFileName, TUINT a_uiMode) } else { m_pBuffer = tmalloc(BUFFER_SIZE, TNULL, -1); - TVALIDADDRESS(m_pBuffer); + TVALIDADDRESS(m_pBuffer); m_bWriteBuffered = TFALSE; } - return TTRUE; + return TTRUE; } void TNativeFile::Close() { - FlushWriteBuffer(); - CloseHandle(m_hFile); - m_hFile = INVALID_HANDLE_VALUE; - m_iPosition = -1; - m_iBufferPosition = -1; - m_iPrevBufferPos = -1; - m_iLastBufferSize = -1; - - if (m_pBuffer != TNULL) { - delete m_pBuffer; - m_pBuffer = TNULL; - } - - if (m_pWriteBuffer != TNULL) { - delete m_pWriteBuffer; - m_pWriteBuffer = TNULL; - } + FlushWriteBuffer(); + CloseHandle(m_hFile); + m_hFile = INVALID_HANDLE_VALUE; + m_iPosition = -1; + m_iBufferPosition = -1; + m_iPrevBufferPos = -1; + m_iLastBufferSize = -1; + + if (m_pBuffer != TNULL) { + delete m_pBuffer; + m_pBuffer = TNULL; + } + + if (m_pWriteBuffer != TNULL) { + delete m_pWriteBuffer; + m_pWriteBuffer = TNULL; + } } TINT TNativeFile::ReadUnbuffered(TPVOID a_pBuffer, TINT a_iSize) { - DWORD lpNumberOfBytesRead; + DWORD lpNumberOfBytesRead; - if (m_iPosition != m_iBufferPosition) { - m_iBufferPosition = SetFilePointer(m_hFile, m_iPosition, TNULL, FILE_BEGIN); + if (m_iPosition != m_iBufferPosition) { + m_iBufferPosition = SetFilePointer(m_hFile, m_iPosition, TNULL, FILE_BEGIN); - if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { - return 0; - } + if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { + return 0; + } - m_iPosition = m_iBufferPosition; - } + m_iPosition = m_iBufferPosition; + } - if (!ReadFile(m_hFile, a_pBuffer, a_iSize, &lpNumberOfBytesRead, TNULL)) { - return 0; - } + if (!ReadFile(m_hFile, a_pBuffer, a_iSize, &lpNumberOfBytesRead, TNULL)) { + return 0; + } - m_iBufferPosition += lpNumberOfBytesRead; - m_iPosition = m_iBufferPosition; + m_iBufferPosition += lpNumberOfBytesRead; + m_iPosition = m_iBufferPosition; - return lpNumberOfBytesRead; + return lpNumberOfBytesRead; } TBOOL TNativeFile::LoadBuffer(TINT a_iBufferPos) { - DWORD lpNumberOfBytesRead; + DWORD lpNumberOfBytesRead; - if (m_iPrevBufferPos != a_iBufferPos) { + if (m_iPrevBufferPos != a_iBufferPos) { - if (m_iBufferPosition != a_iBufferPos) { - m_iBufferPosition = SetFilePointer(m_hFile, a_iBufferPos, TNULL, FILE_BEGIN); - if (m_iBufferPosition != a_iBufferPos) { - return TFALSE; - } - } + if (m_iBufferPosition != a_iBufferPos) { + m_iBufferPosition = SetFilePointer(m_hFile, a_iBufferPos, TNULL, FILE_BEGIN); + if (m_iBufferPosition != a_iBufferPos) { + return TFALSE; + } + } - if (!ReadFile(m_hFile, m_pBuffer, BUFFER_SIZE, &lpNumberOfBytesRead, TNULL)) { - return TFALSE; - } + if (!ReadFile(m_hFile, m_pBuffer, BUFFER_SIZE, &lpNumberOfBytesRead, TNULL)) { + return TFALSE; + } - m_iBufferPosition += lpNumberOfBytesRead; - m_iLastBufferSize = lpNumberOfBytesRead; - m_iPrevBufferPos = a_iBufferPos; - } + m_iBufferPosition += lpNumberOfBytesRead; + m_iLastBufferSize = lpNumberOfBytesRead; + m_iPrevBufferPos = a_iBufferPos; + } - return TTRUE; + return TTRUE; } TINT TNativeFile::FlushWriteBuffer() { - DWORD lpNumberOfBytesWritten; + DWORD lpNumberOfBytesWritten; - if (m_iPosition != m_iBufferPosition) { - m_iBufferPosition = SetFilePointer(m_hFile, m_iPosition, NULL, FILE_BEGIN); + if (m_iPosition != m_iBufferPosition) { + m_iBufferPosition = SetFilePointer(m_hFile, m_iPosition, NULL, FILE_BEGIN); - if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { - return 0; - } + if (m_iBufferPosition == INVALID_SET_FILE_POINTER && GetLastError() != NO_ERROR) { + return 0; + } - m_iPosition = m_iBufferPosition; - } + m_iPosition = m_iBufferPosition; + } - if (!WriteFile(m_hFile, m_pBuffer, m_iWriteBufferUsed, &lpNumberOfBytesWritten, TNULL)) { - return 0; - } + if (!WriteFile(m_hFile, m_pBuffer, m_iWriteBufferUsed, &lpNumberOfBytesWritten, TNULL)) { + return 0; + } - m_iBufferPosition += lpNumberOfBytesWritten; - m_iPosition = m_iBufferPosition; - m_iWriteBufferUsed = 0; - return lpNumberOfBytesWritten; + m_iBufferPosition += lpNumberOfBytesWritten; + m_iPosition = m_iBufferPosition; + m_iWriteBufferUsed = 0; + return lpNumberOfBytesWritten; } diff --git a/Toshi/Source/TKernel/Win/TThreadWin.cpp b/Toshi/Source/TKernel/Win/TThreadWin.cpp index c542bec..4bd45b5 100644 --- a/Toshi/Source/TKernel/Win/TThreadWin.cpp +++ b/Toshi/Source/TKernel/Win/TThreadWin.cpp @@ -5,14 +5,14 @@ TOSHI_NAMESPACE_USING TBOOL TMutex::Create() { m_hMutexHnd = CreateMutex(NULL, FALSE, NULL); - TASSERT(m_hMutexHnd!=NULL); + TASSERT(m_hMutexHnd != NULL); return TTRUE; } TBOOL TMutex::Destroy() { TASSERT(m_hMutexHnd != NULL); - BOOL bRes = CloseHandle(m_hMutexHnd); + BOOL bRes = CloseHandle(m_hMutexHnd); m_hMutexHnd = NULL; return bRes; } @@ -21,7 +21,7 @@ TBOOL TMutex::Lock(TUINT a_uiFlags) { TASSERT(m_hMutexHnd != NULL); DWORD waitForMs = (a_uiFlags & TMutexLockFlag_DoNotWait) ? 0 : INFINITE; - DWORD result = WaitForSingleObject(m_hMutexHnd, waitForMs); + DWORD result = WaitForSingleObject(m_hMutexHnd, waitForMs); return result == WAIT_OBJECT_0; } diff --git a/Toshi/Source/TRender/TMaterialLibrary.cpp b/Toshi/Source/TRender/TMaterialLibrary.cpp index f0e378a..0bda51f 100644 --- a/Toshi/Source/TRender/TMaterialLibrary.cpp +++ b/Toshi/Source/TRender/TMaterialLibrary.cpp @@ -3,14 +3,14 @@ TOSHI_NAMESPACE_BEGIN -TMaterial* TMaterialLibrary::GetMaterial(TPCCHAR a_szMaterial) +TMaterial *TMaterialLibrary::GetMaterial(TPCCHAR a_szMaterial) { return TNULL; } void TMaterialLibraryManager::Create() { - TMaterial* pSkin = reinterpret_cast(TRenderInterface::GetRenderer()->GetSystemResource(TRenderInterface::SYSRESOURCE_SHSKIN)); + TMaterial *pSkin = reinterpret_cast(TRenderInterface::GetRenderer()->GetSystemResource(TRenderInterface::SYSRESOURCE_SHSKIN)); } void TMaterialLibraryManager::Destroy() @@ -22,14 +22,14 @@ void TMaterialLibraryManager::Destroy() } } -TMaterial* TMaterialLibraryManager::GetMaterial(TPCCHAR a_szMaterial) +TMaterial *TMaterialLibraryManager::GetMaterial(TPCCHAR a_szMaterial) { if (m_oLibraries.IsEmpty()) { TDPRINTF("******** TMaterialLibraryManager::GetMaterial(%s) FAILED!!!!!!! **********\n", a_szMaterial); return m_pInvalidMaterial; } for (auto it = m_oLibraries.Begin(); it != m_oLibraries.End(); it++) { - TMaterial* pMat = it->GetMaterial(a_szMaterial); + TMaterial *pMat = it->GetMaterial(a_szMaterial); if (pMat) { return pMat; } @@ -38,4 +38,3 @@ TMaterial* TMaterialLibraryManager::GetMaterial(TPCCHAR a_szMaterial) } TOSHI_NAMESPACE_END - diff --git a/Toshi/Source/TRender/TModel.cpp b/Toshi/Source/TRender/TModel.cpp index 7852018..2bb0b4a 100644 --- a/Toshi/Source/TRender/TModel.cpp +++ b/Toshi/Source/TRender/TModel.cpp @@ -1,4 +1,3 @@ #include "TModel.h" TOSHI_NAMESPACE_USING - diff --git a/Toshi/Source/TRender/TNullResource.cpp b/Toshi/Source/TRender/TNullResource.cpp index ef94767..7c70bf1 100644 --- a/Toshi/Source/TRender/TNullResource.cpp +++ b/Toshi/Source/TRender/TNullResource.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -IMPLEMENT_DYNCREATE(TNullResource, TResource) \ No newline at end of file +IMPLEMENT_DYNCREATE(TNullResource, TResource) diff --git a/Toshi/Source/TRender/TRenderAdapter.cpp b/Toshi/Source/TRender/TRenderAdapter.cpp index d7c417f..f871c7b 100644 --- a/Toshi/Source/TRender/TRenderAdapter.cpp +++ b/Toshi/Source/TRender/TRenderAdapter.cpp @@ -1 +1 @@ -#include "TRenderAdapter.h" \ No newline at end of file +#include "TRenderAdapter.h" diff --git a/Toshi/Source/TRender/TRenderCapture.cpp b/Toshi/Source/TRender/TRenderCapture.cpp index 21cc33a..5e38da9 100644 --- a/Toshi/Source/TRender/TRenderCapture.cpp +++ b/Toshi/Source/TRender/TRenderCapture.cpp @@ -1 +1 @@ -#include "TRender/TRenderCapture.h" \ No newline at end of file +#include "TRender/TRenderCapture.h" diff --git a/Toshi/Source/TRender/TRenderInterface.cpp b/Toshi/Source/TRender/TRenderInterface.cpp index 2018ade..5bcefde 100644 --- a/Toshi/Source/TRender/TRenderInterface.cpp +++ b/Toshi/Source/TRender/TRenderInterface.cpp @@ -7,16 +7,16 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNAMIC(TRenderInterface, TObject) -TRenderInterface* TRenderInterface::s_Interface = TNULL; +TRenderInterface *TRenderInterface::s_Interface = TNULL; TRenderInterface::TRenderInterface() { - m_bIsCreated = TFALSE; - m_bIsDiplayCreated = TFALSE; + m_bIsCreated = TFALSE; + m_bIsDiplayCreated = TFALSE; m_pDefaultRenderContext = TNULL; m_pCurrentRenderContext = TNULL; - m_pKernel = TNULL; - m_iResourceCount = 1; + m_pKernel = TNULL; + m_iResourceCount = 1; TCString("Creating TRenderInterface\n").Print(); TASSERT(s_Interface == TNULL); s_Interface = this; @@ -24,7 +24,7 @@ TRenderInterface::TRenderInterface() TCString("Created TRenderInterface\n").Print(); } -TBOOL TRenderInterface::CreateDisplay(const DisplayParams& a_rParams) +TBOOL TRenderInterface::CreateDisplay(const DisplayParams &a_rParams) { TASSERT(TTRUE == IsCreated()); TASSERT(TFALSE == IsDisplayCreated()); @@ -34,7 +34,7 @@ TBOOL TRenderInterface::CreateDisplay(const DisplayParams& a_rParams) TBOOL TRenderInterface::DestroyDisplay() { - TASSERT(TTRUE==IsCreated()); + TASSERT(TTRUE == IsCreated()); m_bIsDiplayCreated = TFALSE; return TTRUE; } @@ -47,36 +47,36 @@ TBOOL TRenderInterface::Update(float a_fDeltaTime) TBOOL TRenderInterface::BeginScene() { - TASSERT(TTRUE==IsCreated()); - TASSERT(TTRUE==IsDisplayCreated()); + TASSERT(TTRUE == IsCreated()); + TASSERT(TTRUE == IsDisplayCreated()); m_iSceneCount++; return TTRUE; } TBOOL TRenderInterface::EndScene() { - TASSERT(TTRUE==IsCreated()); - TASSERT(TTRUE==IsDisplayCreated()); + TASSERT(TTRUE == IsCreated()); + TASSERT(TTRUE == IsDisplayCreated()); return TTRUE; } -TRenderAdapter::Mode::Device* TRenderInterface::GetCurrentDevice() +TRenderAdapter::Mode::Device *TRenderInterface::GetCurrentDevice() { return TNULL; } -TRenderInterface::DisplayParams* TRenderInterface::GetCurrentDisplayParams() +TRenderInterface::DisplayParams *TRenderInterface::GetCurrentDisplayParams() { return nullptr; } -TBOOL TRenderInterface::Create(TKernelInterface* pKernelInterface) +TBOOL TRenderInterface::Create(TKernelInterface *pKernelInterface) { TASSERT(TFALSE == IsCreated()); TVALIDADDRESS(pKernelInterface); m_pKernel = pKernelInterface; - + m_pDefaultRenderContext = CreateRenderContext(); TVALIDADDRESS(m_pDefaultRenderContext); @@ -92,30 +92,30 @@ TBOOL TRenderInterface::CreateSystemResources() { TCString(" Adding base resources\n").Print(); - TBOOL bRes = TFALSE; + TBOOL bRes = TFALSE; TVertexFactoryFormat vertexFormat; m_aSysResources[SYSRESOURCE_VFACTORIES] = CreateResource(&TGetClass(TNullResource), "VFactories", TNULL); m_aSysResources[SYSRESOURCE_VFSYSSVNDUV1] = CreateResource(TFindClass(TVertexFactoryResource, TNULL), "VFSYSSVNDUV1", GetSystemResource(SYSRESOURCE_VFACTORIES)); TVALIDADDRESS(m_aSysResources[SYSRESOURCE_VFSYSSVNDUV1]); - vertexFormat.m_uiNumStreams = 1; + vertexFormat.m_uiNumStreams = 1; vertexFormat.m_aStreamFormats[0].m_uiVertexSize = 24; - vertexFormat.m_aStreamFormats[0].m_uiUnk = 0; - bRes = static_cast(GetSystemResource(SYSRESOURCE_VFSYSSVNDUV1))->Create(&vertexFormat, 11000, 0); + vertexFormat.m_aStreamFormats[0].m_uiUnk = 0; + bRes = static_cast(GetSystemResource(SYSRESOURCE_VFSYSSVNDUV1))->Create(&vertexFormat, 11000, 0); TASSERT(TTRUE == bRes); m_aSysResources[SYSRESOURCE_VFSKIN] = CreateResource(TFindClass(TVertexFactoryResource, TNULL), "VFSKIN", GetSystemResource(SYSRESOURCE_VFACTORIES)); TVALIDADDRESS(m_aSysResources[SYSRESOURCE_VFSKIN]); - vertexFormat.m_uiNumStreams = 1; + vertexFormat.m_uiNumStreams = 1; vertexFormat.m_aStreamFormats[0].m_uiVertexSize = 40; - vertexFormat.m_aStreamFormats[0].m_uiUnk = 0; - bRes = static_cast(GetSystemResource(SYSRESOURCE_VFSKIN))->Create(&vertexFormat, 11000, 0); + vertexFormat.m_aStreamFormats[0].m_uiUnk = 0; + bRes = static_cast(GetSystemResource(SYSRESOURCE_VFSKIN))->Create(&vertexFormat, 11000, 0); TASSERT(TTRUE == bRes); m_aSysResources[SYSRESOURCE_TEXTUREFACTORY] = CreateResource(TFindClass(TTextureFactoryHAL, TNULL), "TextureFactory", TNULL); - bRes = m_aSysResources[SYSRESOURCE_TEXTUREFACTORY]->Create(); - TASSERT(TTRUE==bRes); + bRes = m_aSysResources[SYSRESOURCE_TEXTUREFACTORY]->Create(); + TASSERT(TTRUE == bRes); return TTRUE; } @@ -124,12 +124,12 @@ void TRenderInterface::DestroySystemResources() { } -TResource* TRenderInterface::CreateResource(const TClass* a_pClass, TPCCHAR a_szResName, TResource* a_pParent) -{ +TResource *TRenderInterface::CreateResource(const TClass *a_pClass, TPCCHAR a_szResName, TResource *a_pParent) +{ TASSERT(TNULL != a_pClass); TASSERT(a_pClass->IsA(TGetClass(TResource))); - TResource* pResource = (TResource*)a_pClass->CreateObject(); + TResource *pResource = (TResource *)a_pClass->CreateObject(); TASSERT(TNULL != pResource); if (a_pParent && a_pParent->IsDying()) { @@ -144,14 +144,14 @@ TResource* TRenderInterface::CreateResource(const TClass* a_pClass, TPCCHAR a_sz } m_Resources.Insert(a_pParent, pResource); - pResource->m_uiUId = m_iResourceCount++; + pResource->m_uiUId = m_iResourceCount++; pResource->m_pRenderer = this; pResource->SetName(a_szResName); return pResource; } -const TRenderAdapter::Mode::Device* TRenderInterface::FindDevice(const DisplayParams* a_pDisplayParams) +const TRenderAdapter::Mode::Device *TRenderInterface::FindDevice(const DisplayParams *a_pDisplayParams) { auto pAdapter = GetAdapterList()->Begin(); @@ -197,7 +197,7 @@ const TRenderAdapter::Mode::Device* TRenderInterface::FindDevice(const DisplayPa bPassedWindowed = TFALSE; } - auto uiWidth = pDevice->GetMode()->GetWidth(); + auto uiWidth = pDevice->GetMode()->GetWidth(); auto uiHeight = pDevice->GetMode()->GetHeight(); if (uiHeight < uiWidth || !a_pDisplayParams->bWindowed || a_pDisplayParams->uiWidth <= a_pDisplayParams->uiHeight) @@ -205,7 +205,7 @@ const TRenderAdapter::Mode::Device* TRenderInterface::FindDevice(const DisplayPa if (uiWidth == a_pDisplayParams->uiWidth && uiHeight == a_pDisplayParams->uiHeight) { if (pDevice->IsDepthStencilFormatSupported(a_pDisplayParams->eDepthStencilFormat) && - bPassedColourDepth && bPassedWindowed) + bPassedColourDepth && bPassedWindowed) { return pDevice; } @@ -218,7 +218,7 @@ const TRenderAdapter::Mode::Device* TRenderInterface::FindDevice(const DisplayPa if (uiHeight < a_pDisplayParams->uiHeight) continue; if (pDevice->IsDepthStencilFormatSupported(a_pDisplayParams->eDepthStencilFormat) && - bPassedColourDepth && bPassedWindowed) + bPassedColourDepth && bPassedWindowed) { return pDevice; } @@ -240,13 +240,13 @@ void TRenderInterface::FlushDyingResources() } } -void TRenderInterface::DestroyDyingResources(TResource* a_pResource) +void TRenderInterface::DestroyDyingResources(TResource *a_pResource) { // TODO: refactor - TResource* pTVar1; - TResource* next; - TResource* pRes1; - TResource* pRes2; + TResource *pTVar1; + TResource *next; + TResource *pRes1; + TResource *pRes2; pRes1 = a_pResource; pRes2 = a_pResource; @@ -254,28 +254,28 @@ void TRenderInterface::DestroyDyingResources(TResource* a_pResource) do { next = pRes2->Next(); if (next == pRes1) { - next = (TResource*)0x0; + next = (TResource *)0x0; } if ((pRes2->m_Flags & 4) == 0) { pRes2 = pRes2->Child(); - if (pRes2 != (TResource*)0x0) { + if (pRes2 != (TResource *)0x0) { DestroyDyingResources(pRes2); } } else { if (pRes2 == pRes1) { - pRes1 = next; + pRes1 = next; a_pResource = next; } pTVar1 = pRes2->Child(); - while (pTVar1 != (TResource*)0x0) { + while (pTVar1 != (TResource *)0x0) { pRes1 = pTVar1->Next(); if (pRes1 == pTVar1) { - pRes1 = (TResource*)0x0; + pRes1 = (TResource *)0x0; } DeleteResourceAtomic(pTVar1); pTVar1 = pRes1; - pRes1 = a_pResource; + pRes1 = a_pResource; } DeleteResourceAtomic(pRes2); } @@ -284,13 +284,13 @@ void TRenderInterface::DestroyDyingResources(TResource* a_pResource) } } -void TRenderInterface::DeleteResource(TResource* a_pResource) +void TRenderInterface::DeleteResource(TResource *a_pResource) { DeleteResourceRecurse(a_pResource->Child()); DeleteResourceAtomic(a_pResource); } -void TRenderInterface::DeleteResourceRecurse(TResource* a_pResource) +void TRenderInterface::DeleteResourceRecurse(TResource *a_pResource) { while (a_pResource) { @@ -302,7 +302,7 @@ void TRenderInterface::DeleteResourceRecurse(TResource* a_pResource) } } -void TRenderInterface::DeleteResourceAtomic(TResource* a_pResource) +void TRenderInterface::DeleteResourceAtomic(TResource *a_pResource) { if (a_pResource) { DeleteResourceRecurse(a_pResource->Child()); @@ -337,11 +337,11 @@ void TRenderInterface::DumpStats() { } -void TRenderInterface::GetScreenOffset(TVector2& a_rVec) +void TRenderInterface::GetScreenOffset(TVector2 &a_rVec) { } -void TRenderInterface::SetScreenOffset(const TVector2& a_rVec) +void TRenderInterface::SetScreenOffset(const TVector2 &a_rVec) { } @@ -360,33 +360,33 @@ TBOOL TRenderInterface::SetPixelAspectRatio(float a_fPixelAspectRatio) return TBOOL(); } -TRenderContext* TRenderInterface::CreateRenderContext() +TRenderContext *TRenderInterface::CreateRenderContext() { return TNULL; } -TRenderCapture* TRenderInterface::CreateCapture() +TRenderCapture *TRenderInterface::CreateCapture() { return TNULL; } -void TRenderInterface::DestroyCapture(TRenderCapture* a_pRenderCapture) +void TRenderInterface::DestroyCapture(TRenderCapture *a_pRenderCapture) { } -void TRenderInterface::SetLightDirectionMatrix(const TMatrix44& a_rMatrix) +void TRenderInterface::SetLightDirectionMatrix(const TMatrix44 &a_rMatrix) { } -void TRenderInterface::SetLightColourMatrix(const TMatrix44& a_rMatrix) +void TRenderInterface::SetLightColourMatrix(const TMatrix44 &a_rMatrix) { } -void TRenderInterface::ConnectDefaultViewportHandelrs(TViewport& a_pViewport) +void TRenderInterface::ConnectDefaultViewportHandelrs(TViewport &a_pViewport) { } -TModel* TRenderInterface::CreateModel(TPCCHAR a_szName, TINT a_iUnk1) +TModel *TRenderInterface::CreateModel(TPCCHAR a_szName, TINT a_iUnk1) { return nullptr; } diff --git a/Toshi/Source/TRender/TResource.cpp b/Toshi/Source/TRender/TResource.cpp index 7fbcf3a..29e2822 100644 --- a/Toshi/Source/TRender/TResource.cpp +++ b/Toshi/Source/TRender/TResource.cpp @@ -5,15 +5,15 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNCREATE(TResource, TObject) -static TINT s_iResourceCount = 0; +static TINT s_iResourceCount = 0; static TINT s_iResourcesCreated = 0; TResource::TResource() { - m_Flags = 0; - m_uiUId = 0; + m_Flags = 0; + m_uiUId = 0; m_pRenderer = TNULL; - *m_szName = 0; + *m_szName = 0; s_iResourceCount++; if (s_iResourcesCreated < s_iResourceCount) { s_iResourcesCreated = s_iResourceCount; @@ -36,8 +36,8 @@ TBOOL TResource::Create() TBOOL TResource::Validate() { - TASSERT((TNULL==Parent()) || (TFALSE==Parent()->IsDying())); - TASSERT(!(m_Flags&TResource::FLAGS_DYING)); + TASSERT((TNULL == Parent()) || (TFALSE == Parent()->IsDying())); + TASSERT(!(m_Flags & TResource::FLAGS_DYING)); if (IsDying()) return TFALSE; m_Flags |= FLAGS_VALID; return TTRUE; @@ -55,7 +55,7 @@ void TResource::OnDestroy() { } -void TResource::SetParent(TResource* a_pParent) +void TResource::SetParent(TResource *a_pParent) { TASSERT((TNULL == a_pParent) || (TTRUE == IsDying()) || (TFALSE == a_pParent->IsDying())); TASSERT(TNULL != GetTree()); @@ -81,16 +81,16 @@ void TResource::SetName(TPCCHAR a_strName) szName[3] = ':'; TSystem::StringIntToString(GetUId(), &szName[4], 10); } - TASSERT(TSystem::StringLength(a_strName)<=MAXNAMELEN); + TASSERT(TSystem::StringLength(a_strName) <= MAXNAMELEN); TSystem::StringCopy(m_szName, a_strName, -1); } -TBOOL Recurse(TResource::t_RecurseCb a_pCallback, TResource* a_pResource, TBOOL a_bFlag, TPVOID a_pUserData) +TBOOL Recurse(TResource::t_RecurseCb a_pCallback, TResource *a_pResource, TBOOL a_bFlag, TPVOID a_pUserData) { - TResource* pResource = a_pResource; + TResource *pResource = a_pResource; while (pResource) { - TResource* pNext = pResource->Next(); + TResource *pNext = pResource->Next(); if (pNext == a_pResource || pNext == pResource || !a_bFlag) { pNext = TNULL; @@ -111,7 +111,7 @@ TBOOL Recurse(TResource::t_RecurseCb a_pCallback, TResource* a_pResource, TBOOL return TTRUE; } -void TResource::RecurseSimple(t_RecurseCb a_pfnCallback, TResource* a_pResource, TPVOID a_pUserData) +void TResource::RecurseSimple(t_RecurseCb a_pfnCallback, TResource *a_pResource, TPVOID a_pUserData) { TASSERT(TNULL != GetTree()); TASSERT(TNULL != a_pfnCallback); diff --git a/Toshi/Source/TRender/TSceneObject.cpp b/Toshi/Source/TRender/TSceneObject.cpp index 92dbfd0..3ad7fe0 100644 --- a/Toshi/Source/TRender/TSceneObject.cpp +++ b/Toshi/Source/TRender/TSceneObject.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -IMPLEMENT_DYNCREATE(TSceneObject, TResource) \ No newline at end of file +IMPLEMENT_DYNCREATE(TSceneObject, TResource) diff --git a/Toshi/Source/TRender/TShader.cpp b/Toshi/Source/TRender/TShader.cpp index f642402..12743d1 100644 --- a/Toshi/Source/TRender/TShader.cpp +++ b/Toshi/Source/TRender/TShader.cpp @@ -4,4 +4,4 @@ TOSHI_NAMESPACE_BEGIN IMPLEMENT_DYNAMIC(TMaterial, TResource) -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TRender/TTextureFactory.cpp b/Toshi/Source/TRender/TTextureFactory.cpp index a8b5b4d..e136760 100644 --- a/Toshi/Source/TRender/TTextureFactory.cpp +++ b/Toshi/Source/TRender/TTextureFactory.cpp @@ -7,27 +7,27 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNAMIC(TTextureFactory, TResource) -TTextureResource* TTextureFactory::CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) +TTextureResource *TTextureFactory::CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) { return TNULL; } -TTextureResource* TTextureFactory::CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) +TTextureResource *TTextureFactory::CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) { return TNULL; } -TTextureResource* TTextureFactory::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) +TTextureResource *TTextureFactory::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) { return TNULL; } -TTextureFactory* TOSHI_API TTextureFactory::CreateHAL(TRenderInterface* a_pRenderer, TPCCHAR a_szName, TResource* a_pResource) +TTextureFactory *TOSHI_API TTextureFactory::CreateHAL(TRenderInterface *a_pRenderer, TPCCHAR a_szName, TResource *a_pResource) { - return (TTextureFactory*)a_pRenderer->CreateResource(TClass::Find("TTextureFactoryHAL", TNULL), a_szName, a_pResource); + return (TTextureFactory *)a_pRenderer->CreateResource(TClass::Find("TTextureFactoryHAL", TNULL), a_szName, a_pResource); } -TTextureResource* TTextureFactory::FindTexture(TPCCHAR a_szName) +TTextureResource *TTextureFactory::FindTexture(TPCCHAR a_szName) { auto pList = &m_aLists[HashName(a_szName)]; @@ -42,11 +42,11 @@ TTextureResource* TTextureFactory::FindTexture(TPCCHAR a_szName) return TNULL; } -void TTextureFactory::DeregisterTexture(TTextureResource* a_pTexture) +void TTextureFactory::DeregisterTexture(TTextureResource *a_pTexture) { TVALIDADDRESS(a_pTexture); - TTextureFactory::NameEntry* pList = a_pTexture->m_pNameEntry; + TTextureFactory::NameEntry *pList = a_pTexture->m_pNameEntry; if (pList) { pList->Remove(); @@ -66,9 +66,9 @@ TUINT TTextureFactory::HashName(TPCCHAR a_szName) return iHash % NUM_LISTS; } -TTextureFactory::NameEntry* TTextureFactory::RegisterTexture(TPCCHAR a_szName, TTextureResource* a_pTexture) +TTextureFactory::NameEntry *TTextureFactory::RegisterTexture(TPCCHAR a_szName, TTextureResource *a_pTexture) { - auto pList = &m_aLists[HashName(a_szName)]; + auto pList = &m_aLists[HashName(a_szName)]; auto pEntry = new TTextureFactory::NameEntry(a_szName, a_pTexture); a_pTexture->m_pNameEntry = pEntry; diff --git a/Toshi/Source/TRender/TTextureResource.cpp b/Toshi/Source/TRender/TTextureResource.cpp index 8bb2776..2f62887 100644 --- a/Toshi/Source/TRender/TTextureResource.cpp +++ b/Toshi/Source/TRender/TTextureResource.cpp @@ -8,15 +8,15 @@ IMPLEMENT_DYNAMIC(TTextureResource, TResource) TTextureResource::TTextureResource() { m_eAddressMode = ADDRESSMODE_UNKNOWN; - m_CreateFlags = 0; - m_pNameEntry = TNULL; + m_CreateFlags = 0; + m_pNameEntry = TNULL; } TTextureResource::~TTextureResource() { - TRenderInterface* pRenderer = TRenderInterface::GetRenderer(); + TRenderInterface *pRenderer = TRenderInterface::GetRenderer(); TVALIDADDRESS(pRenderer); - TTextureFactory* pTextureFactory = (TTextureFactory*)pRenderer->GetSystemResource(TRenderInterface::SYSRESOURCE_TEXTUREFACTORY); + TTextureFactory *pTextureFactory = (TTextureFactory *)pRenderer->GetSystemResource(TRenderInterface::SYSRESOURCE_TEXTUREFACTORY); TVALIDADDRESS(pTextureFactory); pTextureFactory->DeregisterTexture(this); } @@ -31,7 +31,7 @@ TUINT TTextureResource::GetHeight() return 0; } -TBOOL TTextureResource::Lock(LOCKSTATE& a_rLockState) +TBOOL TTextureResource::Lock(LOCKSTATE &a_rLockState) { return TFALSE; } @@ -55,7 +55,7 @@ TBOOL TTextureResource::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiW return TResource::Create(); } -TTextureResource* TOSHI_API TTextureResource::CreateHAL(TRenderInterface* a_pRenderer, TPCCHAR a_szName, TResource* a_pResource) +TTextureResource *TOSHI_API TTextureResource::CreateHAL(TRenderInterface *a_pRenderer, TPCCHAR a_szName, TResource *a_pResource) { - return (TTextureResource*)a_pRenderer->CreateResource(TFindClass(TTextureResourceHAL, TNULL), a_szName, a_pResource); + return (TTextureResource *)a_pRenderer->CreateResource(TFindClass(TTextureResourceHAL, TNULL), a_szName, a_pResource); } diff --git a/Toshi/Source/TRender/TVertexFactoryResourceInterface.cpp b/Toshi/Source/TRender/TVertexFactoryResourceInterface.cpp index 22e6a72..756e6a0 100644 --- a/Toshi/Source/TRender/TVertexFactoryResourceInterface.cpp +++ b/Toshi/Source/TRender/TVertexFactoryResourceInterface.cpp @@ -8,21 +8,21 @@ IMPLEMENT_DYNAMIC(TVertexFactoryResourceInterface, TResource) TVertexFactoryResourceInterface::TVertexFactoryResourceInterface() { m_uiNumCreatedVertexPools = 0; - m_usMaxStaticVertices = 0; - m_uiFlags = 0; + m_usMaxStaticVertices = 0; + m_uiFlags = 0; } -TBOOL TVertexFactoryResourceInterface::Create(TVertexFactoryFormat* a_pVertexFormat, TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags) +TBOOL TVertexFactoryResourceInterface::Create(TVertexFactoryFormat *a_pVertexFormat, TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags) { TVALIDADDRESS(a_pVertexFormat); - m_oVertexFormat = *a_pVertexFormat; + m_oVertexFormat = *a_pVertexFormat; m_usMaxStaticVertices = a_uiMaxStaticVertices; - m_uiFlags = a_uiFlags; + m_uiFlags = a_uiFlags; return TResource::Create(); } -TVertexPoolResourceInterface* TVertexFactoryResourceInterface::CreatePool(TUSHORT a_usMaxStaticVertices, TUINT a_uiFlags) +TVertexPoolResourceInterface *TVertexFactoryResourceInterface::CreatePool(TUSHORT a_usMaxStaticVertices, TUINT a_uiFlags) { m_uiNumCreatedVertexPools++; return TNULL; diff --git a/Toshi/Source/TRender/TVertexPoolResourceInterface.cpp b/Toshi/Source/TRender/TVertexPoolResourceInterface.cpp index 66c34d0..ae8ccdd 100644 --- a/Toshi/Source/TRender/TVertexPoolResourceInterface.cpp +++ b/Toshi/Source/TRender/TVertexPoolResourceInterface.cpp @@ -7,7 +7,7 @@ IMPLEMENT_DYNAMIC(TVertexPoolResourceInterface, TResource) TVertexPoolResourceInterface::LockBuffer::LockBuffer() { uiNumStreams = 0; - uiOffset = 0; + uiOffset = 0; apStreams[0] = TNULL; apStreams[1] = TNULL; apStreams[2] = TNULL; @@ -20,21 +20,21 @@ TVertexPoolResourceInterface::LockBuffer::LockBuffer() TVertexPoolResourceInterface::TVertexPoolResourceInterface() { - m_pFactory = TNULL; - m_usFlags = 0; + m_pFactory = TNULL; + m_usFlags = 0; m_usMaxVertices = 0; m_usNumVertices = 0; - m_uiLockCount = 0; + m_uiLockCount = 0; } void TVertexPoolResourceInterface::OnDestroy() { - TASSERT(0==m_uiLockCount); + TASSERT(0 == m_uiLockCount); m_pFactory->m_uiNumCreatedVertexPools--; TResource::OnDestroy(); } -TBOOL TVertexPoolResourceInterface::Lock(LockBuffer* a_pLockBuffer) +TBOOL TVertexPoolResourceInterface::Lock(LockBuffer *a_pLockBuffer) { return TBOOL(); } @@ -43,12 +43,10 @@ void TVertexPoolResourceInterface::Unlock(TUSHORT a_uiNewNumVertices) { } -TBOOL TVertexPoolResourceInterface::Create(TVertexFactoryResourceInterface* a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags) +TBOOL TVertexPoolResourceInterface::Create(TVertexFactoryResourceInterface *a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags) { - m_pFactory = a_pFactory; + m_pFactory = a_pFactory; m_usMaxVertices = a_uiMaxVertices; - m_usFlags = a_uiFlags; + m_usFlags = a_uiFlags; return TResource::Create(); } - - diff --git a/Toshi/Source/TRender/TViewport.cpp b/Toshi/Source/TRender/TViewport.cpp index ad1d3c9..73f28e9 100644 --- a/Toshi/Source/TRender/TViewport.cpp +++ b/Toshi/Source/TRender/TViewport.cpp @@ -2,4 +2,4 @@ TOSHI_NAMESPACE_USING -IMPLEMENT_DYNCREATE(TViewport, TSceneObject) \ No newline at end of file +IMPLEMENT_DYNCREATE(TViewport, TSceneObject) diff --git a/Toshi/Source/TRenderD3D/TD3DVertexBlockResource.cpp b/Toshi/Source/TRenderD3D/TD3DVertexBlockResource.cpp index cbbbe6f..215152a 100644 --- a/Toshi/Source/TRenderD3D/TD3DVertexBlockResource.cpp +++ b/Toshi/Source/TRenderD3D/TD3DVertexBlockResource.cpp @@ -7,7 +7,7 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNCREATE(TVertexBlockResource, TResource) IMPLEMENT_FREELIST(TVertexBlockResource, 0, 8) -TBOOL TVertexBlockResource::CanFit(TVertexPoolResource* a_pPoolResource) +TBOOL TVertexBlockResource::CanFit(TVertexPoolResource *a_pPoolResource) { if (GetFlags() & 1 && a_pPoolResource->GetFlags() & 1) { return m_uiMaxVertices >= a_pPoolResource->GetNumVertices() + m_uiVerticesUsed; @@ -16,7 +16,7 @@ TBOOL TVertexBlockResource::CanFit(TVertexPoolResource* a_pPoolResource) return TFALSE; } -TBOOL TVertexBlockResource::AttachPool(TVertexPoolResource* a_pPool) +TBOOL TVertexBlockResource::AttachPool(TVertexPoolResource *a_pPool) { TVALIDADDRESS(a_pPool); @@ -30,12 +30,12 @@ TBOOL TVertexBlockResource::AttachPool(TVertexPoolResource* a_pPool) return TTRUE; } -TBOOL TVertexBlockResource::Create(TVertexFactoryResource* a_pFactory, TUSHORT a_uiMaxVertices, TUINT a_uiFlags) +TBOOL TVertexBlockResource::Create(TVertexFactoryResource *a_pFactory, TUSHORT a_uiMaxVertices, TUINT a_uiFlags) { TASSERT(TFALSE == IsCreated()); TVALIDADDRESS(a_pFactory); - m_pFactory = a_pFactory; + m_pFactory = a_pFactory; m_uiMaxVertices = a_uiMaxVertices; - m_uiFlags = a_uiFlags; + m_uiFlags = a_uiFlags; return TResource::Create(); } diff --git a/Toshi/Source/TRenderD3D/TD3DVertexFactoryResource.cpp b/Toshi/Source/TRenderD3D/TD3DVertexFactoryResource.cpp index 5c37fcc..87c02e8 100644 --- a/Toshi/Source/TRenderD3D/TD3DVertexFactoryResource.cpp +++ b/Toshi/Source/TRenderD3D/TD3DVertexFactoryResource.cpp @@ -5,12 +5,11 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNCREATE(TVertexFactoryResource, TVertexFactoryResourceInterface) -TVertexPoolResourceInterface* TVertexFactoryResource::CreatePoolResource(TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags) +TVertexPoolResourceInterface *TVertexFactoryResource::CreatePoolResource(TUSHORT a_uiMaxStaticVertices, TUINT a_uiFlags) { - TVertexPoolResource* pVertexPool = TSTATICCAST( - TVertexPoolResource*, - GetRenderer()->CreateResource(&TGetClass(TVertexPoolResource), TNULL, this) - ); + TVertexPoolResource *pVertexPool = TSTATICCAST( + TVertexPoolResource *, + GetRenderer()->CreateResource(&TGetClass(TVertexPoolResource), TNULL, this)); TVALIDADDRESS(pVertexPool); @@ -21,14 +20,14 @@ TVertexPoolResourceInterface* TVertexFactoryResource::CreatePoolResource(TUSHORT struct CallbackStruct { - TVertexBlockResource* m_pBlock; - TVertexPoolResource* m_pPool; + TVertexBlockResource *m_pBlock; + TVertexPoolResource *m_pPool; }; -static TBOOL CallBack(TResource* a_pResource, TPVOID a_pUserData) +static TBOOL CallBack(TResource *a_pResource, TPVOID a_pUserData) { - CallbackStruct* pStruct = TSTATICCAST(CallbackStruct*, a_pUserData); - TVertexBlockResource* pBlockResource = TSTATICCAST(TVertexBlockResource*, a_pResource); + CallbackStruct *pStruct = TSTATICCAST(CallbackStruct *, a_pUserData); + TVertexBlockResource *pBlockResource = TSTATICCAST(TVertexBlockResource *, a_pResource); if (a_pResource->IsA(TGetClass(TVertexBlockResource))) { @@ -41,21 +40,21 @@ static TBOOL CallBack(TResource* a_pResource, TPVOID a_pUserData) return TTRUE; } -TVertexBlockResource* TVertexFactoryResource::FindBlockResource(TVertexPoolResource* a_pResource) +TVertexBlockResource *TVertexFactoryResource::FindBlockResource(TVertexPoolResource *a_pResource) { CallbackStruct result = { TNULL, a_pResource }; if (a_pResource->GetFlags() & 2) { return TNULL; } RecurseSimple(CallBack, this, &result); + return result.m_pBlock; } -TVertexBlockResource* TVertexFactoryResource::CreateBlockResource(TUSHORT a_uiMaxVertices, TUINT a_uiFlags) +TVertexBlockResource *TVertexFactoryResource::CreateBlockResource(TUSHORT a_uiMaxVertices, TUINT a_uiFlags) { - TVertexBlockResource* pVertexBlock = TSTATICCAST( - TVertexBlockResource*, - GetRenderer()->CreateResource(&TGetClass(TVertexBlockResource), TNULL, this) - ); + TVertexBlockResource *pVertexBlock = TSTATICCAST( + TVertexBlockResource *, + GetRenderer()->CreateResource(&TGetClass(TVertexBlockResource), TNULL, this)); TVALIDADDRESS(pVertexBlock); diff --git a/Toshi/Source/TRenderD3D/TD3DVertexPoolResource.cpp b/Toshi/Source/TRenderD3D/TD3DVertexPoolResource.cpp index e25ba8d..c14c412 100644 --- a/Toshi/Source/TRenderD3D/TD3DVertexPoolResource.cpp +++ b/Toshi/Source/TRenderD3D/TD3DVertexPoolResource.cpp @@ -13,8 +13,8 @@ TBOOL TVertexPoolResource::Validate() return TTRUE; } - TVertexFactoryResource* pFactory = TSTATICCAST(TVertexFactoryResource*, GetFactory()); - TVertexBlockResource* pVertexBlock = pFactory->FindBlockResource(this); + TVertexFactoryResource *pFactory = TSTATICCAST(TVertexFactoryResource *, GetFactory()); + TVertexBlockResource *pVertexBlock = pFactory->FindBlockResource(this); if (!pVertexBlock) { @@ -30,7 +30,7 @@ TBOOL TVertexPoolResource::Validate() } else if (uiUnk1 == 2) { uiNumVerts = GetMaxVertices(); - uiFlags = 2; + uiFlags = 2; } else { if (uiUnk1 != 4) { @@ -38,7 +38,7 @@ TBOOL TVertexPoolResource::Validate() } uiNumVerts = GetMaxVertices(); - uiFlags = 4; + uiFlags = 4; } pVertexBlock = pFactory->CreateBlockResource(uiNumVerts, uiFlags); @@ -61,7 +61,7 @@ void TVertexPoolResource::OnDestroy() { } -TBOOL TVertexPoolResource::Lock(LockBuffer* a_pLockBuffer) +TBOOL TVertexPoolResource::Lock(LockBuffer *a_pLockBuffer) { return TBOOL(); } @@ -70,7 +70,7 @@ void TVertexPoolResource::Unlock(TUSHORT a_uiNewNumVertices) { } -TBOOL TVertexPoolResource::Create(TVertexFactoryResourceInterface* a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags) +TBOOL TVertexPoolResource::Create(TVertexFactoryResourceInterface *a_pFactory, TUINT a_uiMaxVertices, TUINT a_uiFlags) { return TBOOL(); } diff --git a/Toshi/Source/TRenderD3D/TMSWindow.cpp b/Toshi/Source/TRenderD3D/TMSWindow.cpp index c2bb4ae..d3d60f6 100644 --- a/Toshi/Source/TRenderD3D/TMSWindow.cpp +++ b/Toshi/Source/TRenderD3D/TMSWindow.cpp @@ -6,32 +6,32 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNCREATE(TMSWindow, TObject) LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam); + WPARAM wParam, LPARAM lParam); TMSWindow::TMSWindow() { - m_hWnd = NULL; + m_hWnd = NULL; m_pD3DInterface = TNULL; - m_bIsEnabled = TFALSE; - m_bIsWindowed = TTRUE; + m_bIsEnabled = TFALSE; + m_bIsWindowed = TTRUE; TCString className = TGetClass(TRenderD3DInterface).GetName(); Destroy(); WNDCLASSEX wndClass; - wndClass.cbSize = sizeof(WNDCLASSEX); - wndClass.style = CS_CLASSDC; - wndClass.lpfnWndProc = WindowProc; - wndClass.cbClsExtra = 0; // No extra bytes after the window class - wndClass.cbWndExtra = 0; // structure or the window instance - wndClass.hInstance = 0; - wndClass.hIcon = 0; - wndClass.hCursor = 0; + wndClass.cbSize = sizeof(WNDCLASSEX); + wndClass.style = CS_CLASSDC; + wndClass.lpfnWndProc = WindowProc; + wndClass.cbClsExtra = 0; // No extra bytes after the window class + wndClass.cbWndExtra = 0; // structure or the window instance + wndClass.hInstance = 0; + wndClass.hIcon = 0; + wndClass.hCursor = 0; wndClass.hbrBackground = 0; - wndClass.lpszMenuName = 0; + wndClass.lpszMenuName = 0; wndClass.lpszClassName = 0; - wndClass.hIconSm = 0; - wndClass.hInstance = GetModuleHandle(NULL); + wndClass.hIconSm = 0; + wndClass.hInstance = GetModuleHandle(NULL); wndClass.lpszClassName = className; RegisterClassEx(&wndClass); @@ -44,11 +44,11 @@ TMSWindow::~TMSWindow() } LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, - WPARAM wParam, LPARAM lParam) + WPARAM wParam, LPARAM lParam) { - TMSWindow* pWindow; + TMSWindow *pWindow; if (message == WM_CREATE) { - SetWindowLong(hWnd, GWL_USERDATA, *(LONG*)lParam); + SetWindowLong(hWnd, GWL_USERDATA, *(LONG *)lParam); return 0; } if (message != WM_CLOSE) { @@ -65,7 +65,7 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, else if (message != WM_DESTROY) { if (message == WM_SETCURSOR) { SetCursor(NULL); - pWindow = (TMSWindow*)GetWindowLong(hWnd, GWL_USERDATA); + pWindow = (TMSWindow *)GetWindowLong(hWnd, GWL_USERDATA); pWindow->GetD3DInterface()->GetD3DDevice()->ShowCursor(TRUE); return 1; } @@ -74,26 +74,25 @@ LRESULT CALLBACK WindowProc(HWND hWnd, UINT message, } return 0; } - pWindow = (TMSWindow*)GetWindowLong(hWnd, GWL_USERDATA); + pWindow = (TMSWindow *)GetWindowLong(hWnd, GWL_USERDATA); pWindow->GetD3DInterface()->Exit(); return 0; } -TBOOL TMSWindow::Create(TRenderD3DInterface* a_pRenderer, TPCCHAR a_szName) +TBOOL TMSWindow::Create(TRenderD3DInterface *a_pRenderer, TPCCHAR a_szName) { Destroy(); m_pD3DInterface = a_pRenderer; - m_hWnd = CreateWindowEx( - 0, - TGetClass(TRenderD3DInterface).GetName(), - a_szName, - WS_DISABLED | WS_CAPTION | WS_SYSMENU | WS_GROUP, - 0, 0, 0, 0, - GetDesktopWindow(), - NULL, - GetModuleHandle(NULL), - this - ); + m_hWnd = CreateWindowEx( + 0, + TGetClass(TRenderD3DInterface).GetName(), + a_szName, + WS_DISABLED | WS_CAPTION | WS_SYSMENU | WS_GROUP, + 0, 0, 0, 0, + GetDesktopWindow(), + NULL, + GetModuleHandle(NULL), + this); if (m_hWnd) { Disable(); diff --git a/Toshi/Source/TRenderD3D/TRenderCaptureD3D.cpp b/Toshi/Source/TRenderD3D/TRenderCaptureD3D.cpp index 924ba31..bb233ca 100644 --- a/Toshi/Source/TRenderD3D/TRenderCaptureD3D.cpp +++ b/Toshi/Source/TRenderD3D/TRenderCaptureD3D.cpp @@ -7,7 +7,7 @@ TBOOL TRenderCaptureD3D::Create(FORMAT a_eFormat, TINT a_iWidth, TINT a_iHeight) { TASSERT(a_eFormat == FORMAT_RGB24 || a_eFormat == FORMAT_RGBA32); m_eFormat = a_eFormat; - m_iWidth = a_iWidth; + m_iWidth = a_iWidth; m_iHeight = a_iHeight; return TTRUE; } @@ -20,13 +20,13 @@ void TRenderCaptureD3D::Destroy() TBOOL TRenderCaptureD3D::Request() { ReleaseBuffer(); - TRenderD3DInterface* renderer = static_cast(TRenderInterface::GetRenderer()); - auto pDevice = renderer->GetCurrentDevice(); - auto pMode = pDevice->GetMode(); - TMSWindow* window = renderer->GetMSWindow(); - RECT rect; + TRenderD3DInterface *renderer = static_cast(TRenderInterface::GetRenderer()); + auto pDevice = renderer->GetCurrentDevice(); + auto pMode = pDevice->GetMode(); + TMSWindow *window = renderer->GetMSWindow(); + RECT rect; GetWindowRect(window->GetHWND(), &rect); - TRenderInterface::DisplayParams* params = renderer->GetCurrentDisplayParams(); + TRenderInterface::DisplayParams *params = renderer->GetCurrentDisplayParams(); if (params->bWindowed) { rect.left += 10.0f; rect.top += 25.0f; @@ -35,9 +35,9 @@ TBOOL TRenderCaptureD3D::Request() // All points are floor/ceil/rounded but not sure, might just be a float addition } else { - rect.left = 0; - rect.top = 0; - rect.right = pMode->GetWidth(); + rect.left = 0; + rect.top = 0; + rect.right = pMode->GetWidth(); rect.bottom = pMode->GetHeight(); } m_pBuffer = new TCHAR[m_iHeight * m_iWidth * 4]; @@ -70,4 +70,4 @@ void TRenderCaptureD3D::ReleaseBuffer() } } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TRenderD3D/TRenderContextD3D.cpp b/Toshi/Source/TRenderD3D/TRenderContextD3D.cpp index 81fc41e..49f022d 100644 --- a/Toshi/Source/TRenderD3D/TRenderContextD3D.cpp +++ b/Toshi/Source/TRenderD3D/TRenderContextD3D.cpp @@ -1 +1 @@ -#include "TRenderD3D/TRenderContextD3D.h" \ No newline at end of file +#include "TRenderD3D/TRenderContextD3D.h" diff --git a/Toshi/Source/TRenderD3D/TRenderD3DAdapter.cpp b/Toshi/Source/TRenderD3D/TRenderD3DAdapter.cpp index c51dd1d..f3669b4 100644 --- a/Toshi/Source/TRenderD3D/TRenderD3DAdapter.cpp +++ b/Toshi/Source/TRenderD3D/TRenderD3DAdapter.cpp @@ -8,12 +8,12 @@ TUINT TD3DAdapter::GetAdapterIndex() const return m_uiAdapterIndex; } -const TCString& TD3DAdapter::GetDriver() const +const TCString &TD3DAdapter::GetDriver() const { return m_Driver; } -const TCString& TD3DAdapter::GetDriverDescription() const +const TCString &TD3DAdapter::GetDriverDescription() const { return m_Description; } @@ -38,7 +38,7 @@ TUSHORT TD3DAdapter::GetBuild() const return m_DriverVersionLowPart & 0xFFFF; } -const GUID& TD3DAdapter::GetDeviceIdentifier() const +const GUID &TD3DAdapter::GetDeviceIdentifier() const { return m_DeviceIdentifier; } @@ -48,13 +48,13 @@ TUINT TD3DAdapter::GetNumSupportedDevices() const return Mode::NUMSUPPORTEDDEVICES; } -void TD3DAdapter::EnumerateOutputs(TRenderInterface* a_pRenderer) +void TD3DAdapter::EnumerateOutputs(TRenderInterface *a_pRenderer) { - TRenderD3DInterface* pRenderer = TSTATICCAST(TRenderD3DInterface*, a_pRenderer); + TRenderD3DInterface *pRenderer = TSTATICCAST(TRenderD3DInterface *, a_pRenderer); - TUINT32 uiAdapterIndex = GetAdapterIndex(); + TUINT32 uiAdapterIndex = GetAdapterIndex(); TUINT32 uiNumSupportedDevices = GetNumSupportedDevices(); - TUINT32 uiAdapterModeCount = pRenderer->GetD3DInterface()->GetAdapterModeCount(uiAdapterIndex); + TUINT32 uiAdapterModeCount = pRenderer->GetD3DInterface()->GetAdapterModeCount(uiAdapterIndex); for (TUINT32 i = 0; i < uiAdapterModeCount; i++) { @@ -67,7 +67,7 @@ void TD3DAdapter::EnumerateOutputs(TRenderInterface* a_pRenderer) for (TUINT32 k = 0; k < uiNumSupportedDevices; k++) { - auto pDevice = TSTATICCAST(TD3DAdapter::Mode::Device*, pMode->GetDevice(k)); + auto pDevice = TSTATICCAST(TD3DAdapter::Mode::Device *, pMode->GetDevice(k)); pDevice->SetOwnerMode(pMode); pDevice->SetDeviceIndex(k); @@ -78,12 +78,11 @@ void TD3DAdapter::EnumerateOutputs(TRenderInterface* a_pRenderer) Mode::Device::DEVICETYPES[k], pMode->GetD3DDisplayMode().Format, pMode->GetD3DDisplayMode().Format, - FALSE - ); + FALSE); if (SUCCEEDED(hRes)) { - auto& caps = pDevice->GetD3DCaps(); + auto &caps = pDevice->GetD3DCaps(); if (Mode::Device::DEVICETYPES[k] == D3DDEVTYPE_REF) { @@ -98,7 +97,7 @@ void TD3DAdapter::EnumerateOutputs(TRenderInterface* a_pRenderer) if (caps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) { pDevice->m_bSupportsTransformation = TTRUE; - pDevice->m_bSupportsPureDevice = caps.DevCaps & D3DDEVCAPS_PUREDEVICE; + pDevice->m_bSupportsPureDevice = caps.DevCaps & D3DDEVCAPS_PUREDEVICE; } if (caps.DevCaps & D3DDEVCAPS_NPATCHES) @@ -132,18 +131,16 @@ void TD3DAdapter::EnumerateOutputs(TRenderInterface* a_pRenderer) pMode->GetD3DDisplayMode().Format, D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_SURFACE, - Mode::Device::DEPTHSTENCILFORMATS[j] - ); + Mode::Device::DEPTHSTENCILFORMATS[j]); if (SUCCEEDED(hCheck)) { - HRESULT hMatch = pRenderer->GetD3DInterface ()->CheckDepthStencilMatch( + HRESULT hMatch = pRenderer->GetD3DInterface()->CheckDepthStencilMatch( uiAdapterIndex, Mode::Device::DEVICETYPES[k], pMode->GetD3DDisplayMode().Format, pMode->GetD3DDisplayMode().Format, - Mode::Device::DEPTHSTENCILFORMATS[j] - ); + Mode::Device::DEPTHSTENCILFORMATS[j]); if (SUCCEEDED(hMatch)) { @@ -159,7 +156,7 @@ void TD3DAdapter::EnumerateOutputs(TRenderInterface* a_pRenderer) } } -TRenderAdapter* TD3DAdapter::Mode::GetAdapter() const +TRenderAdapter *TD3DAdapter::Mode::GetAdapter() const { return m_pOwnerAdapter; } @@ -186,8 +183,7 @@ TBOOL TD3DAdapter::Mode::Is32Bit() const TBOOL TD3DAdapter::Mode::Is16Bit() const { - return - m_DisplayMode.Format == D3DFMT_R5G6B5 || + return m_DisplayMode.Format == D3DFMT_R5G6B5 || m_DisplayMode.Format == D3DFMT_X1R5G5B5 || m_DisplayMode.Format == D3DFMT_X4R4G4B4; } @@ -197,7 +193,7 @@ TUINT TD3DAdapter::Mode::GetRefreshRate() const return m_DisplayMode.RefreshRate; } -TRenderAdapter::Mode::Device* TD3DAdapter::Mode::GetDevice(TUINT a_iDevice) +TRenderAdapter::Mode::Device *TD3DAdapter::Mode::GetDevice(TUINT a_iDevice) { if (a_iDevice >= 0 && a_iDevice < NUMSUPPORTEDDEVICES) { @@ -211,13 +207,13 @@ D3DFORMAT TD3DAdapter::Mode::GetBackBufferFormat(TUINT a_uiColourDepth) { if (a_uiColourDepth == 16) { - return TSTATICCAST(D3DFORMAT, (-(TUINT32)((*(TUINT8*)&(m_DisplayMode).Format & 0x17) != 0) & 0xfffffff9) + D3DFMT_X4R4G4B4); + return TSTATICCAST(D3DFORMAT, (-(TUINT32)((*(TUINT8 *)&(m_DisplayMode).Format & 0x17) != 0) & 0xfffffff9) + D3DFMT_X4R4G4B4); } return TSTATICCAST(D3DFORMAT, (a_uiColourDepth != 32) - 1 & 0x16); } -TRenderAdapter::Mode* TD3DAdapter::Mode::Device::GetMode() const +TRenderAdapter::Mode *TD3DAdapter::Mode::Device::GetMode() const { return m_pOwnerMode; } @@ -255,4 +251,4 @@ TBOOL TD3DAdapter::Mode::Device::IsDepthStencilFormatSupported(TUINT a_iIndex) c TBOOL TD3DAdapter::Mode::Device::SupportsPureDevice() const { return m_bSupportsPureDevice; -} \ No newline at end of file +} diff --git a/Toshi/Source/TRenderD3D/TRenderD3DInterface.cpp b/Toshi/Source/TRenderD3D/TRenderD3DInterface.cpp index 98a4081..ce5c49c 100644 --- a/Toshi/Source/TRenderD3D/TRenderD3DInterface.cpp +++ b/Toshi/Source/TRenderD3D/TRenderD3DInterface.cpp @@ -11,19 +11,19 @@ IMPLEMENT_DYNCREATE(TRenderD3DInterface, TRenderInterface) TRenderD3DInterface::TRenderD3DInterface() { - m_pD3DInterface = NULL; - m_pD3DDevice = NULL; - m_hAccel = NULL; - m_pCurrentDevice = TNULL; - m_oDisplayParams.uiWidth = 640; - m_oDisplayParams.uiHeight = 480; - m_oDisplayParams.uiColourDepth = 32; - m_oDisplayParams.bWindowed = TTRUE; - m_bIsExited = TFALSE; - m_bUsingColorCorrection = TTRUE; + m_pD3DInterface = NULL; + m_pD3DDevice = NULL; + m_hAccel = NULL; + m_pCurrentDevice = TNULL; + m_oDisplayParams.uiWidth = 640; + m_oDisplayParams.uiHeight = 480; + m_oDisplayParams.uiColourDepth = 32; + m_oDisplayParams.bWindowed = TTRUE; + m_bIsExited = TFALSE; + m_bUsingColorCorrection = TTRUE; m_bCheckedCapableColourCorrection = TFALSE; - m_bCapableColourCorrection = TFALSE; - m_bEnableColourCorrection = TTRUE; + m_bCapableColourCorrection = TFALSE; + m_bEnableColourCorrection = TTRUE; } void TOSHI_API TRenderD3DInterface::TD3DAssert(HRESULT a_hr, TPCCHAR a_pError) @@ -44,7 +44,7 @@ TRenderD3DInterface::~TRenderD3DInterface() Destroy(); } -TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& a_rParams) +TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams &a_rParams) { TASSERT(TTRUE == IsCreated()); TASSERT(TFALSE == IsDisplayCreated()); @@ -53,7 +53,7 @@ TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& return TFALSE; } - m_pCurrentDevice = (TD3DAdapter::Mode::Device*)FindDevice(&a_rParams); + m_pCurrentDevice = (TD3DAdapter::Mode::Device *)FindDevice(&a_rParams); m_oDisplayParams = a_rParams; TASSERT(m_pCurrentDevice != TNULL); @@ -61,7 +61,7 @@ TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& return TFALSE; } - TRenderInterface::DisplayParams* pDisplayParams = GetCurrentDisplayParams(); + TRenderInterface::DisplayParams *pDisplayParams = GetCurrentDisplayParams(); RECT clientRect; GetClientRect(GetDesktopWindow(), &clientRect); @@ -74,25 +74,25 @@ TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& TUINT32 uiWindowPosY = 0; if (pDisplayParams->bWindowed) { - TRenderAdapter::Mode* pMode = GetCurrentDevice()->GetMode(); - uiWindowPosX = (clientRect.right - pMode->GetWidth()) / 2; - uiWindowPosY = (clientRect.bottom - pMode->GetHeight()) / 2; + TRenderAdapter::Mode *pMode = GetCurrentDevice()->GetMode(); + uiWindowPosX = (clientRect.right - pMode->GetWidth()) / 2; + uiWindowPosY = (clientRect.bottom - pMode->GetHeight()) / 2; } TSystem::MemSet(&m_oPresentParams, 0, sizeof(m_oPresentParams)); - m_oPresentParams.Windowed = pDisplayParams->bWindowed; - m_oPresentParams.BackBufferCount = 1; - m_oPresentParams.MultiSampleType = D3DMULTISAMPLE_NONE; - m_oPresentParams.SwapEffect = D3DSWAPEFFECT_DISCARD; + m_oPresentParams.Windowed = pDisplayParams->bWindowed; + m_oPresentParams.BackBufferCount = 1; + m_oPresentParams.MultiSampleType = D3DMULTISAMPLE_NONE; + m_oPresentParams.SwapEffect = D3DSWAPEFFECT_DISCARD; m_oPresentParams.EnableAutoDepthStencil = TRUE; - m_oPresentParams.hDeviceWindow = GetMSWindow()->GetHWND(); + m_oPresentParams.hDeviceWindow = GetMSWindow()->GetHWND(); m_oPresentParams.AutoDepthStencilFormat = TD3DAdapter::Mode::Device::DEPTHSTENCILFORMATS[pDisplayParams->eDepthStencilFormat]; - m_oPresentParams.BackBufferWidth = pDisplayParams->uiWidth; - m_oPresentParams.BackBufferHeight = pDisplayParams->uiHeight; + m_oPresentParams.BackBufferWidth = pDisplayParams->uiWidth; + m_oPresentParams.BackBufferHeight = pDisplayParams->uiHeight; - auto pDevice = TSTATICCAST(TD3DAdapter::Mode::Device*, GetCurrentDevice()); - auto pMode = TSTATICCAST(TD3DAdapter::Mode*, pDevice->GetMode()); - auto pAdapter = TSTATICCAST(TD3DAdapter*, pMode->GetAdapter()); + auto pDevice = TSTATICCAST(TD3DAdapter::Mode::Device *, GetCurrentDevice()); + auto pMode = TSTATICCAST(TD3DAdapter::Mode *, pDevice->GetMode()); + auto pAdapter = TSTATICCAST(TD3DAdapter *, pMode->GetAdapter()); auto uiAdapterIndex = pAdapter->GetAdapterIndex(); if (pDisplayParams->bWindowed) { @@ -108,8 +108,7 @@ TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& GetMSWindow()->GetHWND(), pDevice->GetD3DDeviceFlags(), &m_oPresentParams, - &m_pD3DDevice - ); + &m_pD3DDevice); if (FAILED(hRes)) { TD3DAssert(hRes, "Failed to create D3D Device!"); @@ -128,7 +127,7 @@ TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& GetMSWindow()->Position(uiWindowPosX, uiWindowPosY, pDisplayParams->uiWidth, pDisplayParams->uiHeight); GetMSWindow()->Enable(); - IDirect3DSurface8* pSurface; + IDirect3DSurface8 *pSurface; GetD3DDevice()->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &pSurface); pSurface->GetDesc(&m_oSurfaceDesk); pSurface->Release(); @@ -138,9 +137,9 @@ TBOOL TRenderD3DInterface::CreateDisplay(const TRenderInterface::DisplayParams& for (int i = 0; i < 32; i++) { invalidTextureData[i] = 0xff0fff0f; } - - TTextureFactoryHAL* factory = (TTextureFactoryHAL*)GetSystemResource(SYSRESOURCE_TEXTUREFACTORY); - m_pInvalidTexture = factory->CreateTextureFromMemory(invalidTextureData, sizeof(invalidTextureData), 17, 8, 8); + + TTextureFactoryHAL *factory = (TTextureFactoryHAL *)GetSystemResource(SYSRESOURCE_TEXTUREFACTORY); + m_pInvalidTexture = factory->CreateTextureFromMemory(invalidTextureData, sizeof(invalidTextureData), 17, 8, 8); TVALIDADDRESS(m_pInvalidTexture); EnableColourCorrection(TTRUE); @@ -169,7 +168,7 @@ TBOOL TRenderD3DInterface::Update(float a_fDeltaTime) if (TranslateAccelerator(GetMSWindow()->GetHWND(), GetAcceleratorTable(), &msg) == 0) { TranslateMessage(&msg); DispatchMessage(&msg); - } + } } } if (!m_bIsExited) { @@ -180,8 +179,8 @@ TBOOL TRenderD3DInterface::Update(float a_fDeltaTime) TBOOL TRenderD3DInterface::BeginScene() { - TASSERT(TTRUE==IsDisplayCreated()); - TASSERT(TFALSE==IsInScene()); + TASSERT(TTRUE == IsDisplayCreated()); + TASSERT(TFALSE == IsInScene()); if (TRenderInterface::BeginScene()) { if (FAILED(m_pD3DDevice->BeginScene())) { return TFALSE; @@ -189,12 +188,12 @@ TBOOL TRenderD3DInterface::BeginScene() RECT windowRect; GetWindowRect(GetMSWindow()->GetHWND(), &windowRect); D3DVIEWPORT8 viewport = { - .X = 0, - .Y = 0, - .Width = DWORD(windowRect.right - windowRect.left), + .X = 0, + .Y = 0, + .Width = DWORD(windowRect.right - windowRect.left), .Height = DWORD(windowRect.bottom - windowRect.top), - .MinZ = 0.0f, - .MaxZ = 1.0f, + .MinZ = 0.0f, + .MaxZ = 1.0f, }; m_pD3DDevice->SetViewport(&viewport); //UpdateColourSettings(); @@ -206,8 +205,8 @@ TBOOL TRenderD3DInterface::BeginScene() TBOOL TRenderD3DInterface::EndScene() { - TASSERT(TTRUE==IsDisplayCreated()); - TASSERT(TFALSE==IsInScene()); + TASSERT(TTRUE == IsDisplayCreated()); + TASSERT(TFALSE == IsInScene()); static TBOOL s_bDeviceLost = TFALSE; if (IsInScene()) { if (FAILED(m_pD3DDevice->EndScene())) { @@ -241,19 +240,19 @@ TBOOL TRenderD3DInterface::EndScene() return TTRUE; } -TRenderAdapter::Mode::Device* TRenderD3DInterface::GetCurrentDevice() +TRenderAdapter::Mode::Device *TRenderD3DInterface::GetCurrentDevice() { return m_pCurrentDevice; } -TRenderInterface::DisplayParams* TRenderD3DInterface::GetCurrentDisplayParams() +TRenderInterface::DisplayParams *TRenderD3DInterface::GetCurrentDisplayParams() { return &m_oDisplayParams; } -TBOOL TRenderD3DInterface::Create(TKernelInterface* a_pKernel) +TBOOL TRenderD3DInterface::Create(TKernelInterface *a_pKernel) { - TASSERT(TFALSE==IsCreated()); + TASSERT(TFALSE == IsCreated()); if (!TRenderInterface::Create(a_pKernel)) { return TFALSE; @@ -314,27 +313,27 @@ TBOOL TRenderD3DInterface::SetPixelAspectRatio(float a_fPixelAspectRatio) return TBOOL(); } -TRenderContext* TRenderD3DInterface::CreateRenderContext() +TRenderContext *TRenderD3DInterface::CreateRenderContext() { - TRenderContextD3D* pRenderContext = new TRenderContextD3D(); + TRenderContextD3D *pRenderContext = new TRenderContextD3D(); TVALIDADDRESS(pRenderContext); return pRenderContext; } -TRenderCapture* TRenderD3DInterface::CreateCapture() +TRenderCapture *TRenderD3DInterface::CreateCapture() { return nullptr; } -void TRenderD3DInterface::DestroyCapture(TRenderCapture* a_pRenderCapture) +void TRenderD3DInterface::DestroyCapture(TRenderCapture *a_pRenderCapture) { } -void TRenderD3DInterface::ConnectDefaultViewportHandelrs(TViewport& a_pViewport) +void TRenderD3DInterface::ConnectDefaultViewportHandelrs(TViewport &a_pViewport) { } -TModel* TRenderD3DInterface::CreateModel(TPCCHAR a_szName, TINT a_iUnk1) +TModel *TRenderD3DInterface::CreateModel(TPCCHAR a_szName, TINT a_iUnk1) { return nullptr; } @@ -343,7 +342,7 @@ TBOOL TRenderD3DInterface::IsCapableColourCorrection() { if (!m_bCheckedCapableColourCorrection) { D3DCAPS8 caps; - HRESULT hRes = GetD3DDevice()->GetDeviceCaps(&caps); + HRESULT hRes = GetD3DDevice()->GetDeviceCaps(&caps); m_bCapableColourCorrection = SUCCEEDED(hRes) && HASFLAG(caps.AdapterOrdinal & 0x20000); } @@ -358,16 +357,16 @@ void TRenderD3DInterface::EnableColourCorrection(TBOOL a_bEnable) TBOOL TRenderD3DInterface::IsTextureFormatSupported(TTEXTURERESOURCEFORMAT a_eTextureFormat) { switch (a_eTextureFormat) { - case R8G8B8A8: - return IsTextureFormatSupported(D3DFMT_A8R8G8B8); - case R8G8B8: - return IsTextureFormatSupported(D3DFMT_X8R8G8B8); - case R5G5B5A1: - return IsTextureFormatSupported(D3DFMT_A1R5G5B5); - case DDS: - return TTRUE; - default: - return TFALSE; + case R8G8B8A8: + return IsTextureFormatSupported(D3DFMT_A8R8G8B8); + case R8G8B8: + return IsTextureFormatSupported(D3DFMT_X8R8G8B8); + case R5G5B5A1: + return IsTextureFormatSupported(D3DFMT_A1R5G5B5); + case DDS: + return TTRUE; + default: + return TFALSE; } } @@ -380,9 +379,7 @@ TBOOL TRenderD3DInterface::IsTextureFormatSupported(D3DFORMAT a_eFormat) m_oPresentParams.BackBufferFormat, 0, D3DRTYPE_TEXTURE, - a_eFormat - ) - ); + a_eFormat)); } TBOOL TRenderD3DInterface::Supports32BitTextures() @@ -397,7 +394,7 @@ void TRenderD3DInterface::BuildAdapterDatabase() pAdapter->SetAdapterIndex(i); D3DDISPLAYMODE displayMode; - auto pIdentifier = pAdapter->GetD3DIdentifier8(); + auto pIdentifier = pAdapter->GetD3DIdentifier8(); m_pD3DInterface->GetAdapterIdentifier(i, D3DENUM_NO_WHQL_LEVEL, pIdentifier); m_pD3DInterface->GetAdapterDisplayMode(i, &displayMode); @@ -424,13 +421,13 @@ void TRenderD3DInterface::CreateAcceleratorTableA() ACCEL accel[2]; // ESCAPE accel[0].fVirt = FVIRTKEY; - accel[0].key = VK_ESCAPE; - accel[0].cmd = 0; + accel[0].key = VK_ESCAPE; + accel[0].cmd = 0; // ALT+ENTER accel[1].fVirt = FALT; - accel[1].key = VK_RETURN; - accel[1].cmd = 1; - m_hAccel = ::CreateAcceleratorTableA(accel, 2); + accel[1].key = VK_RETURN; + accel[1].cmd = 1; + m_hAccel = ::CreateAcceleratorTableA(accel, 2); } void TRenderD3DInterface::DestroyAcceleratorTable() diff --git a/Toshi/Source/TRenderD3D/TTextureFactoryD3D.cpp b/Toshi/Source/TRenderD3D/TTextureFactoryD3D.cpp index d509731..ff6c7e7 100644 --- a/Toshi/Source/TRenderD3D/TTextureFactoryD3D.cpp +++ b/Toshi/Source/TRenderD3D/TTextureFactoryD3D.cpp @@ -6,20 +6,18 @@ TOSHI_NAMESPACE_USING IMPLEMENT_DYNCREATE(TTextureFactoryHAL, TTextureFactory) -TTextureResource* TTextureFactoryHAL::CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) +TTextureResource *TTextureFactoryHAL::CreateTextureFromFile(TPCCHAR a_szFileName, TUINT a_eTextureFlags) { - TTextureResource* pTexture = FindTexture(a_szFileName); + TTextureResource *pTexture = FindTexture(a_szFileName); if (pTexture) return pTexture; pTexture = TSTATICCAST( - TTextureResource*, + TTextureResource *, GetRenderer()->CreateResource( TClass::Find("TTextureResourceHAL", TNULL), TNULL, - this - ) - ); + this)); pTexture->Create(a_szFileName, a_eTextureFlags); RegisterTexture(a_szFileName, pTexture); @@ -28,10 +26,10 @@ TTextureResource* TTextureFactoryHAL::CreateTextureFromFile(TPCCHAR a_szFileName return pTexture; } -TTextureResource* TTextureFactoryHAL::CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) +TTextureResource *TTextureFactoryHAL::CreateTextureFromMemory(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels) { static TUINT s_iNumMemTextures = 0; - static char s_szName[32]; + static char s_szName[32]; s_szName[0] = 'm'; s_szName[1] = 't'; @@ -40,14 +38,12 @@ TTextureResource* TTextureFactoryHAL::CreateTextureFromMemory(TPVOID a_pData, TU s_szName[4] = ':'; TSystem::StringIntToString(++s_iNumMemTextures, &s_szName[5], 16); - TTextureResource* pTexture = TSTATICCAST( - TTextureResource*, + TTextureResource *pTexture = TSTATICCAST( + TTextureResource *, GetRenderer()->CreateResource( TClass::Find("TTextureResourceHAL", TNULL), TNULL, - this - ) - ); + this)); pTexture->Create(a_pData, a_uiDataSize, a_uiWidth, a_uiHeight, a_uiMipLevels); RegisterTexture(s_szName, pTexture); @@ -55,10 +51,10 @@ TTextureResource* TTextureFactoryHAL::CreateTextureFromMemory(TPVOID a_pData, TU return pTexture; } -TTextureResource* TTextureFactoryHAL::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) +TTextureResource *TTextureFactoryHAL::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiMipLevels, TTEXTURERESOURCEFORMAT a_eFormat, TUINT a_uiFormatBits) { static TUINT s_iNumMemTextures = 0; - static char s_szName[32]; + static char s_szName[32]; s_szName[0] = 'm'; s_szName[1] = 't'; @@ -67,14 +63,12 @@ TTextureResource* TTextureFactoryHAL::CreateEx(TPVOID a_pData, TUINT a_uiDataSiz s_szName[4] = ':'; TSystem::StringIntToString(++s_iNumMemTextures, &s_szName[5], 16); - TTextureResource* pTexture = TSTATICCAST( - TTextureResource*, + TTextureResource *pTexture = TSTATICCAST( + TTextureResource *, GetRenderer()->CreateResource( TClass::Find("TTextureResourceHAL", TNULL), TNULL, - this - ) - ); + this)); pTexture->CreateEx(a_pData, a_uiDataSize, a_uiWidth, a_uiHeight, a_uiMipLevels, a_eFormat, a_uiFormatBits); RegisterTexture(s_szName, pTexture); diff --git a/Toshi/Source/TRenderD3D/TTextureResourceD3D.cpp b/Toshi/Source/TRenderD3D/TTextureResourceD3D.cpp index 47cd62e..7aa6a7c 100644 --- a/Toshi/Source/TRenderD3D/TTextureResourceD3D.cpp +++ b/Toshi/Source/TRenderD3D/TTextureResourceD3D.cpp @@ -15,7 +15,7 @@ TBOOL TTextureResourceHAL::Validate() } TMemory::DebugPrintHALMemInfo("ENTER TTextureResourceHAL::Validate()"); - auto pRenderer = TSTATICCAST(TRenderD3DInterface*, GetRenderer()); + auto pRenderer = TSTATICCAST(TRenderD3DInterface *, GetRenderer()); if (m_iLoadFromMemory) { // Load from memory @@ -39,20 +39,20 @@ TBOOL TTextureResourceHAL::Validate() } else { HRESULT hRes = D3DXCreateTextureFromFileInMemoryEx(pRenderer->GetD3DDevice(), - m_pData, - m_uiDataSize, - -1, - -1, - -1, - 0, - D3DFMT_UNKNOWN, - D3DPOOL_MANAGED, - D3DX_FILTER_BOX, - D3DX_FILTER_BOX, - 0, - &m_oImageInfo, - NULL, - &m_pD3DTexture); + m_pData, + m_uiDataSize, + -1, + -1, + -1, + 0, + D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, + D3DX_FILTER_BOX, + D3DX_FILTER_BOX, + 0, + &m_oImageInfo, + NULL, + &m_pD3DTexture); TRenderD3DInterface::TD3DAssert(hRes, TNULL); } } @@ -64,9 +64,8 @@ TBOOL TTextureResourceHAL::Validate() if (GetNameEntry() && !IsPPM(GetNameEntry()->GetName())) { HRESULT hRes = D3DXCreateTextureFromFileEx(pRenderer->GetD3DDevice(), GetNameEntry()->GetName(), - -1, -1, -1, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DFILTER_LINEARMIPNEAREST, - D3DFILTER_LINEARMIPNEAREST, 0, &m_oImageInfo, NULL, &m_pD3DTexture - ); + -1, -1, -1, 0, D3DFMT_UNKNOWN, D3DPOOL_MANAGED, D3DFILTER_LINEARMIPNEAREST, + D3DFILTER_LINEARMIPNEAREST, 0, &m_oImageInfo, NULL, &m_pD3DTexture); TRenderD3DInterface::TD3DAssert(hRes, TNULL); } } @@ -90,7 +89,7 @@ TUINT TTextureResourceHAL::GetHeight() return m_oImageInfo.Height; } -TBOOL TTextureResourceHAL::Lock(TTextureResource::LOCKSTATE& a_rLockState) +TBOOL TTextureResourceHAL::Lock(TTextureResource::LOCKSTATE &a_rLockState) { if (!m_pD3DTexture) { return TFALSE; @@ -114,8 +113,8 @@ TBOOL TTextureResourceHAL::Lock(TTextureResource::LOCKSTATE& a_rLockState) void TTextureResourceHAL::Unlock() { - TASSERT(0!=m_uiLockCount); - TASSERT(TNULL!=m_pD3DTexture); + TASSERT(0 != m_uiLockCount); + TASSERT(TNULL != m_pD3DTexture); if (m_uiLockCount != 0 && m_pD3DTexture) { @@ -131,15 +130,15 @@ TBOOL TTextureResourceHAL::Create(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_eT return TFALSE; } - m_eTextureFlags = a_eTextureFlags; - m_uiWidth = a_uiWidth; - m_uiHeight = a_uiHeight; - m_uiMipLevels = 0; + m_eTextureFlags = a_eTextureFlags; + m_uiWidth = a_uiWidth; + m_uiHeight = a_uiHeight; + m_uiMipLevels = 0; m_eResourceFormat = UNKNOWN; - m_uiMipmapFlags = MIPMAPFLAGS_DISABLED; + m_uiMipmapFlags = MIPMAPFLAGS_DISABLED; m_iLoadFromMemory = 1; - m_pData = a_pData; - m_uiDataSize = a_uiDataSize; + m_pData = a_pData; + m_uiDataSize = a_uiDataSize; Validate(); return TTRUE; @@ -163,15 +162,15 @@ TBOOL TTextureResourceHAL::CreateEx(TPVOID a_pData, TUINT a_uiDataSize, TUINT a_ return TFALSE; } - m_eTextureFlags = 0x40; - m_uiWidth = a_uiWidth; - m_uiHeight = a_uiHeight; - m_uiMipLevels = a_uiMipLevels; + m_eTextureFlags = 0x40; + m_uiWidth = a_uiWidth; + m_uiHeight = a_uiHeight; + m_uiMipLevels = a_uiMipLevels; m_eResourceFormat = a_eFormat; - m_uiMipmapFlags = a_uiMipmapFlags; + m_uiMipmapFlags = a_uiMipmapFlags; m_iLoadFromMemory = 1; - m_pData = a_pData; - m_uiDataSize = a_uiDataSize; + m_pData = a_pData; + m_uiDataSize = a_uiDataSize; Validate(); return TTRUE; @@ -183,25 +182,25 @@ TBOOL TTextureResourceHAL::CreateFromFormat() switch (m_eResourceFormat) { - case TTEXTURERESOURCEFORMAT::R8G8B8A8: - return CreateFromMemory8888(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); - case TTEXTURERESOURCEFORMAT::R8G8B8: - return CreateFromMemory888(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); - case TTEXTURERESOURCEFORMAT::R5G5B5A1: - return CreateFromMemory5551(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); - case TTEXTURERESOURCEFORMAT::DDS: - return CreateFromMemoryDDS(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); - case TTEXTURERESOURCEFORMAT::R4G4B4A4: - return CreateFromMemory4444(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); - default: - TASSERT(!"Unknown format!\n"); - return TFALSE; + case TTEXTURERESOURCEFORMAT::R8G8B8A8: + return CreateFromMemory8888(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); + case TTEXTURERESOURCEFORMAT::R8G8B8: + return CreateFromMemory888(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); + case TTEXTURERESOURCEFORMAT::R5G5B5A1: + return CreateFromMemory5551(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); + case TTEXTURERESOURCEFORMAT::DDS: + return CreateFromMemoryDDS(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); + case TTEXTURERESOURCEFORMAT::R4G4B4A4: + return CreateFromMemory4444(m_uiWidth, m_uiHeight, uiMipLevels, m_pData); + default: + TASSERT(!"Unknown format!\n"); + return TFALSE; } } TBOOL TTextureResourceHAL::CreateFromMemory8888(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData) { - TRenderD3DInterface* pRenderer = static_cast(GetRenderer()); + TRenderD3DInterface *pRenderer = static_cast(GetRenderer()); HRESULT hCreateRes = pRenderer->GetD3DDevice()->CreateTexture( a_uiWidth, @@ -210,8 +209,7 @@ TBOOL TTextureResourceHAL::CreateFromMemory8888(TUINT a_uiWidth, TUINT a_uiHeigh 0, D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, - &m_pD3DTexture - ); + &m_pD3DTexture); TRenderD3DInterface::TD3DAssert(hCreateRes, TNULL); if (SUCCEEDED(hCreateRes)) { @@ -220,15 +218,15 @@ TBOOL TTextureResourceHAL::CreateFromMemory8888(TUINT a_uiWidth, TUINT a_uiHeigh TRenderD3DInterface::TD3DAssert(hCreateRes, TNULL); if (a_uiHeight != 0) { - TUINT8* pTexPixel = TSTATICCAST(TUINT8*, rect.pBits); - TUINT8* pDataPixel = TSTATICCAST(TUINT8*, a_pData); + TUINT8 *pTexPixel = TSTATICCAST(TUINT8 *, rect.pBits); + TUINT8 *pDataPixel = TSTATICCAST(TUINT8 *, a_pData); for (TUINT i = a_uiHeight; i != 0; i--) { TUINT8 uiDataPixel = *pDataPixel; - pTexPixel[0] = pDataPixel[3]; - pTexPixel[1] = pDataPixel[2]; - pTexPixel[2] = pDataPixel[1]; - pTexPixel[3] = pDataPixel[0]; + pTexPixel[0] = pDataPixel[3]; + pTexPixel[1] = pDataPixel[2]; + pTexPixel[2] = pDataPixel[1]; + pTexPixel[3] = pDataPixel[0]; pTexPixel += 4; pDataPixel += 4; @@ -238,11 +236,10 @@ TBOOL TTextureResourceHAL::CreateFromMemory8888(TUINT a_uiWidth, TUINT a_uiHeigh if (a_uiLevels == 0) { TSystem::MemSet(&m_oImageInfo, 0, sizeof(D3DXIMAGE_INFO)); - m_oImageInfo.Width = a_uiWidth; + m_oImageInfo.Width = a_uiWidth; m_oImageInfo.Height = a_uiHeight; } } - } return TTRUE; @@ -250,7 +247,7 @@ TBOOL TTextureResourceHAL::CreateFromMemory8888(TUINT a_uiWidth, TUINT a_uiHeigh TBOOL TTextureResourceHAL::CreateFromMemory888(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData) { - TRenderD3DInterface* pRenderer = static_cast(GetRenderer()); + TRenderD3DInterface *pRenderer = static_cast(GetRenderer()); HRESULT hCreateRes = pRenderer->GetD3DDevice()->CreateTexture( a_uiWidth, @@ -259,8 +256,7 @@ TBOOL TTextureResourceHAL::CreateFromMemory888(TUINT a_uiWidth, TUINT a_uiHeight 0, D3DFMT_X8R8G8B8, D3DPOOL_MANAGED, - &m_pD3DTexture - ); + &m_pD3DTexture); TRenderD3DInterface::TD3DAssert(hCreateRes, TNULL); if (SUCCEEDED(hCreateRes)) { @@ -269,15 +265,15 @@ TBOOL TTextureResourceHAL::CreateFromMemory888(TUINT a_uiWidth, TUINT a_uiHeight TRenderD3DInterface::TD3DAssert(hCreateRes, TNULL); if (a_uiHeight != 0) { - TUINT8* pTexPixel = TSTATICCAST(TUINT8*, rect.pBits); - TUINT8* pDataPixel = TSTATICCAST(TUINT8*, a_pData); + TUINT8 *pTexPixel = TSTATICCAST(TUINT8 *, rect.pBits); + TUINT8 *pDataPixel = TSTATICCAST(TUINT8 *, a_pData); for (TUINT i = a_uiHeight; i != 0; i--) { TUINT8 uiDataPixel = *pDataPixel; - pTexPixel[0] = pDataPixel[2]; - pTexPixel[1] = pDataPixel[1]; - pTexPixel[2] = pDataPixel[0]; - pTexPixel[3] = 255; + pTexPixel[0] = pDataPixel[2]; + pTexPixel[1] = pDataPixel[1]; + pTexPixel[2] = pDataPixel[0]; + pTexPixel[3] = 255; pTexPixel += 4; pDataPixel += 3; @@ -287,11 +283,10 @@ TBOOL TTextureResourceHAL::CreateFromMemory888(TUINT a_uiWidth, TUINT a_uiHeight if (a_uiLevels == 0) { TSystem::MemSet(&m_oImageInfo, 0, sizeof(D3DXIMAGE_INFO)); - m_oImageInfo.Width = a_uiWidth; + m_oImageInfo.Width = a_uiWidth; m_oImageInfo.Height = a_uiHeight; } } - } return TBOOL(); @@ -304,23 +299,23 @@ TBOOL TTextureResourceHAL::CreateFromMemory5551(TUINT a_uiWidth, TUINT a_uiHeigh TBOOL TTextureResourceHAL::CreateFromMemoryDDS(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData) { - auto pRenderer = TSTATICCAST(TRenderD3DInterface*, GetRenderer()); - - HRESULT hRes = D3DXCreateTextureFromFileInMemoryEx(pRenderer->GetD3DDevice(), - a_pData, - m_uiDataSize, - -1, - -1, - a_uiLevels, - 0, - D3DFMT_UNKNOWN, - D3DPOOL_MANAGED, - -1, - -1, - 0, - &m_oImageInfo, - NULL, - &m_pD3DTexture); + auto pRenderer = TSTATICCAST(TRenderD3DInterface *, GetRenderer()); + + HRESULT hRes = D3DXCreateTextureFromFileInMemoryEx(pRenderer->GetD3DDevice(), + a_pData, + m_uiDataSize, + -1, + -1, + a_uiLevels, + 0, + D3DFMT_UNKNOWN, + D3DPOOL_MANAGED, + -1, + -1, + 0, + &m_oImageInfo, + NULL, + &m_pD3DTexture); TRenderD3DInterface::TD3DAssert(hRes, TNULL); if (hRes == D3D_OK) { return TTRUE; @@ -331,7 +326,7 @@ TBOOL TTextureResourceHAL::CreateFromMemoryDDS(TUINT a_uiWidth, TUINT a_uiHeight TBOOL TTextureResourceHAL::CreateFromMemory4444(TUINT a_uiWidth, TUINT a_uiHeight, TUINT a_uiLevels, TPVOID a_pData) { - auto pRenderer = TSTATICCAST(TRenderD3DInterface*, GetRenderer()); + auto pRenderer = TSTATICCAST(TRenderD3DInterface *, GetRenderer()); HRESULT hCreateRes = pRenderer->GetD3DDevice()->CreateTexture( a_uiWidth, @@ -340,8 +335,7 @@ TBOOL TTextureResourceHAL::CreateFromMemory4444(TUINT a_uiWidth, TUINT a_uiHeigh 0, D3DFMT_A4R4G4B4, D3DPOOL_MANAGED, - &m_pD3DTexture - ); + &m_pD3DTexture); TRenderD3DInterface::TD3DAssert(hCreateRes, TNULL); if (SUCCEEDED(hCreateRes)) { @@ -350,12 +344,12 @@ TBOOL TTextureResourceHAL::CreateFromMemory4444(TUINT a_uiWidth, TUINT a_uiHeigh TRenderD3DInterface::TD3DAssert(hCreateRes, TNULL); if (a_uiHeight != 0) { - TUSHORT* pTexPixel = TSTATICCAST(TUSHORT*, rect.pBits); - TUSHORT* pDataPixel = TSTATICCAST(TUSHORT*, a_pData); + TUSHORT *pTexPixel = TSTATICCAST(TUSHORT *, rect.pBits); + TUSHORT *pDataPixel = TSTATICCAST(TUSHORT *, a_pData); for (TUINT i = a_uiHeight; i != 0; i--) { TUSHORT uiDataPixel = *pDataPixel; - *pTexPixel = ((((uiDataPixel >> 12) << 4 | uiDataPixel & 15) << 4 | uiDataPixel >> 4 & 15) << 4) | uiDataPixel >> 8 & 15; + *pTexPixel = ((((uiDataPixel >> 12) << 4 | uiDataPixel & 15) << 4 | uiDataPixel >> 4 & 15) << 4) | uiDataPixel >> 8 & 15; pTexPixel++; pDataPixel++; } @@ -365,7 +359,7 @@ TBOOL TTextureResourceHAL::CreateFromMemory4444(TUINT a_uiWidth, TUINT a_uiHeigh if (a_uiLevels == 0) { TSystem::MemSet(&m_oImageInfo, 0, sizeof(D3DXIMAGE_INFO)); - m_oImageInfo.Width = a_uiWidth; + m_oImageInfo.Width = a_uiWidth; m_oImageInfo.Height = a_uiHeight; } diff --git a/Toshi/Source/TTerrain/TTerrainInterface.cpp b/Toshi/Source/TTerrain/TTerrainInterface.cpp index 7cf5b3b..b8af67d 100644 --- a/Toshi/Source/TTerrain/TTerrainInterface.cpp +++ b/Toshi/Source/TTerrain/TTerrainInterface.cpp @@ -4,61 +4,60 @@ TOSHI_NAMESPACE_BEGIN IMPLEMENT_DYNCREATE(TTerrainInterface, TObject) -TFLOAT TTerrainInterface::sm_fLowLODDist = 120.0f; -TFLOAT TTerrainInterface::sm_fLev2LODDist = 70.0f; -TFLOAT TTerrainInterface::sm_fLev1LODDist = 40.0f; +TFLOAT TTerrainInterface::sm_fLowLODDist = 120.0f; +TFLOAT TTerrainInterface::sm_fLev2LODDist = 70.0f; +TFLOAT TTerrainInterface::sm_fLev1LODDist = 40.0f; TFLOAT TTerrainInterface::sm_fLowLODHeightChange = 2.0f; -TFLOAT TTerrainInterface::sm_fLowMountLODDist = 100000000.0f; -TFLOAT TTerrainInterface::sm_fLev2MountLODDist = 150.0f; -TFLOAT TTerrainInterface::sm_fLev1MountLODDist = 100.0f; -TFLOAT TTerrainInterface::sm_fMountainBounds = 4.0f; -TFLOAT TTerrainInterface::sm_fWaterHeight = 2.1f; +TFLOAT TTerrainInterface::sm_fLowMountLODDist = 100000000.0f; +TFLOAT TTerrainInterface::sm_fLev2MountLODDist = 150.0f; +TFLOAT TTerrainInterface::sm_fLev1MountLODDist = 100.0f; +TFLOAT TTerrainInterface::sm_fMountainBounds = 4.0f; +TFLOAT TTerrainInterface::sm_fWaterHeight = 2.1f; -TUINT TTerrainInterface::s_ui32TStamp = 1; -TTerrainInterface *TTerrainInterface::ms_pTerrainInterface = TNULL; -TTerrainInterface::TERRAINLOD TTerrainInterface::sm_eLOD = TERRAINLOD_HIGH; +TUINT TTerrainInterface::s_ui32TStamp = 1; +TTerrainInterface *TTerrainInterface::ms_pTerrainInterface = TNULL; +TTerrainInterface::TERRAINLOD TTerrainInterface::sm_eLOD = TERRAINLOD_HIGH; void TTerrainInterface::SetLODDetail(TERRAINLOD a_eLODDetail) { switch (a_eLODDetail) { - case Toshi::TTerrainInterface::TERRAINLOD_LOW: - sm_fLowLODDist = 80.0f; - sm_fLev2LODDist = 40.0f; - sm_fLev1LODDist = 0.0f; - sm_fLowLODHeightChange = 2.0f; - sm_fLowMountLODDist = 120.0f; - sm_fLev2MountLODDist = 0.0f; - sm_fLev1MountLODDist = 0.0f; - sm_fMountainBounds = 4.0f; - sm_fWaterHeight = 2.1f; - break; - case Toshi::TTerrainInterface::TERRAINLOD_MEDIUM: - sm_fLowLODDist = 110.0f; - sm_fLev2LODDist = 60.0f; - sm_fLev1LODDist = 30.0f; - sm_fLowLODHeightChange = 2.0f; - sm_fLowMountLODDist = 1000000.0f; - sm_fLev2MountLODDist = 140.0f; - sm_fLev1MountLODDist = 100.0f; - sm_fMountainBounds = 4.0f; - sm_fWaterHeight = 2.1f; - break; - case Toshi::TTerrainInterface::TERRAINLOD_HIGH: - sm_fLowLODDist = 220.0f; - sm_fLev2LODDist = 120.0f; - sm_fLev1LODDist = 80.0f; - sm_fLowLODHeightChange = 2.0f; - sm_fLowMountLODDist = 1000000.0f; - sm_fLev2MountLODDist = 170.0f; - sm_fLev1MountLODDist = 130.0f; - sm_fMountainBounds = 4.0f; - sm_fWaterHeight = 2.1f; - break; + case Toshi::TTerrainInterface::TERRAINLOD_LOW: + sm_fLowLODDist = 80.0f; + sm_fLev2LODDist = 40.0f; + sm_fLev1LODDist = 0.0f; + sm_fLowLODHeightChange = 2.0f; + sm_fLowMountLODDist = 120.0f; + sm_fLev2MountLODDist = 0.0f; + sm_fLev1MountLODDist = 0.0f; + sm_fMountainBounds = 4.0f; + sm_fWaterHeight = 2.1f; + break; + case Toshi::TTerrainInterface::TERRAINLOD_MEDIUM: + sm_fLowLODDist = 110.0f; + sm_fLev2LODDist = 60.0f; + sm_fLev1LODDist = 30.0f; + sm_fLowLODHeightChange = 2.0f; + sm_fLowMountLODDist = 1000000.0f; + sm_fLev2MountLODDist = 140.0f; + sm_fLev1MountLODDist = 100.0f; + sm_fMountainBounds = 4.0f; + sm_fWaterHeight = 2.1f; + break; + case Toshi::TTerrainInterface::TERRAINLOD_HIGH: + sm_fLowLODDist = 220.0f; + sm_fLev2LODDist = 120.0f; + sm_fLev1LODDist = 80.0f; + sm_fLowLODHeightChange = 2.0f; + sm_fLowMountLODDist = 1000000.0f; + sm_fLev2MountLODDist = 170.0f; + sm_fLev1MountLODDist = 130.0f; + sm_fMountainBounds = 4.0f; + sm_fWaterHeight = 2.1f; + break; } if (ms_pTerrainInterface) { - } } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/Source/TTerrain/TTerrainSection.cpp b/Toshi/Source/TTerrain/TTerrainSection.cpp index 11e0bc7..7043d5a 100644 --- a/Toshi/Source/TTerrain/TTerrainSection.cpp +++ b/Toshi/Source/TTerrain/TTerrainSection.cpp @@ -9,4 +9,4 @@ void TTerrainSection::SetSystemFlags(TUINT a_ui32ClipFlags) m_ui32ClipFlags = (m_ui32ClipFlags | CLIPFLAG_UNK - 1) & (a_ui32ClipFlags | uiUserBitsFlagMask); } -TOSHI_NAMESPACE_END \ No newline at end of file +TOSHI_NAMESPACE_END diff --git a/Toshi/premake5.lua b/Toshi/premake5.lua index 2aaa1e8..ab0b174 100644 --- a/Toshi/premake5.lua +++ b/Toshi/premake5.lua @@ -1,8 +1,6 @@ project ("TKernelInterface") kind "SharedLib" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -18,21 +16,15 @@ project ("TKernelInterface") defines { - "TKERNELINTERFACE", - "_CRT_SECURE_NO_WARNINGS" + "TKERNELINTERFACE" } libdirs { "%{LibDir.fmod}" } - - filter "files:**.c" - flags { "NoPCH" } filter "system:windows" - systemversion "latest" - files { "Include/*.h", @@ -43,32 +35,10 @@ project ("TKernelInterface") "Include/TKernel/**.h", "Source/TKernel/**.cpp" } - - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" project ("TApplication") kind "SharedLib" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -92,41 +62,12 @@ project ("TApplication") defines { - "TAPPLICATION", - "_CRT_SECURE_NO_WARNINGS" + "TAPPLICATION" } - - filter "files:**.c" - flags { "NoPCH" } - - filter "system:windows" - systemversion "latest" - - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" project ("TTerrainInterface") kind "SharedLib" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -150,41 +91,12 @@ project ("TTerrainInterface") defines { - "TTERRAININTERFACE", - "_CRT_SECURE_NO_WARNINGS" + "TTERRAININTERFACE" } - - filter "files:**.c" - flags { "NoPCH" } - - filter "system:windows" - systemversion "latest" - - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" project ("TRenderInterface") kind "SharedLib" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -201,16 +113,10 @@ project ("TRenderInterface") defines { - "TRENDERINTERFACE", - "_CRT_SECURE_NO_WARNINGS" + "TRENDERINTERFACE" } - - filter "files:**.c" - flags { "NoPCH" } filter "system:windows" - systemversion "latest" - files { "Include/*.h", @@ -218,31 +124,9 @@ project ("TRenderInterface") "Source/TRender/**.cpp" } - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" - project ("TRenderD3DInterface") kind "SharedLib" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -276,18 +160,12 @@ project ("TRenderD3DInterface") defines { "TRENDERINTERFACED3D", - "SAFESEH=0", - "_CRT_SECURE_NO_WARNINGS" + "SAFESEH=0" } linkoptions "/SAFESEH:NO" - - filter "files:**.c" - flags { "NoPCH" } filter "system:windows" - systemversion "latest" - files { "Include/*.h", @@ -295,31 +173,9 @@ project ("TRenderD3DInterface") "Source/TRenderD3D/**.cpp" } - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" - project ("TSysShaderD3D") kind "SharedLib" language "C++" - cppdialect "C++20" - characterset "ASCII" links { @@ -353,18 +209,12 @@ project ("TSysShaderD3D") defines { "TSYSSHADERD3D", - "SAFESEH=0", - "_CRT_SECURE_NO_WARNINGS" + "SAFESEH=0" } linkoptions "/SAFESEH:NO" - - filter "files:**.c" - flags { "NoPCH" } filter "system:windows" - systemversion "latest" - files { "Include/*.h", @@ -372,26 +222,6 @@ project ("TSysShaderD3D") "Shaders/TSysShader/Source/**.cpp" } - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" - project ("TGuiInterface") kind "SharedLib" language "C++" @@ -420,32 +250,5 @@ project ("TGuiInterface") defines { - "TGUIINTERFACE", - "_CRT_SECURE_NO_WARNINGS" + "TGUIINTERFACE" } - - filter "files:**.c" - flags { "NoPCH" } - - filter "system:windows" - systemversion "latest" - - defines - { - "TOSHI_SKU_WINDOWS" - } - - filter "configurations:Debug" - defines "TOSHI_DEBUG" - runtime "Debug" - symbols "On" - - filter "configurations:Release" - defines "TOSHI_RELEASE" - runtime "Release" - optimize "On" - - filter "configurations:Final" - defines "TOSHI_FINAL" - runtime "Release" - optimize "On" \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index bdfe870..3e5fe10 100644 --- a/premake5.lua +++ b/premake5.lua @@ -2,21 +2,61 @@ include "Settings.lua" include "Dependencies.lua" workspace ("OpenJPOG") + cppdialect "C++20" + characterset "ASCII" + platforms "Windows" configurations { "Debug", "Release", "Final" } - disablewarnings { "4996" } + disablewarnings { "4996", "4251", "4275" } debugdir ("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") targetdir ("%{wks.location}/bin/" .. outputdir .. "/%{prj.name}") objdir ("%{wks.location}/bin-int/" .. outputdir .. "/%{prj.name}") + + -- Disable precompiled headers for C files + filter "files:**.c" + flags { "NoPCH" } + + -- Global defines + defines + { + "_CRT_SECURE_NO_WARNINGS", + "NOMINMAX" + } + + -- Windows defines + filter "system:windows" + systemversion "latest" + + defines + { + "TOSHI_SKU_WINDOWS" + } + -- Architectures filter "options:arch=x86" architecture "x86" filter "options:arch=x64" architecture "x64" + -- Building modes + filter "configurations:Debug" + defines "TOSHI_DEBUG" + runtime "Debug" + symbols "On" + + filter "configurations:Release" + defines "TOSHI_RELEASE" + runtime "Release" + optimize "On" + + filter "configurations:Final" + defines "TOSHI_FINAL" + runtime "Release" + optimize "On" + group "Engine" include "Toshi" include "OpenJPOG" diff --git a/vendor/clang-format.exe b/vendor/clang-format.exe new file mode 100644 index 0000000..5d40801 Binary files /dev/null and b/vendor/clang-format.exe differ