Added ability to double click a resource in the resource browser to open it for editing

src/Core/GameProject/CGameExporter.cpp

@@ -31,6 +31,10 @@ CGameExporter::CGameExporter(const TString& rkInputDir, const TString& rkOutputD
     mStore.SetActiveProject(mpProject);
 }
 
+#if PUBLIC_RELEASE
+#error Fix export directory being cleared!
+#endif
+
 bool CGameExporter::Export()
 {
     SCOPED_TIMER(ExportGame);

src/Editor/CharacterEditor/CCharacterEditor.cpp

@@ -175,25 +175,7 @@ CAnimation* CCharacterEditor::CurrentAnimation() const
         return nullptr;
 }
 
-void CCharacterEditor::SetSelectedBone(CBone *pBone)
+void CCharacterEditor::SetActiveAnimSet(CAnimSet *pSet)
-{
-    if (pBone != mpSelectedBone)
-    {
-        if (mpSelectedBone) mpSelectedBone->SetSelected(false);
-        mpSelectedBone = pBone;
-        if (mpSelectedBone) mpSelectedBone->SetSelected(true);
-    }
-}
-
-// ************ PUBLIC SLOTS ************
-void CCharacterEditor::Open()
-{
-    QString CharFilename = QFileDialog::getOpenFileName(this, "Open Character", "", "Animation Character Set (*.ANCS)");
-    if (CharFilename.isEmpty()) return;
-
-    CAnimSet *pSet = (CAnimSet*) gpResourceStore->LoadResource(CharFilename.toStdString());
-
-    if (pSet)
 {
     mpSet = pSet;
     mpCharNode->SetCharSet(mpSet);
@@ -237,6 +219,29 @@ void CCharacterEditor::Open()
     ui->Viewport->Camera().SetOrbit(mpCharNode->AABox(), 4.f);
 }
 
+void CCharacterEditor::SetSelectedBone(CBone *pBone)
+{
+    if (pBone != mpSelectedBone)
+    {
+        if (mpSelectedBone) mpSelectedBone->SetSelected(false);
+        mpSelectedBone = pBone;
+        if (mpSelectedBone) mpSelectedBone->SetSelected(true);
+    }
+}
+
+// ************ PUBLIC SLOTS ************
+void CCharacterEditor::Open()
+{
+    QString CharFilename = QFileDialog::getOpenFileName(this, "Open Character", "", "Animation Character Set (*.ANCS)");
+    if (CharFilename.isEmpty()) return;
+
+    CAnimSet *pSet = (CAnimSet*) gpResourceStore->LoadResource(CharFilename.toStdString());
+
+    if (pSet)
+    {
+        SetActiveAnimSet(pSet);
+    }
+
     else
     {
         QMessageBox::warning(this, "Error", "Couldn't load file: " + CharFilename);

src/Editor/CharacterEditor/CCharacterEditor.h

@@ -51,6 +51,7 @@ public:
     void UpdateCameraOrbit();
     CSkeleton* CurrentSkeleton() const;
     CAnimation* CurrentAnimation() const;
+    void SetActiveAnimSet(CAnimSet *pSet);
     void SetSelectedBone(CBone *pBone);
 
 public slots:

src/Editor/ResourceBrowser/CResourceBrowser.cpp

@@ -1,11 +1,15 @@
 #include "CResourceBrowser.h"
 #include "ui_CResourceBrowser.h"
+#include "Editor/ModelEditor/CModelEditorWindow.h"
+#include "Editor/CharacterEditor/CCharacterEditor.h"
+#include <QMessageBox>
 
 CResourceBrowser::CResourceBrowser(QWidget *pParent)
     : QDialog(pParent)
     , mpUI(new Ui::CResourceBrowser)
 {
     mpUI->setupUi(this);
+    setWindowFlags(windowFlags() | Qt::WindowMinimizeButtonHint);
 
     // Set up table models
     mpModel = new CResourceTableModel(this);
@@ -29,6 +33,7 @@ CResourceBrowser::CResourceBrowser(QWidget *pParent)
     connect(mpUI->SearchBar, SIGNAL(textChanged(QString)), this, SLOT(OnSearchStringChanged()));
     connect(mpUI->SortComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(OnSortModeChanged(int)));
     connect(mpUI->DirectoryTreeView->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)), this, SLOT(OnDirectorySelectionChanged(QModelIndex,QModelIndex)));
+    connect(mpUI->ResourceTableView, SIGNAL(doubleClicked(QModelIndex)), this, SLOT(OnDoubleClickResource(QModelIndex)));
 }
 
 CResourceBrowser::~CResourceBrowser()
@@ -61,3 +66,40 @@ void CResourceBrowser::OnDirectorySelectionChanged(const QModelIndex& rkNewIndex
 
     mpProxyModel->SetDirectory(pDir);
 }
+
+void CResourceBrowser::OnDoubleClickResource(QModelIndex Index)
+{
+    QModelIndex SourceIndex = mpProxyModel->mapToSource(Index);
+    CResourceEntry *pEntry = mpModel->IndexEntry(SourceIndex);
+
+    if (pEntry->ResourceType() == eModel)
+    {
+        CModel *pModel = (CModel*) pEntry->Load();
+
+        if (pModel)
+        {
+            CModelEditorWindow *pModelEd = new CModelEditorWindow(parentWidget());
+            pModelEd->SetActiveModel(pModel);
+            pModelEd->show();
+        }
+        else
+            QMessageBox::warning(this, "Error", "Failed to load resource");
+    }
+
+    else if (pEntry->ResourceType() == eAnimSet)
+    {
+        CAnimSet *pSet = (CAnimSet*) pEntry->Load();
+
+        if (pSet)
+        {
+            CCharacterEditor *pCharEd = new CCharacterEditor(parentWidget());
+            pCharEd->SetActiveAnimSet(pSet);
+            pCharEd->show();
+        }
+        else
+            QMessageBox::warning(this, "Error", "Failed to load resource");
+    }
+
+    else
+        QMessageBox::information(this, "Unsupported Resource", "The selected resource type is currently unsupported for editing.");
+}

src/Editor/ResourceBrowser/CResourceBrowser.h

@@ -27,6 +27,7 @@ public slots:
     void OnSortModeChanged(int Index);
     void OnSearchStringChanged();
     void OnDirectorySelectionChanged(const QModelIndex& rkNewIndex, const QModelIndex& rkPrevIndex);
+    void OnDoubleClickResource(QModelIndex Index);
 };
 
 #endif // CRESOURCEBROWSER_H

