Merge pull request #114 from InfiniteC0re/master

Clean up and actualize code a bit

Author: AdventureT

.clang-format

@@ -0,0 +1,111 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: BlockIndent
+AlignConsecutiveMacros: true
+AlignConsecutiveAssignments: true
+AlignConsecutiveDeclarations: true
+AlignEscapedNewlines: Left
+AlignOperands:   false
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: true
+AllowShortFunctionsOnASingleLine: InlineOnly
+AllowShortLambdasOnASingleLine: Inline
+AllowShortIfStatementsOnASingleLine: WithoutElse
+AllowShortLoopsOnASingleLine: true
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: false
+AlwaysBreakTemplateDeclarations: No
+BinPackArguments: true
+BinPackParameters: false
+BreakBeforeBraces: Custom
+BraceWrapping:
+  AfterCaseLabel: true
+  AfterClass: true
+  AfterControlStatement: Always
+  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: Left
+ReflowComments:  false
+SortIncludes:    false
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: 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:          ForIndentation
+BreakInheritanceList: BeforeComma
+BreakConstructorInitializers: BeforeComma

.github/workflows/ci.yaml

@@ -32,7 +32,7 @@ jobs:
       run: .\bin\Release_Windows_x86\UnitTests\UnitTests.exe
 
     - name: Publish Artifact
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: Toshi Binaries
         path: bin

Format-Code.bat

@@ -0,0 +1,5 @@
+@echo off
+set clang_format=%cd%\vendor\clang-format.exe
+set directories=(Toshi\Source,OpenBlob\Source,OpenGlobs\Source,Shared\Source)
+
+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")

OpenBlob/Source/ABaseEntity.cpp

@@ -1,13 +1,13 @@
 #include "pch.h"
 #include "ABaseEntity.h"
 
