Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #1409 Fixed some things for a sane compiler (Linux/gcc)

Browse source
This commit is contained in:
sfb 2011-12-09 08:10:02 -06:00
parent ceb8f7997d
commit c9bf8088b4
2 changed files with 102 additions and 102 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

200
code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_editor_main_window.cpp
View file

@ -39,7 +39,7 @@ TileEditorMainWindow::TileEditorMainWindow(QWidget *parent)
m_undoStack = new QUndoStack(this); m_undoStack = new QUndoStack(this);
// Retrieve the menu manager // Retrieve the menu manager
Core::ICore *core = Core::ICore::instance(); Core::ICore *core = Core::ICore::instance();
Core::MenuManager *menuManager = core->menuManager(); Core::MenuManager *menuManager = core->menuManager();
QMenu *m_tileEditorMenu; QMenu *m_tileEditorMenu;
@ -77,8 +77,8 @@ TileEditorMainWindow::TileEditorMainWindow(QWidget *parent)
m_ui->tileSetLV->setModel(m_model); m_ui->tileSetLV->setModel(m_model);
//m_ui->tileSetLV->setRootIndex(m_model->index(0,0)); //m_ui->tileSetLV->setRootIndex(m_model->index(0,0));
connect(m_ui->tileSetAddTB, SIGNAL(clicked()), this, SLOT(onTileSetAdd())); connect(m_ui->tileSetAddTB, SIGNAL(clicked()), this, SLOT(onTileSetAdd()));
connect(m_ui->tileSetLV->selectionModel(), connect(m_ui->tileSetLV->selectionModel(),
SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)), SIGNAL(currentChanged(const QModelIndex &, const QModelIndex &)),
this, SLOT(changeActiveTileSet(const QModelIndex &, const QModelIndex &))); this, SLOT(changeActiveTileSet(const QModelIndex &, const QModelIndex &)));
// 128x128 List View // 128x128 List View
@ -143,98 +143,98 @@ void TileEditorMainWindow::onActionDeleteImage(bool triggered)
void TileEditorMainWindow::onTileSetAdd() void TileEditorMainWindow::onTileSetAdd()
{ {
bool ok; bool ok;
QString text = QInputDialog::getText(this, tr("Add Tile Set"), tr("Enter Tile Set name:"), QLineEdit::Normal, "", &ok); QString text = QInputDialog::getText(this, tr("Add Tile Set"), tr("Enter Tile Set name:"), QLineEdit::Normal, "", &ok);
if (ok && !text.isEmpty()) if (ok && !text.isEmpty())
{ {
//if (ui.tileSetListWidget->findItems(text, Qt::MatchExactly).count() > 0) //if (ui.tileSetListWidget->findItems(text, Qt::MatchExactly).count() > 0)
//{ //{
// QMessageBox::information( this, tr("Error Adding Tile Set"), tr("This name already exists") ); // QMessageBox::information( this, tr("Error Adding Tile Set"), tr("This name already exists") );
//} //}
//else //else
//{ //{
//QModelIndex index = m_ui->tileSetLV->selectionModel()->currentIndex(); //QModelIndex index = m_ui->tileSetLV->selectionModel()->currentIndex();
TileModel *model = static_cast<TileModel*>(m_ui->tileSetLV->model()); TileModel *model = static_cast<TileModel*>(m_ui->tileSetLV->model());
//if(index.isValid()) //if(index.isValid())
//{ //{
// if(!model->insertRow(index.row()+1, index.parent())) // if(!model->insertRow(index.row()+1, index.parent()))
// return; // return;
// //updateActions() // //updateActions()
// for(int column=0; column<model->columnCount(index.parent()); column++) // for(int column=0; column<model->columnCount(index.parent()); column++)
// { // {
// QModelIndex child = model->index(index.row()+1, column, index.parent()); // QModelIndex child = model->index(index.row()+1, column, index.parent());
// model->setData(child, QVariant(text), Qt::EditRole); // model->setData(child, QVariant(text), Qt::EditRole);
// } // }
//} //}
//else //else
//{ //{
// Create the new tile set. // Create the new tile set.
QVector<QVariant> items; QVector<QVariant> items;
items.push_back(text); items.push_back(text);
TileItem *tileSet = new TileItem(items); TileItem *tileSet = new TileItem(items);
// child for 128x128 tiles // child for 128x128 tiles
QVector<QVariant> tiles128; QVector<QVariant> tiles128;
tiles128.push_back(QString("128")); tiles128.push_back(QString("128"));
TileTypeTileItem *tile128= new TileTypeTileItem(tiles128); TileTypeTileItem *tile128= new TileTypeTileItem(tiles128);
// child for 256x256 tiles // child for 256x256 tiles
QVector<QVariant> tiles256; QVector<QVariant> tiles256;
tiles256.push_back(QString("256")); tiles256.push_back(QString("256"));
TileTypeTileItem *tile256= new TileTypeTileItem(tiles256); TileTypeTileItem *tile256= new TileTypeTileItem(tiles256);
// child for transition tiles. // child for transition tiles.
QVector<QVariant> tilesTrans; QVector<QVariant> tilesTrans;
tilesTrans.push_back(QString("Transition")); tilesTrans.push_back(QString("Transition"));
TileTypeTileItem *tileTrans= new TileTypeTileItem(tilesTrans); TileTypeTileItem *tileTrans= new TileTypeTileItem(tilesTrans);
// Add the default transition tiles. // Add the default transition tiles.
// TODO tie this to CTileSet::count from NeL // TODO tie this to CTileSet::count from NeL
for(int transPos=0; transPos<48; transPos++) for(int transPos=0; transPos<48; transPos++)
{ {
QVector<QVariant> tileInfo; QVector<QVariant> tileInfo;
tileInfo.push_back(QString("filename").append(QString::number(transPos+1))); tileInfo.push_back(QString("filename").append(QString::number(transPos+1)));
TileItem *transTile= new TileItem(tileInfo); TileItem *transTile= new TileItem(tileInfo);
tileTrans->appendRow(transTile); tileTrans->appendRow(transTile);
} }
// child for displacement tiles // child for displacement tiles
QVector<QVariant> tilesDisp; QVector<QVariant> tilesDisp;
tilesDisp.push_back(QString("Displacement")); tilesDisp.push_back(QString("Displacement"));
TileTypeTileItem *tileDisp= new TileTypeTileItem(tilesDisp); TileTypeTileItem *tileDisp= new TileTypeTileItem(tilesDisp);
// Add the default displacement tiles. // Add the default displacement tiles.
// TODO tie this to CTileSet::CountDisplace from NeL // TODO tie this to CTileSet::CountDisplace from NeL
for(int dispPos=0; dispPos<16; dispPos++) for(int dispPos=0; dispPos<16; dispPos++)
{ {
QVector<QVariant> tileInfo; QVector<QVariant> tileInfo;
tileInfo.push_back(QString("filename").append(QString::number(dispPos+1))); tileInfo.push_back(QString("filename").append(QString::number(dispPos+1)));
TileItem *dispTile= new TileItem(tileInfo); TileItem *dispTile= new TileItem(tileInfo);
tileDisp->appendRow(dispTile); tileDisp->appendRow(dispTile);
} }
// Append them in the correct order to the tile set. // Append them in the correct order to the tile set.
tileSet->appendRow(tile128); tileSet->appendRow(tile128);
tileSet->appendRow(tile256); tileSet->appendRow(tile256);
tileSet->appendRow(tileTrans); tileSet->appendRow(tileTrans);
tileSet->appendRow(tileDisp); tileSet->appendRow(tileDisp);
model->appendRow(tileSet); model->appendRow(tileSet);
m_ui->tileSetLV->reset(); m_ui->tileSetLV->reset();
//updateActions() //updateActions()
//} //}
// tileBank.addTileSet( text.toStdString() ); // tileBank.addTileSet( text.toStdString() );
// ui.tileSetListWidget->addItem(text); // ui.tileSetListWidget->addItem(text);
// ui.tileSetListWidget->setCurrentRow(ui.tileSetListWidget->count() - 1); // ui.tileSetListWidget->setCurrentRow(ui.tileSetListWidget->count() - 1);
//} //}
} }
} }
@ -247,13 +247,13 @@ void TileEditorMainWindow::onActionAddTile(int tabId)
void TileEditorMainWindow::changeActiveTileSet(const QModelIndex &newIndex, const QModelIndex &oldIndex) void TileEditorMainWindow::changeActiveTileSet(const QModelIndex &newIndex, const QModelIndex &oldIndex)
{ {
QModelIndex &tile128Idx = newIndex.child(0,0); const QModelIndex &tile128Idx = newIndex.child(0,0);
QModelIndex &tile256Idx = newIndex.child(1,0); const QModelIndex &tile256Idx = newIndex.child(1,0);
QModelIndex &tileTransIdx = newIndex.child(2,0); const QModelIndex &tileTransIdx = newIndex.child(2,0);
QModelIndex &tileDispIdx = newIndex.child(3,0); const QModelIndex &tileDispIdx = newIndex.child(3,0);
m_ui->listView128->setRootIndex(tile128Idx); m_ui->listView128->setRootIndex(tile128Idx);
m_ui->listView256->setRootIndex(tile256Idx); m_ui->listView256->setRootIndex(tile256Idx);
m_ui->listViewTransition->setRootIndex(tileTransIdx); m_ui->listViewTransition->setRootIndex(tileTransIdx);
m_ui->listViewDisplacement->setRootIndex(tileDispIdx); m_ui->listViewDisplacement->setRootIndex(tileDispIdx);
} }

4
code/nel/tools/3d/object_viewer_qt/src/plugins/tile_editor/tile_model.h
View file

@ -28,8 +28,8 @@ class TileModel : public QAbstractItemModel
Q_OBJECT Q_OBJECT
public: public:
TileModel::TileModel(const QStringList &headers, QObject *parent); TileModel(const QStringList &headers, QObject *parent);
~TileModel(); ~TileModel();
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const;