mirror of
https://github.com/TES3MP/TES3MP.git
synced 2025-09-27 06:55:54 -04:00
Merge branch 'scene'
This commit is contained in:
commit
b8ae195a46
@ -59,7 +59,8 @@ opencs_hdrs_noqt (view/doc
|
|||||||
|
|
||||||
opencs_units (view/world
|
opencs_units (view/world
|
||||||
table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
|
table tablesubview scriptsubview util regionmapsubview tablebottombox creator genericcreator
|
||||||
cellcreator referenceablecreator referencecreator
|
cellcreator referenceablecreator referencecreator scenesubview scenetoolbar scenetool
|
||||||
|
scenetoolmode
|
||||||
)
|
)
|
||||||
|
|
||||||
opencs_units_noqt (view/world
|
opencs_units_noqt (view/world
|
||||||
|
@ -87,6 +87,7 @@ namespace
|
|||||||
static const TypeData sIndexArg[] =
|
static const TypeData sIndexArg[] =
|
||||||
{
|
{
|
||||||
{ CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results", 0 },
|
{ CSMWorld::UniversalId::Class_Transient, CSMWorld::UniversalId::Type_VerificationResults, "Verification Results", 0 },
|
||||||
|
{ CSMWorld::UniversalId::Class_Collection, CSMWorld::UniversalId::Type_Scene, "Scene", 0 },
|
||||||
|
|
||||||
{ CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
|
{ CSMWorld::UniversalId::Class_None, CSMWorld::UniversalId::Type_None, 0, 0 } // end marker
|
||||||
};
|
};
|
||||||
|
@ -86,10 +86,11 @@ namespace CSMWorld
|
|||||||
Type_Reference,
|
Type_Reference,
|
||||||
Type_RegionMap,
|
Type_RegionMap,
|
||||||
Type_Filter,
|
Type_Filter,
|
||||||
Type_Filters
|
Type_Filters,
|
||||||
|
Type_Scene
|
||||||
};
|
};
|
||||||
|
|
||||||
enum { NumberOfTypes = Type_Filters+1 };
|
enum { NumberOfTypes = Type_Scene+1 };
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
|
@ -115,6 +115,10 @@ void CSVDoc::View::setupWorldMenu()
|
|||||||
|
|
||||||
world->addSeparator(); // items that don't represent single record lists follow here
|
world->addSeparator(); // items that don't represent single record lists follow here
|
||||||
|
|
||||||
|
QAction *scene = new QAction (tr ("Scene"), this);
|
||||||
|
connect (scene, SIGNAL (triggered()), this, SLOT (addSceneSubView()));
|
||||||
|
world->addAction (scene);
|
||||||
|
|
||||||
QAction *regionMap = new QAction (tr ("Region Map"), this);
|
QAction *regionMap = new QAction (tr ("Region Map"), this);
|
||||||
connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
|
connect (regionMap, SIGNAL (triggered()), this, SLOT (addRegionMapSubView()));
|
||||||
world->addAction (regionMap);
|
world->addAction (regionMap);
|
||||||
@ -403,6 +407,11 @@ void CSVDoc::View::addFiltersSubView()
|
|||||||
addSubView (CSMWorld::UniversalId::Type_Filters);
|
addSubView (CSMWorld::UniversalId::Type_Filters);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CSVDoc::View::addSceneSubView()
|
||||||
|
{
|
||||||
|
addSubView (CSMWorld::UniversalId::Type_Scene);
|
||||||
|
}
|
||||||
|
|
||||||
void CSVDoc::View::abortOperation (int type)
|
void CSVDoc::View::abortOperation (int type)
|
||||||
{
|
{
|
||||||
mDocument->abortOperation (type);
|
mDocument->abortOperation (type);
|
||||||
|
@ -164,6 +164,8 @@ namespace CSVDoc
|
|||||||
|
|
||||||
void addFiltersSubView();
|
void addFiltersSubView();
|
||||||
|
|
||||||
|
void addSceneSubView();
|
||||||
|
|
||||||
void toggleShowStatusBar (bool show);
|
void toggleShowStatusBar (bool show);
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
82
apps/opencs/view/world/scenesubview.cpp
Normal file
82
apps/opencs/view/world/scenesubview.cpp
Normal file
@ -0,0 +1,82 @@
|
|||||||
|
|
||||||
|
#include "scenesubview.hpp"
|
||||||
|
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
#include <QHBoxLayout>
|
||||||
|
#include <QLabel>
|
||||||
|
|
||||||
|
#include "../../model/doc/document.hpp"
|
||||||
|
|
||||||
|
#include "../filter/filterbox.hpp"
|
||||||
|
|
||||||
|
#include "tablebottombox.hpp"
|
||||||
|
#include "creator.hpp"
|
||||||
|
#include "scenetoolbar.hpp"
|
||||||
|
#include "scenetoolmode.hpp"
|
||||||
|
|
||||||
|
CSVWorld::SceneSubView::SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document)
|
||||||
|
: SubView (id)
|
||||||
|
{
|
||||||
|
QVBoxLayout *layout = new QVBoxLayout;
|
||||||
|
|
||||||
|
layout->setContentsMargins (QMargins (0, 0, 0, 0));
|
||||||
|
|
||||||
|
layout->addWidget (mBottom =
|
||||||
|
new TableBottomBox (NullCreatorFactory(), document.getData(), document.getUndoStack(), id,
|
||||||
|
this), 0);
|
||||||
|
|
||||||
|
QHBoxLayout *layout2 = new QHBoxLayout;
|
||||||
|
|
||||||
|
layout2->setContentsMargins (QMargins (0, 0, 0, 0));
|
||||||
|
|
||||||
|
SceneToolbar *toolbar = new SceneToolbar (48, this);
|
||||||
|
// test
|
||||||
|
SceneToolMode *tool = new SceneToolMode (toolbar);
|
||||||
|
tool->addButton (":door.png", "a");
|
||||||
|
tool->addButton (":GMST.png", "b");
|
||||||
|
tool->addButton (":Info.png", "c");
|
||||||
|
toolbar->addTool (tool);
|
||||||
|
toolbar->addTool (new SceneToolMode (toolbar));
|
||||||
|
toolbar->addTool (new SceneToolMode (toolbar));
|
||||||
|
toolbar->addTool (new SceneToolMode (toolbar));
|
||||||
|
layout2->addWidget (toolbar, 0);
|
||||||
|
|
||||||
|
/// \todo replace with rendering widget
|
||||||
|
QPalette palette2 (palette());
|
||||||
|
palette2.setColor (QPalette::Background, Qt::white);
|
||||||
|
QLabel *placeholder = new QLabel ("Here goes the 3D scene", this);
|
||||||
|
placeholder->setAutoFillBackground (true);
|
||||||
|
placeholder->setPalette (palette2);
|
||||||
|
placeholder->setAlignment (Qt::AlignHCenter);
|
||||||
|
|
||||||
|
layout2->addWidget (placeholder, 1);
|
||||||
|
|
||||||
|
layout->insertLayout (0, layout2, 1);
|
||||||
|
|
||||||
|
CSVFilter::FilterBox *filterBox = new CSVFilter::FilterBox (document.getData(), this);
|
||||||
|
|
||||||
|
layout->insertWidget (0, filterBox);
|
||||||
|
|
||||||
|
QWidget *widget = new QWidget;
|
||||||
|
|
||||||
|
widget->setLayout (layout);
|
||||||
|
|
||||||
|
setWidget (widget);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneSubView::setEditLock (bool locked)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneSubView::updateEditorSetting(const QString &settingName, const QString &settingValue)
|
||||||
|
{
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneSubView::setStatusBar (bool show)
|
||||||
|
{
|
||||||
|
mBottom->setStatusBar (show);
|
||||||
|
}
|
37
apps/opencs/view/world/scenesubview.hpp
Normal file
37
apps/opencs/view/world/scenesubview.hpp
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
#ifndef CSV_WORLD_SCENESUBVIEW_H
|
||||||
|
#define CSV_WORLD_SCENESUBVIEW_H
|
||||||
|
|
||||||
|
#include "../doc/subview.hpp"
|
||||||
|
|
||||||
|
class QModelIndex;
|
||||||
|
|
||||||
|
namespace CSMDoc
|
||||||
|
{
|
||||||
|
class Document;
|
||||||
|
}
|
||||||
|
|
||||||
|
namespace CSVWorld
|
||||||
|
{
|
||||||
|
class Table;
|
||||||
|
class TableBottomBox;
|
||||||
|
class CreatorFactoryBase;
|
||||||
|
|
||||||
|
class SceneSubView : public CSVDoc::SubView
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
TableBottomBox *mBottom;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
SceneSubView (const CSMWorld::UniversalId& id, CSMDoc::Document& document);
|
||||||
|
|
||||||
|
virtual void setEditLock (bool locked);
|
||||||
|
|
||||||
|
virtual void updateEditorSetting (const QString& key, const QString& value);
|
||||||
|
|
||||||
|
virtual void setStatusBar (bool show);
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
17
apps/opencs/view/world/scenetool.cpp
Normal file
17
apps/opencs/view/world/scenetool.cpp
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
|
||||||
|
#include "scenetool.hpp"
|
||||||
|
|
||||||
|
#include "scenetoolbar.hpp"
|
||||||
|
|
||||||
|
CSVWorld::SceneTool::SceneTool (SceneToolbar *parent) : QPushButton (parent)
|
||||||
|
{
|
||||||
|
setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
|
||||||
|
setFixedSize (parent->getButtonSize(), parent->getButtonSize());
|
||||||
|
|
||||||
|
connect (this, SIGNAL (clicked()), this, SLOT (openRequest()));
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneTool::openRequest()
|
||||||
|
{
|
||||||
|
showPanel (parentWidget()->mapToGlobal (pos()));
|
||||||
|
}
|
27
apps/opencs/view/world/scenetool.hpp
Normal file
27
apps/opencs/view/world/scenetool.hpp
Normal file
@ -0,0 +1,27 @@
|
|||||||
|
#ifndef CSV_WORLD_SCENETOOL_H
|
||||||
|
#define CSV_WORLD_SCENETOOL_H
|
||||||
|
|
||||||
|
#include <QPushButton>
|
||||||
|
|
||||||
|
namespace CSVWorld
|
||||||
|
{
|
||||||
|
class SceneToolbar;
|
||||||
|
|
||||||
|
///< \brief Tool base class
|
||||||
|
class SceneTool : public QPushButton
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
SceneTool (SceneToolbar *parent);
|
||||||
|
|
||||||
|
virtual void showPanel (const QPoint& position) = 0;
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
|
||||||
|
void openRequest();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
29
apps/opencs/view/world/scenetoolbar.cpp
Normal file
29
apps/opencs/view/world/scenetoolbar.cpp
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
|
||||||
|
#include "scenetoolbar.hpp"
|
||||||
|
|
||||||
|
#include <QVBoxLayout>
|
||||||
|
|
||||||
|
#include "scenetool.hpp"
|
||||||
|
|
||||||
|
CSVWorld::SceneToolbar::SceneToolbar (int buttonSize, QWidget *parent)
|
||||||
|
: QWidget (parent), mButtonSize (buttonSize)
|
||||||
|
{
|
||||||
|
setFixedWidth (mButtonSize);
|
||||||
|
|
||||||
|
mLayout = new QVBoxLayout (this);
|
||||||
|
mLayout->setAlignment (Qt::AlignTop);
|
||||||
|
|
||||||
|
mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
|
||||||
|
|
||||||
|
setLayout (mLayout);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneToolbar::addTool (SceneTool *tool)
|
||||||
|
{
|
||||||
|
mLayout->addWidget (tool, 0, Qt::AlignTop);
|
||||||
|
}
|
||||||
|
|
||||||
|
int CSVWorld::SceneToolbar::getButtonSize() const
|
||||||
|
{
|
||||||
|
return mButtonSize;
|
||||||
|
}
|
29
apps/opencs/view/world/scenetoolbar.hpp
Normal file
29
apps/opencs/view/world/scenetoolbar.hpp
Normal file
@ -0,0 +1,29 @@
|
|||||||
|
#ifndef CSV_WORLD_SCENETOOLBAR_H
|
||||||
|
#define CSV_WORLD_SCENETOOLBAR_H
|
||||||
|
|
||||||
|
#include <QWidget>
|
||||||
|
|
||||||
|
class QVBoxLayout;
|
||||||
|
|
||||||
|
namespace CSVWorld
|
||||||
|
{
|
||||||
|
class SceneTool;
|
||||||
|
|
||||||
|
class SceneToolbar : public QWidget
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
QVBoxLayout *mLayout;
|
||||||
|
int mButtonSize;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
SceneToolbar (int buttonSize, QWidget *parent = 0);
|
||||||
|
|
||||||
|
void addTool (SceneTool *tool);
|
||||||
|
|
||||||
|
int getButtonSize() const;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
56
apps/opencs/view/world/scenetoolmode.cpp
Normal file
56
apps/opencs/view/world/scenetoolmode.cpp
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
|
||||||
|
#include "scenetoolmode.hpp"
|
||||||
|
|
||||||
|
#include <QHBoxLayout>
|
||||||
|
#include <QFrame>
|
||||||
|
#include <QSignalMapper>
|
||||||
|
|
||||||
|
#include "scenetoolbar.hpp"
|
||||||
|
|
||||||
|
CSVWorld::SceneToolMode::SceneToolMode (SceneToolbar *parent)
|
||||||
|
: SceneTool (parent), mButtonSize (parent->getButtonSize())
|
||||||
|
{
|
||||||
|
mPanel = new QFrame (this, Qt::Popup);
|
||||||
|
|
||||||
|
mLayout = new QHBoxLayout (mPanel);
|
||||||
|
|
||||||
|
mLayout->setContentsMargins (QMargins (0, 0, 0, 0));
|
||||||
|
|
||||||
|
mPanel->setLayout (mLayout);
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneToolMode::showPanel (const QPoint& position)
|
||||||
|
{
|
||||||
|
mPanel->move (position);
|
||||||
|
mPanel->show();
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneToolMode::addButton (const std::string& icon, const std::string& id)
|
||||||
|
{
|
||||||
|
QPushButton *button = new QPushButton (QIcon (QPixmap (icon.c_str())), "", mPanel);
|
||||||
|
button->setSizePolicy (QSizePolicy (QSizePolicy::Fixed, QSizePolicy::Fixed));
|
||||||
|
button->setFixedSize (mButtonSize, mButtonSize);
|
||||||
|
|
||||||
|
mLayout->addWidget (button);
|
||||||
|
|
||||||
|
mButtons.insert (std::make_pair (button, id));
|
||||||
|
|
||||||
|
connect (button, SIGNAL (clicked()), this, SLOT (selected()));
|
||||||
|
|
||||||
|
if (mButtons.size()==1)
|
||||||
|
setIcon (button->icon());
|
||||||
|
}
|
||||||
|
|
||||||
|
void CSVWorld::SceneToolMode::selected()
|
||||||
|
{
|
||||||
|
std::map<QPushButton *, std::string>::const_iterator iter =
|
||||||
|
mButtons.find (dynamic_cast<QPushButton *> (sender()));
|
||||||
|
|
||||||
|
if (iter!=mButtons.end())
|
||||||
|
{
|
||||||
|
mPanel->hide();
|
||||||
|
|
||||||
|
setIcon (iter->first->icon());
|
||||||
|
emit modeChanged (iter->second);
|
||||||
|
}
|
||||||
|
}
|
42
apps/opencs/view/world/scenetoolmode.hpp
Normal file
42
apps/opencs/view/world/scenetoolmode.hpp
Normal file
@ -0,0 +1,42 @@
|
|||||||
|
#ifndef CSV_WORLD_SCENETOOL_MODE_H
|
||||||
|
#define CSV_WORLD_SCENETOOL_MODE_H
|
||||||
|
|
||||||
|
#include "scenetool.hpp"
|
||||||
|
|
||||||
|
#include <map>
|
||||||
|
|
||||||
|
class QHBoxLayout;
|
||||||
|
|
||||||
|
namespace CSVWorld
|
||||||
|
{
|
||||||
|
class SceneToolbar;
|
||||||
|
|
||||||
|
///< \brief Mode selector tool
|
||||||
|
class SceneToolMode : public SceneTool
|
||||||
|
{
|
||||||
|
Q_OBJECT
|
||||||
|
|
||||||
|
QWidget *mPanel;
|
||||||
|
QHBoxLayout *mLayout;
|
||||||
|
std::map<QPushButton *, std::string> mButtons; // widget, id
|
||||||
|
int mButtonSize;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
SceneToolMode (SceneToolbar *parent);
|
||||||
|
|
||||||
|
virtual void showPanel (const QPoint& position);
|
||||||
|
|
||||||
|
void addButton (const std::string& icon, const std::string& id);
|
||||||
|
|
||||||
|
signals:
|
||||||
|
|
||||||
|
void modeChanged (const std::string& id);
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
|
||||||
|
void selected();
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif
|
@ -13,6 +13,7 @@
|
|||||||
#include "cellcreator.hpp"
|
#include "cellcreator.hpp"
|
||||||
#include "referenceablecreator.hpp"
|
#include "referenceablecreator.hpp"
|
||||||
#include "referencecreator.hpp"
|
#include "referencecreator.hpp"
|
||||||
|
#include "scenesubview.hpp"
|
||||||
|
|
||||||
void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
|
void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
|
||||||
{
|
{
|
||||||
@ -62,4 +63,5 @@ void CSVWorld::addSubViewFactories (CSVDoc::SubViewFactoryManager& manager)
|
|||||||
new CSVDoc::SubViewFactoryWithCreator<TableSubView,
|
new CSVDoc::SubViewFactoryWithCreator<TableSubView,
|
||||||
CreatorFactory<CSVFilter::FilterCreator> >);
|
CreatorFactory<CSVFilter::FilterCreator> >);
|
||||||
|
|
||||||
|
manager.add (CSMWorld::UniversalId::Type_Scene, new CSVDoc::SubViewFactory<SceneSubView>);
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user