diff --git a/Runtime/Audio/CAudioStateWin.hpp b/Runtime/Audio/CAudioStateWin.hpp index 3ecd62935..59d833506 100644 --- a/Runtime/Audio/CAudioStateWin.hpp +++ b/Runtime/Audio/CAudioStateWin.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CAUDIOSTATEWIN_HPP__ -#define __PSHAG_CAUDIOSTATEWIN_HPP__ +#ifndef __URDE_CAUDIOSTATEWIN_HPP__ +#define __URDE_CAUDIOSTATEWIN_HPP__ #include "../CIOWin.hpp" @@ -18,4 +18,4 @@ public: } -#endif // __PSHAG_CAUDIOSTATEWIN_HPP__ +#endif // __URDE_CAUDIOSTATEWIN_HPP__ diff --git a/Runtime/Audio/CAudioSys.hpp b/Runtime/Audio/CAudioSys.hpp index 5571dc1e8..e81222b3d 100644 --- a/Runtime/Audio/CAudioSys.hpp +++ b/Runtime/Audio/CAudioSys.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CAUDIOSYS_HPP__ -#define __PSHAG_CAUDIOSYS_HPP__ +#ifndef __URDE_CAUDIOSYS_HPP__ +#define __URDE_CAUDIOSYS_HPP__ #include "../GCNTypes.hpp" #include "zeus/CVector3f.hpp" @@ -29,4 +29,4 @@ public: } -#endif // __PSHAG_CAUDIOSYS_HPP__ +#endif // __URDE_CAUDIOSYS_HPP__ diff --git a/Runtime/Audio/CSfxHandle.hpp b/Runtime/Audio/CSfxHandle.hpp index 3699ddc3a..496c4bfcb 100644 --- a/Runtime/Audio/CSfxHandle.hpp +++ b/Runtime/Audio/CSfxHandle.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSFXHANDLE_HPP__ -#define __PSHAG_CSFXHANDLE_HPP__ +#ifndef __URDE_CSFXHANDLE_HPP__ +#define __URDE_CSFXHANDLE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CSfxHandle } -#endif // __PSHAG_CSFXHANDLE_HPP__ +#endif // __URDE_CSFXHANDLE_HPP__ diff --git a/Runtime/Audio/CSfxManager.hpp b/Runtime/Audio/CSfxManager.hpp index 993bdb78e..dcfed9699 100644 --- a/Runtime/Audio/CSfxManager.hpp +++ b/Runtime/Audio/CSfxManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSFXMANAGER_HPP__ -#define __PSHAG_CSFXMANAGER_HPP__ +#ifndef __URDE_CSFXMANAGER_HPP__ +#define __URDE_CSFXMANAGER_HPP__ #include #include "../RetroTypes.hpp" @@ -130,4 +130,4 @@ class CSfxManager } -#endif // __PSHAG_CSFXMANAGER_HPP__ +#endif // __URDE_CSFXMANAGER_HPP__ diff --git a/Runtime/CActor.hpp b/Runtime/CActor.hpp index 056e8434f..1216f68cc 100644 --- a/Runtime/CActor.hpp +++ b/Runtime/CActor.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CACTOR_HPP__ -#define __PSHAG_CACTOR_HPP__ +#ifndef __URDE_CACTOR_HPP__ +#define __URDE_CACTOR_HPP__ #include "CEntity.hpp" #include "zeus/zeus.hpp" @@ -80,4 +80,4 @@ public: } -#endif // __PSHAG_CACTOR_HPP__ +#endif // __URDE_CACTOR_HPP__ diff --git a/Runtime/CAi.hpp b/Runtime/CAi.hpp index 1b3544368..350ab51ea 100644 --- a/Runtime/CAi.hpp +++ b/Runtime/CAi.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CAI_HPP__ -#define __PSHAG_CAI_HPP__ +#ifndef __URDE_CAI_HPP__ +#define __URDE_CAI_HPP__ #include "GCNTypes.hpp" #include "ScriptObjectSupport.hpp" @@ -175,4 +175,4 @@ public: } -#endif // __PSHAG_CAI_HPP__ +#endif // __URDE_CAI_HPP__ diff --git a/Runtime/CArchitectureMessage.hpp b/Runtime/CArchitectureMessage.hpp index 69eebe543..d23ac9cf7 100644 --- a/Runtime/CArchitectureMessage.hpp +++ b/Runtime/CArchitectureMessage.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CARCHITECTUREMESSAGE_HPP__ -#define __PSHAG_CARCHITECTUREMESSAGE_HPP__ +#ifndef __URDE_CARCHITECTUREMESSAGE_HPP__ +#define __URDE_CARCHITECTUREMESSAGE_HPP__ #include "GCNTypes.hpp" #include "Input/CFinalInput.hpp" @@ -164,4 +164,4 @@ public: } -#endif // __PSHAG_CARCHITECTUREMESSAGE_HPP__ +#endif // __URDE_CARCHITECTUREMESSAGE_HPP__ diff --git a/Runtime/CArchitectureQueue.hpp b/Runtime/CArchitectureQueue.hpp index 6b18171c0..336151127 100644 --- a/Runtime/CArchitectureQueue.hpp +++ b/Runtime/CArchitectureQueue.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CARCHITECTUREQUEUE_HPP__ -#define __PSHAG_CARCHITECTUREQUEUE_HPP__ +#ifndef __URDE_CARCHITECTUREQUEUE_HPP__ +#define __URDE_CARCHITECTUREQUEUE_HPP__ #include #include "CArchitectureMessage.hpp" @@ -27,4 +27,4 @@ public: } -#endif // __PSHAG_CARCHITECTUREQUEUE_HPP__ +#endif // __URDE_CARCHITECTUREQUEUE_HPP__ diff --git a/Runtime/CAreaOctTree.hpp b/Runtime/CAreaOctTree.hpp index d68130f8c..93e7334d8 100644 --- a/Runtime/CAreaOctTree.hpp +++ b/Runtime/CAreaOctTree.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CAREAOCTTREE_HPP__ -#define __PSHAG_CAREAOCTTREE_HPP__ +#ifndef __URDE_CAREAOCTTREE_HPP__ +#define __URDE_CAREAOCTTREE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CAreaOctTree } -#endif // __PSHAG_CAREAOCTTREE_HPP__ +#endif // __URDE_CAREAOCTTREE_HPP__ diff --git a/Runtime/CBasics.hpp b/Runtime/CBasics.hpp index 0288e1785..673e0d9b0 100644 --- a/Runtime/CBasics.hpp +++ b/Runtime/CBasics.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CBASICS_HPP__ -#define __PSHAG_CBASICS_HPP__ +#ifndef __URDE_CBASICS_HPP__ +#define __URDE_CBASICS_HPP__ #include #include @@ -18,4 +18,4 @@ public: } -#endif // __PSHAG_CBASICS_HPP__ +#endif // __URDE_CBASICS_HPP__ diff --git a/Runtime/CCallStack.hpp b/Runtime/CCallStack.hpp index 9b7e05aa8..2ef5168c6 100644 --- a/Runtime/CCallStack.hpp +++ b/Runtime/CCallStack.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCALLSTACK_HPP__ -#define __PSHAG_CCALLSTACK_HPP__ +#ifndef __URDE_CCALLSTACK_HPP__ +#define __URDE_CCALLSTACK_HPP__ namespace urde { @@ -17,4 +17,4 @@ public: } -#endif // __PSHAG_CCALLSTACK_HPP__ +#endif // __URDE_CCALLSTACK_HPP__ diff --git a/Runtime/CDvdFile.hpp b/Runtime/CDvdFile.hpp index fb7eb38ad..6c2c46fd0 100644 --- a/Runtime/CDvdFile.hpp +++ b/Runtime/CDvdFile.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CDVDFILE_HPP__ -#define __PSHAG_CDVDFILE_HPP__ +#ifndef __URDE_CDVDFILE_HPP__ +#define __URDE_CDVDFILE_HPP__ #include "RetroTypes.hpp" @@ -77,4 +77,4 @@ public: }; } -#endif // __PSHAG_CDVDFILE_HPP__ +#endif // __URDE_CDVDFILE_HPP__ diff --git a/Runtime/CDvdRequest.hpp b/Runtime/CDvdRequest.hpp index 82052f50d..500cbc029 100644 --- a/Runtime/CDvdRequest.hpp +++ b/Runtime/CDvdRequest.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CDVDREQUEST_HPP__ -#define __PSHAG_CDVDREQUEST_HPP__ +#ifndef __URDE_CDVDREQUEST_HPP__ +#define __URDE_CDVDREQUEST_HPP__ namespace urde { @@ -25,4 +25,4 @@ public: } -#endif // __PSHAG_CDVDREQUEST_HPP__ +#endif // __URDE_CDVDREQUEST_HPP__ diff --git a/Runtime/CEntity.hpp b/Runtime/CEntity.hpp index cf43ca5cb..961573d84 100644 --- a/Runtime/CEntity.hpp +++ b/Runtime/CEntity.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CENTITY_HPP__ -#define __PSHAG_CENTITY_HPP__ +#ifndef __URDE_CENTITY_HPP__ +#define __URDE_CENTITY_HPP__ #include "RetroTypes.hpp" #include "ScriptObjectSupport.hpp" @@ -45,4 +45,4 @@ public: } -#endif // __PSHAG_CENTITY_HPP__ +#endif // __URDE_CENTITY_HPP__ diff --git a/Runtime/CFactoryMgr.hpp b/Runtime/CFactoryMgr.hpp index 01299e624..85f360c88 100644 --- a/Runtime/CFactoryMgr.hpp +++ b/Runtime/CFactoryMgr.hpp @@ -1,9 +1,10 @@ -#ifndef __PSHAG_CFACTORYMGR_HPP__ -#define __PSHAG_CFACTORYMGR_HPP__ +#ifndef __URDE_CFACTORYMGR_HPP__ +#define __URDE_CFACTORYMGR_HPP__ #include #include "RetroTypes.hpp" #include "IOStreams.hpp" +#include "IFactory.hpp" namespace urde { @@ -11,13 +12,6 @@ struct SObjectTag; class CVParamTransfer; class IObj; -using CFactoryFnReturn = std::unique_ptr; -using FFactoryFunc = std::function; -using FMemFactoryFunc = std::function&& in, u32 len, - const urde::CVParamTransfer& vparms)>; class CFactoryMgr { std::unordered_map m_factories; @@ -26,7 +20,9 @@ public: CFactoryFnReturn MakeObject(const SObjectTag& tag, urde::CInputStream& in, const CVParamTransfer& paramXfer); bool CanMakeMemory(const urde::SObjectTag& tag) const; - CFactoryFnReturn MakeObjectFromMemory(const SObjectTag& tag, std::unique_ptr&& buf, int size, bool compressed, + CFactoryFnReturn MakeObjectFromMemory(const SObjectTag& tag, + std::unique_ptr&& buf, + int size, bool compressed, const CVParamTransfer& paramXfer); void AddFactory(FourCC key, FFactoryFunc func) {m_factories[key] = func;} void AddFactory(FourCC key, FMemFactoryFunc func) {m_memFactories[key] = func;} @@ -34,4 +30,4 @@ public: } -#endif // __PSHAG_CFACTORYMGR_HPP__ +#endif // __URDE_CFACTORYMGR_HPP__ diff --git a/Runtime/CGameAllocator.hpp b/Runtime/CGameAllocator.hpp index 9f35db013..9fe2a9659 100644 --- a/Runtime/CGameAllocator.hpp +++ b/Runtime/CGameAllocator.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CGAMEALLOCATOR_HPP__ -#define __PSHAG_CGAMEALLOCATOR_HPP__ +#ifndef __URDE_CGAMEALLOCATOR_HPP__ +#define __URDE_CGAMEALLOCATOR_HPP__ #include "IAllocator.hpp" @@ -48,4 +48,4 @@ public: } -#endif // __PSHAG_CGAMEALLOCATOR_HPP__ +#endif // __URDE_CGAMEALLOCATOR_HPP__ diff --git a/Runtime/CGameDebug.hpp b/Runtime/CGameDebug.hpp index b2a8b550d..791d5ea94 100644 --- a/Runtime/CGameDebug.hpp +++ b/Runtime/CGameDebug.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CGAMEDEBUG_HPP__ -#define __PSHAG_CGAMEDEBUG_HPP__ +#ifndef __URDE_CGAMEDEBUG_HPP__ +#define __URDE_CGAMEDEBUG_HPP__ #include @@ -53,4 +53,4 @@ public: } -#endif // __PSHAG_CGAMEDEBUG_HPP__ +#endif // __URDE_CGAMEDEBUG_HPP__ diff --git a/Runtime/CGameOptions.hpp b/Runtime/CGameOptions.hpp index c17cbc753..21448f3d2 100644 --- a/Runtime/CGameOptions.hpp +++ b/Runtime/CGameOptions.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CGAMEOPTIONS_HPP__ -#define __PSHAG_CGAMEOPTIONS_HPP__ +#ifndef __URDE_CGAMEOPTIONS_HPP__ +#define __URDE_CGAMEOPTIONS_HPP__ #include "RetroTypes.hpp" @@ -19,4 +19,4 @@ class CGameOptions } -#endif // __PSHAG_CGAMEOPTIONS_HPP__ +#endif // __URDE_CGAMEOPTIONS_HPP__ diff --git a/Runtime/CGameState.hpp b/Runtime/CGameState.hpp index 5ab5103bf..360a66e56 100644 --- a/Runtime/CGameState.hpp +++ b/Runtime/CGameState.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CGAMESTATE_HPP__ -#define __PSHAG_CGAMESTATE_HPP__ +#ifndef __URDE_CGAMESTATE_HPP__ +#define __URDE_CGAMESTATE_HPP__ #include #include "CBasics.hpp" @@ -28,4 +28,4 @@ public: } -#endif // __PSHAG_CGAMESTATE_HPP__ +#endif // __URDE_CGAMESTATE_HPP__ diff --git a/Runtime/CIOWin.hpp b/Runtime/CIOWin.hpp index b47866d50..76ade1b17 100644 --- a/Runtime/CIOWin.hpp +++ b/Runtime/CIOWin.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CIOWIN_HPP__ -#define __PSHAG_CIOWIN_HPP__ +#ifndef __URDE_CIOWIN_HPP__ +#define __URDE_CIOWIN_HPP__ #include #include @@ -38,4 +38,4 @@ static bool operator==(std::shared_ptr a, std::shared_ptr b) } -#endif // __PSHAG_CIOWIN_HPP__ +#endif // __URDE_CIOWIN_HPP__ diff --git a/Runtime/CIOWinManager.hpp b/Runtime/CIOWinManager.hpp index 8e1d66098..050ad34e7 100644 --- a/Runtime/CIOWinManager.hpp +++ b/Runtime/CIOWinManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CIOWINMANAGER_HPP__ -#define __PSHAG_CIOWINMANAGER_HPP__ +#ifndef __URDE_CIOWINMANAGER_HPP__ +#define __URDE_CIOWINMANAGER_HPP__ #include #include @@ -41,4 +41,4 @@ public: } -#endif // __PSHAG_CIOWINMANAGER_HPP__ +#endif // __URDE_CIOWINMANAGER_HPP__ diff --git a/Runtime/CInGameTweakManagerBase.hpp b/Runtime/CInGameTweakManagerBase.hpp index a43e2c750..4e1c971cb 100644 --- a/Runtime/CInGameTweakManagerBase.hpp +++ b/Runtime/CInGameTweakManagerBase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__ -#define __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__ +#ifndef __URDE_CINGAMETWEAKMANAGERBASE_HPP__ +#define __URDE_CINGAMETWEAKMANAGERBASE_HPP__ #include @@ -17,4 +17,4 @@ public: } -#endif // __PSHAG_CINGAMETWEAKMANAGERBASE_HPP__ +#endif // __URDE_CINGAMETWEAKMANAGERBASE_HPP__ diff --git a/Runtime/CMFGameBase.hpp b/Runtime/CMFGameBase.hpp index 29b56e60f..18ad4390c 100644 --- a/Runtime/CMFGameBase.hpp +++ b/Runtime/CMFGameBase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMFGAMEBASE_HPP__ -#define __PSHAG_CMFGAMEBASE_HPP__ +#ifndef __URDE_CMFGAMEBASE_HPP__ +#define __URDE_CMFGAMEBASE_HPP__ #include "CIOWin.hpp" @@ -20,4 +20,4 @@ public: } -#endif // __PSHAG_CMFGAMEBASE_HPP__ +#endif // __URDE_CMFGAMEBASE_HPP__ diff --git a/Runtime/CMainFlowBase.hpp b/Runtime/CMainFlowBase.hpp index 61d8a86bb..5a987950c 100644 --- a/Runtime/CMainFlowBase.hpp +++ b/Runtime/CMainFlowBase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMAINFLOWBASE_HPP__ -#define __PSHAG_CMAINFLOWBASE_HPP__ +#ifndef __URDE_CMAINFLOWBASE_HPP__ +#define __URDE_CMAINFLOWBASE_HPP__ #include "CIOWin.hpp" @@ -27,4 +27,4 @@ public: } -#endif // __PSHAG_CMAINFLOWBASE_HPP__ +#endif // __URDE_CMAINFLOWBASE_HPP__ diff --git a/Runtime/CMakeLists.txt b/Runtime/CMakeLists.txt index c0fc38eac..dd8c75146 100644 --- a/Runtime/CMakeLists.txt +++ b/Runtime/CMakeLists.txt @@ -46,6 +46,7 @@ add_library(RuntimeCommon CCRC32.hpp CCRC32.cpp CEntity.hpp CEntity.cpp IFactory.hpp + IObjFactory.hpp ScriptObjectSupport.hpp ScriptObjectSupport.cpp CObjectList.hpp CArchitectureMessage.hpp diff --git a/Runtime/CMapWorldInfo.hpp b/Runtime/CMapWorldInfo.hpp index f0ec67b9f..d029f650a 100644 --- a/Runtime/CMapWorldInfo.hpp +++ b/Runtime/CMapWorldInfo.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMAPWORLDINFO_HPP__ -#define __PSHAG_CMAPWORLDINFO_HPP__ +#ifndef __URDE_CMAPWORLDINFO_HPP__ +#define __URDE_CMAPWORLDINFO_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CMapWorldInfo } -#endif // __PSHAG_CMAPWORLDINFO_HPP__ +#endif // __URDE_CMAPWORLDINFO_HPP__ diff --git a/Runtime/CMemory.hpp b/Runtime/CMemory.hpp index 521f2d0dd..f78c731a2 100644 --- a/Runtime/CMemory.hpp +++ b/Runtime/CMemory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMEMORY_HPP__ -#define __PSHAG_CMEMORY_HPP__ +#ifndef __URDE_CMEMORY_HPP__ +#define __URDE_CMEMORY_HPP__ #include "IAllocator.hpp" @@ -33,4 +33,4 @@ public: void* operator new(std::size_t sz, const char* funcName, const char* typeName); void* operator new[](std::size_t sz, const char* funcName, const char* typeName); -#endif // __PSHAG_CMEMORY_HPP__ +#endif // __URDE_CMEMORY_HPP__ diff --git a/Runtime/CMemoryCardSys.hpp b/Runtime/CMemoryCardSys.hpp index 853b57494..9fd6d142c 100644 --- a/Runtime/CMemoryCardSys.hpp +++ b/Runtime/CMemoryCardSys.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMEMORYCARDSYS_HPP__ -#define __PSHAG_CMEMORYCARDSYS_HPP__ +#ifndef __URDE_CMEMORYCARDSYS_HPP__ +#define __URDE_CMEMORYCARDSYS_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CMemoryCardSys } -#endif // __PSHAG_CMEMORYCARDSYS_HPP__ +#endif // __URDE_CMEMORYCARDSYS_HPP__ diff --git a/Runtime/CObjectList.hpp b/Runtime/CObjectList.hpp index ba5a8a785..1cd450973 100644 --- a/Runtime/CObjectList.hpp +++ b/Runtime/CObjectList.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_COBJECTLIST_HPP__ -#define __PSHAG_COBJECTLIST_HPP__ +#ifndef __URDE_COBJECTLIST_HPP__ +#define __URDE_COBJECTLIST_HPP__ #include "CEntity.hpp" #include "RetroTypes.hpp" @@ -95,4 +95,4 @@ public: } -#endif // __PSHAG_COBJECTLIST_HPP__ +#endif // __URDE_COBJECTLIST_HPP__ diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp index b13d7c26e..29c6b1ea8 100644 --- a/Runtime/CPakFile.hpp +++ b/Runtime/CPakFile.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPAKFILE_HPP__ -#define __PSHAG_CPAKFILE_HPP__ +#ifndef __URDE_CPAKFILE_HPP__ +#define __URDE_CPAKFILE_HPP__ #include #include "RetroTypes.hpp" @@ -74,4 +74,4 @@ public: } -#endif // __PSHAG_CPAKFILE_HPP__ +#endif // __URDE_CPAKFILE_HPP__ diff --git a/Runtime/CPhysicsActor.hpp b/Runtime/CPhysicsActor.hpp index 575d1d1cb..d4a02376f 100644 --- a/Runtime/CPhysicsActor.hpp +++ b/Runtime/CPhysicsActor.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPHYSICSACTOR_HPP__ -#define __PSHAG_CPHYSICSACTOR_HPP__ +#ifndef __URDE_CPHYSICSACTOR_HPP__ +#define __URDE_CPHYSICSACTOR_HPP__ #include "CActor.hpp" @@ -120,4 +120,4 @@ public: } -#endif // __PSHAG_CPHYSICSACTOR_HPP__ +#endif // __URDE_CPHYSICSACTOR_HPP__ diff --git a/Runtime/CPlayMovieBase.hpp b/Runtime/CPlayMovieBase.hpp index 886565526..acb5f5f25 100644 --- a/Runtime/CPlayMovieBase.hpp +++ b/Runtime/CPlayMovieBase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPLAYMOVIEBASE_HPP__ -#define __PSHAG_CPLAYMOVIEBASE_HPP__ +#ifndef __URDE_CPLAYMOVIEBASE_HPP__ +#define __URDE_CPLAYMOVIEBASE_HPP__ #include "CIOWin.hpp" #include "Graphics/CMoviePlayer.hpp" @@ -19,4 +19,4 @@ public: } -#endif // __PSHAG_CPLAYMOVIEBASE_HPP__ +#endif // __URDE_CPLAYMOVIEBASE_HPP__ diff --git a/Runtime/CPlayerState.hpp b/Runtime/CPlayerState.hpp index df4835923..16fe978b8 100644 --- a/Runtime/CPlayerState.hpp +++ b/Runtime/CPlayerState.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPLAYERSTATE_HPP__ -#define __PSHAG_CPLAYERSTATE_HPP__ +#ifndef __URDE_CPLAYERSTATE_HPP__ +#define __URDE_CPLAYERSTATE_HPP__ #include "RetroTypes.hpp" #include "CBasics.hpp" @@ -163,4 +163,4 @@ public: }; } -#endif // __PSHAG_CPLAYERSTATE_HPP__ +#endif // __URDE_CPLAYERSTATE_HPP__ diff --git a/Runtime/CResFactory.hpp b/Runtime/CResFactory.hpp index 44fb032a8..99a5b4556 100644 --- a/Runtime/CResFactory.hpp +++ b/Runtime/CResFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CRESFACTORY_HPP__ -#define __PSHAG_CRESFACTORY_HPP__ +#ifndef __URDE_CRESFACTORY_HPP__ +#define __URDE_CRESFACTORY_HPP__ #include #include "IFactory.hpp" @@ -55,4 +55,4 @@ public: } -#endif // __PSHAG_CRESFACTORY_HPP__ +#endif // __URDE_CRESFACTORY_HPP__ diff --git a/Runtime/CResLoader.hpp b/Runtime/CResLoader.hpp index 9a2607d2b..af8ea4779 100644 --- a/Runtime/CResLoader.hpp +++ b/Runtime/CResLoader.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CRESLOADER_HPP__ -#define __PSHAG_CRESLOADER_HPP__ +#ifndef __URDE_CRESLOADER_HPP__ +#define __URDE_CRESLOADER_HPP__ #include #include @@ -48,4 +48,4 @@ public: } -#endif // __PSHAG_CRESLOADER_HPP__ +#endif // __URDE_CRESLOADER_HPP__ diff --git a/Runtime/CScriptMailbox.hpp b/Runtime/CScriptMailbox.hpp index 9674c1e88..1f5f539eb 100644 --- a/Runtime/CScriptMailbox.hpp +++ b/Runtime/CScriptMailbox.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSCRIPTMAILBOX_HPP__ -#define __PSHAG_CSCRIPTMAILBOX_HPP__ +#ifndef __URDE_CSCRIPTMAILBOX_HPP__ +#define __URDE_CSCRIPTMAILBOX_HPP__ #include "IOStreams.hpp" #include "ScriptObjectSupport.hpp" @@ -35,4 +35,4 @@ public: } -#endif // __PSHAG_CSCRIPTMAILBOX_HPP__ +#endif // __URDE_CSCRIPTMAILBOX_HPP__ diff --git a/Runtime/CSimplePool.hpp b/Runtime/CSimplePool.hpp index 55b581c3a..6ad910fb8 100644 --- a/Runtime/CSimplePool.hpp +++ b/Runtime/CSimplePool.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSIMPLEPOOL_HPP__ -#define __PSHAG_CSIMPLEPOOL_HPP__ +#ifndef __URDE_CSIMPLEPOOL_HPP__ +#define __URDE_CSIMPLEPOOL_HPP__ #include "IObjectStore.hpp" #include "RetroTypes.hpp" @@ -33,4 +33,4 @@ public: } -#endif // __PSHAG_CSIMPLEPOOL_HPP__ +#endif // __URDE_CSIMPLEPOOL_HPP__ diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp index a61d94c8a..16de1dbc3 100644 --- a/Runtime/CStateManager.hpp +++ b/Runtime/CStateManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSTATEMANAGER_HPP__ -#define __PSHAG_CSTATEMANAGER_HPP__ +#ifndef __URDE_CSTATEMANAGER_HPP__ +#define __URDE_CSTATEMANAGER_HPP__ #include #include "CBasics.hpp" diff --git a/Runtime/CStaticInterference.hpp b/Runtime/CStaticInterference.hpp index 0e6e0a13a..878a4f6f9 100644 --- a/Runtime/CStaticInterference.hpp +++ b/Runtime/CStaticInterference.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSTATICINTERFERENCE_HPP__ -#define __PSHAG_CSTATICINTERFERENCE_HPP__ +#ifndef __URDE_CSTATICINTERFERENCE_HPP__ +#define __URDE_CSTATICINTERFERENCE_HPP__ #include #include "RetroTypes.hpp" @@ -83,4 +83,4 @@ public: } -#endif // __PSHAG_CSTATICINTERFERENCE_HPP__ +#endif // __URDE_CSTATICINTERFERENCE_HPP__ diff --git a/Runtime/CStringExtras.hpp b/Runtime/CStringExtras.hpp index 4d612b8a7..e0f733e3f 100644 --- a/Runtime/CStringExtras.hpp +++ b/Runtime/CStringExtras.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSTRINGEXTRAS_HPP__ -#define __PSHAG_CSTRINGEXTRAS_HPP__ +#ifndef __URDE_CSTRINGEXTRAS_HPP__ +#define __URDE_CSTRINGEXTRAS_HPP__ #include #include @@ -26,4 +26,4 @@ public: } -#endif // __PSHAG_CSTRINGEXTRAS_HPP__ +#endif // __URDE_CSTRINGEXTRAS_HPP__ diff --git a/Runtime/CTimeProvider.hpp b/Runtime/CTimeProvider.hpp index 27a62e45a..1a031aa49 100644 --- a/Runtime/CTimeProvider.hpp +++ b/Runtime/CTimeProvider.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG__CTIMEPROVIDER_HPP__ -#define __PSHAG__CTIMEPROVIDER_HPP__ +#ifndef __URDE__CTIMEPROVIDER_HPP__ +#define __URDE__CTIMEPROVIDER_HPP__ namespace urde { class CTimeProvider; diff --git a/Runtime/CToken.hpp b/Runtime/CToken.hpp index 0fc6c62d9..4fc3f51f7 100644 --- a/Runtime/CToken.hpp +++ b/Runtime/CToken.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CTOKEN_HPP__ -#define __PSHAG_CTOKEN_HPP__ +#ifndef __URDE_CTOKEN_HPP__ +#define __URDE_CTOKEN_HPP__ #include #include "IObj.hpp" @@ -314,4 +314,4 @@ public: } -#endif // __PSHAG_CTOKEN_HPP__ +#endif // __URDE_CTOKEN_HPP__ diff --git a/Runtime/CWorldTransManager.hpp b/Runtime/CWorldTransManager.hpp index fe24f33c7..c17e3d07e 100644 --- a/Runtime/CWorldTransManager.hpp +++ b/Runtime/CWorldTransManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CWORLDTRANSMANAGER_HPP__ -#define __PSHAG_CWORLDTRANSMANAGER_HPP__ +#ifndef __URDE_CWORLDTRANSMANAGER_HPP__ +#define __URDE_CWORLDTRANSMANAGER_HPP__ namespace urde { @@ -21,4 +21,4 @@ public: } -#endif // __PSHAG_CWORLDTRANSMANAGER_HPP__ +#endif // __URDE_CWORLDTRANSMANAGER_HPP__ diff --git a/Runtime/Character/CAllFormatsAnimSource.hpp b/Runtime/Character/CAllFormatsAnimSource.hpp index 92fdd6be3..e7d7321de 100644 --- a/Runtime/Character/CAllFormatsAnimSource.hpp +++ b/Runtime/Character/CAllFormatsAnimSource.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CALLFORMATANIMSOURCE_HPP__ -#define __PSHAG_CALLFORMATANIMSOURCE_HPP__ +#ifndef __URDE_CALLFORMATANIMSOURCE_HPP__ +#define __URDE_CALLFORMATANIMSOURCE_HPP__ #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -48,4 +48,4 @@ CFactoryFnReturn AnimSourceFactory(const SObjectTag& tag, CInputStream& in, cons } -#endif // __PSHAG_CALLFORMATANIMSOURCE_HPP__ +#endif // __URDE_CALLFORMATANIMSOURCE_HPP__ diff --git a/Runtime/Character/CAnimCharacterSet.hpp b/Runtime/Character/CAnimCharacterSet.hpp index 0dbcb1b9b..f67f0231a 100644 --- a/Runtime/Character/CAnimCharacterSet.hpp +++ b/Runtime/Character/CAnimCharacterSet.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMCHARACTERSET_HPP__ -#define __PSHAG_CANIMCHARACTERSET_HPP__ +#ifndef __URDE_CANIMCHARACTERSET_HPP__ +#define __URDE_CANIMCHARACTERSET_HPP__ #include "CFactoryMgr.hpp" #include "CCharacterSet.hpp" @@ -15,10 +15,12 @@ class CAnimCharacterSet CAnimationSet x1c_animationSet; public: CAnimCharacterSet(CInputStream& in); + const CCharacterSet& GetCharacterSet() const {return x4_characterSet;} + const CAnimationSet& GetAnimationSet() const {return x1c_animationSet;} }; CFactoryFnReturn FAnimCharacterSet(const SObjectTag&, CInputStream&, const CVParamTransfer&); } -#endif // __PSHAG_CANIMCHARACTERSET_HPP__ +#endif // __URDE_CANIMCHARACTERSET_HPP__ diff --git a/Runtime/Character/CAnimData.hpp b/Runtime/Character/CAnimData.hpp index 73fc4d86e..0acafea0e 100644 --- a/Runtime/Character/CAnimData.hpp +++ b/Runtime/Character/CAnimData.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMDATA_HPP__ -#define __PSHAG_CANIMDATA_HPP__ +#ifndef __URDE_CANIMDATA_HPP__ +#define __URDE_CANIMDATA_HPP__ #include "RetroTypes.hpp" #include "CToken.hpp" @@ -110,4 +110,4 @@ public: } -#endif // __PSHAG_CANIMDATA_HPP__ +#endif // __URDE_CANIMDATA_HPP__ diff --git a/Runtime/Character/CAnimPOIData.hpp b/Runtime/Character/CAnimPOIData.hpp index a141c1030..ea374af27 100644 --- a/Runtime/Character/CAnimPOIData.hpp +++ b/Runtime/Character/CAnimPOIData.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMPOIDATA_HPP__ -#define __PSHAG_CANIMPOIDATA_HPP__ +#ifndef __URDE_CANIMPOIDATA_HPP__ +#define __URDE_CANIMPOIDATA_HPP__ #include "CFactoryMgr.hpp" #include "CBoolPOINode.hpp" @@ -31,4 +31,4 @@ CFactoryFnReturn AnimPOIDataFactory(const SObjectTag& tag, CInputStream& in, } -#endif // __PSHAG_CANIMPOIDATA_HPP__ +#endif // __URDE_CANIMPOIDATA_HPP__ diff --git a/Runtime/Character/CAnimSource.hpp b/Runtime/Character/CAnimSource.hpp index c6d584619..9bb6b1907 100644 --- a/Runtime/Character/CAnimSource.hpp +++ b/Runtime/Character/CAnimSource.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMSOURCE_HPP__ -#define __PSHAG_CANIMSOURCE_HPP__ +#ifndef __URDE_CANIMSOURCE_HPP__ +#define __URDE_CANIMSOURCE_HPP__ #include "RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -83,4 +83,4 @@ public: } -#endif // __PSHAG_CANIMSOURCE_HPP__ +#endif // __URDE_CANIMSOURCE_HPP__ diff --git a/Runtime/Character/CAnimSourceReader.hpp b/Runtime/Character/CAnimSourceReader.hpp index a222a2b4e..66aaf9be5 100644 --- a/Runtime/Character/CAnimSourceReader.hpp +++ b/Runtime/Character/CAnimSourceReader.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMSOURCEREADER_HPP__ -#define __PSHAG_CANIMSOURCEREADER_HPP__ +#ifndef __URDE_CANIMSOURCEREADER_HPP__ +#define __URDE_CANIMSOURCEREADER_HPP__ #include "IAnimReader.hpp" #include "CToken.hpp" @@ -101,4 +101,4 @@ public: } -#endif // __PSHAG_CANIMSOURCEREADER_HPP__ +#endif // __URDE_CANIMSOURCEREADER_HPP__ diff --git a/Runtime/Character/CAnimSysContext.hpp b/Runtime/Character/CAnimSysContext.hpp new file mode 100644 index 000000000..28a0d00fb --- /dev/null +++ b/Runtime/Character/CAnimSysContext.hpp @@ -0,0 +1,27 @@ +#ifndef __URDE_CANIMSYSCONTEXT_HPP__ +#define __URDE_CANIMSYSCONTEXT_HPP__ + +#include "CToken.hpp" +#include "CRandom16.hpp" + +namespace urde +{ +class CTransitionDatabaseGame; +class CSimplePool; + +struct CAnimSysContext +{ + TToken x0_transDB; + std::shared_ptr x8_random; + CSimplePool& xc_store; + + CAnimSysContext(const TToken& transDB, + u32 randomSeed, CSimplePool& store) + : x0_transDB(transDB), + x8_random(std::make_shared(randomSeed)), + xc_store(store) {} +}; + +} + +#endif // __URDE_CANIMSYSCONTEXT_HPP__ diff --git a/Runtime/Character/CAnimTreeAnimReaderContainer.hpp b/Runtime/Character/CAnimTreeAnimReaderContainer.hpp index 4e86788bf..a5fc19b1e 100644 --- a/Runtime/Character/CAnimTreeAnimReaderContainer.hpp +++ b/Runtime/Character/CAnimTreeAnimReaderContainer.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREEANIMREADERCONTAINER_HPP__ -#define __PSHAG_CANIMTREEANIMREADERCONTAINER_HPP__ +#ifndef __URDE_CANIMTREEANIMREADERCONTAINER_HPP__ +#define __URDE_CANIMTREEANIMREADERCONTAINER_HPP__ #include "CAnimTreeNode.hpp" @@ -15,4 +15,4 @@ public: } -#endif // __PSHAG_CANIMTREEANIMREADERCONTAINER_HPP__ +#endif // __URDE_CANIMTREEANIMREADERCONTAINER_HPP__ diff --git a/Runtime/Character/CAnimTreeBlend.hpp b/Runtime/Character/CAnimTreeBlend.hpp index 030ac2c2c..5ed3fee17 100644 --- a/Runtime/Character/CAnimTreeBlend.hpp +++ b/Runtime/Character/CAnimTreeBlend.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREEBLEND_HPP__ -#define __PSHAG_CANIMTREEBLEND_HPP__ +#ifndef __URDE_CANIMTREEBLEND_HPP__ +#define __URDE_CANIMTREEBLEND_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CAnimTreeBlend } -#endif // __PSHAG_CANIMTREEBLEND_HPP__ +#endif // __URDE_CANIMTREEBLEND_HPP__ diff --git a/Runtime/Character/CAnimTreeDoubleChild.hpp b/Runtime/Character/CAnimTreeDoubleChild.hpp index 301ec3f86..eee20d212 100644 --- a/Runtime/Character/CAnimTreeDoubleChild.hpp +++ b/Runtime/Character/CAnimTreeDoubleChild.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREEDOUBLECHILD_HPP__ -#define __PSHAG_CANIMTREEDOUBLECHILD_HPP__ +#ifndef __URDE_CANIMTREEDOUBLECHILD_HPP__ +#define __URDE_CANIMTREEDOUBLECHILD_HPP__ #include "CAnimTreeNode.hpp" @@ -27,4 +27,4 @@ public: } -#endif // __PSHAG_CANIMTREEDOUBLECHILD_HPP__ +#endif // __URDE_CANIMTREEDOUBLECHILD_HPP__ diff --git a/Runtime/Character/CAnimTreeLoopIn.hpp b/Runtime/Character/CAnimTreeLoopIn.hpp index 9fcb2b845..36bdce21f 100644 --- a/Runtime/Character/CAnimTreeLoopIn.hpp +++ b/Runtime/Character/CAnimTreeLoopIn.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREELOOPIN_HPP__ -#define __PSHAG_CANIMTREELOOPIN_HPP__ +#ifndef __URDE_CANIMTREELOOPIN_HPP__ +#define __URDE_CANIMTREELOOPIN_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CAnimTreeLoopIn } -#endif // __PSHAG_CANIMTREELOOPIN_HPP__ +#endif // __URDE_CANIMTREELOOPIN_HPP__ diff --git a/Runtime/Character/CAnimTreeNode.hpp b/Runtime/Character/CAnimTreeNode.hpp index d7a1f8063..03672fe12 100644 --- a/Runtime/Character/CAnimTreeNode.hpp +++ b/Runtime/Character/CAnimTreeNode.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREENODE_HPP__ -#define __PSHAG_CANIMTREENODE_HPP__ +#ifndef __URDE_CANIMTREENODE_HPP__ +#define __URDE_CANIMTREENODE_HPP__ #include "IAnimReader.hpp" @@ -25,4 +25,4 @@ public: } -#endif // __PSHAG_CANIMTREENODE_HPP__ +#endif // __URDE_CANIMTREENODE_HPP__ diff --git a/Runtime/Character/CAnimTreeScale.hpp b/Runtime/Character/CAnimTreeScale.hpp index 26a0395a1..4104e8270 100644 --- a/Runtime/Character/CAnimTreeScale.hpp +++ b/Runtime/Character/CAnimTreeScale.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREESCALE_HPP__ -#define __PSHAG_CANIMTREESCALE_HPP__ +#ifndef __URDE_CANIMTREESCALE_HPP__ +#define __URDE_CANIMTREESCALE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CAnimTreeScale } -#endif // __PSHAG_CANIMTREESCALE_HPP__ +#endif // __URDE_CANIMTREESCALE_HPP__ diff --git a/Runtime/Character/CAnimTreeSequence.hpp b/Runtime/Character/CAnimTreeSequence.hpp index a42706cbd..23f233f17 100644 --- a/Runtime/Character/CAnimTreeSequence.hpp +++ b/Runtime/Character/CAnimTreeSequence.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREESEQUENCE_HPP__ -#define __PSHAG_CANIMTREESEQUENCE_HPP__ +#ifndef __URDE_CANIMTREESEQUENCE_HPP__ +#define __URDE_CANIMTREESEQUENCE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CAnimTreeSequence } -#endif // __PSHAG_CANIMTREESEQUENCE_HPP__ +#endif // __URDE_CANIMTREESEQUENCE_HPP__ diff --git a/Runtime/Character/CAnimTreeSingleChild.hpp b/Runtime/Character/CAnimTreeSingleChild.hpp index 062dc2934..bd127cf0e 100644 --- a/Runtime/Character/CAnimTreeSingleChild.hpp +++ b/Runtime/Character/CAnimTreeSingleChild.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREESINGLECHILD_HPP__ -#define __PSHAG_CANIMTREESINGLECHILD_HPP__ +#ifndef __URDE_CANIMTREESINGLECHILD_HPP__ +#define __URDE_CANIMTREESINGLECHILD_HPP__ #include "CAnimTreeNode.hpp" @@ -34,4 +34,4 @@ public: } -#endif // __PSHAG_CANIMTREESINGLECHILD_HPP__ +#endif // __URDE_CANIMTREESINGLECHILD_HPP__ diff --git a/Runtime/Character/CAnimTreeTimeScale.hpp b/Runtime/Character/CAnimTreeTimeScale.hpp index 2219985b2..40edb4769 100644 --- a/Runtime/Character/CAnimTreeTimeScale.hpp +++ b/Runtime/Character/CAnimTreeTimeScale.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREETIMESCALE_HPP__ -#define __PSHAG_CANIMTREETIMESCALE_HPP__ +#ifndef __URDE_CANIMTREETIMESCALE_HPP__ +#define __URDE_CANIMTREETIMESCALE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CAnimTreeTimeScale } -#endif // __PSHAG_CANIMTREETIMESCALE_HPP__ +#endif // __URDE_CANIMTREETIMESCALE_HPP__ diff --git a/Runtime/Character/CAnimTreeTransition.hpp b/Runtime/Character/CAnimTreeTransition.hpp index 2c2fb7c7c..7f6047ff0 100644 --- a/Runtime/Character/CAnimTreeTransition.hpp +++ b/Runtime/Character/CAnimTreeTransition.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREETRANSITION_HPP__ -#define __PSHAG_CANIMTREETRANSITION_HPP__ +#ifndef __URDE_CANIMTREETRANSITION_HPP__ +#define __URDE_CANIMTREETRANSITION_HPP__ #include "RetroTypes.hpp" #include "CAnimTreeTweenBase.hpp" @@ -15,4 +15,4 @@ public: } -#endif // __PSHAG_CANIMTREETRANSITION_HPP__ +#endif // __URDE_CANIMTREETRANSITION_HPP__ diff --git a/Runtime/Character/CAnimTreeTweenBase.hpp b/Runtime/Character/CAnimTreeTweenBase.hpp index 769ae5f77..7f1d16db1 100644 --- a/Runtime/Character/CAnimTreeTweenBase.hpp +++ b/Runtime/Character/CAnimTreeTweenBase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMTREETWEENBASE_HPP__ -#define __PSHAG_CANIMTREETWEENBASE_HPP__ +#ifndef __URDE_CANIMTREETWEENBASE_HPP__ +#define __URDE_CANIMTREETWEENBASE_HPP__ #include "CAnimTreeDoubleChild.hpp" @@ -12,4 +12,4 @@ class CAnimTreeTweenBase : public CAnimTreeDoubleChild } -#endif // __PSHAG_CANIMTREETWEENBASE_HPP__ +#endif // __URDE_CANIMTREETWEENBASE_HPP__ diff --git a/Runtime/Character/CAnimation.hpp b/Runtime/Character/CAnimation.hpp index 483b4c16b..5eda83d38 100644 --- a/Runtime/Character/CAnimation.hpp +++ b/Runtime/Character/CAnimation.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMATION_HPP__ -#define __PSHAG_CANIMATION_HPP__ +#ifndef __URDE_CANIMATION_HPP__ +#define __URDE_CANIMATION_HPP__ #include "IOStreams.hpp" #include "CMetaAnimFactory.hpp" @@ -14,8 +14,9 @@ class CAnimation std::shared_ptr x10_anim; public: CAnimation(CInputStream& in); + const std::shared_ptr& GetMetaAnim() const {return x10_anim;} }; } -#endif // __PSHAG_CANIMATION_HPP__ +#endif // __URDE_CANIMATION_HPP__ diff --git a/Runtime/Character/CAnimationDatabase.hpp b/Runtime/Character/CAnimationDatabase.hpp index 9ac6fa070..18a305c03 100644 --- a/Runtime/Character/CAnimationDatabase.hpp +++ b/Runtime/Character/CAnimationDatabase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMATIONDATABASE_HPP__ -#define __PSHAG_CANIMATIONDATABASE_HPP__ +#ifndef __URDE_CANIMATIONDATABASE_HPP__ +#define __URDE_CANIMATIONDATABASE_HPP__ #include "../RetroTypes.hpp" #include @@ -14,7 +14,7 @@ class CPrimitive; class CAnimationDatabase { public: - virtual const IMetaAnim* GetMetaAnim(u32) const=0; + virtual const std::shared_ptr& GetMetaAnim(u32) const=0; virtual u32 GetNumMetaAnims() const=0; virtual const char* GetMetaAnimName(u32) const=0; virtual void GetAllUniquePrimitives(std::vector&) const=0; @@ -23,4 +23,4 @@ public: } -#endif // __PSHAG_CANIMATIONDATABASE_HPP__ +#endif // __URDE_CANIMATIONDATABASE_HPP__ diff --git a/Runtime/Character/CAnimationDatabaseGame.cpp b/Runtime/Character/CAnimationDatabaseGame.cpp new file mode 100644 index 000000000..b27a23293 --- /dev/null +++ b/Runtime/Character/CAnimationDatabaseGame.cpp @@ -0,0 +1,45 @@ +#include "CAnimationDatabaseGame.hpp" +#include "IMetaAnim.hpp" +#include "CPrimitive.hpp" +#include "CAnimation.hpp" + +namespace urde +{ + +CAnimationDatabaseGame::CAnimationDatabaseGame(const std::vector& anims) +{ + x10_anims.reserve(anims.size()); + for (const CAnimation& anim : anims) + x10_anims.emplace_back(anim.GetMetaAnim()); +} + +const std::shared_ptr& CAnimationDatabaseGame::GetMetaAnim(u32 idx) const +{ + return x10_anims[idx]; +} + +u32 CAnimationDatabaseGame::GetNumMetaAnims() const +{ + return x10_anims.size(); +} + +const char* CAnimationDatabaseGame::GetMetaAnimName(u32 idx) const +{ + return "Meta-animation name unavailable in Release mode."; +} + +void CAnimationDatabaseGame::GetAllUniquePrimitives(std::vector& primsOut) const +{ + std::set primitives; + for (const std::shared_ptr& anim : x10_anims) + anim->GetUniquePrimitives(primitives); + primsOut.reserve(primitives.size()); + for (const CPrimitive& prim : primitives) + primsOut.push_back(prim); +} + +void CAnimationDatabaseGame::GetUniquePrimitivesFromMetaAnim(std::set& primsOut, + const std::string& name) const +{} + +} diff --git a/Runtime/Character/CAnimationDatabaseGame.hpp b/Runtime/Character/CAnimationDatabaseGame.hpp index bfc86318e..d1e1a7c00 100644 --- a/Runtime/Character/CAnimationDatabaseGame.hpp +++ b/Runtime/Character/CAnimationDatabaseGame.hpp @@ -1,21 +1,24 @@ -#ifndef __PSHAG_CANIMATIONDATABASEGAME_HPP__ -#define __PSHAG_CANIMATIONDATABASEGAME_HPP__ +#ifndef __URDE_CANIMATIONDATABASEGAME_HPP__ +#define __URDE_CANIMATIONDATABASEGAME_HPP__ #include "CAnimationDatabase.hpp" namespace urde { +class CAnimation; class CAnimationDatabaseGame : public CAnimationDatabase { + std::vector> x10_anims; public: - const IMetaAnim* GetMetaAnim(u32) const; + CAnimationDatabaseGame(const std::vector& anims); + const std::shared_ptr& GetMetaAnim(u32 idx) const; u32 GetNumMetaAnims() const; - const char* GetMetaAnimName(u32) const; - void GetAllUniquePrimitives(std::vector&) const; - void GetUniquePrimitivesFromMetaAnim(std::set&, const std::string&) const; + const char* GetMetaAnimName(u32 idx) const; + void GetAllUniquePrimitives(std::vector& primsOut) const; + void GetUniquePrimitivesFromMetaAnim(std::set& primsOut, const std::string& name) const; }; } -#endif // __PSHAG_CANIMATIONDATABASEGAME_HPP__ +#endif // __URDE_CANIMATIONDATABASEGAME_HPP__ diff --git a/Runtime/Character/CAnimationManager.hpp b/Runtime/Character/CAnimationManager.hpp index f0257b85d..ec451704a 100644 --- a/Runtime/Character/CAnimationManager.hpp +++ b/Runtime/Character/CAnimationManager.hpp @@ -1,13 +1,27 @@ -#ifndef __PSHAG_CANIMATIONMANAGER_HPP__ -#define __PSHAG_CANIMATIONMANAGER_HPP__ +#ifndef __URDE_CANIMATIONMANAGER_HPP__ +#define __URDE_CANIMATIONMANAGER_HPP__ + +#include "CToken.hpp" +#include "CAnimSysContext.hpp" namespace urde { +class CAnimationDatabaseGame; +class CTransitionDatabaseGame; +class CSimplePool; class CAnimationManager { + TToken x0_animDB; + CAnimSysContext x8_sysCtx; +public: + CAnimationManager(const TToken& animDB, + const CAnimSysContext& sysCtx) + : x0_animDB(animDB), x8_sysCtx(sysCtx) {} + + const CAnimationDatabaseGame* GetAnimationDatabase() const {return x0_animDB.GetObj();} }; } -#endif // __PSHAG_CANIMATIONMANAGER_HPP__ +#endif // __URDE_CANIMATIONMANAGER_HPP__ diff --git a/Runtime/Character/CAnimationSet.hpp b/Runtime/Character/CAnimationSet.hpp index fc3ce0be1..3551d0e87 100644 --- a/Runtime/Character/CAnimationSet.hpp +++ b/Runtime/Character/CAnimationSet.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CANIMATIONSET_HPP__ -#define __PSHAG_CANIMATIONSET_HPP__ +#ifndef __URDE_CANIMATIONSET_HPP__ +#define __URDE_CANIMATIONSET_HPP__ #include "IOStreams.hpp" #include "CAnimation.hpp" @@ -36,8 +36,19 @@ class CAnimationSet public: CAnimationSet(CInputStream& in); + + const std::vector& GetAnimations() const {return x4_animations;} + const std::vector& GetTransitions() const {return x14_transitions;} + const std::shared_ptr& GetDefaultTransition() const {return x24_defaultTransition;} + const std::vector& GetHalfTransitions() const {return x40_halfTransitions;} + const std::vector>& + GetAdditiveInfo() const {return x28_additiveInfo;} + const CAdditiveAnimationInfo& + GetDefaultAdditiveInfo() const {return x38_defaultAdditiveInfo;} + const std::vector>& + GetAnimResIds() const {return x50_animRes;} }; } -#endif // __PSHAG_CANIMATIONSET_HPP__ +#endif // __URDE_CANIMATIONSET_HPP__ diff --git a/Runtime/Character/CAssetFactory.hpp b/Runtime/Character/CAssetFactory.hpp index 703ecd050..d35bb6777 100644 --- a/Runtime/Character/CAssetFactory.hpp +++ b/Runtime/Character/CAssetFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CASSETFACTORY_HPP__ -#define __PSHAG_CASSETFACTORY_HPP__ +#ifndef __URDE_CASSETFACTORY_HPP__ +#define __URDE_CASSETFACTORY_HPP__ #include "../IFactory.hpp" #include "../IObj.hpp" @@ -17,4 +17,4 @@ public: }; } -#endif // __PSHAG_CASSETFACTORY_HPP__ +#endif // __URDE_CASSETFACTORY_HPP__ diff --git a/Runtime/Character/CBoolPOINode.hpp b/Runtime/Character/CBoolPOINode.hpp index 618998898..218b2f008 100644 --- a/Runtime/Character/CBoolPOINode.hpp +++ b/Runtime/Character/CBoolPOINode.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CBOOLPOINODE_HPP__ -#define __PSHAG_CBOOLPOINODE_HPP__ +#ifndef __URDE_CBOOLPOINODE_HPP__ +#define __URDE_CBOOLPOINODE_HPP__ #include "CPOINode.hpp" @@ -26,4 +26,4 @@ public: } -#endif // __PSHAG_CBOOLPOINODE_HPP__ +#endif // __URDE_CBOOLPOINODE_HPP__ diff --git a/Runtime/Character/CCharAnimTime.hpp b/Runtime/Character/CCharAnimTime.hpp index 88534676a..98a453f86 100644 --- a/Runtime/Character/CCharAnimTime.hpp +++ b/Runtime/Character/CCharAnimTime.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCHARANIMTIME_HPP__ -#define __PSHAG_CCHARANIMTIME_HPP__ +#ifndef __URDE_CCHARANIMTIME_HPP__ +#define __URDE_CCHARANIMTIME_HPP__ #include "IOStreams.hpp" @@ -48,4 +48,4 @@ public: }; } -#endif // __PSHAG_CCHARANIMTIME_HPP__ +#endif // __URDE_CCHARANIMTIME_HPP__ diff --git a/Runtime/Character/CCharLayoutInfo.hpp b/Runtime/Character/CCharLayoutInfo.hpp index 93e816aa8..9a16f40ed 100644 --- a/Runtime/Character/CCharLayoutInfo.hpp +++ b/Runtime/Character/CCharLayoutInfo.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCHARLAYOUTINFO_HPP__ -#define __PSHAG_CCHARLAYOUTINFO_HPP__ +#ifndef __URDE_CCHARLAYOUTINFO_HPP__ +#define __URDE_CCHARLAYOUTINFO_HPP__ #include "CFactoryMgr.hpp" #include "IOStreams.hpp" @@ -41,4 +41,4 @@ CFactoryFnReturn FCharLayoutInfo(const SObjectTag&, CInputStream&, const CVParam } -#endif // __PSHAG_CCHARLAYOUTINFO_HPP__ +#endif // __URDE_CCHARLAYOUTINFO_HPP__ diff --git a/Runtime/Character/CCharacterFactory.cpp b/Runtime/Character/CCharacterFactory.cpp index e69de29bb..945ab9dbe 100644 --- a/Runtime/Character/CCharacterFactory.cpp +++ b/Runtime/Character/CCharacterFactory.cpp @@ -0,0 +1,92 @@ +#include "CCharacterFactory.hpp" +#include "CAnimCharacterSet.hpp" +#include "CSimplePool.hpp" +#include "CTransitionDatabaseGame.hpp" +#include "CAnimationDatabaseGame.hpp" +#include "CAnimationManager.hpp" +#include "CTransitionManager.hpp" +#include "CRandom16.hpp" +#include "CPrimitive.hpp" + +namespace urde +{ + +CFactoryFnReturn CCharacterFactory::CDummyFactory::Build(const SObjectTag&, const CVParamTransfer&) +{ + return {}; +} + +void CCharacterFactory::CDummyFactory::BuildAsync(const SObjectTag&, const CVParamTransfer&, IObj**) +{ +} + +void CCharacterFactory::CDummyFactory::CancelBuild(const SObjectTag&) +{ +} + +bool CCharacterFactory::CDummyFactory::CanBuild(const SObjectTag&) +{ + return true; +} + +const SObjectTag* CCharacterFactory::CDummyFactory::GetResourceIdByName(const char*) const +{ + return nullptr; +} + +TResId CCharacterFactory::GetEventResourceIdForAnimResourceId(TResId) const +{ +} + +std::vector +CCharacterFactory::GetCharacterInfoDB(const CAnimCharacterSet& ancs) +{ + std::vector ret; + const std::map& charInfoMap = ancs.GetCharacterSet().GetCharacterInfoMap(); + ret.reserve(charInfoMap.size()); + for (const auto& charInfo : charInfoMap) + ret.push_back(charInfo.second); + return ret; +} + +std::vector> +CCharacterFactory::GetCharLayoutInfoDB(CSimplePool& store, + const std::vector& chars) +{ + std::vector> ret; + ret.reserve(chars.size()); + for (const CCharacterInfo& charInfo : chars) + ret.push_back(store.GetObj({SBIG('CINF'), charInfo.GetCharLayoutInfoId()})); + return ret; +} + +CCharacterFactory::CCharacterFactory(CSimplePool& store, + const CAnimCharacterSet& ancs, + TResId selfId) +: x4_charInfoDB(GetCharacterInfoDB(ancs)), + x14_charLayoutInfoDB(GetCharLayoutInfoDB(store, x4_charInfoDB)), + x24_sysContext(std::make_shared( + TToken( + std::make_unique(ancs.GetAnimationSet().GetTransitions(), + ancs.GetAnimationSet().GetHalfTransitions(), + ancs.GetAnimationSet().GetDefaultTransition())), + 2334, store)), + x28_animMgr(std::make_shared( + TToken( + std::make_unique( + ancs.GetAnimationSet().GetAnimations())), *x24_sysContext)), + x2c_transMgr(std::make_shared(*x24_sysContext)), + x40_additiveInfo(ancs.GetAnimationSet().GetAdditiveInfo()), + x50_defaultAdditiveInfo(ancs.GetAnimationSet().GetDefaultAdditiveInfo()), + x58_animResources(ancs.GetAnimationSet().GetAnimResIds()), + x68_selfId(selfId), + x70_cacheResPool(x6c_dummyFactory) +{ + std::vector primitives; + x28_animMgr->GetAnimationDatabase()->GetAllUniquePrimitives(primitives); + x30_animSourceDB.reserve(primitives.size()); + for (const CPrimitive& prim : primitives) + x30_animSourceDB.push_back(store.GetObj({SBIG('ANIM'), prim.GetAnimResId()})); +} + +} diff --git a/Runtime/Character/CCharacterFactory.hpp b/Runtime/Character/CCharacterFactory.hpp index 9e840ff38..d29378f1d 100644 --- a/Runtime/Character/CCharacterFactory.hpp +++ b/Runtime/Character/CCharacterFactory.hpp @@ -1,23 +1,63 @@ -#ifndef __PSHAG_CCHARACTERFACTORY_HPP__ -#define __PSHAG_CCHARACTERFACTORY_HPP__ +#ifndef __URDE_CCHARACTERFACTORY_HPP__ +#define __URDE_CCHARACTERFACTORY_HPP__ -#include "../IFactory.hpp" +#include "IFactory.hpp" +#include "IObjFactory.hpp" +#include "CToken.hpp" +#include "CSimplePool.hpp" +#include "CAnimationSet.hpp" namespace urde { +class CSimplePool; +class CAnimCharacterSet; +class CCharacterInfo; +class CCharLayoutInfo; +class CAdditiveAnimationInfo; +class CTransitionDatabaseGame; +class CAnimationManager; +class CTransitionManager; +class CAllFormatsAnimSource; -class CAnimSysContext -{ -}; - -class CCharacterFactory : public IFactory +class CCharacterFactory : public IObjFactory { public: class CDummyFactory : public IFactory { + public: + CFactoryFnReturn Build(const SObjectTag&, const CVParamTransfer&); + void BuildAsync(const SObjectTag&, const CVParamTransfer&, IObj**); + void CancelBuild(const SObjectTag&); + bool CanBuild(const SObjectTag&); + const SObjectTag* GetResourceIdByName(const char*) const; }; + +private: + std::vector x4_charInfoDB; + std::vector> x14_charLayoutInfoDB; + std::shared_ptr x24_sysContext; + std::shared_ptr x28_animMgr; + std::shared_ptr x2c_transMgr; + std::vector> x30_animSourceDB; + std::vector> x40_additiveInfo; + CAdditiveAnimationInfo x50_defaultAdditiveInfo; + std::vector> x58_animResources; + TResId x68_selfId; + CDummyFactory x6c_dummyFactory; + CSimplePool x70_cacheResPool; + + static std::vector GetCharacterInfoDB(const CAnimCharacterSet& ancs); + static std::vector> + GetCharLayoutInfoDB(CSimplePool& store, + const std::vector& chars); + +public: + CCharacterFactory(CSimplePool& store, const CAnimCharacterSet& ancs, TResId); + + void CreateCharacter(int, bool, const TLockedToken& factory, int) const; + TResId GetEventResourceIdForAnimResourceId(TResId animId) const; }; } -#endif // __PSHAG_CCHARACTERFACTORY_HPP__ +#endif // __URDE_CCHARACTERFACTORY_HPP__ diff --git a/Runtime/Character/CCharacterInfo.hpp b/Runtime/Character/CCharacterInfo.hpp index d431d2132..ebd3d7f8a 100644 --- a/Runtime/Character/CCharacterInfo.hpp +++ b/Runtime/Character/CCharacterInfo.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCHARACTERINFO_HPP__ -#define __PSHAG_CCHARACTERINFO_HPP__ +#ifndef __URDE_CCHARACTERINFO_HPP__ +#define __URDE_CCHARACTERINFO_HPP__ #include "IOStreams.hpp" #include "CPASDatabase.hpp" @@ -40,8 +40,10 @@ private: public: CCharacterInfo(CInputStream& in); + + TResId GetCharLayoutInfoId() const {return x1c_cinf;} }; } -#endif // __PSHAG_CCHARACTERINFO_HPP__ +#endif // __URDE_CCHARACTERINFO_HPP__ diff --git a/Runtime/Character/CCharacterSet.hpp b/Runtime/Character/CCharacterSet.hpp index af55d24f8..224b971ee 100644 --- a/Runtime/Character/CCharacterSet.hpp +++ b/Runtime/Character/CCharacterSet.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCHARACTERSET_HPP__ -#define __PSHAG_CCHARACTERSET_HPP__ +#ifndef __URDE_CCHARACTERSET_HPP__ +#define __URDE_CCHARACTERSET_HPP__ #include "IOStreams.hpp" #include "CCharacterInfo.hpp" @@ -13,8 +13,9 @@ class CCharacterSet std::map x4_characters; public: CCharacterSet(CInputStream& in); + const std::map& GetCharacterInfoMap() const {return x4_characters;} }; } -#endif // __PSHAG_CCHARACTERSET_HPP__ +#endif // __URDE_CCHARACTERSET_HPP__ diff --git a/Runtime/Character/CEffectComponent.hpp b/Runtime/Character/CEffectComponent.hpp index 95f7c0d3d..da8c69324 100644 --- a/Runtime/Character/CEffectComponent.hpp +++ b/Runtime/Character/CEffectComponent.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CEFFECTCOMPONENT_HPP__ -#define __PSHAG_CEFFECTCOMPONENT_HPP__ +#ifndef __URDE_CEFFECTCOMPONENT_HPP__ +#define __URDE_CEFFECTCOMPONENT_HPP__ #include "IOStreams.hpp" #include "RetroTypes.hpp" @@ -22,4 +22,4 @@ public: } -#endif // __PSHAG_CEFFECTCOMPONENT_HPP__ +#endif // __URDE_CEFFECTCOMPONENT_HPP__ diff --git a/Runtime/Character/CHalfTransition.hpp b/Runtime/Character/CHalfTransition.hpp index dd909c87d..e2216ab43 100644 --- a/Runtime/Character/CHalfTransition.hpp +++ b/Runtime/Character/CHalfTransition.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CHALFTRANSITION_HPP__ -#define __PSHAG_CHALFTRANSITION_HPP__ +#ifndef __URDE_CHALFTRANSITION_HPP__ +#define __URDE_CHALFTRANSITION_HPP__ #include "IOStreams.hpp" #include "IMetaTrans.hpp" @@ -13,8 +13,10 @@ class CHalfTransition std::shared_ptr x4_trans; public: CHalfTransition(CInputStream& in); + u32 GetId() const {return x0_id;} + const std::shared_ptr& GetMetaTrans() const {return x4_trans;} }; } -#endif // __PSHAG_CHALFTRANSITION_HPP__ +#endif // __URDE_CHALFTRANSITION_HPP__ diff --git a/Runtime/Character/CHierarchyPoseBuilder.hpp b/Runtime/Character/CHierarchyPoseBuilder.hpp index 2694ee919..ef57ef072 100644 --- a/Runtime/Character/CHierarchyPoseBuilder.hpp +++ b/Runtime/Character/CHierarchyPoseBuilder.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CHIERARCHYPOSEBUILDER_HPP__ -#define __PSHAG_CHIERARCHYPOSEBUILDER_HPP__ +#ifndef __URDE_CHIERARCHYPOSEBUILDER_HPP__ +#define __URDE_CHIERARCHYPOSEBUILDER_HPP__ namespace urde { @@ -13,4 +13,4 @@ public: } -#endif // __PSHAG_CHIERARCHYPOSEBUILDER_HPP__ +#endif // __URDE_CHIERARCHYPOSEBUILDER_HPP__ diff --git a/Runtime/Character/CInt32POINode.hpp b/Runtime/Character/CInt32POINode.hpp index 536bf2fd4..a2a08900a 100644 --- a/Runtime/Character/CInt32POINode.hpp +++ b/Runtime/Character/CInt32POINode.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CINT32POINODE_HPP__ -#define __PSHAG_CINT32POINODE_HPP__ +#ifndef __URDE_CINT32POINODE_HPP__ +#define __URDE_CINT32POINODE_HPP__ #include "CPOINode.hpp" @@ -28,4 +28,4 @@ public: } -#endif // __PSHAG_CINT32POINODE_HPP__ +#endif // __URDE_CINT32POINODE_HPP__ diff --git a/Runtime/Character/CMakeLists.txt b/Runtime/Character/CMakeLists.txt index 17262fe54..71159dbd5 100644 --- a/Runtime/Character/CMakeLists.txt +++ b/Runtime/Character/CMakeLists.txt @@ -1,14 +1,15 @@ add_library(RuntimeCommonCharacter CAssetFactory.hpp CAssetFactory.cpp CCharacterFactory.hpp CCharacterFactory.cpp + CModelData.hpp CModelData.cpp CAnimData.hpp CAnimData.cpp CCharAnimTime.hpp CCharAnimTime.cpp IMetaAnim.hpp IMetaAnim.cpp IMetaTrans.hpp CAnimationDatabase.hpp - CAnimationDatabaseGame.hpp + CAnimationDatabaseGame.hpp CAnimationDatabaseGame.cpp CTransitionDatabase.hpp - CTransitionDatabaseGame.hpp + CTransitionDatabaseGame.hpp CTransitionDatabaseGame.cpp CHierarchyPoseBuilder.hpp CHierarchyPoseBuilder.cpp CPoseAsTransforms.hpp CPoseAsTransforms.cpp CSkinBank.hpp CSkinBank.cpp @@ -68,4 +69,5 @@ add_library(RuntimeCommonCharacter CAnimSource.hpp CAnimSource.cpp CAllFormatsAnimSource.hpp CAllFormatsAnimSource.cpp CSegStatementSet.hpp CSegStatementSet.cpp + CAnimSysContext.hpp CBodyState.hpp) diff --git a/Runtime/Character/CMetaAnimBlend.hpp b/Runtime/Character/CMetaAnimBlend.hpp index 532c1caa1..9986e98f2 100644 --- a/Runtime/Character/CMetaAnimBlend.hpp +++ b/Runtime/Character/CMetaAnimBlend.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETAANIMBLEND_HPP__ -#define __PSHAG_CMETAANIMBLEND_HPP__ +#ifndef __URDE_CMETAANIMBLEND_HPP__ +#define __URDE_CMETAANIMBLEND_HPP__ #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -26,4 +26,4 @@ public: } -#endif // __PSHAG_CMETAANIMBLEND_HPP__ +#endif // __URDE_CMETAANIMBLEND_HPP__ diff --git a/Runtime/Character/CMetaAnimFactory.hpp b/Runtime/Character/CMetaAnimFactory.hpp index e2d6dbb47..42431e956 100644 --- a/Runtime/Character/CMetaAnimFactory.hpp +++ b/Runtime/Character/CMetaAnimFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETAANIMFACTORY_HPP__ -#define __PSHAG_CMETAANIMFACTORY_HPP__ +#ifndef __URDE_CMETAANIMFACTORY_HPP__ +#define __URDE_CMETAANIMFACTORY_HPP__ #include "IOStreams.hpp" #include "IMetaAnim.hpp" @@ -15,4 +15,4 @@ public: } -#endif // __PSHAG_CMETAANIMFACTORY_HPP__ +#endif // __URDE_CMETAANIMFACTORY_HPP__ diff --git a/Runtime/Character/CMetaAnimPhaseBlend.hpp b/Runtime/Character/CMetaAnimPhaseBlend.hpp index 62b1f9e50..0840da406 100644 --- a/Runtime/Character/CMetaAnimPhaseBlend.hpp +++ b/Runtime/Character/CMetaAnimPhaseBlend.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETAANIMPHASEBLEND_HPP__ -#define __PSHAG_CMETAANIMPHASEBLEND_HPP__ +#ifndef __URDE_CMETAANIMPHASEBLEND_HPP__ +#define __URDE_CMETAANIMPHASEBLEND_HPP__ #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -26,4 +26,4 @@ public: } -#endif // __PSHAG_CMETAANIMPHASEBLEND_HPP__ +#endif // __URDE_CMETAANIMPHASEBLEND_HPP__ diff --git a/Runtime/Character/CMetaAnimPlay.hpp b/Runtime/Character/CMetaAnimPlay.hpp index c68893090..07d77dd60 100644 --- a/Runtime/Character/CMetaAnimPlay.hpp +++ b/Runtime/Character/CMetaAnimPlay.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETAANIMPLAY_HPP__ -#define __PSHAG_CMETAANIMPLAY_HPP__ +#ifndef __URDE_CMETAANIMPLAY_HPP__ +#define __URDE_CMETAANIMPLAY_HPP__ #include "IMetaAnim.hpp" #include "CPrimitive.hpp" @@ -26,4 +26,4 @@ public: } -#endif // __PSHAG_CMETAANIMPLAY_HPP__ +#endif // __URDE_CMETAANIMPLAY_HPP__ diff --git a/Runtime/Character/CMetaAnimRandom.hpp b/Runtime/Character/CMetaAnimRandom.hpp index 6b817ea8d..c44411666 100644 --- a/Runtime/Character/CMetaAnimRandom.hpp +++ b/Runtime/Character/CMetaAnimRandom.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETAANIMRANDOM_HPP__ -#define __PSHAG_CMETAANIMRANDOM_HPP__ +#ifndef __URDE_CMETAANIMRANDOM_HPP__ +#define __URDE_CMETAANIMRANDOM_HPP__ #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -25,4 +25,4 @@ public: } -#endif // __PSHAG_CMETAANIMRANDOM_HPP__ +#endif // __URDE_CMETAANIMRANDOM_HPP__ diff --git a/Runtime/Character/CMetaAnimSequence.hpp b/Runtime/Character/CMetaAnimSequence.hpp index 2c2e9dbda..32a8ae0d9 100644 --- a/Runtime/Character/CMetaAnimSequence.hpp +++ b/Runtime/Character/CMetaAnimSequence.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETAANIMSEQUENCE_HPP__ -#define __PSHAG_CMETAANIMSEQUENCE_HPP__ +#ifndef __URDE_CMETAANIMSEQUENCE_HPP__ +#define __URDE_CMETAANIMSEQUENCE_HPP__ #include "IMetaAnim.hpp" #include "IOStreams.hpp" @@ -24,4 +24,4 @@ public: } -#endif // __PSHAG_CMETAANIMSEQUENCE_HPP__ +#endif // __URDE_CMETAANIMSEQUENCE_HPP__ diff --git a/Runtime/Character/CMetaTransFactory.hpp b/Runtime/Character/CMetaTransFactory.hpp index befa22357..bf42d6e75 100644 --- a/Runtime/Character/CMetaTransFactory.hpp +++ b/Runtime/Character/CMetaTransFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETATRANSFACTORY_HPP__ -#define __PSHAG_CMETATRANSFACTORY_HPP__ +#ifndef __URDE_CMETATRANSFACTORY_HPP__ +#define __URDE_CMETATRANSFACTORY_HPP__ #include "IOStreams.hpp" #include "IMetaTrans.hpp" @@ -15,4 +15,4 @@ public: } -#endif // __PSHAG_CMETATRANSFACTORY_HPP__ +#endif // __URDE_CMETATRANSFACTORY_HPP__ diff --git a/Runtime/Character/CMetaTransMetaAnim.hpp b/Runtime/Character/CMetaTransMetaAnim.hpp index 3e12932d6..2d90a23cd 100644 --- a/Runtime/Character/CMetaTransMetaAnim.hpp +++ b/Runtime/Character/CMetaTransMetaAnim.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETATRANSMETAANIM_HPP__ -#define __PSHAG_CMETATRANSMETAANIM_HPP__ +#ifndef __URDE_CMETATRANSMETAANIM_HPP__ +#define __URDE_CMETATRANSMETAANIM_HPP__ #include "IMetaTrans.hpp" #include "IMetaAnim.hpp" @@ -22,4 +22,4 @@ public: } -#endif // __PSHAG_CMETATRANSMETAANIM_HPP__ +#endif // __URDE_CMETATRANSMETAANIM_HPP__ diff --git a/Runtime/Character/CMetaTransPhaseTrans.hpp b/Runtime/Character/CMetaTransPhaseTrans.hpp index a1f6de1b1..d8759755b 100644 --- a/Runtime/Character/CMetaTransPhaseTrans.hpp +++ b/Runtime/Character/CMetaTransPhaseTrans.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETATRANSPHASETRANS_HPP__ -#define __PSHAG_CMETATRANSPHASETRANS_HPP__ +#ifndef __URDE_CMETATRANSPHASETRANS_HPP__ +#define __URDE_CMETATRANSPHASETRANS_HPP__ #include "IMetaTrans.hpp" #include "IOStreams.hpp" @@ -25,4 +25,4 @@ public: } -#endif // __PSHAG_CMETATRANSPHASETRANS_HPP__ +#endif // __URDE_CMETATRANSPHASETRANS_HPP__ diff --git a/Runtime/Character/CMetaTransSnap.hpp b/Runtime/Character/CMetaTransSnap.hpp index 204f22629..e84855484 100644 --- a/Runtime/Character/CMetaTransSnap.hpp +++ b/Runtime/Character/CMetaTransSnap.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETATRANSSNAP_HPP__ -#define __PSHAG_CMETATRANSSNAP_HPP__ +#ifndef __URDE_CMETATRANSSNAP_HPP__ +#define __URDE_CMETATRANSSNAP_HPP__ #include "IMetaTrans.hpp" #include "IOStreams.hpp" @@ -19,4 +19,4 @@ public: } -#endif // __PSHAG_CMETATRANSSNAP_HPP__ +#endif // __URDE_CMETATRANSSNAP_HPP__ diff --git a/Runtime/Character/CMetaTransTrans.hpp b/Runtime/Character/CMetaTransTrans.hpp index 9ddbdfe30..12477d2c0 100644 --- a/Runtime/Character/CMetaTransTrans.hpp +++ b/Runtime/Character/CMetaTransTrans.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETATRANSTRANS_HPP__ -#define __PSHAG_CMETATRANSTRANS_HPP__ +#ifndef __URDE_CMETATRANSTRANS_HPP__ +#define __URDE_CMETATRANSTRANS_HPP__ #include "IMetaTrans.hpp" #include "IOStreams.hpp" @@ -25,4 +25,4 @@ public: } -#endif // __PSHAG_CMETATRANSTRANS_HPP__ +#endif // __URDE_CMETATRANSTRANS_HPP__ diff --git a/Runtime/Character/CModelData.cpp b/Runtime/Character/CModelData.cpp new file mode 100644 index 000000000..e69de29bb diff --git a/Runtime/Character/CModelData.hpp b/Runtime/Character/CModelData.hpp new file mode 100644 index 000000000..4f5e51658 --- /dev/null +++ b/Runtime/Character/CModelData.hpp @@ -0,0 +1,24 @@ +#ifndef __URDE_CMODELDATA_HPP__ +#define __URDE_CMODELDATA_HPP__ + +#include "zeus/CVector3f.hpp" + +namespace urde +{ + +class CAnimRes +{ + zeus::CVector3f x8_scale; +public: + CAnimRes(); +}; + +class CModelData +{ +public: + CModelData(const CAnimRes& res); +}; + +} + +#endif // __URDE_CMODELDATA_HPP__ diff --git a/Runtime/Character/CPASAnimInfo.hpp b/Runtime/Character/CPASAnimInfo.hpp index 954645c7d..e476ed24c 100644 --- a/Runtime/Character/CPASAnimInfo.hpp +++ b/Runtime/Character/CPASAnimInfo.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPASANIMINFO_HPP__ -#define __PSHAG_CPASANIMINFO_HPP__ +#ifndef __URDE_CPASANIMINFO_HPP__ +#define __URDE_CPASANIMINFO_HPP__ #include "IOStreams.hpp" #include "rstl.hpp" @@ -19,4 +19,4 @@ public: } -#endif // __PSHAG_CPASANIMINFO_HPP__ +#endif // __URDE_CPASANIMINFO_HPP__ diff --git a/Runtime/Character/CPASAnimParm.hpp b/Runtime/Character/CPASAnimParm.hpp index 8148ed58b..fd5e8c4cb 100644 --- a/Runtime/Character/CPASAnimParm.hpp +++ b/Runtime/Character/CPASAnimParm.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPASANIMPARM_HPP__ -#define __PSHAG_CPASANIMPARM_HPP__ +#ifndef __URDE_CPASANIMPARM_HPP__ +#define __URDE_CPASANIMPARM_HPP__ #include "RetroTypes.hpp" @@ -83,4 +83,4 @@ public: } -#endif // __PSHAG_CPASANIMPARM_HPP__ +#endif // __URDE_CPASANIMPARM_HPP__ diff --git a/Runtime/Character/CPASAnimState.hpp b/Runtime/Character/CPASAnimState.hpp index 8bf1499cc..c0f8a2793 100644 --- a/Runtime/Character/CPASAnimState.hpp +++ b/Runtime/Character/CPASAnimState.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPASANIMSTATE_HPP__ -#define __PSHAG_CPASANIMSTATE_HPP__ +#ifndef __URDE_CPASANIMSTATE_HPP__ +#define __URDE_CPASANIMSTATE_HPP__ #include "IOStreams.hpp" #include "CPASParmInfo.hpp" @@ -21,4 +21,4 @@ public: } -#endif // __PSHAG_CPASANIMSTATE_HPP__ +#endif // __URDE_CPASANIMSTATE_HPP__ diff --git a/Runtime/Character/CPASDatabase.hpp b/Runtime/Character/CPASDatabase.hpp index 193d077f5..966c77687 100644 --- a/Runtime/Character/CPASDatabase.hpp +++ b/Runtime/Character/CPASDatabase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPASDATABASE_HPP__ -#define __PSHAG_CPASDATABASE_HPP__ +#ifndef __URDE_CPASDATABASE_HPP__ +#define __URDE_CPASDATABASE_HPP__ #include "IOStreams.hpp" #include "CPASAnimState.hpp" @@ -19,4 +19,4 @@ public: } -#endif // __PSHAG_CPASDATABASE_HPP__ +#endif // __URDE_CPASDATABASE_HPP__ diff --git a/Runtime/Character/CPASParmInfo.hpp b/Runtime/Character/CPASParmInfo.hpp index 3d09977f3..2aa835ffa 100644 --- a/Runtime/Character/CPASParmInfo.hpp +++ b/Runtime/Character/CPASParmInfo.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPASPARMINFO_HPP__ -#define __PSHAG_CPASPARMINFO_HPP__ +#ifndef __URDE_CPASPARMINFO_HPP__ +#define __URDE_CPASPARMINFO_HPP__ #include "IOStreams.hpp" #include "CPASAnimParm.hpp" @@ -21,4 +21,4 @@ public: } -#endif // __PSHAG_CPASPARMINFO_HPP__ +#endif // __URDE_CPASPARMINFO_HPP__ diff --git a/Runtime/Character/CPOINode.hpp b/Runtime/Character/CPOINode.hpp index 33e41c3d3..148abe907 100644 --- a/Runtime/Character/CPOINode.hpp +++ b/Runtime/Character/CPOINode.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPOINODE_HPP__ -#define __PSHAG_CPOINODE_HPP__ +#ifndef __URDE_CPOINODE_HPP__ +#define __URDE_CPOINODE_HPP__ #include "IOStreams.hpp" #include "CCharAnimTime.hpp" @@ -31,4 +31,4 @@ public: } -#endif // __PSHAG_CPOINODE_HPP__ +#endif // __URDE_CPOINODE_HPP__ diff --git a/Runtime/Character/CParticleData.hpp b/Runtime/Character/CParticleData.hpp index 32b42da56..ab74caf06 100644 --- a/Runtime/Character/CParticleData.hpp +++ b/Runtime/Character/CParticleData.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEDATA_HPP__ -#define __PSHAG_CPARTICLEDATA_HPP__ +#ifndef __URDE_CPARTICLEDATA_HPP__ +#define __URDE_CPARTICLEDATA_HPP__ #include "IOStreams.hpp" #include "RetroTypes.hpp" @@ -29,4 +29,4 @@ public: } -#endif // __PSHAG_CPARTICLEDATA_HPP__ +#endif // __URDE_CPARTICLEDATA_HPP__ diff --git a/Runtime/Character/CParticleDatabase.hpp b/Runtime/Character/CParticleDatabase.hpp index 8a33936e6..a655317c7 100644 --- a/Runtime/Character/CParticleDatabase.hpp +++ b/Runtime/Character/CParticleDatabase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEDATABASE_HPP__ -#define __PSHAG_CPARTICLEDATABASE_HPP__ +#ifndef __URDE_CPARTICLEDATABASE_HPP__ +#define __URDE_CPARTICLEDATABASE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CParticleDatabase } -#endif // __PSHAG_CPARTICLEDATABASE_HPP__ +#endif // __URDE_CPARTICLEDATABASE_HPP__ diff --git a/Runtime/Character/CParticlePOINode.hpp b/Runtime/Character/CParticlePOINode.hpp index 4131a96e9..7115b2cc6 100644 --- a/Runtime/Character/CParticlePOINode.hpp +++ b/Runtime/Character/CParticlePOINode.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEPOINODE_HPP__ -#define __PSHAG_CPARTICLEPOINODE_HPP__ +#ifndef __URDE_CPARTICLEPOINODE_HPP__ +#define __URDE_CPARTICLEPOINODE_HPP__ #include "CPOINode.hpp" #include "CParticleData.hpp" @@ -27,4 +27,4 @@ public: } -#endif // __PSHAG_CPARTICLEPOINODE_HPP__ +#endif // __URDE_CPARTICLEPOINODE_HPP__ diff --git a/Runtime/Character/CPoseAsTransforms.hpp b/Runtime/Character/CPoseAsTransforms.hpp index 29cd5afa1..4eadd5db9 100644 --- a/Runtime/Character/CPoseAsTransforms.hpp +++ b/Runtime/Character/CPoseAsTransforms.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPOSEASTRANSFORMS_HPP__ -#define __PSHAG_CPOSEASTRANSFORMS_HPP__ +#ifndef __URDE_CPOSEASTRANSFORMS_HPP__ +#define __URDE_CPOSEASTRANSFORMS_HPP__ #include "RetroTypes.hpp" #include "CSegId.hpp" @@ -28,4 +28,4 @@ public: } -#endif // __PSHAG_CPOSEASTRANSFORMS_HPP__ +#endif // __URDE_CPOSEASTRANSFORMS_HPP__ diff --git a/Runtime/Character/CPrimitive.hpp b/Runtime/Character/CPrimitive.hpp index 7510b3e04..dab8a9009 100644 --- a/Runtime/Character/CPrimitive.hpp +++ b/Runtime/Character/CPrimitive.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPRIMITIVE_HPP__ -#define __PSHAG_CPRIMITIVE_HPP__ +#ifndef __URDE_CPRIMITIVE_HPP__ +#define __URDE_CPRIMITIVE_HPP__ #include "IOStreams.hpp" #include "RetroTypes.hpp" @@ -14,8 +14,9 @@ class CPrimitive std::string x8_animName; public: CPrimitive(CInputStream& in); + TResId GetAnimResId() const {return x0_animId;} }; } -#endif // __PSHAG_CPRIMITIVE_HPP__ +#endif // __URDE_CPRIMITIVE_HPP__ diff --git a/Runtime/Character/CSegId.hpp b/Runtime/Character/CSegId.hpp index 75cabd2e1..e294470f2 100644 --- a/Runtime/Character/CSegId.hpp +++ b/Runtime/Character/CSegId.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSEGID_HPP__ -#define __PSHAG_CSEGID_HPP__ +#ifndef __URDE_CSEGID_HPP__ +#define __URDE_CSEGID_HPP__ #include "RetroTypes.hpp" #include "IOStreams.hpp" @@ -22,4 +22,4 @@ public: } -#endif // __PSHAG_CSEGID_HPP__ +#endif // __URDE_CSEGID_HPP__ diff --git a/Runtime/Character/CSegIdList.hpp b/Runtime/Character/CSegIdList.hpp index a9477aedc..05f080ae4 100644 --- a/Runtime/Character/CSegIdList.hpp +++ b/Runtime/Character/CSegIdList.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSEGIDLIST_HPP__ -#define __PSHAG_CSEGIDLIST_HPP__ +#ifndef __URDE_CSEGIDLIST_HPP__ +#define __URDE_CSEGIDLIST_HPP__ #include "IOStreams.hpp" #include "CSegId.hpp" @@ -17,4 +17,4 @@ public: } -#endif // __PSHAG_CSEGIDLIST_HPP__ +#endif // __URDE_CSEGIDLIST_HPP__ diff --git a/Runtime/Character/CSegStatementSet.hpp b/Runtime/Character/CSegStatementSet.hpp index c3b9cd44f..c4aed3a47 100644 --- a/Runtime/Character/CSegStatementSet.hpp +++ b/Runtime/Character/CSegStatementSet.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSEGSTATEMENTSET_HPP__ -#define __PSHAG_CSEGSTATEMENTSET_HPP__ +#ifndef __URDE_CSEGSTATEMENTSET_HPP__ +#define __URDE_CSEGSTATEMENTSET_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CSegStatementSet } -#endif // __PSHAG_CSEGSTATEMENTSET_HPP__ +#endif // __URDE_CSEGSTATEMENTSET_HPP__ diff --git a/Runtime/Character/CSkinBank.hpp b/Runtime/Character/CSkinBank.hpp index 435a058c2..5812b2a99 100644 --- a/Runtime/Character/CSkinBank.hpp +++ b/Runtime/Character/CSkinBank.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSKINBANK_HPP__ -#define __PSHAG_CSKINBANK_HPP__ +#ifndef __URDE_CSKINBANK_HPP__ +#define __URDE_CSKINBANK_HPP__ #include "IOStreams.hpp" #include "CSegId.hpp" @@ -16,4 +16,4 @@ public: } -#endif // __PSHAG_CSKINBANK_HPP__ +#endif // __URDE_CSKINBANK_HPP__ diff --git a/Runtime/Character/CSkinRules.hpp b/Runtime/Character/CSkinRules.hpp index 0c02bbe43..a406aeaa2 100644 --- a/Runtime/Character/CSkinRules.hpp +++ b/Runtime/Character/CSkinRules.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSKINRULES_HPP__ -#define __PSHAG_CSKINRULES_HPP__ +#ifndef __URDE_CSKINRULES_HPP__ +#define __URDE_CSKINRULES_HPP__ #include "RetroTypes.hpp" #include "CSkinBank.hpp" @@ -20,4 +20,4 @@ CFactoryFnReturn FSkinRulesFactory(const SObjectTag& tag, CInputStream& in, cons } -#endif // __PSHAG_CSKINRULES_HPP__ +#endif // __URDE_CSKINRULES_HPP__ diff --git a/Runtime/Character/CSoundPOINode.hpp b/Runtime/Character/CSoundPOINode.hpp index 61d524e24..df3752015 100644 --- a/Runtime/Character/CSoundPOINode.hpp +++ b/Runtime/Character/CSoundPOINode.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSOUNDPOINODE_HPP__ -#define __PSHAG_CSOUNDPOINODE_HPP__ +#ifndef __URDE_CSOUNDPOINODE_HPP__ +#define __URDE_CSOUNDPOINODE_HPP__ #include "CPOINode.hpp" #include "CCharAnimTime.hpp" @@ -31,4 +31,4 @@ public: } -#endif // __PSHAG_CSOUNDPOINODE_HPP__ +#endif // __URDE_CSOUNDPOINODE_HPP__ diff --git a/Runtime/Character/CTimeScaleFunctions.hpp b/Runtime/Character/CTimeScaleFunctions.hpp index 8d5ec50ea..78036f3e6 100644 --- a/Runtime/Character/CTimeScaleFunctions.hpp +++ b/Runtime/Character/CTimeScaleFunctions.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CTIMESCALEFUNCTIONS_HPP__ -#define __PSHAG_CTIMESCALEFUNCTIONS_HPP__ +#ifndef __URDE_CTIMESCALEFUNCTIONS_HPP__ +#define __URDE_CTIMESCALEFUNCTIONS_HPP__ #include "RetroTypes.hpp" @@ -56,4 +56,4 @@ public: } -#endif // __PSHAG_CTIMESCALEFUNCTIONS_HPP__ +#endif // __URDE_CTIMESCALEFUNCTIONS_HPP__ diff --git a/Runtime/Character/CTransition.hpp b/Runtime/Character/CTransition.hpp index 0c6e51696..8ab47b385 100644 --- a/Runtime/Character/CTransition.hpp +++ b/Runtime/Character/CTransition.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CTRANSITION_HPP__ -#define __PSHAG_CTRANSITION_HPP__ +#ifndef __URDE_CTRANSITION_HPP__ +#define __URDE_CTRANSITION_HPP__ #include "IOStreams.hpp" #include "CMetaTransFactory.hpp" @@ -12,11 +12,15 @@ class CTransition u32 x0_id; u32 x4_animA; u32 x8_animB; - std::unique_ptr xc_trans; + std::shared_ptr xc_trans; public: CTransition(CInputStream& in); + u32 GetAnimA() const {return x4_animA;} + u32 GetAnimB() const {return x8_animB;} + std::pair GetAnimPair() const {return {x4_animA, x8_animB};} + const std::shared_ptr& GetMetaTrans() const {return xc_trans;} }; } -#endif // __PSHAG_CTRANSITION_HPP__ +#endif // __URDE_CTRANSITION_HPP__ diff --git a/Runtime/Character/CTransitionDatabase.hpp b/Runtime/Character/CTransitionDatabase.hpp index ad3e1dce3..5b927009f 100644 --- a/Runtime/Character/CTransitionDatabase.hpp +++ b/Runtime/Character/CTransitionDatabase.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CTRANSITIONDATABASE_HPP__ -#define __PSHAG_CTRANSITIONDATABASE_HPP__ +#ifndef __URDE_CTRANSITIONDATABASE_HPP__ +#define __URDE_CTRANSITIONDATABASE_HPP__ #include "../RetroTypes.hpp" @@ -10,9 +10,9 @@ class IMetaTrans; class CTransitionDatabase { public: - virtual const IMetaTrans* GetMetaTrans(u32, u32) const=0; + virtual const std::shared_ptr& GetMetaTrans(u32, u32) const=0; }; } -#endif // __PSHAG_CTRANSITIONDATABASE_HPP__ +#endif // __URDE_CTRANSITIONDATABASE_HPP__ diff --git a/Runtime/Character/CTransitionDatabaseGame.cpp b/Runtime/Character/CTransitionDatabaseGame.cpp new file mode 100644 index 000000000..ad4407c0d --- /dev/null +++ b/Runtime/Character/CTransitionDatabaseGame.cpp @@ -0,0 +1,34 @@ +#include "CTransitionDatabaseGame.hpp" +#include "CTransition.hpp" +#include "CHalfTransition.hpp" + +namespace urde +{ + +CTransitionDatabaseGame::CTransitionDatabaseGame(const std::vector& transitions, + const std::vector& halfTransitions, + const std::shared_ptr& defaultTrans) +: x10_defaultTrans(defaultTrans) +{ + x14_transitions.reserve(transitions.size()); + for (const CTransition& trans : transitions) + x14_transitions.emplace_back(trans.GetAnimPair(), trans.GetMetaTrans()); + + x24_halfTransitions.reserve(halfTransitions.size()); + for (const CHalfTransition& trans : halfTransitions) + x24_halfTransitions.emplace_back(trans.GetId(), trans.GetMetaTrans()); +} + +const std::shared_ptr& CTransitionDatabaseGame::GetMetaTrans(u32 a, u32 b) const +{ + auto it = std::find_if(x14_transitions.cbegin(), x14_transitions.cend(), + [&](const std::pair, std::shared_ptr>& elem) -> bool + { + return elem.first.first == a && elem.first.second == b; + }); + if (it != x14_transitions.cend()) + return it->second; + return x10_defaultTrans; +} + +} diff --git a/Runtime/Character/CTransitionDatabaseGame.hpp b/Runtime/Character/CTransitionDatabaseGame.hpp index 672448e68..c6c9eb1c3 100644 --- a/Runtime/Character/CTransitionDatabaseGame.hpp +++ b/Runtime/Character/CTransitionDatabaseGame.hpp @@ -1,17 +1,25 @@ -#ifndef __PSHAG_CTRANSITIONDATABASEGAME_HPP__ -#define __PSHAG_CTRANSITIONDATABASEGAME_HPP__ +#ifndef __URDE_CTRANSITIONDATABASEGAME_HPP__ +#define __URDE_CTRANSITIONDATABASEGAME_HPP__ #include "CTransitionDatabase.hpp" namespace urde { +class CTransition; +class CHalfTransition; class CTransitionDatabaseGame : public CTransitionDatabase { + std::shared_ptr x10_defaultTrans; + std::vector, std::shared_ptr>> x14_transitions; + std::vector>> x24_halfTransitions; public: - const IMetaTrans* GetMetaTrans(u32, u32); + CTransitionDatabaseGame(const std::vector& transitions, + const std::vector& halfTransitions, + const std::shared_ptr& defaultTrans); + const std::shared_ptr& GetMetaTrans(u32, u32) const; }; } -#endif // __PSHAG_CTRANSITIONDATABASEGAME_HPP__ +#endif // __URDE_CTRANSITIONDATABASEGAME_HPP__ diff --git a/Runtime/Character/CTransitionManager.hpp b/Runtime/Character/CTransitionManager.hpp index 870d8b66a..7b4dea426 100644 --- a/Runtime/Character/CTransitionManager.hpp +++ b/Runtime/Character/CTransitionManager.hpp @@ -1,13 +1,22 @@ -#ifndef __PSHAG_CTRANSITIONMANAGER_HPP__ -#define __PSHAG_CTRANSITIONMANAGER_HPP__ +#ifndef __URDE_CTRANSITIONMANAGER_HPP__ +#define __URDE_CTRANSITIONMANAGER_HPP__ + +#include "CToken.hpp" +#include "CAnimSysContext.hpp" namespace urde { +class CTransitionDatabaseGame; +class CRandom16; +class CSimplePool; class CTransitionManager { + CAnimSysContext x0_animCtx; +public: + CTransitionManager(const CAnimSysContext& sysCtx) : x0_animCtx(sysCtx) {} }; } -#endif // __PSHAG_CTRANSITIONMANAGER_HPP__ +#endif // __URDE_CTRANSITIONMANAGER_HPP__ diff --git a/Runtime/Character/IAnimReader.hpp b/Runtime/Character/IAnimReader.hpp index 705183517..f2ebc0374 100644 --- a/Runtime/Character/IAnimReader.hpp +++ b/Runtime/Character/IAnimReader.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IANIMREADER_HPP__ -#define __PSHAG_IANIMREADER_HPP__ +#ifndef __URDE_IANIMREADER_HPP__ +#define __URDE_IANIMREADER_HPP__ #include "RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -57,4 +57,4 @@ public: } -#endif // __PSHAG_IANIMREADER_HPP__ +#endif // __URDE_IANIMREADER_HPP__ diff --git a/Runtime/Character/IMetaAnim.hpp b/Runtime/Character/IMetaAnim.hpp index e43169978..688242e10 100644 --- a/Runtime/Character/IMetaAnim.hpp +++ b/Runtime/Character/IMetaAnim.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IMETAANIM_HPP__ -#define __PSHAG_IMETAANIM_HPP__ +#ifndef __URDE_IMETAANIM_HPP__ +#define __URDE_IMETAANIM_HPP__ #include "../RetroTypes.hpp" #include "CCharAnimTime.hpp" @@ -55,4 +55,4 @@ public: } -#endif // __PSHAG_IMETAANIM_HPP__ +#endif // __URDE_IMETAANIM_HPP__ diff --git a/Runtime/Character/IMetaTrans.hpp b/Runtime/Character/IMetaTrans.hpp index 0106f2d14..a4f5f0c8f 100644 --- a/Runtime/Character/IMetaTrans.hpp +++ b/Runtime/Character/IMetaTrans.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IMETATRANS_HPP__ -#define __PSHAG_IMETATRANS_HPP__ +#ifndef __URDE_IMETATRANS_HPP__ +#define __URDE_IMETATRANS_HPP__ #include "../RetroTypes.hpp" @@ -28,4 +28,4 @@ public: } -#endif // __PSHAG_IMETATRANS_HPP__ +#endif // __URDE_IMETATRANS_HPP__ diff --git a/Runtime/GCNTypes.hpp b/Runtime/GCNTypes.hpp index 0e7fdfca0..725df3888 100644 --- a/Runtime/GCNTypes.hpp +++ b/Runtime/GCNTypes.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_GCTYPES_HPP__ -#define __PSHAG_GCTYPES_HPP__ +#ifndef __URDE_GCTYPES_HPP__ +#define __URDE_GCTYPES_HPP__ #include #include @@ -13,4 +13,4 @@ using u32 = uint32_t; using s64 = int64_t; using u64 = uint64_t; -#endif // __PSHAG_GCTYPES_HPP__ +#endif // __URDE_GCTYPES_HPP__ diff --git a/Runtime/GameGlobalObjects.hpp b/Runtime/GameGlobalObjects.hpp index eee19981a..2db97f524 100644 --- a/Runtime/GameGlobalObjects.hpp +++ b/Runtime/GameGlobalObjects.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_GAMEGLOBALOBJECTS_HPP__ -#define __PSHAG_GAMEGLOBALOBJECTS_HPP__ +#ifndef __URDE_GAMEGLOBALOBJECTS_HPP__ +#define __URDE_GAMEGLOBALOBJECTS_HPP__ #include "../DataSpec/DNACommon/Tweaks/ITweakGame.hpp" #include "../DataSpec/DNACommon/Tweaks/ITweakPlayer.hpp" #include "../DataSpec/DNACommon/Tweaks/ITweakPlayerControl.hpp" @@ -22,4 +22,4 @@ extern DataSpec::ITweakPlayerControl* g_tweakPlayerControl; } -#endif // __PSHAG_GAMEGLOBALOBJECTS_HPP__ +#endif // __URDE_GAMEGLOBALOBJECTS_HPP__ diff --git a/Runtime/Graphics/CBooRenderer.hpp b/Runtime/Graphics/CBooRenderer.hpp index cfeecd104..a072f4f2f 100644 --- a/Runtime/Graphics/CBooRenderer.hpp +++ b/Runtime/Graphics/CBooRenderer.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CBOORENDERER_HPP__ -#define __PSHAG_CBOORENDERER_HPP__ +#ifndef __URDE_CBOORENDERER_HPP__ +#define __URDE_CBOORENDERER_HPP__ namespace urde { @@ -17,4 +17,4 @@ public: } -#endif // __PSHAG_CBOORENDERER_HPP__ +#endif // __URDE_CBOORENDERER_HPP__ diff --git a/Runtime/Graphics/CGraphics.hpp b/Runtime/Graphics/CGraphics.hpp index 853697de7..4e0342ead 100644 --- a/Runtime/Graphics/CGraphics.hpp +++ b/Runtime/Graphics/CGraphics.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CGRAPHICS_HPP__ -#define __PSHAG_CGRAPHICS_HPP__ +#ifndef __URDE_CGRAPHICS_HPP__ +#define __URDE_CGRAPHICS_HPP__ #include "RetroTypes.hpp" #include "zeus/CTransform.hpp" @@ -269,4 +269,4 @@ public: } -#endif // __PSHAG_CGRAPHICS_HPP__ +#endif // __URDE_CGRAPHICS_HPP__ diff --git a/Runtime/Graphics/CLight.hpp b/Runtime/Graphics/CLight.hpp index bfca8e974..815f75cf0 100644 --- a/Runtime/Graphics/CLight.hpp +++ b/Runtime/Graphics/CLight.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CLIGHT_HPP__ -#define __PSHAG_CLIGHT_HPP__ +#ifndef __URDE_CLIGHT_HPP__ +#define __URDE_CLIGHT_HPP__ #include "zeus/CVector3f.hpp" #include "zeus/CColor.hpp" @@ -121,4 +121,4 @@ public: } -#endif // __PSHAG_CLIGHT_HPP__ +#endif // __URDE_CLIGHT_HPP__ diff --git a/Runtime/Graphics/CLineRenderer.hpp b/Runtime/Graphics/CLineRenderer.hpp index 01155ad12..c110f67c7 100644 --- a/Runtime/Graphics/CLineRenderer.hpp +++ b/Runtime/Graphics/CLineRenderer.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CLINERENDERER_HPP__ -#define __PSHAG_CLINERENDERER_HPP__ +#ifndef __URDE_CLINERENDERER_HPP__ +#define __URDE_CLINERENDERER_HPP__ #include "RetroTypes.hpp" #include "zeus/CVector3f.hpp" @@ -57,4 +57,4 @@ public: } -#endif // __PSHAG_CLINERENDERER_HPP__ +#endif // __URDE_CLINERENDERER_HPP__ diff --git a/Runtime/Graphics/CLineRendererShaders.hpp b/Runtime/Graphics/CLineRendererShaders.hpp index d377b6175..dcb350278 100644 --- a/Runtime/Graphics/CLineRendererShaders.hpp +++ b/Runtime/Graphics/CLineRendererShaders.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CLINERENDERERSHADERS_HPP__ -#define __PSHAG_CLINERENDERERSHADERS_HPP__ +#ifndef __URDE_CLINERENDERERSHADERS_HPP__ +#define __URDE_CLINERENDERERSHADERS_HPP__ #include "Graphics/CGraphics.hpp" #include "boo/graphicsdev/GL.hpp" @@ -55,4 +55,4 @@ public: } -#endif // __PSHAG_CLINERENDERERSHADERS_HPP__ +#endif // __URDE_CLINERENDERERSHADERS_HPP__ diff --git a/Runtime/Graphics/CMetroidModelInstance.hpp b/Runtime/Graphics/CMetroidModelInstance.hpp index ad1428745..a992fe043 100644 --- a/Runtime/Graphics/CMetroidModelInstance.hpp +++ b/Runtime/Graphics/CMetroidModelInstance.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMETROIDMODELINSTANCE_HPP__ -#define __PSHAG_CMETROIDMODELINSTANCE_HPP__ +#ifndef __URDE_CMETROIDMODELINSTANCE_HPP__ +#define __URDE_CMETROIDMODELINSTANCE_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CMetroidModelInstance } -#endif // __PSHAG_CMETROIDMODELINSTANCE_HPP__ +#endif // __URDE_CMETROIDMODELINSTANCE_HPP__ diff --git a/Runtime/Graphics/CModel.hpp b/Runtime/Graphics/CModel.hpp index aa76be3a3..3977cd903 100644 --- a/Runtime/Graphics/CModel.hpp +++ b/Runtime/Graphics/CModel.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMODEL_HPP__ -#define __PSHAG_CMODEL_HPP__ +#ifndef __URDE_CMODEL_HPP__ +#define __URDE_CMODEL_HPP__ #include "RetroTypes.hpp" #include "zeus/CColor.hpp" @@ -164,4 +164,4 @@ CFactoryFnReturn FModelFactory(const urde::SObjectTag& tag, } -#endif // __PSHAG_CMODEL_HPP__ +#endif // __URDE_CMODEL_HPP__ diff --git a/Runtime/Graphics/CModelShaders.hpp b/Runtime/Graphics/CModelShaders.hpp index cf5fdf65b..96fd6cf74 100644 --- a/Runtime/Graphics/CModelShaders.hpp +++ b/Runtime/Graphics/CModelShaders.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMODELSHADERS_HPP__ -#define __PSHAG_CMODELSHADERS_HPP__ +#ifndef __URDE_CMODELSHADERS_HPP__ +#define __URDE_CMODELSHADERS_HPP__ #include "hecl/Runtime.hpp" #include "optional.hpp" @@ -72,4 +72,4 @@ public: } -#endif // __PSHAG_CMODELSHADERS_HPP__ +#endif // __URDE_CMODELSHADERS_HPP__ diff --git a/Runtime/Graphics/CMoviePlayer.hpp b/Runtime/Graphics/CMoviePlayer.hpp index 276c482e0..f3372e838 100644 --- a/Runtime/Graphics/CMoviePlayer.hpp +++ b/Runtime/Graphics/CMoviePlayer.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMOVIEPLAYER_HPP__ -#define __PSHAG_CMOVIEPLAYER_HPP__ +#ifndef __URDE_CMOVIEPLAYER_HPP__ +#define __URDE_CMOVIEPLAYER_HPP__ #include "RetroTypes.hpp" #include "CDvdFile.hpp" @@ -171,4 +171,4 @@ public: } -#endif // __PSHAG_CMOVIEPLAYER_HPP__ +#endif // __URDE_CMOVIEPLAYER_HPP__ diff --git a/Runtime/Graphics/CSkinnedModel.hpp b/Runtime/Graphics/CSkinnedModel.hpp index 10e6c8df0..7df861331 100644 --- a/Runtime/Graphics/CSkinnedModel.hpp +++ b/Runtime/Graphics/CSkinnedModel.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSKINNEDMODEL_HPP__ -#define __PSHAG_CSKINNEDMODEL_HPP__ +#ifndef __URDE_CSKINNEDMODEL_HPP__ +#define __URDE_CSKINNEDMODEL_HPP__ #include "CToken.hpp" #include "CModel.hpp" @@ -28,4 +28,4 @@ public: } -#endif // __PSHAG_CSKINNEDMODEL_HPP__ +#endif // __URDE_CSKINNEDMODEL_HPP__ diff --git a/Runtime/Graphics/CTexture.hpp b/Runtime/Graphics/CTexture.hpp index 71a81bd60..23ace2d02 100644 --- a/Runtime/Graphics/CTexture.hpp +++ b/Runtime/Graphics/CTexture.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CTEXTURE_HPP__ -#define __PSHAG_CTEXTURE_HPP__ +#ifndef __URDE_CTEXTURE_HPP__ +#define __URDE_CTEXTURE_HPP__ #include "GCNTypes.hpp" #include "CFactoryMgr.hpp" @@ -56,4 +56,4 @@ CFactoryFnReturn FTextureFactory(const urde::SObjectTag& tag, } -#endif // __PSHAG_CTEXTURE_HPP__ +#endif // __URDE_CTEXTURE_HPP__ diff --git a/Runtime/Graphics/CVertexMorphEffect.hpp b/Runtime/Graphics/CVertexMorphEffect.hpp index 1e9806408..0333d465a 100644 --- a/Runtime/Graphics/CVertexMorphEffect.hpp +++ b/Runtime/Graphics/CVertexMorphEffect.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CVERTEXMORPHEFFECT_HPP__ -#define __PSHAG_CVERTEXMORPHEFFECT_HPP__ +#ifndef __URDE_CVERTEXMORPHEFFECT_HPP__ +#define __URDE_CVERTEXMORPHEFFECT_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CVertexMorphEffect } -#endif // __PSHAG_CVERTEXMORPHEFFECT_HPP__ +#endif // __URDE_CVERTEXMORPHEFFECT_HPP__ diff --git a/Runtime/Graphics/IRenderer.hpp b/Runtime/Graphics/IRenderer.hpp index 9f2298578..a99dae5ab 100644 --- a/Runtime/Graphics/IRenderer.hpp +++ b/Runtime/Graphics/IRenderer.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IRENDERER_HPP__ -#define __PSHAG_IRENDERER_HPP__ +#ifndef __URDE_IRENDERER_HPP__ +#define __URDE_IRENDERER_HPP__ #include #include "../RetroTypes.hpp" @@ -95,4 +95,4 @@ public: } -#endif // __PSHAG_IRENDERER_HPP__ +#endif // __URDE_IRENDERER_HPP__ diff --git a/Runtime/GuiSys/CConsoleOutputWindow.hpp b/Runtime/GuiSys/CConsoleOutputWindow.hpp index a4e82a0dc..3e14a3693 100644 --- a/Runtime/GuiSys/CConsoleOutputWindow.hpp +++ b/Runtime/GuiSys/CConsoleOutputWindow.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCONSOLEOUTPUTWINDOW_HPP__ -#define __PSHAG_CCONSOLEOUTPUTWINDOW_HPP__ +#ifndef __URDE_CCONSOLEOUTPUTWINDOW_HPP__ +#define __URDE_CCONSOLEOUTPUTWINDOW_HPP__ namespace urde { @@ -10,4 +10,4 @@ class CConsoleOutputWindow } -#endif // __PSHAG_CCONSOLEOUTPUTWINDOW_HPP__ +#endif // __URDE_CCONSOLEOUTPUTWINDOW_HPP__ diff --git a/Runtime/IAllocator.hpp b/Runtime/IAllocator.hpp index ce1c0541a..15b778fda 100644 --- a/Runtime/IAllocator.hpp +++ b/Runtime/IAllocator.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IALLOCATOR_HPP__ -#define __PSHAG_IALLOCATOR_HPP__ +#ifndef __URDE_IALLOCATOR_HPP__ +#define __URDE_IALLOCATOR_HPP__ #include "RetroTypes.hpp" @@ -76,4 +76,4 @@ public: } -#endif // __PSHAG_IALLOCATOR_HPP__ +#endif // __URDE_IALLOCATOR_HPP__ diff --git a/Runtime/IFactory.hpp b/Runtime/IFactory.hpp index bf667a154..af285a150 100644 --- a/Runtime/IFactory.hpp +++ b/Runtime/IFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IFACTORY_HPP__ -#define __PSHAG_IFACTORY_HPP__ +#ifndef __URDE_IFACTORY_HPP__ +#define __URDE_IFACTORY_HPP__ #include #include "RetroTypes.hpp" @@ -9,11 +9,19 @@ namespace urde class CVParamTransfer; class IObj; +using CFactoryFnReturn = std::unique_ptr; +using FFactoryFunc = std::function; +using FMemFactoryFunc = std::function&& in, u32 len, + const urde::CVParamTransfer& vparms)>; + class IFactory { public: virtual ~IFactory() = default; - virtual std::unique_ptr Build(const SObjectTag&, const CVParamTransfer&)=0; + virtual CFactoryFnReturn Build(const SObjectTag&, const CVParamTransfer&)=0; virtual void BuildAsync(const SObjectTag&, const CVParamTransfer&, IObj**)=0; virtual void CancelBuild(const SObjectTag&)=0; virtual bool CanBuild(const SObjectTag&)=0; @@ -22,4 +30,4 @@ public: } -#endif // __PSHAG_IFACTORY_HPP__ +#endif // __URDE_IFACTORY_HPP__ diff --git a/Runtime/IOStreams.hpp b/Runtime/IOStreams.hpp index 55dad0435..7c1b443e2 100644 --- a/Runtime/IOStreams.hpp +++ b/Runtime/IOStreams.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IOSTREAMS_HPP__ -#define __PSHAG_IOSTREAMS_HPP__ +#ifndef __URDE_IOSTREAMS_HPP__ +#define __URDE_IOSTREAMS_HPP__ #include "GCNTypes.hpp" #include @@ -94,4 +94,4 @@ public: } -#endif // __PSHAG_IOSTREAMS_HPP__ +#endif // __URDE_IOSTREAMS_HPP__ diff --git a/Runtime/IObj.hpp b/Runtime/IObj.hpp index e46fc4f00..b8ad69dca 100644 --- a/Runtime/IObj.hpp +++ b/Runtime/IObj.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IOBJ_HPP__ -#define __PSHAG_IOBJ_HPP__ +#ifndef __URDE_IOBJ_HPP__ +#define __URDE_IOBJ_HPP__ #include "RetroTypes.hpp" @@ -35,4 +35,4 @@ public: } -#endif // __PSHAG_IOBJ_HPP__ +#endif // __URDE_IOBJ_HPP__ diff --git a/Runtime/IObjFactory.hpp b/Runtime/IObjFactory.hpp new file mode 100644 index 000000000..7e6d44038 --- /dev/null +++ b/Runtime/IObjFactory.hpp @@ -0,0 +1,18 @@ +#ifndef __URDE_IOBJFACTORY_HPP__ +#define __URDE_IOBJFACTORY_HPP__ + +#include +#include "RetroTypes.hpp" + +namespace urde +{ + +class IObjFactory +{ +public: + virtual ~IObjFactory() = default; +}; + +} + +#endif // __URDE_IOBJFACTORY_HPP__ diff --git a/Runtime/IObjectStore.hpp b/Runtime/IObjectStore.hpp index 5029deb0d..3c811e393 100644 --- a/Runtime/IObjectStore.hpp +++ b/Runtime/IObjectStore.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IOBJECTSTORE_HPP__ -#define __PSHAG_IOBJECTSTORE_HPP__ +#ifndef __URDE_IOBJECTSTORE_HPP__ +#define __URDE_IOBJECTSTORE_HPP__ namespace urde { @@ -24,4 +24,4 @@ public: } -#endif // __PSHAG_IOBJECTSTORE_HPP__ +#endif // __URDE_IOBJECTSTORE_HPP__ diff --git a/Runtime/IVParamObj.hpp b/Runtime/IVParamObj.hpp index d60b96237..b7e3b95a9 100644 --- a/Runtime/IVParamObj.hpp +++ b/Runtime/IVParamObj.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IVPARAMOBJ_HPP__ -#define __PSHAG_IVPARAMOBJ_HPP__ +#ifndef __URDE_IVPARAMOBJ_HPP__ +#define __URDE_IVPARAMOBJ_HPP__ #include #include "IObj.hpp" @@ -39,4 +39,4 @@ public: } -#endif // __PSHAG_IVPARAMOBJ_HPP__ +#endif // __URDE_IVPARAMOBJ_HPP__ diff --git a/Runtime/Input/CFinalInput.hpp b/Runtime/Input/CFinalInput.hpp index 446739682..d47dd6006 100644 --- a/Runtime/Input/CFinalInput.hpp +++ b/Runtime/Input/CFinalInput.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CFINALINPUT_HPP__ -#define __PSHAG_CFINALINPUT_HPP__ +#ifndef __URDE_CFINALINPUT_HPP__ +#define __URDE_CFINALINPUT_HPP__ #include "../RetroTypes.hpp" #include "CKeyboardMouseController.hpp" @@ -153,4 +153,4 @@ public: } -#endif // __PSHAG_CFINALINPUT_HPP__ +#endif // __URDE_CFINALINPUT_HPP__ diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp index cf906b59f..bf117893d 100644 --- a/Runtime/Input/CInputGenerator.hpp +++ b/Runtime/Input/CInputGenerator.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CINPUTGENERATOR_HPP__ -#define __PSHAG_CINPUTGENERATOR_HPP__ +#ifndef __URDE_CINPUTGENERATOR_HPP__ +#define __URDE_CINPUTGENERATOR_HPP__ #include #include @@ -180,4 +180,4 @@ public: } -#endif // __PSHAG_CINPUTGENERATOR_HPP__ +#endif // __URDE_CINPUTGENERATOR_HPP__ diff --git a/Runtime/Input/CKeyboardMouseController.hpp b/Runtime/Input/CKeyboardMouseController.hpp index 4218b796a..42269072e 100644 --- a/Runtime/Input/CKeyboardMouseController.hpp +++ b/Runtime/Input/CKeyboardMouseController.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CKEYBOARDMOUSECONTROLLER_HPP__ -#define __PSHAG_CKEYBOARDMOUSECONTROLLER_HPP__ +#ifndef __URDE_CKEYBOARDMOUSECONTROLLER_HPP__ +#define __URDE_CKEYBOARDMOUSECONTROLLER_HPP__ #include @@ -18,4 +18,4 @@ struct CKeyboardMouseControllerData } -#endif // __PSHAG_CKEYBOARDMOUSECONTROLLER_HPP__ +#endif // __URDE_CKEYBOARDMOUSECONTROLLER_HPP__ diff --git a/Runtime/Input/CRumbleManager.hpp b/Runtime/Input/CRumbleManager.hpp index a8b14e88d..fc2313425 100644 --- a/Runtime/Input/CRumbleManager.hpp +++ b/Runtime/Input/CRumbleManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CRUMBLEMANAGER_HPP__ -#define __PSHAG_CRUMBLEMANAGER_HPP__ +#ifndef __URDE_CRUMBLEMANAGER_HPP__ +#define __URDE_CRUMBLEMANAGER_HPP__ #include "CRumbleGenerator.hpp" @@ -18,4 +18,4 @@ public: }; } -#endif // __PSHAG_CRUMBLEMANAGER_HPP__ +#endif // __URDE_CRUMBLEMANAGER_HPP__ diff --git a/Runtime/Input/ControlMapper.hpp b/Runtime/Input/ControlMapper.hpp index 4742b0fdf..54589cfd5 100644 --- a/Runtime/Input/ControlMapper.hpp +++ b/Runtime/Input/ControlMapper.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCONTROLMAPPER_HPP__ -#define __PSHAG_CCONTROLMAPPER_HPP__ +#ifndef __URDE_CCONTROLMAPPER_HPP__ +#define __URDE_CCONTROLMAPPER_HPP__ namespace urde { @@ -112,4 +112,4 @@ public: } -#endif // __PSHAG_CCONTROLMAPPER_HPP__ +#endif // __URDE_CCONTROLMAPPER_HPP__ diff --git a/Runtime/Input/IController.hpp b/Runtime/Input/IController.hpp index 0872ff0f3..808e74d55 100644 --- a/Runtime/Input/IController.hpp +++ b/Runtime/Input/IController.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_ICONTROLLER_HPP__ -#define __PSHAG_ICONTROLLER_HPP__ +#ifndef __URDE_ICONTROLLER_HPP__ +#define __URDE_ICONTROLLER_HPP__ #include "../RetroTypes.hpp" @@ -21,4 +21,4 @@ public: } -#endif // __PSHAG_ICONTROLLER_HPP__ +#endif // __URDE_ICONTROLLER_HPP__ diff --git a/Runtime/MP1/CFrontEndUI.hpp b/Runtime/MP1/CFrontEndUI.hpp index 5122003f7..14a789c7d 100644 --- a/Runtime/MP1/CFrontEndUI.hpp +++ b/Runtime/MP1/CFrontEndUI.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CFRONTENDUI_HPP__ -#define __PSHAG_CFRONTENDUI_HPP__ +#ifndef __URDE_CFRONTENDUI_HPP__ +#define __URDE_CFRONTENDUI_HPP__ #include "CIOWin.hpp" #include "CGameDebug.hpp" @@ -56,4 +56,4 @@ public: } } -#endif // __PSHAG_CFRONTENDUI_HPP__ +#endif // __URDE_CFRONTENDUI_HPP__ diff --git a/Runtime/MP1/CInGameTweakManager.hpp b/Runtime/MP1/CInGameTweakManager.hpp index b5d3de43d..7ce04d980 100644 --- a/Runtime/MP1/CInGameTweakManager.hpp +++ b/Runtime/MP1/CInGameTweakManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CINGAMETWEAKMANAGER_HPP__ -#define __PSHAG_CINGAMETWEAKMANAGER_HPP__ +#ifndef __URDE_CINGAMETWEAKMANAGER_HPP__ +#define __URDE_CINGAMETWEAKMANAGER_HPP__ #include "CInGameTweakManagerBase.hpp" @@ -17,4 +17,4 @@ public: } } -#endif // __PSHAG_CINGAMETWEAKMANAGER_HPP__ +#endif // __URDE_CINGAMETWEAKMANAGER_HPP__ diff --git a/Runtime/MP1/CMFGame.hpp b/Runtime/MP1/CMFGame.hpp index 3d3e267b4..d2d81a1ec 100644 --- a/Runtime/MP1/CMFGame.hpp +++ b/Runtime/MP1/CMFGame.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMFGAME_HPP__ -#define __PSHAG_CMFGAME_HPP__ +#ifndef __URDE_CMFGAME_HPP__ +#define __URDE_CMFGAME_HPP__ #include "CMFGameBase.hpp" @@ -27,4 +27,4 @@ public: } } -#endif // __PSHAG_CMFGAME_HPP__ +#endif // __URDE_CMFGAME_HPP__ diff --git a/Runtime/MP1/CMainFlow.hpp b/Runtime/MP1/CMainFlow.hpp index 9fca4a27d..eea81ec4d 100644 --- a/Runtime/MP1/CMainFlow.hpp +++ b/Runtime/MP1/CMainFlow.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMAINFLOW_HPP__ -#define __PSHAG_CMAINFLOW_HPP__ +#ifndef __URDE_CMAINFLOW_HPP__ +#define __URDE_CMAINFLOW_HPP__ #include "CMainFlowBase.hpp" @@ -25,4 +25,4 @@ public: } -#endif // __PSHAG_CMAINFLOW_HPP__ +#endif // __URDE_CMAINFLOW_HPP__ diff --git a/Runtime/MP1/CPlayMovie.hpp b/Runtime/MP1/CPlayMovie.hpp index 9c55cae7c..a0a054ace 100644 --- a/Runtime/MP1/CPlayMovie.hpp +++ b/Runtime/MP1/CPlayMovie.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPLAYMOVIE_HPP__ -#define __PSHAG_CPLAYMOVIE_HPP__ +#ifndef __URDE_CPLAYMOVIE_HPP__ +#define __URDE_CPLAYMOVIE_HPP__ #include "CPlayMovieBase.hpp" @@ -27,4 +27,4 @@ public: } } -#endif // __PSHAG_CPLAYMOVIE_HPP__ +#endif // __URDE_CPLAYMOVIE_HPP__ diff --git a/Runtime/MP1/CTweaks.hpp b/Runtime/MP1/CTweaks.hpp index b11f713c3..de2286891 100644 --- a/Runtime/MP1/CTweaks.hpp +++ b/Runtime/MP1/CTweaks.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CTWEAKS_HPP__ -#define __PSHAG_CTWEAKS_HPP__ +#ifndef __URDE_CTWEAKS_HPP__ +#define __URDE_CTWEAKS_HPP__ #include "RetroTypes.hpp" @@ -19,4 +19,4 @@ public: } } -#endif // __PSHAG_CTWEAKS_HPP__ +#endif // __URDE_CTWEAKS_HPP__ diff --git a/Runtime/MP1/MP1.hpp b/Runtime/MP1/MP1.hpp index d3631e89a..68f90a3c7 100644 --- a/Runtime/MP1/MP1.hpp +++ b/Runtime/MP1/MP1.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_MP1_HPP__ -#define __PSHAG_MP1_HPP__ +#ifndef __URDE_MP1_HPP__ +#define __URDE_MP1_HPP__ #include #include "CMemory.hpp" @@ -69,4 +69,4 @@ extern CMain* g_main; } } -#endif // __PSHAG_MP1_HPP__ +#endif // __URDE_MP1_HPP__ diff --git a/Runtime/Particle/CCollisionResponseData.hpp b/Runtime/Particle/CCollisionResponseData.hpp index cd983d8c3..6513c3abb 100644 --- a/Runtime/Particle/CCollisionResponseData.hpp +++ b/Runtime/Particle/CCollisionResponseData.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCOLLISIONRESPONSEDATA_HPP__ -#define __PSHAG_CCOLLISIONRESPONSEDATA_HPP__ +#ifndef __URDE_CCOLLISIONRESPONSEDATA_HPP__ +#define __URDE_CCOLLISIONRESPONSEDATA_HPP__ #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -58,4 +58,4 @@ public: CFactoryFnReturn FCollisionResponseDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __PSHAG_CCOLLISIONRESPONSEDATA_HPP__ +#endif // __URDE_CCOLLISIONRESPONSEDATA_HPP__ diff --git a/Runtime/Particle/CColorElement.hpp b/Runtime/Particle/CColorElement.hpp index 340789c44..da2161593 100644 --- a/Runtime/Particle/CColorElement.hpp +++ b/Runtime/Particle/CColorElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CCOLORELEMENT_HPP__ -#define __PSHAG_CCOLORELEMENT_HPP__ +#ifndef __URDE_CCOLORELEMENT_HPP__ +#define __URDE_CCOLORELEMENT_HPP__ #include "IElement.hpp" @@ -96,4 +96,4 @@ public: }; } -#endif // __PSHAG_CCOLORELEMENT_HPP__ +#endif // __URDE_CCOLORELEMENT_HPP__ diff --git a/Runtime/Particle/CDecalDataFactory.hpp b/Runtime/Particle/CDecalDataFactory.hpp index d7c5c80ae..96324cd92 100644 --- a/Runtime/Particle/CDecalDataFactory.hpp +++ b/Runtime/Particle/CDecalDataFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CDECALDATAFACTORY_HPP__ -#define __PSHAG_CDECALDATAFACTORY_HPP__ +#ifndef __URDE_CDECALDATAFACTORY_HPP__ +#define __URDE_CDECALDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -25,4 +25,4 @@ public: CFactoryFnReturn FDecalDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __PSHAG_CDECALDATAFACTORY_HPP__ +#endif // __URDE_CDECALDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CDecalDescription.hpp b/Runtime/Particle/CDecalDescription.hpp index 8c4319f06..9acf7e157 100644 --- a/Runtime/Particle/CDecalDescription.hpp +++ b/Runtime/Particle/CDecalDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CDECALDESCRIPTION_HPP__ -#define __PSHAG_CDECALDESCRIPTION_HPP__ +#ifndef __URDE_CDECALDESCRIPTION_HPP__ +#define __URDE_CDECALDESCRIPTION_HPP__ #include "CRealElement.hpp" #include "CIntElement.hpp" @@ -40,4 +40,4 @@ public: }; } -#endif // __PSHAG_CDECALDESCRIPTION_HPP__ +#endif // __URDE_CDECALDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CDecalManager.hpp b/Runtime/Particle/CDecalManager.hpp index 742366fd9..9c95eaba0 100644 --- a/Runtime/Particle/CDecalManager.hpp +++ b/Runtime/Particle/CDecalManager.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CDECALMANAGER_HPP__ -#define __PSHAG_CDECALMANAGER_HPP__ +#ifndef __URDE_CDECALMANAGER_HPP__ +#define __URDE_CDECALMANAGER_HPP__ #include "RetroTypes.hpp" #include "rstl.hpp" @@ -40,4 +40,4 @@ public: } -#endif // __PSHAG_CDECALMANAGER_HPP__ +#endif // __URDE_CDECALMANAGER_HPP__ diff --git a/Runtime/Particle/CElectricDescription.hpp b/Runtime/Particle/CElectricDescription.hpp index 53cdc6746..ef93a81bc 100644 --- a/Runtime/Particle/CElectricDescription.hpp +++ b/Runtime/Particle/CElectricDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CELECTRICDESCRIPTION_HPP__ -#define __PSHAG_CELECTRICDESCRIPTION_HPP__ +#ifndef __URDE_CELECTRICDESCRIPTION_HPP__ +#define __URDE_CELECTRICDESCRIPTION_HPP__ #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -37,4 +37,4 @@ public: }; } -#endif // __PSHAG_CELECTRICDESCRIPTION_HPP__ +#endif // __URDE_CELECTRICDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CElementGen.hpp b/Runtime/Particle/CElementGen.hpp index 3a9fa3888..c001ff83d 100644 --- a/Runtime/Particle/CElementGen.hpp +++ b/Runtime/Particle/CElementGen.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CELEMENTGEN_HPP__ -#define __PSHAG_CELEMENTGEN_HPP__ +#ifndef __URDE_CELEMENTGEN_HPP__ +#define __URDE_CELEMENTGEN_HPP__ #include "RetroTypes.hpp" #include "zeus/CTransform.hpp" @@ -244,4 +244,4 @@ ENABLE_BITWISE_ENUM(CElementGen::EOptionalSystemFlags) } -#endif // __PSHAG_CELEMENTGEN_HPP__ +#endif // __URDE_CELEMENTGEN_HPP__ diff --git a/Runtime/Particle/CElementGenShaders.hpp b/Runtime/Particle/CElementGenShaders.hpp index a520e594f..2878eea36 100644 --- a/Runtime/Particle/CElementGenShaders.hpp +++ b/Runtime/Particle/CElementGenShaders.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CELEMENTGENSHADERS_HPP__ -#define __PSHAG_CELEMENTGENSHADERS_HPP__ +#ifndef __URDE_CELEMENTGENSHADERS_HPP__ +#define __URDE_CELEMENTGENSHADERS_HPP__ #include "Graphics/CGraphics.hpp" #include "boo/graphicsdev/GL.hpp" @@ -81,4 +81,4 @@ public: } -#endif // __PSHAG_CELEMENTGENSHADERS_HPP__ +#endif // __URDE_CELEMENTGENSHADERS_HPP__ diff --git a/Runtime/Particle/CEmitterElement.hpp b/Runtime/Particle/CEmitterElement.hpp index cf1fc81d5..06ea201b2 100644 --- a/Runtime/Particle/CEmitterElement.hpp +++ b/Runtime/Particle/CEmitterElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CEMITTERELEMENT_HPP__ -#define __PSHAG_CEMITTERELEMENT_HPP__ +#ifndef __URDE_CEMITTERELEMENT_HPP__ +#define __URDE_CEMITTERELEMENT_HPP__ #include "IElement.hpp" @@ -47,4 +47,4 @@ public: } -#endif // __PSHAG_CEMITTERELEMENT_HPP__ +#endif // __URDE_CEMITTERELEMENT_HPP__ diff --git a/Runtime/Particle/CFlameWarp.hpp b/Runtime/Particle/CFlameWarp.hpp index 46c743a5d..ed441f2ad 100644 --- a/Runtime/Particle/CFlameWarp.hpp +++ b/Runtime/Particle/CFlameWarp.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CFLAMEWARP_HPP__ -#define __PSHAG_CFLAMEWARP_HPP__ +#ifndef __URDE_CFLAMEWARP_HPP__ +#define __URDE_CFLAMEWARP_HPP__ #include "CWarp.hpp" @@ -36,4 +36,4 @@ public: }; } -#endif // __PSHAG_CFLAMEWARP_HPP__ +#endif // __URDE_CFLAMEWARP_HPP__ diff --git a/Runtime/Particle/CGenDescription.hpp b/Runtime/Particle/CGenDescription.hpp index 729afd366..88922c08e 100644 --- a/Runtime/Particle/CGenDescription.hpp +++ b/Runtime/Particle/CGenDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CGENDESCRIPTION_HPP__ -#define __PSHAG_CGENDESCRIPTION_HPP__ +#ifndef __URDE_CGENDESCRIPTION_HPP__ +#define __URDE_CGENDESCRIPTION_HPP__ #include #include "CRealElement.hpp" @@ -112,4 +112,4 @@ public: } -#endif // __PSHAG_CGENDESCRIPTION_HPP__ +#endif // __URDE_CGENDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CIntElement.hpp b/Runtime/Particle/CIntElement.hpp index c9ce860af..205475ff5 100644 --- a/Runtime/Particle/CIntElement.hpp +++ b/Runtime/Particle/CIntElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CINTELEMENT_HPP__ -#define __PSHAG_CINTELEMENT_HPP__ +#ifndef __URDE_CINTELEMENT_HPP__ +#define __URDE_CINTELEMENT_HPP__ #include "IElement.hpp" @@ -194,4 +194,4 @@ public: } -#endif // __PSHAG_CINTELEMENT_HPP__ +#endif // __URDE_CINTELEMENT_HPP__ diff --git a/Runtime/Particle/CModVectorElement.hpp b/Runtime/Particle/CModVectorElement.hpp index 4706aaca5..89d7ef796 100644 --- a/Runtime/Particle/CModVectorElement.hpp +++ b/Runtime/Particle/CModVectorElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CMODVECTORELEMENT_HPP__ -#define __PSHAG_CMODVECTORELEMENT_HPP__ +#ifndef __URDE_CMODVECTORELEMENT_HPP__ +#define __URDE_CMODVECTORELEMENT_HPP__ #include "IElement.hpp" @@ -157,4 +157,4 @@ public: } -#endif // __PSHAG_CMODVECTORELEMENT_HPP__ +#endif // __URDE_CMODVECTORELEMENT_HPP__ diff --git a/Runtime/Particle/CParticleDataFactory.hpp b/Runtime/Particle/CParticleDataFactory.hpp index 0ee40880e..45116fa9b 100644 --- a/Runtime/Particle/CParticleDataFactory.hpp +++ b/Runtime/Particle/CParticleDataFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEDATAFACTORY_HPP__ -#define __PSHAG_CPARTICLEDATAFACTORY_HPP__ +#ifndef __URDE_CPARTICLEDATAFACTORY_HPP__ +#define __URDE_CPARTICLEDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -101,4 +101,4 @@ CFactoryFnReturn FParticleFactory(const SObjectTag& tag, CInputStream& in, const } -#endif // __PSHAG_CPARTICLEDATAFACTORY_HPP__ +#endif // __URDE_CPARTICLEDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CParticleElectric.hpp b/Runtime/Particle/CParticleElectric.hpp index 3e80cbc70..88910e6fd 100644 --- a/Runtime/Particle/CParticleElectric.hpp +++ b/Runtime/Particle/CParticleElectric.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEELECTRIC_HPP__ -#define __PSHAG_CPARTICLEELECTRIC_HPP__ +#ifndef __URDE_CPARTICLEELECTRIC_HPP__ +#define __URDE_CPARTICLEELECTRIC_HPP__ #include "CParticleGen.hpp" #include "CToken.hpp" @@ -109,4 +109,4 @@ public: } -#endif // __PSHAG_CPARTICLEELECTRIC_HPP__ +#endif // __URDE_CPARTICLEELECTRIC_HPP__ diff --git a/Runtime/Particle/CParticleElectricDataFactory.hpp b/Runtime/Particle/CParticleElectricDataFactory.hpp index 0e420e06d..3b5fdb8da 100644 --- a/Runtime/Particle/CParticleElectricDataFactory.hpp +++ b/Runtime/Particle/CParticleElectricDataFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__ -#define __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__ +#ifndef __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__ +#define __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -23,4 +23,4 @@ public: CFactoryFnReturn FParticleElectricDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __PSHAG_CPARTICLEELECTRICDATAFACTORY_HPP__ +#endif // __URDE_CPARTICLEELECTRICDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CParticleGen.hpp b/Runtime/Particle/CParticleGen.hpp index 557b0e180..a3294b863 100644 --- a/Runtime/Particle/CParticleGen.hpp +++ b/Runtime/Particle/CParticleGen.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEGEN_HPP__ -#define __PSHAG_CPARTICLEGEN_HPP__ +#ifndef __URDE_CPARTICLEGEN_HPP__ +#define __URDE_CPARTICLEGEN_HPP__ #include "RetroTypes.hpp" #include "Graphics/CLight.hpp" @@ -49,4 +49,4 @@ public: } -#endif // __PSHAG_CPARTICLEGEN_HPP__ +#endif // __URDE_CPARTICLEGEN_HPP__ diff --git a/Runtime/Particle/CParticleGlobals.hpp b/Runtime/Particle/CParticleGlobals.hpp index fd848eafb..fcaf3d50f 100644 --- a/Runtime/Particle/CParticleGlobals.hpp +++ b/Runtime/Particle/CParticleGlobals.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLEGLOBALS_HPP__ -#define __PSHAG_CPARTICLEGLOBALS_HPP__ +#ifndef __URDE_CPARTICLEGLOBALS_HPP__ +#define __URDE_CPARTICLEGLOBALS_HPP__ #include "zeus/CVector3f.hpp" #include "zeus/CColor.hpp" @@ -51,4 +51,4 @@ public: } -#endif // __PSHAG_CPARTICLEGLOBALS_HPP__ +#endif // __URDE_CPARTICLEGLOBALS_HPP__ diff --git a/Runtime/Particle/CParticleSwoosh.hpp b/Runtime/Particle/CParticleSwoosh.hpp index d526e60a2..d1f7e0b2b 100644 --- a/Runtime/Particle/CParticleSwoosh.hpp +++ b/Runtime/Particle/CParticleSwoosh.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLESWOOSH_HPP__ -#define __PSHAG_CPARTICLESWOOSH_HPP__ +#ifndef __URDE_CPARTICLESWOOSH_HPP__ +#define __URDE_CPARTICLESWOOSH_HPP__ #include "CParticleGen.hpp" #include "CToken.hpp" @@ -41,4 +41,4 @@ public: } -#endif // __PSHAG_CPARTICLESWOOSH_HPP__ +#endif // __URDE_CPARTICLESWOOSH_HPP__ diff --git a/Runtime/Particle/CParticleSwooshDataFactory.hpp b/Runtime/Particle/CParticleSwooshDataFactory.hpp index 410386866..5ba867a38 100644 --- a/Runtime/Particle/CParticleSwooshDataFactory.hpp +++ b/Runtime/Particle/CParticleSwooshDataFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__ -#define __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__ +#ifndef __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__ +#define __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -22,4 +22,4 @@ public: CFactoryFnReturn FParticleSwooshDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __PSHAG_CPARTICLESWOOSHDATAFACTORY_HPP__ +#endif // __URDE_CPARTICLESWOOSHDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.hpp b/Runtime/Particle/CProjectileWeaponDataFactory.hpp index 543e638e4..5935c4208 100644 --- a/Runtime/Particle/CProjectileWeaponDataFactory.hpp +++ b/Runtime/Particle/CProjectileWeaponDataFactory.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CPROJECTILEWEAPONDATAFACTORY_HPP__ -#define __PSHAG_CPROJECTILEWEAPONDATAFACTORY_HPP__ +#ifndef __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__ +#define __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__ #include "RetroTypes.hpp" #include "CFactoryMgr.hpp" @@ -22,4 +22,4 @@ public: CFactoryFnReturn FProjectileWeaponDataFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms); } -#endif // __PSHAG_CPROJECTILEWEAPONDATAFACTORY_HPP__ +#endif // __URDE_CPROJECTILEWEAPONDATAFACTORY_HPP__ diff --git a/Runtime/Particle/CRealElement.hpp b/Runtime/Particle/CRealElement.hpp index a9a37cce8..423b8915c 100644 --- a/Runtime/Particle/CRealElement.hpp +++ b/Runtime/Particle/CRealElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CREALELEMENT_HPP__ -#define __PSHAG_CREALELEMENT_HPP__ +#ifndef __URDE_CREALELEMENT_HPP__ +#define __URDE_CREALELEMENT_HPP__ #include "IElement.hpp" @@ -369,4 +369,4 @@ public: }; } -#endif // __PSHAG_CREALELEMENT_HPP__ +#endif // __URDE_CREALELEMENT_HPP__ diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.hpp b/Runtime/Particle/CSpawnSystemKeyframeData.hpp index 8f016bf78..08fc523e2 100644 --- a/Runtime/Particle/CSpawnSystemKeyframeData.hpp +++ b/Runtime/Particle/CSpawnSystemKeyframeData.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ -#define __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#ifndef __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#define __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ #include "IOStreams.hpp" #include "CToken.hpp" @@ -40,4 +40,4 @@ public: } -#endif // __PSHAG_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ +#endif // __URDE_CSPAWNSYSTEMKEYFRAMEDATA_HPP__ diff --git a/Runtime/Particle/CSwooshDescription.hpp b/Runtime/Particle/CSwooshDescription.hpp index 6bb67f369..24780d536 100644 --- a/Runtime/Particle/CSwooshDescription.hpp +++ b/Runtime/Particle/CSwooshDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CSWOOSHDESCRIPTION_HPP__ -#define __PSHAG_CSWOOSHDESCRIPTION_HPP__ +#ifndef __URDE_CSWOOSHDESCRIPTION_HPP__ +#define __URDE_CSWOOSHDESCRIPTION_HPP__ #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -49,4 +49,4 @@ public: }; } -#endif // __PSHAG_CSWOOSHDESCRIPTION_HPP__ +#endif // __URDE_CSWOOSHDESCRIPTION_HPP__ diff --git a/Runtime/Particle/CUVElement.hpp b/Runtime/Particle/CUVElement.hpp index 03f8e8fe8..c540bc9fe 100644 --- a/Runtime/Particle/CUVElement.hpp +++ b/Runtime/Particle/CUVElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CUVELEMENT_HPP__ -#define __PSHAG_CUVELEMENT_HPP__ +#ifndef __URDE_CUVELEMENT_HPP__ +#define __URDE_CUVELEMENT_HPP__ #include "IElement.hpp" #include "CToken.hpp" @@ -68,4 +68,4 @@ public: } -#endif // __PSHAG_CUVELEMENT_HPP__ +#endif // __URDE_CUVELEMENT_HPP__ diff --git a/Runtime/Particle/CVectorElement.hpp b/Runtime/Particle/CVectorElement.hpp index 53c9aa3fb..9e97d90e1 100644 --- a/Runtime/Particle/CVectorElement.hpp +++ b/Runtime/Particle/CVectorElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CVECTORELEMENT_HPP__ -#define __PSHAG_CVECTORELEMENT_HPP__ +#ifndef __URDE_CVECTORELEMENT_HPP__ +#define __URDE_CVECTORELEMENT_HPP__ #include "IElement.hpp" @@ -208,4 +208,4 @@ public: } -#endif // __PSHAG_CVECTORELEMENT_HPP__ +#endif // __URDE_CVECTORELEMENT_HPP__ diff --git a/Runtime/Particle/CWarp.hpp b/Runtime/Particle/CWarp.hpp index a8cfd5954..4703e4a82 100644 --- a/Runtime/Particle/CWarp.hpp +++ b/Runtime/Particle/CWarp.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CWARP_HPP__ -#define __PSHAG_CWARP_HPP__ +#ifndef __URDE_CWARP_HPP__ +#define __URDE_CWARP_HPP__ #include "zeus/CColor.hpp" #include "zeus/CVector3f.hpp" @@ -26,4 +26,4 @@ public: } -#endif // __PSHAG_CWARP_HPP__ +#endif // __URDE_CWARP_HPP__ diff --git a/Runtime/Particle/CWeaponDescription.hpp b/Runtime/Particle/CWeaponDescription.hpp index fc3678981..bf9a624ca 100644 --- a/Runtime/Particle/CWeaponDescription.hpp +++ b/Runtime/Particle/CWeaponDescription.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_CWEAPONDESCRIPTION_HPP__ -#define __PSHAG_CWEAPONDESCRIPTION_HPP__ +#ifndef __URDE_CWEAPONDESCRIPTION_HPP__ +#define __URDE_CWEAPONDESCRIPTION_HPP__ #include "CParticleDataFactory.hpp" #include "CRealElement.hpp" @@ -57,4 +57,4 @@ public: std::unique_ptr xb0_FOFF; }; } -#endif // __PSHAG_CWEAPONDESCRIPTION_HPP__ +#endif // __URDE_CWEAPONDESCRIPTION_HPP__ diff --git a/Runtime/Particle/IElement.hpp b/Runtime/Particle/IElement.hpp index b2087ac2e..00c880adb 100644 --- a/Runtime/Particle/IElement.hpp +++ b/Runtime/Particle/IElement.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_IELEMENT_HPP__ -#define __PSHAG_IELEMENT_HPP__ +#ifndef __URDE_IELEMENT_HPP__ +#define __URDE_IELEMENT_HPP__ #include #include "GCNTypes.hpp" @@ -56,4 +56,4 @@ public: } -#endif // __PSHAG_IELEMENT_HPP__ +#endif // __URDE_IELEMENT_HPP__ diff --git a/Runtime/RetroTypes.hpp b/Runtime/RetroTypes.hpp index c04ffd189..c2d9d4c6c 100644 --- a/Runtime/RetroTypes.hpp +++ b/Runtime/RetroTypes.hpp @@ -1,5 +1,5 @@ -#ifndef __PSHAG_TYPES_HPP__ -#define __PSHAG_TYPES_HPP__ +#ifndef __URDE_TYPES_HPP__ +#define __URDE_TYPES_HPP__ #include #include @@ -13,7 +13,7 @@ namespace urde { using FourCC = hecl::FourCC; -using TResId = u64; +using TResId = s64; struct SObjectTag { @@ -86,4 +86,4 @@ struct hash }; } -#endif // __PSHAG_TYPES_HPP__ +#endif // __URDE_TYPES_HPP__ diff --git a/hecl b/hecl index fad67a063..4c3098628 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit fad67a063140c1b0946122a5f94aaa412f1a4c2a +Subproject commit 4c309862829daf1c6c27833ecdf03d86eae23941