-void ABaseEntity::SetState(int a_State)
+void ABaseEntity::SetState(TINT a_State)
 {
 	TASSERT(a_State >= 0);
 	if (a_State != m_State)
 	{
 		OnLeaveState(m_State);
-		m_State = a_State;
+		m_State  = a_State;
 		m_fTicks = 0.0f;
 		OnEnterState(m_State);
 	}

OpenBlob/Source/ABaseEntity.h

@@ -4,37 +4,37 @@
 #include "Toshi2/T2DList.h"
 #include "Toshi/Math/Math.h"
 
-class ABaseEntity : 
-	public Toshi::TGenericClassDerived<ABaseEntity, Toshi::TObject, "ABaseEntity", TMAKEVERSION(1, 0), TTRUE>,
-	public Toshi::T2DList<ABaseEntity>::Node
+class ABaseEntity : public Toshi::TGenericClassDerived<ABaseEntity, Toshi::TObject, "ABaseEntity", TMAKEVERSION(1, 0), TTRUE>
+    , public Toshi::T2DList<ABaseEntity>::Node
 {
-	static constexpr int ENTITY_HASH_SIZE = 0x400;
+	static constexpr TINT ENTITY_HASH_SIZE = 0x400;
 
 	enum FLAG
 	{
-		FLAG_Created   = BITFIELD(0),
-		FLAG_Visible   = BITFIELD(2),
-		FLAG_DontTick  = BITFIELD(8),
-		FLAG_LowLOD    = BITFIELD(9),
-		FLAG_MediumLOD = BITFIELD(10),
-		FLAG_HighLOD   = BITFIELD(11),
-		FLAG_LODMask   = FLAG_LowLOD | FLAG_MediumLOD | FLAG_HighLOD,
-		FLAG_UPDATEMATRIX  = BITFIELD(15)
+		FLAG_Created      = BITFIELD(0),
+		FLAG_Visible      = BITFIELD(2),
+		FLAG_DontTick     = BITFIELD(8),
+		FLAG_LowLOD       = BITFIELD(9),
+		FLAG_MediumLOD    = BITFIELD(10),
+		FLAG_HighLOD      = BITFIELD(11),
+		FLAG_LODMask      = FLAG_LowLOD | FLAG_MediumLOD | FLAG_HighLOD,
+		FLAG_UPDATEMATRIX = BITFIELD(15)
 	};
+
 public:
 	virtual ~ABaseEntity() = default;
-	virtual void Tick(float a_fTicks) { m_fTicks += a_fTicks; }
-	virtual void OnLODChanging() {};
+	virtual void Tick(TFLOAT a_fTicks) { m_fTicks += a_fTicks; }
+	virtual void OnLODChanging(){};
 	virtual void Create()
 	{
 		TASSERT(0 == (m_Flags & FLAG_Created));
 		m_Flags |= FLAG_Created;
 	}
-	virtual void PostCreate() {};
-	virtual void Destroy() {};
-	
-	virtual float GetAnimationSpeed(int) const { return 1.0f; }
-	virtual void SetVisible(bool bEnable)
+	virtual void PostCreate(){};
+	virtual void Destroy(){};
+
+	virtual TFLOAT GetAnimationSpeed(TINT) const { return 1.0f; }
+	virtual void   SetVisible(TBOOL bEnable)
 	{
 		bEnable ? m_Flags |= FLAG_Visible : m_Flags &= ~FLAG_Visible;
 	}
@@ -56,34 +56,33 @@ class ABaseEntity :
 		m_mMatrix = a_matrix;
 		m_Flags |= FLAG_UPDATEMATRIX;
 	}
-	
+
 	virtual void GetReactionForce(Toshi::TVector4& a_reactionForce)
 	{
 		a_reactionForce = Toshi::TVector4::VEC_ZERO;
 	}
-	
-	virtual float GetStepUpHeight() const { return 0.3f; }
-	virtual void SetBBox(Toshi::TVector4 a_bbox)
+
+	virtual TFLOAT GetStepUpHeight() const { return 0.3f; }
+	virtual void   SetBBox(Toshi::TVector4 a_bbox)
 	{
-		m_vBoundingBox = a_bbox;
+		m_vBoundingBox          = a_bbox;
 		m_fBoundingSphereRadius = a_bbox.Magnitude();
 	}
-	virtual float GetInteractionRadius() const { return 2.5f; }
-	virtual void OnLeaveState(int a_State) {};
-	virtual void OnEnterState(int a_State) {};
+	virtual TFLOAT GetInteractionRadius() const { return 2.5f; }
+	virtual void   OnLeaveState(TINT a_State){};
+	virtual void   OnEnterState(TINT a_State){};
 
-	void SetState(int a_State);
+	void SetState(TINT a_State);
 
 
-	static int sm_EntityHash[ENTITY_HASH_SIZE];
+	static TINT sm_EntityHash[ENTITY_HASH_SIZE];
 
-	short m_State;                                         // 0xC
-	short m_iID;                                           // 0xE
-	Toshi::TMatrix44 m_mMatrix;                            // 0x10
-	Toshi::TVector4 m_vBoundingBox;                        // 0x50
-	float m_fBoundingSphereRadius;                         // 0x68
-	float m_fTicks;                                        // 0x6C
-	uint8_t m_Flags;                                       // 0x70
-	Toshi::T2DList<ABaseEntity>::Node* m_pEntityCellPair;  // 0x7C
+	TSHORT                             m_State;                 // 0xC
+	TSHORT                             m_iID;                   // 0xE
+	Toshi::TMatrix44                   m_mMatrix;               // 0x10
+	Toshi::TVector4                    m_vBoundingBox;          // 0x50
+	TFLOAT                             m_fBoundingSphereRadius; // 0x68
+	TFLOAT                             m_fTicks;                // 0x6C
+	TUINT8                             m_Flags;                 // 0x70
+	Toshi::T2DList<ABaseEntity>::Node* m_pEntityCellPair;       // 0x7C
 };
