Cutscene exporter fix, texture header

3 files changed, 178 insertions, 46 deletions

diff --git a/OTRExporter/CutsceneExporter.cpp b/OTRExporter/CutsceneExporter.cpp
index da6e6bf..040fde4 100644
--- a/OTRExporter/CutsceneExporter.cpp
+++ b/OTRExporter/CutsceneExporter.cpp
@@ -19,13 +19,15 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 
 	for (size_t i = 0; i < cs->commands.size(); i++)
 	{
-		switch ((CutsceneCommands)cs->commands[i]->commandID)
+		switch (cs->commands[i]->commandID)
 		{
-		case CutsceneCommands::SetCameraPos:
+		case (uint32_t)CutsceneCommands::SetCameraPos:
 		{
+			CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i];
+
 			writer->Write(CS_CMD_CAM_EYE);
 			writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame));
-			writer->Write(CMD_HH(0x0000, ((CutsceneCommandSetCameraPos*)cs->commands[i])->endFrame));
+			writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000));
 
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
@@ -36,11 +38,13 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 		}
 		break;
-		case CutsceneCommands::SetCameraFocus:
+		case (uint32_t)CutsceneCommands::SetCameraFocus:
 		{
+			CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i];
+
 			writer->Write(CS_CMD_CAM_AT);
