General: Normalize several headers' include paths

Normalizes the include paths and makes them consistent. Also adds any
missing includes relevant to the interface.
This commit is contained in:
Lioncash 2019-09-22 17:52:05 -04:00
parent 8cdf7f3af3
commit 06789d1860
150 changed files with 927 additions and 576 deletions

View File

@ -1,8 +1,10 @@
#pragma once
#include "GCNTypes.hpp"
#include "Input/CFinalInput.hpp"
#include "rstl.hpp"
#include <memory>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Input/CFinalInput.hpp"
namespace urde {
class CIOWin;

View File

@ -1,7 +1,7 @@
#pragma once
#include <list>
#include "CArchitectureMessage.hpp"
#include "Runtime/CArchitectureMessage.hpp"
namespace urde {

View File

@ -4,7 +4,7 @@
#include <cstdlib>
#include <chrono>
#include "RetroTypes.hpp"
#include "Runtime/GCNTypes.hpp"
namespace urde {

View File

@ -1,6 +1,7 @@
#pragma once
#include "CFactoryMgr.hpp"
#include <vector>
#include "Runtime/CFactoryMgr.hpp"
namespace urde {
class CDependencyGroup {

View File

@ -1,13 +1,18 @@
#pragma once
#include "RetroTypes.hpp"
#include "athena/FileReader.hpp"
#include <thread>
#include <mutex>
#include <atomic>
#include <condition_variable>
#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include <unordered_map>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/RetroTypes.hpp"
#include <athena/FileReader.hpp>
namespace urde {
enum class ESeekOrigin { Begin = 0, Cur = 1, End = 2 };

View File

@ -1,9 +1,10 @@
#pragma once
#include <unordered_map>
#include "RetroTypes.hpp"
#include "IOStreams.hpp"
#include "IFactory.hpp"
#include "Runtime/IFactory.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
struct SObjectTag;

View File

@ -1,6 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include <cstddef>
#include <memory>
#include <vector>
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CGameAllocator {

View File

@ -1,7 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "IFactory.hpp"
#include <string_view>
#include <vector>
#include "Runtime/IFactory.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CGameHintInfo {

View File

@ -1,9 +1,11 @@
#pragma once
#include <array>
#include "RetroTypes.hpp"
#include "Audio/CAudioSys.hpp"
#include "CSaveWorld.hpp"
#include <vector>
#include "Runtime/CSaveWorld.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Audio/CAudioSys.hpp"
namespace urde {
struct CFinalInput;

View File

@ -1,7 +1,7 @@
#pragma once
#include <utility>
#include <memory>
#include <utility>
namespace urde {

View File

@ -1,15 +1,18 @@
#pragma once
#include <memory>
#include "CBasics.hpp"
#include "CPlayerState.hpp"
#include "CGameOptions.hpp"
#include "CRelayTracker.hpp"
#include "World/CWorldTransManager.hpp"
#include "AutoMapper/CMapWorldInfo.hpp"
#include "World/CWorld.hpp"
#include <vector>
#include "DataSpec/DNACommon/DNACommon.hpp"
#include "Runtime/CBasics.hpp"
#include "Runtime/CGameOptions.hpp"
#include "Runtime/CPlayerState.hpp"
#include "Runtime/CRelayTracker.hpp"
#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
#include "Runtime/World/CWorld.hpp"
#include "Runtime/World/CWorldTransManager.hpp"
namespace urde {
class CSaveWorldMemory;

View File

@ -1,9 +1,10 @@
#pragma once
#include <string>
#include <functional>
#include <memory>
#include <string>
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CArchitectureMessage;

View File

@ -1,10 +1,11 @@
#pragma once
#include <memory>
#include <list>
#include "CIOWin.hpp"
#include "rstl.hpp"
#include "CArchitectureQueue.hpp"
#include <memory>
#include "Runtime/CArchitectureQueue.hpp"
#include "Runtime/CIOWin.hpp"
#include "Runtime/rstl.hpp"
namespace urde {

View File

@ -3,7 +3,7 @@
#include <string>
#include <vector>
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "CIOWin.hpp"
#include "Runtime/CIOWin.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "CIOWin.hpp"
#include "Runtime/CIOWin.hpp"
namespace urde {

View File

@ -1,17 +1,23 @@
#pragma once
#include "CToken.hpp"
#include "World/CWorld.hpp"
#include "CGameHintInfo.hpp"
#include "CSaveWorld.hpp"
#include "GuiSys/CStringTable.hpp"
#include "kabufuda/Card.hpp"
#include <memory>
#include <optional>
#include <string>
#include <vector>
#include "Runtime/CGameHintInfo.hpp"
#include "Runtime/CSaveWorld.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/GuiSys/CStringTable.hpp"
#include "Runtime/World/CWorld.hpp"
#include <kabufuda/Card.hpp>
namespace urde {
class CDummyWorld;
class CStringTable;
class CSimplePool;
class CStringTable;
class CSaveWorldMemory {
friend class CMemoryCardSys;

View File

@ -1,7 +1,7 @@
#pragma once
#include "World/CEntity.hpp"
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/World/CEntity.hpp"
namespace urde {

View File

@ -1,11 +1,14 @@
#pragma once
#include <memory>
#include <string>
#include <vector>
#include "RetroTypes.hpp"
#include "CStringExtras.hpp"
#include "CDvdFile.hpp"
#include "CDvdRequest.hpp"
#include "CFactoryMgr.hpp"
#include "Runtime/CDvdFile.hpp"
#include "Runtime/CDvdRequest.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CStringExtras.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {

View File

@ -1,9 +1,15 @@
#pragma once
#include "CGuiWidget.hpp"
#include "CToken.hpp"
#include "Graphics/CTexture.hpp"
#include "Graphics/Shaders/CEnergyBarShader.hpp"
#include <memory>
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Graphics/Shaders/CEnergyBarShader.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CSimplePool;

View File

@ -1,8 +1,16 @@
#pragma once
#include "CGuiWidget.hpp"
#include "CToken.hpp"
#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <zeus/CVector2f.hpp>
#include <zeus/CVector3f.hpp>
namespace zeus {
class CColor;
}
namespace urde {
class CSimplePool;

View File

@ -1,6 +1,10 @@
#pragma once
#include "CGuiGroup.hpp"
#include <memory>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/GuiSys/CGuiGroup.hpp"
namespace urde {
class CSimplePool;

View File

@ -1,16 +1,20 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CQuaternion.hpp"
#include "CToken.hpp"
#include "Graphics/CLineRenderer.hpp"
#include "CPlayerState.hpp"
#include <vector>
#include "Runtime/CPlayerState.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/Graphics/CLineRenderer.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CQuaternion.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CActor;
class CModel;
class CStateManager;
class CScriptGrapplePoint;
class CStateManager;
class CTargetReticleRenderState {
TUniqueId x0_target;

View File

@ -1,6 +1,6 @@
#pragma once
#include "CIOWin.hpp"
#include "Runtime/CIOWin.hpp"
namespace urde {

View File

@ -1,8 +1,8 @@
#pragma once
#include <vector>
#include "RetroTypes.hpp"
#include "CGuiTextSupport.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
namespace urde {

View File

@ -1,7 +1,7 @@
#pragma once
#include "CIOWin.hpp"
#include "RetroTypes.hpp"
#include "Runtime/CIOWin.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {

View File

@ -1,8 +1,10 @@
#pragma once
#include <vector>
#include "CToken.hpp"
#include "zeus/CVector2f.hpp"
#include "Runtime/CToken.hpp"
#include <zeus/CVector2f.hpp>
namespace urde {
class CTexture;

View File

@ -1,18 +1,21 @@
#pragma once
#include "CGuiTextSupport.hpp"
#include "CSaveableState.hpp"
#include "CDrawStringOptions.hpp"
#include <list>
#include <vector>
#include "Runtime/GuiSys/CDrawStringOptions.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
#include "Runtime/GuiSys/CSaveableState.hpp"
namespace urde {
class CLineInstruction;
class CBlockInstruction;
class CLineInstruction;
class CFontRenderState : public CSaveableState {
friend class CLineInstruction;
friend class CBlockInstruction;
friend class CTextInstruction;
friend class CImageInstruction;
friend class CLineInstruction;
friend class CTextInstruction;
friend class CWordInstruction;
CBlockInstruction* x88_curBlock = nullptr;

View File

@ -1,7 +1,8 @@
#include "CGuiCamera.hpp"
#include "CGuiFrame.hpp"
#include "Graphics/CGraphics.hpp"
#include "CGuiWidgetDrawParms.hpp"
#include "Runtime/GuiSys/CGuiCamera.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
namespace urde {

View File

@ -1,6 +1,7 @@
#pragma once
#include "CGuiWidget.hpp"
#include <memory>
#include "Runtime/GuiSys/CGuiWidget.hpp"
namespace urde {
class CSimplePool;

View File

@ -1,4 +1,4 @@
#include "CGuiCompoundWidget.hpp"
#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "CGuiWidget.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
namespace urde {

View File

@ -1,16 +1,18 @@
#include "CGuiFrame.hpp"
#include "CGuiWidget.hpp"
#include "CGuiSys.hpp"
#include "CGuiHeadWidget.hpp"
#include "CGuiLight.hpp"
#include "CGuiCamera.hpp"
#include "Graphics/CGraphics.hpp"
#include "Input/CFinalInput.hpp"
#include "zeus/CColor.hpp"
#include "CSimplePool.hpp"
#include "Graphics/CModel.hpp"
#include "CGuiWidgetDrawParms.hpp"
#include "CGuiTableGroup.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include "Runtime/CSimplePool.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/Graphics/CModel.hpp"
#include "Runtime/GuiSys/CGuiCamera.hpp"
#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
#include "Runtime/GuiSys/CGuiLight.hpp"
#include "Runtime/GuiSys/CGuiSys.hpp"
#include "Runtime/GuiSys/CGuiTableGroup.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
#include "Runtime/Input/CFinalInput.hpp"
#include <zeus/CColor.hpp>
namespace urde {

View File

@ -1,22 +1,27 @@
#pragma once
#include "CGuiWidget.hpp"
#include "CGuiHeadWidget.hpp"
#include "CGuiWidgetIdDB.hpp"
#include "IObj.hpp"
#include "boo/IWindow.hpp"
#include <array>
#include <functional>
#include <memory>
#include <vector>
#include "Runtime/IObj.hpp"
#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
#include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <boo/IWindow.hpp>
namespace urde {
class CBooModel;
class CGuiCamera;
class CGuiLight;
class CGuiSys;
class CLight;
class CGuiCamera;
struct CFinalInput;
class CGuiLight;
class CVParamTransfer;
class CObjectReference;
class CSimplePool;
class CBooModel;
class CVParamTransfer;
struct CFinalInput;
class CGuiFrame {
friend class CGuiSys;

View File

@ -1,4 +1,4 @@
#include "CGuiGroup.hpp"
#include "Runtime/GuiSys/CGuiGroup.hpp"
namespace urde {

View File

@ -1,6 +1,7 @@
#pragma once
#include "CGuiCompoundWidget.hpp"
#include <memory>
#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
namespace urde {

View File

@ -1,5 +1,5 @@
#include "CGuiHeadWidget.hpp"
#include "CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
namespace urde {

View File

@ -1,6 +1,6 @@
#pragma once
#include "CGuiWidget.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
namespace urde {

View File

@ -1,5 +1,5 @@
#include "CGuiLight.hpp"
#include "CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiLight.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
namespace urde {

View File

@ -1,7 +1,11 @@
#pragma once
#include "CGuiWidget.hpp"
#include "Graphics/CLight.hpp"
#include <memory>
#include "Runtime/Graphics/CLight.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <zeus/CColor.hpp>
namespace urde {
class CSimplePool;

View File

@ -1,9 +1,10 @@
#include "CGuiModel.hpp"
#include "CGuiFrame.hpp"
#include "CGuiSys.hpp"
#include "CSimplePool.hpp"
#include "CGuiWidgetDrawParms.hpp"
#include "Graphics/CGraphics.hpp"
#include "Runtime/GuiSys/CGuiModel.hpp"
#include "Runtime/CSimplePool.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiSys.hpp"
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
namespace urde {

View File

@ -1,8 +1,10 @@
#pragma once
#include "CGuiWidget.hpp"
#include "CToken.hpp"
#include "Graphics/CModel.hpp"
#include <memory>
#include "Runtime/CToken.hpp"
#include "Runtime/Graphics/CModel.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
namespace urde {
class CSimplePool;

View File

@ -1,8 +1,9 @@
#include "CGuiObject.hpp"
#include "CGuiWidgetDrawParms.hpp"
#include "Graphics/CTexture.hpp"
#include "CGuiWidget.hpp"
#include "CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiObject.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
namespace urde {

View File

@ -1,9 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CVector3f.hpp"
#include "zeus/CQuaternion.hpp"
#include "zeus/CTransform.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CQuaternion.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
struct CGuiWidgetDrawParms;

View File

@ -1,4 +1,4 @@
#include "CGuiPane.hpp"
#include "Runtime/GuiSys/CGuiPane.hpp"
namespace urde {

View File

@ -1,7 +1,14 @@
#pragma once
#include "CGuiWidget.hpp"
#include "specter/View.hpp"
#include <memory>
#include <vector>
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include <specter/View.hpp>
#include <zeus/CVector2f.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,6 +1,7 @@
#include "CGuiSliderGroup.hpp"
#include "Input/CFinalInput.hpp"
#include "CGuiModel.hpp"
#include "Runtime/GuiSys/CGuiSliderGroup.hpp"
#include "Runtime/GuiSys/CGuiModel.hpp"
#include "Runtime/Input/CFinalInput.hpp"
namespace urde {

View File

@ -1,7 +1,9 @@
#pragma once
#include "CGuiCompoundWidget.hpp"
#include <functional>
#include <memory>
#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
namespace urde {
class CSimplePool;

View File

@ -1,21 +1,22 @@
#include "CGuiSys.hpp"
#include "CGuiWidget.hpp"
#include "CGuiHeadWidget.hpp"
#include "CGuiLight.hpp"
#include "CGuiCamera.hpp"
#include "CGuiGroup.hpp"
#include "CGuiPane.hpp"
#include "CAuiImagePane.hpp"
#include "CAuiMeter.hpp"
#include "CGuiModel.hpp"
#include "CGuiTableGroup.hpp"
#include "CGuiSliderGroup.hpp"
#include "CGuiTextPane.hpp"
#include "CAuiEnergyBarT01.hpp"
#include "CTextParser.hpp"
#include "CSimplePool.hpp"
#include "CTextExecuteBuffer.hpp"
#include "CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiSys.hpp"
#include "Runtime/CSimplePool.hpp"
#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
#include "Runtime/GuiSys/CAuiImagePane.hpp"
#include "Runtime/GuiSys/CAuiMeter.hpp"
#include "Runtime/GuiSys/CGuiCamera.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiGroup.hpp"
#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
#include "Runtime/GuiSys/CGuiLight.hpp"
#include "Runtime/GuiSys/CGuiModel.hpp"
#include "Runtime/GuiSys/CGuiPane.hpp"
#include "Runtime/GuiSys/CGuiSliderGroup.hpp"
#include "Runtime/GuiSys/CGuiTableGroup.hpp"
#include "Runtime/GuiSys/CGuiTextPane.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
#include "Runtime/GuiSys/CTextParser.hpp"
namespace urde {

View File

@ -1,22 +1,25 @@
#pragma once
#include "hecl/hecl.hpp"
#include <unordered_map>
#include <vector>
#include <memory>
#include <stack>
#include "CSaveableState.hpp"
#include "IOStreams.hpp"
#include <unordered_set>
#include <vector>
#include "Runtime/IOStreams.hpp"
#include "Runtime/GuiSys/CSaveableState.hpp"
#include <hecl/hecl.hpp>
namespace urde {
class CGuiObject;
class CVParamTransfer;
struct SObjectTag;
class IFactory;
class CSimplePool;
class CGuiWidget;
class CGuiFrame;
class CTextParser;
class CGuiObject;
class CGuiWidget;
class CSimplePool;
class CTextExecuteBuffer;
class CTextParser;
class CVParamTransfer;
class IFactory;
struct SObjectTag;
class CGuiSys {
friend class CGuiFrame;

View File

@ -1,5 +1,5 @@
#include "CGuiTableGroup.hpp"
#include "Input/CFinalInput.hpp"
#include "Runtime/GuiSys/CGuiTableGroup.hpp"
#include "Runtime/Input/CFinalInput.hpp"
namespace urde {

View File

@ -1,6 +1,9 @@
#pragma once
#include "CGuiCompoundWidget.hpp"
#include <functional>
#include <memory>
#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
namespace urde {

View File

@ -1,10 +1,11 @@
#include "CGuiTextPane.hpp"
#include "CFontImageDef.hpp"
#include "CGuiFrame.hpp"
#include "CGuiSys.hpp"
#include "CGuiWidgetDrawParms.hpp"
#include "Graphics/CGraphics.hpp"
#include "Graphics/CGraphicsPalette.hpp"
#include "Runtime/GuiSys/CGuiTextPane.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/Graphics/CGraphicsPalette.hpp"
#include "Runtime/GuiSys/CFontImageDef.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiSys.hpp"
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
namespace urde {

View File

@ -1,7 +1,10 @@
#pragma once
#include "CGuiPane.hpp"
#include "CGuiTextSupport.hpp"
#include <memory>
#include <vector>
#include "Runtime/GuiSys/CGuiPane.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
namespace urde {

View File

@ -1,12 +1,13 @@
#include "CGuiTextSupport.hpp"
#include "CSimplePool.hpp"
#include "CFontImageDef.hpp"
#include "CGuiSys.hpp"
#include "CTextExecuteBuffer.hpp"
#include "CTextParser.hpp"
#include "Graphics/CGraphicsPalette.hpp"
#include "Graphics/CGraphics.hpp"
#include "GuiSys/CRasterFont.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
#include "Runtime/CSimplePool.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/Graphics/CGraphicsPalette.hpp"
#include "Runtime/GuiSys/CFontImageDef.hpp"
#include "Runtime/GuiSys/CGuiSys.hpp"
#include "Runtime/GuiSys/CRasterFont.hpp"
#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
#include "Runtime/GuiSys/CTextParser.hpp"
namespace urde {

View File

@ -1,19 +1,23 @@
#pragma once
#include "zeus/CColor.hpp"
#include "RetroTypes.hpp"
#include "CToken.hpp"
#include "CTextRenderBuffer.hpp"
#include "CGuiWidget.hpp"
#include "CSaveWorld.hpp"
#include <list>
#include <optional>
#include <string>
#include <vector>
#include "Runtime/CSaveWorld.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include "Runtime/GuiSys/CTextRenderBuffer.hpp"
#include <zeus/CColor.hpp>
namespace urde {
class CSimplePool;
class CRasterFont;
class CTextRenderBuffer;
class CSimplePool;
class CTextExecuteBuffer;
class CTextRenderBuffer;
enum class EJustification { Left = 0, Center, Right, Full, NLeft, NCenter, NRight, LeftMono, CenterMono, RightMono };

View File

@ -1,5 +1,7 @@
#include "CGuiWidget.hpp"
#include "CGuiFrame.hpp"
#include "Runtime/GuiSys/CGuiWidget.hpp"
#include "Runtime/GuiSys/CGuiFrame.hpp"
#include <logvisor/logvisor.hpp>
namespace urde {
static logvisor::Module Log("urde::CGuiWidget");

View File

@ -1,9 +1,18 @@
#pragma once
#include "IOStreams.hpp"
#include "CGuiObject.hpp"
#include "zeus/CColor.hpp"
#include "boo/IWindow.hpp"
#include <memory>
#include <optional>
#include <string>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/GuiSys/CGuiObject.hpp"
#include <boo/IWindow.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CGuiFrame;

View File

@ -1,4 +1,4 @@
#include "CGuiWidgetDrawParms.hpp"
#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
namespace urde {
const CGuiWidgetDrawParms CGuiWidgetDrawParms::Default = {};

View File

@ -1,6 +1,6 @@
#pragma once
#include "zeus/CVector3f.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {

View File

@ -1,4 +1,4 @@
#include "CGuiWidgetIdDB.hpp"
#include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
namespace urde {

View File

@ -1,7 +1,7 @@
#pragma once
#include <unordered_map>
#include "RetroTypes.hpp"
#include "Runtime/GCNTypes.hpp"
namespace urde {

View File

@ -1,14 +1,14 @@
#pragma once
#include "rstl.hpp"
#include "zeus/CVector3f.hpp"
#include "Runtime/rstl.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CGuiFrame;
class CGuiWidget;
class CGuiCamera;
class CGuiFrame;
class CGuiModel;
class CGuiTextPane;
class CGuiWidget;
class CHudBallInterface {
CGuiCamera* x0_camera;

View File

@ -1,13 +1,13 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CVector3f.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CGuiFrame;
class CGuiWidget;
class CAuiEnergyBarT01;
class CGuiFrame;
class CGuiTextPane;
class CGuiWidget;
class CHudBossEnergyInterface {
float x0_alpha;

View File

@ -1,11 +1,12 @@
#pragma once
#include "zeus/CMatrix3f.hpp"
#include "zeus/CQuaternion.hpp"
#include "zeus/CVector3f.hpp"
#include "CToken.hpp"
#include "CScanDisplay.hpp"
#include "World/CPlayer.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/GuiSys/CScanDisplay.hpp"
#include "Runtime/World/CPlayer.hpp"
#include <zeus/CMatrix3f.hpp>
#include <zeus/CQuaternion.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CGuiFrame;

View File

@ -1,15 +1,15 @@
#pragma once
#include "RetroTypes.hpp"
#include "CHudInterface.hpp"
#include "zeus/CVector3f.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CHudInterface.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CGuiFrame;
class CGuiWidget;
class CGuiTextPane;
class CAuiMeter;
class CAuiEnergyBarT01;
class CAuiMeter;
class CGuiFrame;
class CGuiTextPane;
class CGuiWidget;
class CHudEnergyInterface {
EHudType x0_hudType;

View File

@ -1,13 +1,13 @@
#pragma once
#include "RetroTypes.hpp"
#include "CHudInterface.hpp"
#include "zeus/CTransform.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CHudInterface.hpp"
#include <zeus/CTransform.hpp>
namespace urde {
class CGuiFrame;
class CGuiWidget;
class CGuiModel;
class CGuiWidget;
class IFreeLookInterface {
public:

View File

@ -1,12 +1,12 @@
#pragma once
#include "zeus/CMatrix3f.hpp"
#include "RetroTypes.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CMatrix3f.hpp>
namespace urde {
class CGuiCamera;
class CGuiFrame;
class CGuiWidget;
class CGuiCamera;
class CHudHelmetInterface {
zeus::CMatrix3f x0_hudLagRotation;

View File

@ -1,16 +1,16 @@
#pragma once
#include "RetroTypes.hpp"
#include "CHudInterface.hpp"
#include "zeus/CTransform.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CHudInterface.hpp"
#include <zeus/CTransform.hpp>
namespace urde {
class CStateManager;
class CGuiFrame;
class CGuiWidget;
class CGuiTextPane;
class CAuiEnergyBarT01;
class CGuiFrame;
class CGuiModel;
class CGuiTextPane;
class CGuiWidget;
class CStateManager;
class CHudMissileInterface {
enum class EInventoryStatus { Normal, Warning, Depleted };

View File

@ -1,13 +1,18 @@
#pragma once
#include "CToken.hpp"
#include "Graphics/CTexture.hpp"
#include "Graphics/Shaders/CRadarPaintShader.hpp"
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Graphics/Shaders/CRadarPaintShader.hpp"
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CGuiCamera;
class CGuiFrame;
class CGuiWidget;
class CGuiCamera;
class CStateManager;
class CHudRadarInterface {

View File

@ -1,15 +1,15 @@
#pragma once
#include "CHudInterface.hpp"
#include "RetroTypes.hpp"
#include "zeus/CTransform.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/GuiSys/CHudInterface.hpp"
#include <zeus/CTransform.hpp>
namespace urde {
class CAuiEnergyBarT01;
class CGuiFrame;
class CGuiWidget;
class CGuiModel;
class CGuiTextPane;
class CAuiEnergyBarT01;
class CGuiWidget;
class CHudThreatInterface {
enum class EThreatStatus { Normal, Warning, Damage };

View File

@ -1,13 +1,15 @@
#pragma once
#include "RetroTypes.hpp"
#include <cfloat>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
namespace urde {
class CGuiFrame;
class CGuiWidget;
class CGuiTextPane;
class CGuiModel;
class CGuiTextPane;
class CGuiWidget;
class CHudVisorBeamMenu {
public:

View File

@ -1,14 +1,15 @@
#pragma once
#include "CToken.hpp"
#include "CGuiTextSupport.hpp"
#include "CFontImageDef.hpp"
#include <vector>
#include "Runtime/CToken.hpp"
#include "Runtime/GuiSys/CFontImageDef.hpp"
#include "Runtime/GuiSys/CGuiTextSupport.hpp"
namespace urde {
class CFontImageDef;
class CFontRenderState;
class CTextRenderBuffer;
class CFontImageDef;
class CInstruction {
public:

View File

@ -1,8 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "CToken.hpp"
#include "Graphics/CModel.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Graphics/CModel.hpp"
#include <zeus/CVector3f.hpp>
namespace urde {
class CStateManager;

View File

@ -1,7 +1,8 @@
#pragma once
#include "../RetroTypes.hpp"
#include "CKeyboardMouseController.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Input/CKeyboardMouseController.hpp"
#include <boo/inputdev/DolphinSmashAdapter.hpp>
namespace urde {

View File

@ -1,9 +1,12 @@
#pragma once
#include <atomic>
#include <mutex>
#include "Runtime/Input/CFinalInput.hpp"
#include "Runtime/Input/CKeyboardMouseController.hpp"
#include <boo/boo.hpp>
#include "CFinalInput.hpp"
#include "CKeyboardMouseController.hpp"
namespace urde {
class CArchitectureQueue;

View File

@ -1,6 +1,8 @@
#pragma once
#include "boo/IWindow.hpp"
#include <type_traits>
#include <boo/IWindow.hpp>
namespace urde {
struct CFinalInput;

View File

@ -1,6 +1,10 @@
#pragma once
#include "IElement.hpp"
#include <memory>
#include <vector>
#include "Runtime/GCNTypes.hpp"
#include "Runtime/Particle/IElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Color_Elements */

View File

@ -1,10 +1,12 @@
#pragma once
#include "RetroTypes.hpp"
#include "CToken.hpp"
#include "zeus/CTransform.hpp"
#include "CDecalDescription.hpp"
#include "CRandom16.hpp"
#include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Particle/CDecalDescription.hpp"
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
struct SQuadDescr;

View File

@ -1,11 +1,11 @@
#pragma once
#include "RetroTypes.hpp"
#include "CFactoryMgr.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
#include "CDecalDescription.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Particle/CDecalDescription.hpp"
namespace urde {
class CSimplePool;

View File

@ -1,11 +1,13 @@
#pragma once
#include "CRealElement.hpp"
#include "CIntElement.hpp"
#include "CVectorElement.hpp"
#include "CColorElement.hpp"
#include "CUVElement.hpp"
#include "CParticleDataFactory.hpp"
#include <memory>
#include "Runtime/Particle/CColorElement.hpp"
#include "Runtime/Particle/CIntElement.hpp"
#include "Runtime/Particle/CParticleDataFactory.hpp"
#include "Runtime/Particle/CRealElement.hpp"
#include "Runtime/Particle/CUVElement.hpp"
#include "Runtime/Particle/CVectorElement.hpp"
namespace urde {

View File

@ -1,11 +1,12 @@
#pragma once
#include "RetroTypes.hpp"
#include "rstl.hpp"
#include <optional>
#include "CToken.hpp"
#include "CDecal.hpp"
#include "zeus/CFrustum.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Particle/CDecal.hpp"
#include <zeus/CFrustum.hpp>
namespace urde {
class CStateManager;

View File

@ -1,12 +1,14 @@
#pragma once
#include "CParticleDataFactory.hpp"
#include "CRealElement.hpp"
#include "CIntElement.hpp"
#include "CVectorElement.hpp"
#include "CModVectorElement.hpp"
#include "CColorElement.hpp"
#include "CUVElement.hpp"
#include <memory>
#include "Runtime/Particle/CColorElement.hpp"
#include "Runtime/Particle/CIntElement.hpp"
#include "Runtime/Particle/CModVectorElement.hpp"
#include "Runtime/Particle/CParticleDataFactory.hpp"
#include "Runtime/Particle/CRealElement.hpp"
#include "Runtime/Particle/CUVElement.hpp"
#include "Runtime/Particle/CVectorElement.hpp"
namespace urde {
class CElectricDescription {

View File

@ -1,18 +1,22 @@
#pragma once
#include "RetroTypes.hpp"
#include "zeus/CTransform.hpp"
#include "zeus/CVector3f.hpp"
#include "zeus/CColor.hpp"
#include "zeus/CAABox.hpp"
#include "CToken.hpp"
#include "Graphics/CLight.hpp"
#include "Graphics/CGraphics.hpp"
#include "CRandom16.hpp"
#include "CParticleGen.hpp"
#include "Graphics/Shaders/CElementGenShaders.hpp"
#include "Graphics/CLineRenderer.hpp"
#include "Particle/CGenDescription.hpp"
#include <array>
#include <vector>
#include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Graphics/CGraphics.hpp"
#include "Runtime/Graphics/CLight.hpp"
#include "Runtime/Graphics/CLineRenderer.hpp"
#include "Runtime/Graphics/Shaders/CElementGenShaders.hpp"
#include "Runtime/Particle/CGenDescription.hpp"
#include "Runtime/Particle/CParticleGen.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CWarp;

View File

@ -1,6 +1,7 @@
#pragma once
#include "IElement.hpp"
#include <memory>
#include "Runtime/Particle/IElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Emitter_Elements */

View File

@ -1,6 +1,10 @@
#pragma once
#include "CWarp.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Particle/CWarp.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CStateManager;

View File

@ -1,15 +1,16 @@
#pragma once
#include <memory>
#include "CRealElement.hpp"
#include "CIntElement.hpp"
#include "CVectorElement.hpp"
#include "CModVectorElement.hpp"
#include "CColorElement.hpp"
#include "CUVElement.hpp"
#include "CEmitterElement.hpp"
#include "CSpawnSystemKeyframeData.hpp"
#include "CParticleDataFactory.hpp"
#include "Runtime/Particle/CColorElement.hpp"
#include "Runtime/Particle/CEmitterElement.hpp"
#include "Runtime/Particle/CIntElement.hpp"
#include "Runtime/Particle/CModVectorElement.hpp"
#include "Runtime/Particle/CParticleDataFactory.hpp"
#include "Runtime/Particle/CRealElement.hpp"
#include "Runtime/Particle/CSpawnSystemKeyframeData.hpp"
#include "Runtime/Particle/CUVElement.hpp"
#include "Runtime/Particle/CVectorElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/PART_(File_Format) */

View File

@ -1,6 +1,9 @@
#pragma once
#include "IElement.hpp"
#include <memory>
#include <vector>
#include "Runtime/Particle/IElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Int_Elements */

View File

@ -1,6 +1,7 @@
#pragma once
#include "IElement.hpp"
#include <memory>
#include "Runtime/Particle/IElement.hpp"
/* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Mod_Vector_Elements */

View File

@ -1,25 +1,28 @@
#pragma once
#include "RetroTypes.hpp"
#include "CFactoryMgr.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
#include <memory>
#include <vector>
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CGenDescription;
class CSwooshDescription;
class CElectricDescription;
class CSimplePool;
class CVParamTransfer;
class CModel;
class CUVElement;
class CColorElement;
class CModVectorElement;
class CElectricDescription;
class CEmitterElement;
class CVectorElement;
class CRealElement;
class CGenDescription;
class CIntElement;
class CModVectorElement;
class CModel;
class CRealElement;
class CSimplePool;
class CSwooshDescription;
class CUVElement;
class CVParamTransfer;
class CVectorElement;
struct SParticleModel {
TLockedToken<CModel> m_token;

View File

@ -1,14 +1,25 @@
#pragma once
#include "CParticleGen.hpp"
#include "CToken.hpp"
#include "CRandom16.hpp"
#include "Graphics/CLineRenderer.hpp"
#include <list>
#include <memory>
#include <optional>
#include <vector>
#include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Graphics/CLineRenderer.hpp"
#include "Runtime/Particle/CParticleGen.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CElectricDescription;
class CParticleSwoosh;
class CElementGen;
class CParticleSwoosh;
class CParticleElectric : public CParticleGen {
static u16 g_GlobalSeed;

View File

@ -1,10 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "CFactoryMgr.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CElectricDescription;

View File

@ -1,12 +1,15 @@
#pragma once
#include "RetroTypes.hpp"
#include "Graphics/CLight.hpp"
#include "zeus/CColor.hpp"
#include "zeus/CVector3f.hpp"
#include "zeus/CTransform.hpp"
#include "zeus/CAABox.hpp"
#include <list>
#include <optional>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/Graphics/CLight.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CColor.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CWarp;

View File

@ -1,11 +1,14 @@
#pragma once
#include "zeus/CVector3f.hpp"
#include "zeus/CVector4f.hpp"
#include "zeus/CMatrix4f.hpp"
#include "zeus/CColor.hpp"
#include "RetroTypes.hpp"
#include <array>
#include <vector>
#include "Runtime/RetroTypes.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CMatrix4f.hpp>
#include <zeus/CVector3f.hpp>
#include <zeus/CVector4f.hpp>
namespace urde {
class CElementGen;

View File

@ -1,13 +1,21 @@
#pragma once
#include "CParticleGen.hpp"
#include "CToken.hpp"
#include "CRandom16.hpp"
#include "Graphics/CTexture.hpp"
#include "Graphics/CLineRenderer.hpp"
#include "CUVElement.hpp"
#include <memory>
#include <vector>
#include "DataSpec/DNACommon/GX.hpp"
#include "Graphics/Shaders/CParticleSwooshShaders.hpp"
#include "Runtime/CRandom16.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/Graphics/CLineRenderer.hpp"
#include "Runtime/Graphics/CTexture.hpp"
#include "Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp"
#include "Runtime/Particle/CParticleGen.hpp"
#include "Runtime/Particle/CUVElement.hpp"
#include <zeus/CColor.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CSwooshDescription;

View File

@ -1,10 +1,10 @@
#pragma once
#include "RetroTypes.hpp"
#include "CFactoryMgr.hpp"
#include "IObj.hpp"
#include "CToken.hpp"
#include "IOStreams.hpp"
#include "Runtime/CFactoryMgr.hpp"
#include "Runtime/CToken.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/IObj.hpp"
#include "Runtime/RetroTypes.hpp"
namespace urde {
class CSwooshDescription;

View File

@ -1,10 +1,13 @@
#pragma once
#include "CPlayerState.hpp"
#include "RetroTypes.hpp"
#include "CStateManager.hpp"
#include "CGunWeapon.hpp"
#include "CWeapon.hpp"
#include <memory>
#include "Runtime/RetroTypes.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/CPlayerState.hpp"
#include "Runtime/CStateManager.hpp"
#include "Runtime/Weapon/CGunWeapon.hpp"
#include "Runtime/Weapon/CWeapon.hpp"
namespace urde {

View File

@ -1,8 +1,8 @@
#pragma once
#include "RetroTypes.hpp"
#include "IOStreams.hpp"
#include "zeus/CColor.hpp"
#include "Runtime/IOStreams.hpp"
#include "Runtime/RetroTypes.hpp"
#include <zeus/CColor.hpp>
namespace urde {
class CBeamInfo {

View File

@ -1,6 +1,12 @@
#pragma once
#include "Weapon/CGameProjectile.hpp"
#include "Runtime/rstl.hpp"
#include "Runtime/Weapon/CGameProjectile.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CTransform.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {
class CBeamProjectile : public CGameProjectile {
public:

View File

@ -1,7 +1,13 @@
#pragma once
#include "CWeapon.hpp"
#include "CToken.hpp"
#include <memory>
#include <optional>
#include "Runtime/CToken.hpp"
#include "Runtime/Weapon/CWeapon.hpp"
#include <zeus/CAABox.hpp>
#include <zeus/CVector3f.hpp>
namespace urde {

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