-

OpenBlob/Source/ACurrentLevelInformation.cpp

@@ -6,7 +6,7 @@ void ACurrentLevelInformation::Create(DataBlock a_type)
 {
 	auto assetStreaming = AAssetStreaming::GetSingleton();
 
-	char* szFilename = Toshi::TStringManager::GetTempString8();
+	TCHAR* szFilename = Toshi::TStringManager::GetTempString8();
 
 	for (size_t i = 0; i < DataBlockCount; i++)
 	{
@@ -23,14 +23,14 @@ void ACurrentLevelInformation::Create(DataBlock a_type)
 
 		TASSERT(!m_streamingJobs[i]);
 		TASSERT(!m_datablocks[i]);
-		m_datablocks[i] = new Toshi::TTRB();
-		m_streamingJobs[i] = TSTATICCAST(ATRBLoaderJob*, assetStreaming->CancelAllWaitingTerrainJobs());
+		m_datablocks[i]    = new Toshi::TTRB();
+		m_streamingJobs[i] = TSTATICCAST(ATRBLoaderJob, assetStreaming->CancelAllWaitingTerrainJobs());
 		m_streamingJobs[i]->Init(m_datablocks[i], szFilename);
 		assetStreaming->AddMainThreadJob2(m_streamingJobs[i]);
 	}
 }
 
-const char* ACurrentLevelInformation::GetDataBlockFilename(DataBlock a_type)
+const TCHAR* ACurrentLevelInformation::GetDataBlockFilename(DataBlock a_type)
 {
 	TASSERT(a_type >= 0 && a_type < DataBlockCount);
 	return sm_dataBlockFilenames[a_type].second;

OpenBlob/Source/ACurrentLevelInformation.h

@@ -5,29 +5,29 @@
 
 class ACurrentLevelInformation
 {
-	using DataBlock = int;
-	static constexpr int DataBlockCount = 24;
+	using DataBlock                      = TINT;
+	static constexpr TINT DataBlockCount = 24;
 
-	static constexpr std::pair<int, const char*> sm_dataBlockFilenames[DataBlockCount] = {
-		{1, "Common/CameraShakeCommon.trb"},
-		{1, "Blob_FX/FXParticles.trb"},
-		{1, "Entities/BlobProperties"},
-		{1, "Sound/SoundBreakPoints,trb"}
+	static constexpr std::pair<TINT, const TCHAR*> sm_dataBlockFilenames[DataBlockCount] = {
+		{ 1, "Common/CameraShakeCommon.trb" },
+		{ 1, "Blob_FX/FXParticles.trb" },
+		{ 1, "Entities/BlobProperties" },
+		{ 1, "Sound/SoundBreakPoints,trb" }
 	};
 
-	ACurrentLevelInformation(char* a_szLevelName) : m_szLevelName(a_szLevelName)
+	ACurrentLevelInformation(TCHAR* a_szLevelName)
+	    : m_szLevelName(a_szLevelName)
 	{
 		Toshi::TUtil::MemClear(m_datablocks, sizeof(m_datablocks));
 		Toshi::TUtil::MemClear(m_streamingJobs, sizeof(m_streamingJobs));
 	}
 
-	void Create(DataBlock a_type);
-	const char* GetDataBlockFilename(DataBlock a_type);
+	void         Create(DataBlock a_type);
+	const TCHAR* GetDataBlockFilename(DataBlock a_type);
 	Toshi::TTRB* GetDataBlock(DataBlock a_type);
 	Toshi::TTRB* Stream(DataBlock a_type);
 
-	char* m_szLevelName;
+	TCHAR*         m_szLevelName;
 	ATRBLoaderJob* m_streamingJobs[DataBlockCount];
-	Toshi::TTRB* m_datablocks[DataBlockCount];
+	Toshi::TTRB*   m_datablocks[DataBlockCount];
 };
-