-			writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame));
-			writer->Write(CMD_HH(0x0000, ((CutsceneCommandSetCameraPos*)cs->commands[i])->endFrame));
+			writer->Write(CMD_HH(0x0001, cmdCamPos->startFrame));
+			writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000));
 
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
@@ -51,10 +55,10 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::SpecialAction:
+		case (uint32_t)CutsceneCommands::SpecialAction:
 		{
 			writer->Write(CS_CMD_MISC);
-			writer->Write(CMD_W(((CutsceneCommandSpecialAction*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandSpecialAction*)cs->commands[i])->entries.size()));
 			for (auto& e : ((CutsceneCommandSpecialAction*)cs->commands[i])->entries) //All in OOT seem to only have 1 entry
 			{
 				writer->Write(CMD_HH(e->base, e->startFrame));
@@ -72,10 +76,10 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::SetLighting:
+		case (uint32_t)CutsceneCommands::SetLighting:
 		{
 			writer->Write(CS_CMD_SET_LIGHTING);
-			writer->Write(CMD_W(((CutsceneCommandEnvLighting*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandEnvLighting*)cs->commands[i])->entries.size()));
 			for (auto& e : ((CutsceneCommandEnvLighting*)cs->commands[i])->entries)
 			{
 				writer->Write(CMD_HH(e->setting, e->startFrame));
@@ -93,11 +97,13 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::SetCameraPosLink:
+		case (uint32_t)CutsceneCommands::SetCameraPosLink:
 		{
+			CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i];
+
 			writer->Write(CS_CMD_CAM_EYE_REL_TO_PLAYER);
 			writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame));
-			writer->Write(CMD_HH(0x0000, ((CutsceneCommandSetCameraPos*)cs->commands[i])->endFrame));
+			writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000));
 
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
@@ -108,11 +114,13 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::SetCameraFocusLink:
+		case (uint32_t)CutsceneCommands::SetCameraFocusLink:
 		{
+			CutsceneCommandSetCameraPos* cmdCamPos = (CutsceneCommandSetCameraPos*)cs->commands[i];
+
 			writer->Write(CS_CMD_CAM_AT_REL_TO_PLAYER);
 			writer->Write(CMD_HH(0x0001, ((CutsceneCommandSetCameraPos*)cs->commands[i])->startFrame));
-			writer->Write(CMD_HH(0x0000, ((CutsceneCommandSetCameraPos*)cs->commands[i])->endFrame));
+			writer->Write(CMD_HH(cmdCamPos->endFrame, 0x0000));
 
 			for (auto& e : ((CutsceneCommandSetCameraPos*)cs->commands[i])->entries)
 			{
@@ -124,15 +132,15 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			break;
 		}
 
-		case CutsceneCommands::Cmd07: // Not used in OOT
+		case (uint32_t)CutsceneCommands::Cmd07: // Not used in OOT
 			break;
-		case CutsceneCommands::Cmd08: // Not used in OOT
+		case (uint32_t)CutsceneCommands::Cmd08: // Not used in OOT
 			break;
 
-		case CutsceneCommands::Cmd09:
+		case (uint32_t)CutsceneCommands::Cmd09:
 		{
 			writer->Write(CS_CMD_09);
-			writer->Write(CMD_W(((CutsceneCommandUnknown9*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandUnknown9*)cs->commands[i])->entries.size()));
 
 			for (auto& e : ((CutsceneCommandUnknown9*)cs->commands[i])->entries)
 			{
@@ -143,10 +151,10 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			break;
 		}
 
-		case CutsceneCommands::Textbox:
+		case (uint32_t)CutsceneCommands::Textbox:
 		{
 			writer->Write(CS_CMD_TEXTBOX);
-			writer->Write(CMD_W(((CutsceneCommandTextbox*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandTextbox*)cs->commands[i])->entries.size()));
 
 			for (auto& e : ((CutsceneCommandTextbox*)cs->commands[i])->entries)
 			{
@@ -165,22 +173,128 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::SetActorAction0:
-		case CutsceneCommands::SetActorAction1:
-		case CutsceneCommands::SetActorAction2:
-		case CutsceneCommands::SetActorAction3:
-		case CutsceneCommands::SetActorAction4:
-		case CutsceneCommands::SetActorAction5:
-		case CutsceneCommands::SetActorAction6:
-		case CutsceneCommands::SetActorAction7:
-		case CutsceneCommands::SetActorAction8:
-		case CutsceneCommands::SetActorAction9:
-		case CutsceneCommands::SetActorAction10:
+		case (uint32_t)CutsceneCommands::SetActorAction0:
+		case (uint32_t)CutsceneCommands::SetActorAction1:
+		case 17:
+		case 18:
+		case 23:
+		case 34:
+		case 39:
+		case 46:
+		case 76:
+		case 85:
+		case 93:
+		case 105:
+		case 107:
+		case 110:
+		case 119:
+		case 123:
+		case 138:
+		case 139:
+		case 144:
+		case (uint32_t)CutsceneCommands::SetActorAction2:
+		case 16:
+		case 24:
+		case 35:
+		case 40:
+		case 48:
+		case 64:
+		case 68:
+		case 70:
+		case 78:
+		case 80:
+		case 94:
+		case 116:
+		case 118:
+		case 120:
+		case 125:
+		case 131:
+		case 141:
+		case (uint32_t)CutsceneCommands::SetActorAction3:
+		case 36:
+		case 41:
+		case 50:
+		case 67:
+		case 69:
+		case 72:
+		case 74:
+		case 81:
+		case 106:
+		case 117:
+		case 121:
+		case 126:
+		case 132:
+		case (uint32_t)CutsceneCommands::SetActorAction4:
+		case 37:
+		case 42:
+		case 51:
+		case 53:
+		case 63:
+		case 65:
+		case 66:
+		case 75:
+		case 82:
+		case 108:
+		case 127:
+		case 133:
+		case (uint32_t)CutsceneCommands::SetActorAction5:
+		case 38:
+		case 43:
+		case 47:
+		case 54:
+		case 79:
+		case 83:
+		case 128:
+		case 135:
+		case (uint32_t)CutsceneCommands::SetActorAction6:
+		case 55:
+		case 77:
+		case 84:
+		case 90:
+		case 129:
+		case 136:
+		case (uint32_t)CutsceneCommands::SetActorAction7:
+		case 52:
+		case 57:
+		case 58:
+		case 88:
+		case 115:
+		case 130:
+		case 137:
+		case (uint32_t)CutsceneCommands::SetActorAction8:
+		case 60:
+		case 89:
+		case 111:
+		case 114:
+		case 134:
+		case 142:
+		case (uint32_t)CutsceneCommands::SetActorAction9:
+		case (uint32_t)CutsceneCommands::SetActorAction10:
 		{
 			// OTRTODO this one is weird
+			// Why is this one weird Louist? - Matt Damon
+			writer->Write((uint32_t)(CutsceneCommands)cs->commands[i]->commandID);
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandActorAction*)cs->commands[i])->entries.size()));
+
+			for (auto& actorAct : ((CutsceneCommandActorAction*)cs->commands[i])->entries)
+			{
+				writer->Write(CMD_HH(actorAct->action, actorAct->startFrame));
+				writer->Write(CMD_HH(actorAct->endFrame, actorAct->rotX));
+				writer->Write(CMD_HH(actorAct->rotY, actorAct->rotZ));
+				writer->Write(CMD_W(actorAct->startPosX));
+				writer->Write(CMD_W(actorAct->startPosY));
+				writer->Write(CMD_W(actorAct->startPosZ));
+				writer->Write(CMD_W(actorAct->endPosX));
+				writer->Write(CMD_W(actorAct->endPosY));
+				writer->Write(CMD_W(actorAct->endPosZ));
+				writer->Write(CMD_W(actorAct->normalX));
+				writer->Write(CMD_W(actorAct->normalY));
+				writer->Write(CMD_W(actorAct->normalZ));
+			}
+
 			break;
 		}
