소스 검색

set scale/rotation for PC models so they're the right way up, animations still seem to be inverted though. Convert the full test set of field maps, update SUDM for blank enttiy name fix

Paul 11 년 전
부모
커밋
172b04f28e
3개의 변경된 파일18개의 추가작업 그리고 5개의 파일을 삭제
  1. 1 1
      dependencies/SUDM
  2. 15 2
      utilities/q-gears-launcher/src/ff7DataInstaller.cpp
  3. 2 2
      utilities/q-gears-launcher/src/mainwindow.cpp

+ 1 - 1
dependencies/SUDM

@@ -1 +1 @@
-Subproject commit c26c54dfd0ddfb59ec9a6699df3f275b93d81b5d
+Subproject commit 457488098c98423cae0f61ffcab63c8df2344f32

+ 15 - 2
utilities/q-gears-launcher/src/ff7DataInstaller.cpp

@@ -419,6 +419,11 @@ static void FF7PcFieldToQGearsField(
 
                 xmlEntityScript->SetAttribute("direction", "0");
 
+                // TODO: This isn't quite right, the models animation translation seems to be inverted?
+                xmlEntityScript->SetAttribute("scale", "0.03125 0.03125 0.03125");
+                xmlEntityScript->SetAttribute("root_orientation", "0.7071067811865476 0.7071067811865476 0 0");
+
+
                 element->LinkEndChild(xmlEntityScript.release());
 
             }
@@ -670,8 +675,16 @@ static bool IsAFieldFile(Ogre::String& resourceName)
 static bool IsTestField(Ogre::String& resourceName)
 {
     if (
-       // resourceName == "startmap" ||
-        resourceName == "md1stin"
+        resourceName == "startmap" ||
+        resourceName == "md1stin" ||
+        resourceName == "md1_1" ||
+        resourceName == "md1_2" ||
+        resourceName == "nmkin_1" ||
+        resourceName == "nmkin_2" ||
+        resourceName == "nmkin_3" ||
+        resourceName == "nrthmk" ||
+        resourceName == "elevtr1" ||
+        resourceName == "tin_2"
         )
     {
         return true;

+ 2 - 2
utilities/q-gears-launcher/src/mainwindow.cpp

@@ -19,7 +19,7 @@ MainWindow::MainWindow(QWidget *parent) :QMainWindow(parent), ui(new Ui::MainWin
 #ifdef _DEBUG
     // Hard coded prebaked paths for debugging to save time
     ui->lineInput->setText("C:\\Games\\FF7\\data");
-    ui->lineDataDir->setText("C:\\Users\\paul\\Desktop\\q-gears\\output\\_data");
+    ui->lineDataDir->setText("C:\\Users\\paul\\Desktop\\q-gears\\output\\data");
 #endif
 }
 
@@ -127,7 +127,7 @@ void MainWindow::on_btnGO_clicked()
 	}
 	else
 	{
-		QMessageBox::information(this,tr("Converting Data"),tr("Attempt to convert with \n Input: %1 \n Output: %2").arg(ui->lineInput->text(),ui->lineDataDir->text()));
+		//QMessageBox::information(this,tr("Converting Data"),tr("Attempt to convert with \n Input: %1 \n Output: %2").arg(ui->lineInput->text(),ui->lineDataDir->text()));
 
 		QString input = QDir::fromNativeSeparators(ui->lineInput->text());
 		if (!input.endsWith("/"))