AxioDL/PrimeWorldEditor
2
0
Fork 0
mirror of https://github.com/AxioDL/PrimeWorldEditor.git synced 2025-12-19 01:46:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Reorganized collision data classes & added basic collision editor window with an OBB tree visualization

Browse Source
This commit is contained in:
Aruki
2019-02-12 02:50:07 -07:00
parent ff021dcdda
commit 4e1560a99c
32 changed files with 896 additions and 439 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Core/Resource/Area/CGameArea.cpp
View File

@@ -19,8 +19,6 @@ CGameArea::~CGameArea()
{
ClearTerrain();
delete mpCollision;
for (uint32 iSCLY = 0; iSCLY < mScriptLayers.size(); iSCLY++)
delete mScriptLayers[iSCLY];

6
src/Core/Resource/Area/CGameArea.h
View File

@@ -2,10 +2,10 @@
#define CGAMEAREA_H
#include "Core/Resource/CResource.h"
#include "Core/Resource/CCollisionMeshGroup.h"
#include "Core/Resource/CLight.h"
#include "Core/Resource/CMaterialSet.h"
#include "Core/Resource/CPoiToWorld.h"
#include "Core/Resource/Collision/CCollisionMeshGroup.h"
#include "Core/Resource/Model/CModel.h"
#include "Core/Resource/Model/CStaticModel.h"
#include <Common/BasicTypes.h>
@@ -51,7 +51,7 @@ class CGameArea : public CResource
std::vector<CScriptLayer*> mScriptLayers;
std::unordered_map<uint32, CScriptObject*> mObjectMap;
// Collision
CCollisionMeshGroup *mpCollision;
std::unique_ptr<CCollisionMeshGroup> mpCollision;
// Lights
std::vector<std::vector<CLight*>> mLightLayers;
// Path Mesh
@@ -93,7 +93,7 @@ public:
inline uint32 NumStaticModels() const { return mStaticWorldModels.size(); }
inline CModel* TerrainModel(uint32 iMdl) const { return mWorldModels[iMdl]; }
inline CStaticModel* StaticModel(uint32 iMdl) const { return mStaticWorldModels[iMdl]; }
inline CCollisionMeshGroup* Collision() const { return mpCollision; }
inline CCollisionMeshGroup* Collision() const { return mpCollision.get(); }
inline uint32 NumScriptLayers() const { return mScriptLayers.size(); }
inline CScriptLayer* ScriptLayer(uint32 Index) const { return mScriptLayers[Index]; }
inline uint32 NumLightLayers() const { return mLightLayers.size(); }