-		case CutsceneCommands::SetSceneTransFX:
+		case (uint32_t)CutsceneCommands::SetSceneTransFX:
 		{
 			CutsceneCommandSceneTransFX* cmdTFX = (CutsceneCommandSceneTransFX*)cs->commands[i];
 
@@ -190,12 +304,12 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			writer->Write(CMD_HH((((CutsceneCommandSceneTransFX*)cs->commands[i])->endFrame), ((CutsceneCommandSceneTransFX*)cs->commands[i])->endFrame));
 			break;
 		}
-		case CutsceneCommands::Nop: //Not used in OOT
+		case (uint32_t)CutsceneCommands::Nop: //Not used in OOT
 			break;
-		case CutsceneCommands::PlayBGM:
+		case (uint32_t)CutsceneCommands::PlayBGM:
 		{
 			writer->Write(CS_CMD_PLAYBGM);
-			writer->Write(CMD_W(((CutsceneCommandPlayBGM*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandPlayBGM*)cs->commands[i])->entries.size()));
 
 			for (auto& e : ((CutsceneCommandPlayBGM*)cs->commands[i])->entries)
 			{
@@ -213,10 +327,10 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::StopBGM:
+		case (uint32_t)CutsceneCommands::StopBGM:
 		{
 			writer->Write(CS_CMD_STOPBGM);
-			writer->Write(CMD_W(((CutsceneCommandStopBGM*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandStopBGM*)cs->commands[i])->entries.size()));
 
 			for (auto& e : ((CutsceneCommandStopBGM*)cs->commands[i])->entries)
 			{
@@ -234,10 +348,10 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::FadeBGM:
+		case (uint32_t)CutsceneCommands::FadeBGM:
 		{
 			writer->Write(CS_CMD_FADEBGM);
-			writer->Write(CMD_W(((CutsceneCommandFadeBGM*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandFadeBGM*)cs->commands[i])->entries.size()));
 
 			for (auto& e : ((CutsceneCommandFadeBGM*)cs->commands[i])->entries)
 			{
@@ -255,10 +369,10 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::SetTime:
+		case (uint32_t)CutsceneCommands::SetTime:
 		{
 			writer->Write(CS_CMD_SETTIME);
-			writer->Write(CMD_W(((CutsceneCommandDayTime*)cs->commands[i])->entries.size()));
+			writer->Write((uint32_t)CMD_W(((CutsceneCommandDayTime*)cs->commands[i])->entries.size()));
 
 			for (auto& e : ((CutsceneCommandDayTime*)cs->commands[i])->entries)
 			{
@@ -268,7 +382,7 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			}
 			break;
 		}
-		case CutsceneCommands::Terminator:
+		case (uint32_t)CutsceneCommands::Terminator:
 		{
 			writer->Write(CS_CMD_TERMINATOR);
 			writer->Write((uint32_t)1);
@@ -276,6 +390,12 @@ void OTRExporter_Cutscene::Save(ZResource* res, fs::path outPath, BinaryWriter*
 			writer->Write(CMD_HH(((CutsceneCommandTerminator*)cs->commands[i])->endFrame, ((CutsceneCommandTerminator*)cs->commands[i])->endFrame));
 			break;
 		}
+		default:
+		{
+			//writer->Write((uint32_t)cs->commands[i]->commandID);
+			printf("Undefined CS Opcode: %04X\n", cs->commands[i]->commandID);
+		}
+			break;
 		}
 	}
 
diff --git a/OTRExporter/TextureExporter.cpp b/OTRExporter/TextureExporter.cpp
index ada7c15..aaa7a4e 100644
--- a/OTRExporter/TextureExporter.cpp
+++ b/OTRExporter/TextureExporter.cpp
@@ -5,9 +5,17 @@ void OTRExporter_Texture::Save(ZResource* res, fs::path outPath, BinaryWriter* w
 {
 	ZTexture* tex = (ZTexture*)res;
 	
+	WriteHeader(tex, outPath, writer, Ship::ResourceType::Texture);
+
 	auto start = std::chrono::steady_clock::now();
 
 	//printf("Exporting Texture %s\n", tex->GetName().c_str());
+	
+	writer->Write((uint32_t)tex->GetTextureType());
+	writer->Write((uint32_t)tex->GetWidth());
+	writer->Write((uint32_t)tex->GetHeight());
+
+	writer->Write((uint32_t)tex->GetRawDataSize());
 
 	auto data = tex->parent->GetRawData();
 
diff --git a/OTRExporter/command_macros_base.h b/OTRExporter/command_macros_base.h
index bd9ac16..18c1222 100644
--- a/OTRExporter/command_macros_base.h
+++ b/OTRExporter/command_macros_base.h
@@ -11,13 +11,17 @@
 #define _SHIFTR(v, s, w)    \
     ((unsigned int)(((unsigned int)(v) >> (s)) & ((0x01 << (w)) - 1)))
 
-#define CMD_BBBB(a, b, c, d) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 8, 8) | _SHIFTL(d, 0, 8))
+//#define CMD_BBBB(a, b, c, d) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 8, 8) | _SHIFTL(d, 0, 8))
+#define CMD_BBBB(a, b, c, d) (_SHIFTL(d, 24, 8) | _SHIFTL(c, 16, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(a, 0, 8))
 
-#define CMD_BBH(a, b, c) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 0, 16))
+//#define CMD_BBH(a, b, c) (_SHIFTL(a, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 0, 16))
+#define CMD_BBH(a, b, c) (_SHIFTL(a, 0, 8) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 16, 16))
 
-#define CMD_HBB(a, b, c) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 0, 8))
+//#define CMD_HBB(a, b, c) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 8, 8) | _SHIFTL(c, 0, 8))
+#define CMD_HBB(a, b, c) (_SHIFTL(c, 24, 8) | _SHIFTL(b, 16, 8) | _SHIFTL(c, 0, 16))
 
-#define CMD_HH(a, b) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 0, 16))
+//#define CMD_HH(a, b) (_SHIFTL(a, 16, 16) | _SHIFTL(b, 0, 16))
+#define CMD_HH(a, b) (_SHIFTL(b, 16, 16) | _SHIFTL(a, 0, 16))
 
 #define CMD_W(a) (a)