src/Editor/ResourceBrowser/CResourceBrowser.ui

@@ -126,7 +126,10 @@
         <bool>true</bool>
        </property>
        <property name="selectionMode">
-        <enum>QAbstractItemView::NoSelection</enum>
+        <enum>QAbstractItemView::ExtendedSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
        </property>
        <property name="verticalScrollMode">
         <enum>QAbstractItemView::ScrollPerPixel</enum>

templates/mp1/MasterTemplate.xml

@@ -3,7 +3,7 @@
     <objects>
         <object ID="0x00" template="Script/Actor.xml"/>
         <object ID="0x02" template="Script/Waypoint.xml"/>
-        <object ID="0x03" template="Script/DoorArea.xml"/>
+        <object ID="0x03" template="Script/Door.xml"/>
         <object ID="0x04" template="Script/Trigger.xml"/>
         <object ID="0x05" template="Script/Timer.xml"/>
         <object ID="0x06" template="Script/Counter.xml"/>

templates/mp1/Script/Door.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ScriptTemplate version="4">
-    <name>DoorArea</name>
+    <name>Door</name>
     <properties>
         <property ID="0x00" name="Name" type="string"/>
         <property ID="0x01" name="Position" type="vector3f"/>

templates/mp1/Script/PhazonHealingNodule.xml

@@ -8,9 +8,9 @@
         <property ID="0x03" name="Scale" type="vector3f"/>
         <struct ID="0x04" name="PatternedInfo" template="Structs/PatternedInfo.xml"/>
         <struct ID="0x05" name="ActorParameters" template="Structs/ActorParameters.xml"/>
-        <property ID="0x06" name="Unknown 1" type="bool"/>
+        <property ID="0x06" name="Unused" type="bool"/>
         <property ID="0x07" name="ELSC" type="file" extensions="ELSC"/>
-        <property ID="0x08" name="Unknown 2" type="string"/>
+        <property ID="0x08" name="Target Locator" type="string"/>
     </properties>
     <states/>
     <messages/>