Started Tweaks in MP1 DataSpec

This commit is contained in:
Jack Andersen 2015-08-17 13:46:41 -10:00
parent d099a210d0
commit 3112addebd
20 changed files with 74 additions and 5 deletions

View File

@ -7,8 +7,12 @@ find_package(atdna REQUIRED)
# Assembles a source/header pair list for use in a DNA library
macro(make_dnalist outlist)
foreach(type ${ARGN})
atdna(atdna_${type}.cpp ${type}.hpp)
list(APPEND ${outlist} atdna_${type}.cpp ${type}.hpp)
get_filename_component(dir ${type} DIRECTORY)
get_filename_component(name ${type} NAME)
atdna(${dir}/atdna_${name}.cpp ${dir}/${name}.hpp)
list(APPEND ${outlist}
${CMAKE_CURRENT_BINARY_DIR}/${dir}/atdna_${name}.cpp
${CMAKE_CURRENT_SOURCE_DIR}/${dir}/${name}.hpp)
endforeach()
endmacro()

View File

@ -1,3 +1,4 @@
add_subdirectory(Tweaks)
make_dnalist(liblist
PAK
MLVL
@ -8,7 +9,8 @@ make_dnalist(liblist
EVNT
MAPA
CMDLMaterials
MREA)
MREA
Tweaks/CTweakParticle)
add_library(DNAMP1
DNAMP1.hpp DNAMP1.cpp
${liblist}

View File

View File

@ -6,6 +6,10 @@ namespace Retro
namespace Common
{
class CAiFuncMap
{
};
}
}

View File

View File

@ -0,0 +1,16 @@
#ifndef __RETRO_CELEMENTGEN_HPP__
#define __RETRO_CELEMENTGEN_HPP__
namespace Retro
{
namespace Common
{
class CElementGen
{
};
}
}
#endif // __RETRO_CELEMENTGEN_HPP__

View File

View File

@ -0,0 +1,16 @@
#ifndef __RETRO_CINGAMETWEAKMANAGER_HPP__
#define __RETRO_CINGAMETWEAKMANAGER_HPP__
namespace Retro
{
namespace Common
{
class CInGameTweakManager
{
};
}
}
#endif // __RETRO_CINGAMETWEAKMANAGER_HPP__

View File

@ -11,6 +11,7 @@ add_library(RuntimeCommon
CGameAllocator.hpp CGameAllocator.cpp
CBasics.hpp CBasicsPC.cpp
CTweaks.hpp CTweaks.cpp
CInGameTweakManager.hpp CInGameTweakManager.cpp
CTweakParticle.hpp CTweakParticle.cpp
CStateManager.hpp CStateManager.cpp
CGameState.hpp CGameState.cpp
@ -21,10 +22,10 @@ add_library(RuntimeCommon
CRandom16.hpp CRandom16.cpp
CResFactory.hpp CResFactory.cpp
CSimplePool.hpp CSimplePool.cpp
CAssetFactory.hpp CAssetFactory.cpp
CAi.hpp CAi.cpp
CGameOptions.hpp CGameOptions.cpp
CStaticInterference.hpp CStaticInterference.cpp
CElementGen.hpp CElementGen.cpp
CCRC32.hpp CCRC32.cpp
RetroTemplates.hpp
GCNTypes.hpp)

View File

View File

View File

@ -6,6 +6,10 @@ namespace Retro
namespace Common
{
class CCharacterFactoryBuilder
{
};
}
}

View File

@ -0,0 +1,8 @@
#ifndef __RETRO_CCHARACTERFACTORY_HPP__
#define __RETRO_CCHARACTERFACTORY_HPP__
class CCharacterFactory
{
};
#endif // __RETRO_CCHARACTERFACTORY_HPP__

View File

@ -0,0 +1,4 @@
add_library(RuntimeCommonCharacter
CAssetFactory.hpp CAssetFactory.cpp
CCharacterFactory.hpp CCharacterFactory.cpp
CAnimData.hpp CAnimData.cpp)

View File

@ -2,4 +2,5 @@ include_directories(. ../Common)
add_executable(mp1
main.cpp)
target_link_libraries(mp1
RuntimeCommonCharacter
RuntimeCommon)

View File

@ -6,6 +6,10 @@
#include "CMemoryCardSys.hpp"
#include "CResFactory.hpp"
#include "CSimplePool.hpp"
#include "Character/CAssetFactory.hpp"
#include "CAi.hpp"
#include "CGameState.hpp"
#include "CInGameTweakManager.hpp"
namespace Retro
{
@ -17,6 +21,11 @@ class CGameGlobalObjects : public Common::TOneStatic<CGameGlobalObjects>
Common::CMemoryCardSys m_memoryCardSys;
Common::CResFactory m_resFactory;
Common::CSimplePool m_simplePool;
Common::CCharacterFactoryBuilder m_charFactoryBuilder;
Common::CAiFuncMap m_aiFuncMap;
Common::CGameState m_gameState;
Common::CInGameTweakManager m_tweakManager;
public:
void PostInitialize(Common::COsContext& osctx, Common::CMemorySys& memSys)
{

2
hecl

@ -1 +1 @@
Subproject commit 9b3a0413b0132334cc56fa4bb973e1563c5f0183
Subproject commit b96d1e8d9a7912674b91f3c3878f524c25901ef8