From bdedd145e4b88567fbf9b8c03934c1845dddfb1e Mon Sep 17 00:00:00 2001
From: dfighter1985 <none@none>
Date: Mon, 4 Aug 2014 21:53:22 +0200
Subject: [PATCH] Surface data.

--HG--
branch : gsoc2014-dfighter
---
 .../src/plugins/tile_editor/tile_bank.cpp     | 20 +++++++++++++++++++
 .../src/plugins/tile_editor/tile_bank.h       |  3 +++
 .../tile_editor/tile_editor_main_window.cpp   | 16 +++++++++++++++
 .../tile_editor/tile_editor_main_window.h     |  1 +
 .../src/plugins/tile_editor/tile_model.cpp    | 10 ++++++++++
 .../src/plugins/tile_editor/tile_model.h      |  3 +++
 6 files changed, 53 insertions(+)

diff --git a/code/studio/src/plugins/tile_editor/tile_bank.cpp b/code/studio/src/plugins/tile_editor/tile_bank.cpp
index 85e69dd49..86c2646f9 100644
--- a/code/studio/src/plugins/tile_editor/tile_bank.cpp
+++ b/code/studio/src/plugins/tile_editor/tile_bank.cpp
@@ -430,3 +430,23 @@ bool TileBank::getOriented( int tileSet ) const
 	return set->getOriented();
 }
 
+
+void TileBank::setSurfaceData( int tileSet, unsigned long data )
+{
+	NL3D::CTileSet *set = m_pvt->m_bank.getTileSet( tileSet );
+	if( set == NULL )
+		return;
+
+	set->SurfaceData = data;
+}
+
+unsigned long TileBank::getSurfaceData( int tileSet ) const
+{
+	NL3D::CTileSet *set = m_pvt->m_bank.getTileSet( tileSet );
+	if( set == NULL )
+		return 0;
+
+	return set->SurfaceData;
+}
+
+
diff --git a/code/studio/src/plugins/tile_editor/tile_bank.h b/code/studio/src/plugins/tile_editor/tile_bank.h
index ce6aa737c..dddafe032 100644
--- a/code/studio/src/plugins/tile_editor/tile_bank.h
+++ b/code/studio/src/plugins/tile_editor/tile_bank.h
@@ -35,6 +35,9 @@ public:
 
 	void setOriented( int tileSet, bool b );
 	bool getOriented( int tileSet ) const;
+
+	void setSurfaceData( int tileSet, unsigned long data );
+	unsigned long getSurfaceData( int tileSet ) const;
 	
 	bool hasError() const{ return m_hasError; }
 	QString getLastError() const{ return m_lastError; }
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp b/code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
index 516db5ce3..f673d75c4 100644
--- a/code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
+++ b/code/studio/src/plugins/tile_editor/tile_editor_main_window.cpp
@@ -183,6 +183,7 @@ TileEditorMainWindow::TileEditorMainWindow(QWidget *parent)
 	connect( m_ui->actionOpenTileBank, SIGNAL( triggered() ), this, SLOT( open() ) );
 
 	connect( m_ui->orientedCheckBox, SIGNAL( stateChanged( int ) ), this, SLOT( onOrientedStateChanged( int ) ) );
+	connect( m_ui->surfaceDataLineEdit, SIGNAL( textEdited( const QString& ) ), this, SLOT( onSurfaceDataChanged( const QString& ) ) );
 
 	connect( m_ui->diffuse128BT, SIGNAL( toggled( bool ) ), this, SLOT( onDiffuseToggled( bool ) ) );
 	connect( m_ui->diffuse256BT, SIGNAL( toggled( bool ) ), this, SLOT( onDiffuseToggled( bool ) ) );
@@ -598,6 +599,20 @@ void TileEditorMainWindow::onOrientedStateChanged( int state )
 		m_tileModel->setOriented( row, false );
 }
 
+void TileEditorMainWindow::onSurfaceDataChanged( const QString &text )
+{
+	QModelIndex idx = m_ui->tileSetLV->currentIndex();
+	if( !idx.isValid() )
+		return;
+
+	bool ok = false;
+	unsigned long data = text.toUInt( &ok );
+	if( !ok )
+		return;
+
+	m_tileModel->setSurfaceData( idx.row(), data );
+}
+
 void TileEditorMainWindow::onDiffuseToggled( bool b )
 {
 	if( !b )
@@ -868,6 +883,7 @@ void TileEditorMainWindow::changeActiveTileSet(const QModelIndex &newIndex, cons
 			m_ui->chooseVegetPushButton->setText( "..." );
 
 		m_ui->orientedCheckBox->setChecked( m_tileModel->getOriented( newIndex.row() ) );
+		m_ui->surfaceDataLineEdit->setText( QString::number( m_tileModel->getSurfaceData( newIndex.row() ) ) );
 	}
 	else
 	{
diff --git a/code/studio/src/plugins/tile_editor/tile_editor_main_window.h b/code/studio/src/plugins/tile_editor/tile_editor_main_window.h
index 1ec80cd96..c9b96928c 100644
--- a/code/studio/src/plugins/tile_editor/tile_editor_main_window.h
+++ b/code/studio/src/plugins/tile_editor/tile_editor_main_window.h
@@ -68,6 +68,7 @@ private Q_SLOTS:
 	void onChooseTexturePath();
 
 	void onOrientedStateChanged( int state );
+	void onSurfaceDataChanged( const QString &text );
 
 	void onDiffuseToggled( bool b );
 	void onAdditiveToggled( bool b );
diff --git a/code/studio/src/plugins/tile_editor/tile_model.cpp b/code/studio/src/plugins/tile_editor/tile_model.cpp
index f1372be80..e1d7019b4 100644
--- a/code/studio/src/plugins/tile_editor/tile_model.cpp
+++ b/code/studio/src/plugins/tile_editor/tile_model.cpp
@@ -416,6 +416,16 @@ bool TileModel::getOriented( int tileSet ) const
 	return m_tileBank->getOriented( tileSet );
 }
 
+void TileModel::setSurfaceData( int tileSet, unsigned long data )
+{
+	m_tileBank->setSurfaceData( tileSet, data );
+}
+
+unsigned long TileModel::getSurfaceData( int tileSet ) const
+{
+	return m_tileBank->getSurfaceData( tileSet );
+}
+
 QString TileModel::getLastError() const{
 	return m_tileBank->getLastError();
 }
diff --git a/code/studio/src/plugins/tile_editor/tile_model.h b/code/studio/src/plugins/tile_editor/tile_model.h
index a58b55ce1..daec140ea 100644
--- a/code/studio/src/plugins/tile_editor/tile_model.h
+++ b/code/studio/src/plugins/tile_editor/tile_model.h
@@ -104,6 +104,9 @@ public:
 	void setOriented( int tileSet, bool b );
 	bool getOriented( int tileSet ) const;
 
+	void setSurfaceData( int tileSet, unsigned long data );
+	unsigned long getSurfaceData( int tileSet ) const;
+
 	QString getLastError() const;
 	bool hasError() const;