AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/AxioDL/urde

This commit is contained in:
Jack Andersen 2016-04-20 11:46:22 -10:00
parent 0f6d1645ba 4ce505989b
commit 9b14f0b381
10 changed files with 148 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Runtime/Collision/CMaterialList.hpp
View File

@ -11,7 +11,7 @@ class CMaterialList
public:
u64 x0_ = 0;
CMaterialList() = default;
CMaterialList(int idx) : x0_(1 << idx) {}
CMaterialList(int idx) : x0_(1ull << idx) {}
};
}

4
Runtime/World/CMakeLists.txt
View File

@ -14,7 +14,6 @@ add_library(RuntimeCommonWorld
CTeamAiTypes.hpp CTeamAiTypes.cpp
ScriptObjectSupport.hpp ScriptObjectSupport.cpp
ScriptLoader.hpp ScriptLoader.cpp
CScriptWater.hpp CScriptWater.cpp
CScriptActor.hpp CScriptActor.cpp
CScriptWaypoint.hpp CScriptWaypoint.cpp
CScriptDoor.hpp CScriptDoor.cpp
@ -25,6 +24,9 @@ add_library(RuntimeCommonWorld
CScriptPlatform.hpp CScriptPlatform.cpp
CScriptSound.hpp CScriptSound.cpp
CScriptGenerator.hpp CScriptGenerator.cpp
CScriptDock.hpp CScriptDock.cpp
CScriptWater.hpp CScriptWater.cpp
CScriptGrapplePoint.hpp CScriptGrapplePoint.cpp
CGrappleParameters.hpp
CActorParameters.hpp
CLightParameters.hpp

30
Runtime/World/CScriptDock.cpp Normal file
View File

@ -0,0 +1,30 @@
#include "CScriptDock.hpp"
#include "CActorParameters.hpp"
#include "Character/CModelData.hpp"
#include "Collision/CMaterialList.hpp"
namespace urde
{
CMaterialList MakeDockMaterialList()
{
CMaterialList list;
list.x0_ |= (1ull << 34);
list.x0_ |= (1ull << 43);
list.x0_ |= (1ull << 48);
return list;
}
CScriptDock::CScriptDock(TUniqueId uid, const std::string &name, const CEntityInfo &info, const zeus::CVector3f position,
const zeus::CVector3f& extents, s32 dock, TAreaId area, bool active, s32 w1, bool b1)
: CPhysicsActor(uid, active, name, info, zeus::CTransform(zeus::CMatrix3f::skIdentityMatrix3f, position),
CModelData::CModelDataNull(), MakeDockMaterialList(), zeus::CAABox(-extents * 0.5f, extents * 0.5f), SMoverData(1.f), CActorParameters::None(), 0.3f, 0.1f),
x258_(w1),
x25c_dock(dock),
x260_area(area),
x264_(3)
{
x268_24_ = false;
x268_25_ = b1;
x268_26_ = false;
}
}

30
Runtime/World/CScriptDock.hpp Normal file
View File

@ -0,0 +1,30 @@
#ifndef __URDE_CSCRIPTDOCK_HPP__
#define __URDE_CSCRIPTDOCK_HPP__
#include "CPhysicsActor.hpp"
namespace urde
{
class CScriptDock : public CPhysicsActor
{
s32 x258_;
s32 x25c_dock;
TAreaId x260_area;
u32 x264_;
union
{
struct
{
bool x268_24_ : 1;
bool x268_25_ : 1;
bool x268_26_ : 1;
};
u8 dummy = 0;
};
public:
CScriptDock(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CVector3f position,
const zeus::CVector3f& extent, s32, TAreaId, bool active, s32 w1, bool b1);
};
}
#endif // __URDE_CSCRIPTDOCK_HPP__

18
Runtime/World/CScriptGrapplePoint.cpp Normal file
View File

@ -0,0 +1,18 @@
#include "CScriptGrapplePoint.hpp"
#include "Character/CModelData.hpp"
#include "Collision/CMaterialList.hpp"
#include "CActorParameters.hpp"
namespace urde
{
CScriptGrapplePoint::CScriptGrapplePoint(TUniqueId uid, const std::string &name, const CEntityInfo& info,
const zeus::CTransform &transform, bool active, const CGrappleParameters &params)
: CActor(uid, active, name, info, transform, CModelData::CModelDataNull(), CMaterialList(41), CActorParameters::None(),
kInvalidUniqueId),
xe8_({x40_unknown - 0.5f, x50_unknown - 0.5f, x60_unknown - 0.5f},
{x40_unknown + 0.5f, x50_unknown + 0.5f, x60_unknown + 0.5f}),
x100_parameters(params)
{
}
}

19
Runtime/World/CScriptGrapplePoint.hpp Normal file
View File

@ -0,0 +1,19 @@
#ifndef __URDE_CSCRIPTGRAPPLEPOINT_HPP__
#define __URDE_CSCRIPTGRAPPLEPOINT_HPP__
#include "CActor.hpp"
#include "CGrappleParameters.hpp"
namespace urde
{
class CScriptGrapplePoint : public CActor
{
zeus::CAABox xe8_;
CGrappleParameters x100_parameters;
public:
CScriptGrapplePoint(TUniqueId uid, const std::string& name, const CEntityInfo& info, const zeus::CTransform& transform,
bool active, const CGrappleParameters& params);
};
}
#endif // __URDE_CSCRIPTGRAPPLEPOINT_HPP__

1
Runtime/World/CScriptWaypoint.hpp
View File

@ -13,7 +13,6 @@ public:
const zeus::CTransform&, bool, float, float,
u32, u32, u32, u32, u32, u32, u32);
};
}
#endif // __URDE_CSCRIPTWAYPOINT_HPP__

