mirror of
https://github.com/AxioDL/PrimeWorldEditor.git
synced 2025-06-06 06:33:39 +00:00
More linux and memory leak fixes
This commit is contained in:
parent
fc7cffbf37
commit
28f96e91c2
@ -41,7 +41,7 @@
|
||||
"url": "https://github.com/jackoalan/LibCommon",
|
||||
"type": "git",
|
||||
"head": "dew",
|
||||
"ref": "86c7e5a455a77bdee72cb8706630a5782a102257"
|
||||
"ref": "7d35c8ce1ee944a3430325ec733b550de48afa12"
|
||||
},
|
||||
{
|
||||
"name": "lzo",
|
||||
|
@ -17,6 +17,7 @@ protected:
|
||||
CCollisionRenderData mRenderData;
|
||||
|
||||
public:
|
||||
virtual ~CCollisionMesh() = default;
|
||||
virtual void BuildRenderData();
|
||||
|
||||
/** Accessors */
|
||||
|
@ -14,6 +14,7 @@ enum class EOBBTreeNodeType : uint8
|
||||
|
||||
struct SOBBTreeNode
|
||||
{
|
||||
virtual ~SOBBTreeNode() = default;
|
||||
CTransform4f Transform;
|
||||
CVector3f Radii;
|
||||
EOBBTreeNodeType NodeType;
|
||||
|
@ -50,6 +50,8 @@ protected:
|
||||
{}
|
||||
|
||||
public:
|
||||
virtual ~CArrayProperty() { delete mpItemArchetype; }
|
||||
|
||||
virtual uint32 DataSize() const
|
||||
{
|
||||
return sizeof(SScriptArray);
|
||||
|
@ -352,13 +352,9 @@ public:
|
||||
typedef PropType ValueType;
|
||||
|
||||
protected:
|
||||
PropType mDefaultValue;
|
||||
PropType mDefaultValue = {};
|
||||
|
||||
TTypedProperty(EGame Game)
|
||||
: IProperty(Game)
|
||||
{
|
||||
memset(&mDefaultValue, 0, sizeof(PropType));
|
||||
}
|
||||
TTypedProperty(EGame Game) : IProperty(Game) {}
|
||||
|
||||
public:
|
||||
virtual EPropertyType Type() const { return PropEnum; }
|
||||
|
@ -66,7 +66,7 @@ CScriptNode::CScriptNode(CScene *pScene, uint32 NodeID, CSceneNode *pParent, CSc
|
||||
}
|
||||
|
||||
// Fetch LightParameters
|
||||
mpLightParameters = new CLightParameters(mpInstance->LightParameters(), mpInstance->GameTemplate()->Game());
|
||||
mpLightParameters = std::make_unique<CLightParameters>(mpInstance->LightParameters(), mpInstance->GameTemplate()->Game());
|
||||
SetLightLayerIndex(mpLightParameters->LightLayerIndex());
|
||||
}
|
||||
|
||||
|
@ -25,7 +25,7 @@ class CScriptNode : public CSceneNode
|
||||
bool mHasVolumePreview;
|
||||
CModelNode *mpVolumePreviewNode;
|
||||
|
||||
CLightParameters *mpLightParameters;
|
||||
std::unique_ptr<CLightParameters> mpLightParameters;
|
||||
|
||||
public:
|
||||
enum class EGameModeVisibility
|
||||
|
@ -90,9 +90,9 @@ elseif (APPLE)
|
||||
endforeach()
|
||||
set(PLAT_SRCS icons/mac/mainicon.icns ${RES_SOURCES} MacOSExtras.mm)
|
||||
else()
|
||||
configure_file(icons/freedesktop/metainfo/PrimeWorldEditor.appdata.xml.in
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/PrimeWorldEditor.appdata.xml" @ONLY)
|
||||
#install(FILES "${CMAKE_CURRENT_BINARY_DIR}/PrimeWorldEditor.appdata.xml" DESTINATION share/metainfo)
|
||||
configure_file(icons/freedesktop/metainfo/io.github.arukibree.PrimeWorldEditor.appdata.xml.in
|
||||
"${CMAKE_CURRENT_BINARY_DIR}/io.github.arukibree.PrimeWorldEditor.appdata.xml" @ONLY)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/io.github.arukibree.PrimeWorldEditor.appdata.xml" DESTINATION share/metainfo)
|
||||
install(DIRECTORY icons/freedesktop/applications icons/freedesktop/icons DESTINATION share)
|
||||
endif()
|
||||
|
||||
|
@ -301,7 +301,7 @@ void CResourceBrowser::CreateAddMenu()
|
||||
mpAddMenu->addAction("New Folder", this, SLOT(CreateDirectory()));
|
||||
mpAddMenu->addSeparator();
|
||||
|
||||
QMenu* pCreateMenu = new QMenu("Create...");
|
||||
QMenu* pCreateMenu = new QMenu("Create...", mpAddMenu);
|
||||
mpAddMenu->addMenu(pCreateMenu);
|
||||
AddCreateAssetMenuActions(pCreateMenu);
|
||||
|
||||
|
@ -1,21 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright @CURRENT_YEAR@ Aruki -->
|
||||
<component type="desktop-application">
|
||||
<id>com.Aruki.PrimeWorldEditor</id>
|
||||
<metadata_license>FSFAP</metadata_license>
|
||||
<project_license>MIT</project_license>
|
||||
<name>Prime World Editor</name>
|
||||
<summary>Edit world assets from games by Retro Studios</summary>
|
||||
|
||||
<launchable type="desktop-id">PrimeWorldEditor.desktop</launchable>
|
||||
|
||||
<url type="homepage">http://github.com/arukibree/PrimeWorldEditor</url>
|
||||
|
||||
<provides>
|
||||
<binary>PrimeWorldEditor</binary>
|
||||
</provides>
|
||||
|
||||
<releases>
|
||||
<release version="@pwe_editor_VERSION@" />
|
||||
</releases>
|
||||
</component>
|
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<!-- Copyright @CURRENT_YEAR@ Aruki -->
|
||||
<component type="desktop-application">
|
||||
<id>io.github.arukibree.PrimeWorldEditor</id>
|
||||
<metadata_license>FSFAP</metadata_license>
|
||||
<project_license>MIT</project_license>
|
||||
<name>Prime World Editor</name>
|
||||
<summary>Edit world assets from games by Retro Studios</summary>
|
||||
|
||||
<description>
|
||||
<p>Prime World Editor is a tool used to access and modify assets found in games by Retro Studios.</p>
|
||||
</description>
|
||||
|
||||
<launchable type="desktop-id">io.github.arukibree.PrimeWorldEditor.desktop</launchable>
|
||||
|
||||
<url type="homepage">https://github.com/arukibree/PrimeWorldEditor</url>
|
||||
|
||||
<provides>
|
||||
<binary>PrimeWorldEditor</binary>
|
||||
</provides>
|
||||
|
||||
<releases>
|
||||
<release version="@pwe_editor_VERSION@" />
|
||||
</releases>
|
||||
</component>
|
Loading…
x
Reference in New Issue
Block a user