Blast 1.1 release (windows / linux)

see docs/release_notes.txt for details

1 files changed, 73 insertions, 4 deletions

diff --git a/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp b/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp
index db40407..9db55c2 100644
--- a/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp
+++ b/tools/ArtistTools/source/BlastPlugin/Window/SourceAssetOpenDlg.cpp
@@ -2,18 +2,51 @@
 #include "ui_SourceAssetOpenDlg.h"
 #include <QtWidgets/QFileDialog>
 #include "AppMainWindow.h"
+#include "GlobalSettings.h"
 
-SourceAssetOpenDlg::SourceAssetOpenDlg(bool bOpenBlastFile, QWidget *parent) :
+SourceAssetOpenDlg::SourceAssetOpenDlg(int usefor, QWidget *parent) :
     QDialog(parent),
     ui(new Ui::SourceAssetOpenDlg)
 {
     ui->setupUi(this);
 
-	m_bOpenBlastFile = bOpenBlastFile;
+	m_usefor = usefor;
 	ui->buttonBox->button(QDialogButtonBox::Ok)->setFixedWidth(100);
 	ui->buttonBox->button(QDialogButtonBox::Cancel)->setFixedWidth(100);
 	ui->spinBoxDegree->setMaximum(180);
 	ui->spinBoxDegree->setMinimum(-180);
+
+	ui->spinBoxXPosition->setRange(-DBL_MAX, DBL_MAX);
+	ui->spinBoxYPosition->setRange(-DBL_MAX, DBL_MAX);
+	ui->spinBoxZPosition->setRange(-DBL_MAX, DBL_MAX);
+	ui->spinBoxXAxis->setRange(-DBL_MAX, DBL_MAX);
+	ui->spinBoxYAxis->setRange(-DBL_MAX, DBL_MAX);
+	ui->spinBoxZAxis->setRange(-DBL_MAX, DBL_MAX);
+
+	if (m_usefor == 2)
+	{
+		ui->fileLabel->setVisible(false);
+		ui->lineEditFile->setVisible(false);
+		ui->btnOpenFile->setVisible(false);
+
+		ui->skinnedLabel->setVisible(false);
+		ui->checkBoxSkinned->setVisible(false);
+
+		ui->appendLabel->setVisible(false);
+		ui->checkBoxAppend->setVisible(false);
+
+		ui->preFracturedLabel->setVisible(false);
+		ui->checkBoxPreFractured->setVisible(false);
+	}
+
+	GlobalSettings& globalSettings = GlobalSettings::Inst();
+	ui->cbSceneUnit->setCurrentIndex(globalSettings.m_sceneUnitIndex);
+	
+	if (m_usefor != 0)
+	{
+		ui->autoComputeLabel->setVisible(false);
+		ui->checkBoxAutoCompute->setVisible(false);
+	}
 }
 
 SourceAssetOpenDlg::~SourceAssetOpenDlg()
@@ -21,6 +54,11 @@ SourceAssetOpenDlg::~SourceAssetOpenDlg()
     delete ui;
 }
 
+void SourceAssetOpenDlg::setDefaultFile(const QString& fn)
+{
+	ui->lineEditFile->setText(fn);
+}
+
 QString SourceAssetOpenDlg::getFile()
 {
     return ui->lineEditFile->text();
@@ -46,20 +84,35 @@ double SourceAssetOpenDlg::getRotationDegree()
 	return ui->spinBoxDegree->value();
 }
 
+int  SourceAssetOpenDlg::sceneUnitIndex()
+{
+	return ui->cbSceneUnit->currentIndex();
+}
+
 bool SourceAssetOpenDlg::isAppend()
 {
 	return ui->checkBoxAppend->isChecked();
 }
 
+bool SourceAssetOpenDlg::isPreFractured()
+{
+	return ui->checkBoxPreFractured->isChecked();
+}
+
+bool SourceAssetOpenDlg::isAutoCompute()
+{
+	return ui->checkBoxAutoCompute->isChecked();
+}
+
 void SourceAssetOpenDlg::on_btnOpenFile_clicked()
 {
 	QString lastDir = AppMainWindow::Inst()._lastFilePath;
 	QString titleStr = "Open Source Asset File";
 
 	QString filetype = "Source Asset (*.fbx)";
-	if (m_bOpenBlastFile)
+	if (m_usefor == 1)
 	{
-		filetype = "Source Asset (*.bpxa)";
+		filetype = "Source Asset (*.blast)";
 	}
 	QString fileName = QFileDialog::getOpenFileName(this, titleStr, lastDir, filetype);
 	if (!fileName.isEmpty())
@@ -80,3 +133,19 @@ void SourceAssetOpenDlg::on_buttonBox_rejected()
 {
 
 }
+
+void SourceAssetOpenDlg::on_checkBoxPreFractured_stateChanged(int arg1)
+{
+	if (!ui->checkBoxPreFractured->isChecked())
+	{
+		ui->checkBoxAutoCompute->setChecked(false);
+	}
+}
+
+void SourceAssetOpenDlg::on_checkBoxAutoCompute_stateChanged(int arg1)
+{
+	if (ui->checkBoxAutoCompute->isChecked())
+	{
+		ui->checkBoxPreFractured->setChecked(true);
+	}
+}
\ No newline at end of file