6
Runtime/World/CScriptWorldTeleporter.cpp Normal file
View File

@ -0,0 +1,6 @@
#include "CScriptWorldTeleporter.hpp"
namespace urde
{
}

17
Runtime/World/CScriptWorldTeleporter.hpp Normal file
View File

@ -0,0 +1,17 @@
#ifndef __CSCRIPTWORLDTELEPORTER_HPP__
#define __CSCRIPTWORLDTELEPORTER_HPP__
#include "CEntity.hpp"
namespace urde
{
class CScriptWorldTeleporter
{
public:
};
}
#endif // __CSCRIPTWORLDTELEPORTER_HPP__

25
Runtime/World/ScriptLoader.cpp
View File

@ -18,11 +18,13 @@
#include "CScriptTrigger.hpp"
#include "CScriptTimer.hpp"
#include "CScriptCounter.hpp"
#include "CScriptDock.hpp"
#include "CScriptWater.hpp"
#include "CScriptEffect.hpp"
#include "CScriptPlatform.hpp"
#include "CScriptSound.hpp"
#include "CScriptGenerator.hpp"
#include "CScriptGrapplePoint.hpp"
#include "CSimplePool.hpp"
#include "Collision/CCollidableOBBTreeGroup.hpp"
#include "Editor/ProjectResourceFactoryMP1.hpp"
@ -709,7 +711,20 @@ CEntity* ScriptLoader::LoadGenerator(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadDock(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
{
if (!EnsurePropertyCount(propCount, 7, "Dock"))
return nullptr;
std::string name = *mgr.HashInstanceName(in);
bool active = in.readBool();
zeus::CVector3f position;
position.readBig(in);
zeus::CVector3f scale;
scale.readBig(in);
u32 dock = in.readUint32Big();
TAreaId area = in.readUint32Big();
bool b1 = in.readBool();
return new CScriptDock(mgr.AllocateUniqueId(), name, info, position, scale, dock, area, active, 0, b1);
}
CEntity* ScriptLoader::LoadCamera(CStateManager& mgr, CInputStream& in,
@ -967,6 +982,14 @@ CEntity* ScriptLoader::LoadPathCamera(CStateManager& mgr, CInputStream& in,
CEntity* ScriptLoader::LoadGrapplePoint(CStateManager& mgr, CInputStream& in,
int propCount, const CEntityInfo& info)
{
if (!EnsurePropertyCount(propCount, 5, "GrapplePoint"))
return nullptr;
std::string name = *mgr.HashInstanceName(in);
zeus::CTransform grappleXf = LoadEditorTransform(in);
bool active = in.readBool();
CGrappleParameters parameters = LoadGrappleParameters(in);
return new CScriptGrapplePoint(mgr.AllocateUniqueId(), name, info, grappleXf, active, parameters);
}
CEntity* ScriptLoader::LoadPuddleSpore(CStateManager& mgr, CInputStream& in,