Mirrors/openrw
1
0
Fork 0
mirror of https://github.com/rwengine/openrw.git synced 2024-11-07 03:12:36 +01:00
Code Issues Projects Releases Activity

clang-format files in rwviewer/widgets

Browse Source
This commit is contained in:
Daniel Evans 2016-09-09 21:13:21 +01:00
parent 4ca99c380a
commit 46628d98d9
2 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
rwviewer/widgets/ModelFramesWidget.cpp
View File

@ -2,21 +2,20 @@
#include <data/Model.hpp>
#include <glm/gtx/string_cast.hpp>
void ModelFramesWidget::updateInfoBox(Model* model, ModelFrame *f)
{
if( f == nullptr ) {
void ModelFramesWidget::updateInfoBox(Model* model, ModelFrame* f) {
if (f == nullptr) {
_frameLabel->setText("");
}
else {
} else {
auto labText = QString("Name: %1\nTranslation: %2\nTextures:%3")
.arg(QString::fromStdString(f->getName()))
.arg(QString::fromStdString(glm::to_string(f->getDefaultTranslation())));
.arg(QString::fromStdString(
glm::to_string(f->getDefaultTranslation())));
QString geomString;
for(size_t gi : f->getGeometries()) {
for (size_t gi : f->getGeometries()) {
auto& g = model->geometries[gi];
//for(Model::SubGeometry& sg : g->subgeom)
for(Model::Material& m : g->materials) {
for(Model::Texture& t : m.textures) {
// for(Model::SubGeometry& sg : g->subgeom)
for (Model::Material& m : g->materials) {
for (Model::Texture& t : m.textures) {
geomString += QString("\n %1 (%2)")
.arg(t.name.c_str())
.arg(t.alphaName.c_str());
@ -28,15 +27,14 @@ void ModelFramesWidget::updateInfoBox(Model* model, ModelFrame *f)
}
}
void ModelFramesWidget::selectedModelChanged(const QModelIndex & n, const QModelIndex &)
{
updateInfoBox( gmodel, (ModelFrame*) n.internalPointer() );
selectedFrameChanged( (ModelFrame*) n.internalPointer() );
void ModelFramesWidget::selectedModelChanged(const QModelIndex& n,
const QModelIndex&) {
updateInfoBox(gmodel, (ModelFrame*)n.internalPointer());
selectedFrameChanged((ModelFrame*)n.internalPointer());
}
ModelFramesWidget::ModelFramesWidget(QWidget* parent, Qt::WindowFlags flags)
: QWidget(parent, flags), gmodel(nullptr), framemodel(nullptr)
{
: QWidget(parent, flags), gmodel(nullptr), framemodel(nullptr) {
setWindowTitle("Frames");
_layout = new QVBoxLayout;
@ -48,22 +46,21 @@ ModelFramesWidget::ModelFramesWidget(QWidget* parent, Qt::WindowFlags flags)
setLayout(_layout);
}
void ModelFramesWidget::setModel(Model *model, Skeleton* skeleton)
{
if(framemodel) {
void ModelFramesWidget::setModel(Model* model, Skeleton* skeleton) {
if (framemodel) {
delete framemodel;
framemodel = nullptr;
tree->setModel(nullptr);
}
gmodel = model;
if(model != nullptr) {
if (model != nullptr) {
framemodel = new DFFFramesTreeModel(model, skeleton, this);
tree->setModel(framemodel);
tree->setDisabled(false);
connect(tree->selectionModel(), SIGNAL(currentChanged(QModelIndex,QModelIndex)),
SLOT(selectedModelChanged(QModelIndex,QModelIndex)));
}
else {
connect(tree->selectionModel(),
SIGNAL(currentChanged(QModelIndex, QModelIndex)),
SLOT(selectedModelChanged(QModelIndex, QModelIndex)));
} else {
tree->setDisabled(true);
}
}

15
rwviewer/widgets/ModelFramesWidget.hpp
View File

@ -2,16 +2,15 @@
#ifndef _MODELFRAMESWIDGET_HPP_
#define _MODELFRAMESWIDGET_HPP_
#include <QDockWidget>
#include <QTreeView>
#include "models/DFFFramesTreeModel.hpp"
#include <rw/types.hpp>
#include <QVBoxLayout>
#include <QLabel>
#include <QTreeView>
#include <QVBoxLayout>
#include <rw/types.hpp>
#include "models/DFFFramesTreeModel.hpp"
class ModelFrame;
class ModelFramesWidget : public QWidget
{
class ModelFramesWidget : public QWidget {
Q_OBJECT
Model* gmodel;
@ -24,14 +23,14 @@ private slots:
void updateInfoBox(Model* model, ModelFrame* f);
void selectedModelChanged(const QModelIndex&,const QModelIndex&);
void selectedModelChanged(const QModelIndex&, const QModelIndex&);
public:
ModelFramesWidget(QWidget* parent = 0, Qt::WindowFlags flags = 0);
public slots:
void setModel(Model *model, Skeleton* skeleton);
void setModel(Model* model, Skeleton* skeleton);
signals: