Merge pull request #5 from OpenDriver2/level_viewer

Rewrite of LEV file loaders, addition of Level viewer and complete world exporting

Author: SoapyMan

.appveyor/AfterBuild.bat

@@ -3,6 +3,7 @@
 set config=Debug:Release
 for %%c in (%config::= %) do (
     cd %project_folder%\DriverLevelTool\bin\%%c
+	copy %windows_sdl2_dir%\lib\x86\SDL2.dll SDL2.dll /Y
 
     xcopy /e /v %data_folder% .\ /Y
     7z a "DriverLevelTool_%%c.zip" ".\*"

.appveyor/Build.bat

@@ -2,6 +2,8 @@
 
 cd %project_folder%
 
+set SDL2_DIR=%windows_sdl2_dir%
+
 premake5 vs2019
 
 set config=Debug:Release

.appveyor/Install.bat

@@ -2,3 +2,6 @@
 
 appveyor DownloadFile %windows_premake_url% -FileName premake5.zip
 7z x premake5.zip -o%project_folder% -aoa
+
+appveyor DownloadFile %windows_sdl2_url% -FileName SDL2.zip
+7z x SDL2.zip -o%dependency_folder%

.appveyor/Install.sh

@@ -8,6 +8,9 @@ cd "$APPVEYOR_BUILD_FOLDER"
 curl "$linux_premake_url" -Lo premake5.tar.gz
 tar xvf premake5.tar.gz
 
+sudo apt-get update
+
 sudo apt-get install -qq \
-    g++-multilib -y
+    libsdl2-dev \
+    g++-multilib -y \
 

Driver2CutsceneTool/cutscene_tool.cpp

@@ -326,7 +326,7 @@ void PackCutsceneFile(const char* foldername)
 
 				// shrink size
 				repsizes[i] -= sizeof(PLAYBACKCAMERA) * MAX_REPLAY_CAMERAS;
-				MsgAccept("\Shinking '%s', now %d bytes\n", folderPath, repsizes[i]);
+				MsgAccept("\tShrinking '%s', now %d bytes\n", folderPath, repsizes[i]);
 			}
 		}
 		else
@@ -434,8 +434,8 @@ void PackCutsceneFile(const char* foldername)
 void PrintCommandLineArguments()
 {
 	MsgInfo("Example usage:\n");
-	MsgInfo("\tDriverCutsceneTool -unpack CUT2.R\n");
-	MsgInfo("\tDriverCutsceneTool -pack CUT2\n");
+	MsgInfo("\tDriver2CutsceneTool -unpack CUT2.R\n");
+	MsgInfo("\tDriver2CutsceneTool -pack CUT2\n");
 }
 
 int main(int argc, char** argv)

Driver2MissionTool/mission_tool.cpp

@@ -0,0 +1,68 @@
+#include <math.h>
+
+#include <malloc.h>
+#include "core/VirtualStream.h"
+#include "core/cmdlib.h"
+#include "math/dktypes.h"
+#include "util/image.h"
+#include "util/util.h"
+#include <string>
+#include <DriverLevelTool/driver_routines/d2_types.h>
+
+//----------------------------------------------------
+
+void CompileMissionBlk(const char* filename)
+{
+}
+
+void DecompileMissionBlk(const char* filename, int missionNumber)
+{
+	if (missionNumber <= 0) // decompile all
+	{
+
+	}
+}
+
+//-----------------------------------------------------
+
+void PrintCommandLineArguments()
+{
+	MsgInfo("Example usage:\n");
+	MsgInfo("\tDriver2MissionTool -decompile MISSIONS.BLK [mission_number]\n");
+	MsgInfo("\tDriver2MissionTool -compile <mission_script_name.d2ms>\n");
+}
+
+int main(int argc, char** argv)
+{
+#ifdef _WIN32
+	Install_ConsoleSpewFunction();
+#endif
+
+	Msg("---------------\nDriverMissionTool - Driver 2 mission decompiler\n---------------\n\n");
+
+	if (argc <= 1)
+	{
+		PrintCommandLineArguments();
+		return -1;
+	}
+
+	for (int i = 0; i < argc; i++)
+	{
+		if (!stricmp(argv[i], "-compile"))
+		{
+			if (i + 1 <= argc)
+				CompileMissionBlk(argv[i + 1]);
+			else
+				MsgWarning("-compile must have an argument!");
+		}
+		else if (!stricmp(argv[i], "-decompile"))
+		{
+			if (i + 1 <= argc)
+				DecompileMissionBlk(argv[i + 1], atoi(argv[i + 2]));
+			else
+				MsgWarning("-decompile must have at least one argument!");
+		}
+	}
+
+	return 0;
+}

Driver2MissionTool/premake5.lua

@@ -0,0 +1,31 @@
+-- premake5.lua
+
+project "Driver2MissionTool"
+    kind "ConsoleApp"
+    language "C++"
+    compileas "C++"
+    targetdir "bin/%{cfg.buildcfg}"
+
+    files {
+        "**.cpp",
+        "**.h",
+    }
+        
+    filter "system:linux"
+        buildoptions {
+            "-Wno-narrowing",
+            "-fpermissive",
+            "-m32"
+        }
+        
+        linkoptions {
+            "-m32"
+        }
+        
+    filter "configurations:Debug"
+		targetsuffix "_dbg"
+		 symbols "On"
+
+    filter "configurations:Release"
+        optimize "Full"
+	

DriverLevelTool/driver_level.cpp

@@ -4,6 +4,7 @@
 
 #include "model_compiler/compiler.h"
 #include "util/util.h"
+#include "viewer/viewer.h"
 
 bool g_export_carmodels = false;
 bool g_export_models = false;
@@ -133,6 +134,7 @@ void PrintCommandLineArguments()
 	const char* argumentsMessage =
 		"Example: DriverLevelTool <command> [arguments]\n\n\n"
 		"  -lev <filename.LEV> \t: Specify level file you want to input\n\n"
+		"  -viewer \t: Enables level file viewer\n\n"
 		"  -format <n> \t: Specify level format. 1 = Driver 1, 2 = Driver 2 Demo (alpha 1.6), 3 = Driver 2 Retail\n\n"
 		"  -textures <1/0> \t: Export textures (TGA)\n\n"
 		"  -models <1/0> \t: Export models (OBJ\n\n"
@@ -162,11 +164,15 @@ int main(int argc, char* argv[])
 	}
 
 	bool generate_denting = false;
-	bool do_main_routine = true;
+	int main_routine = 1;
 
 	for (int i = 1; i < argc; i++)
 	{
-		if (!stricmp(argv[i], "-format"))
+		if (!stricmp(argv[i], "-viewer"))
+		{
+			main_routine = 2;
+		}
+		else if (!stricmp(argv[i], "-format"))
 		{
 			g_format = (ELevelFormat)atoi(argv[i + 1]);
 			i++;
@@ -213,7 +219,7 @@ int main(int argc, char* argv[])
 		else if (!stricmp(argv[i], "-dmodel2obj"))
 		{
 			ConvertDModelFileToOBJ(argv[i + 1], argv[i + 2]);
-			do_main_routine = false;
+			main_routine = 0;
 			i += 2;
 		}
 		else if (!stricmp(argv[i], "-denting"))
@@ -223,7 +229,7 @@ int main(int argc, char* argv[])
 		else if (!stricmp(argv[i], "-compiledmodel"))
 		{
 			CompileOBJModelToDMODEL(argv[i + 1], argv[i + 2], generate_denting);
-			do_main_routine = false;
+			main_routine = 0;
 			generate_denting = false; // disable denting compiler after it's job done
 			i += 2;
 		}
@@ -241,8 +247,10 @@ int main(int argc, char* argv[])
 		return 0;
 	}
 
-	if(do_main_routine)
+	if (main_routine == 1)
 		ProcessLevFile(g_levname.c_str());
+	else if (main_routine == 2)
+		ViewerMain(g_levname.c_str());
 
 	return 0;
 }

DriverLevelTool/driver_level.h

@@ -22,15 +22,19 @@
 // extern some vars
 extern IVirtualStream*			g_levStream;
 
+extern CDriverLevelTextures		g_levTextures;
+extern CDriverLevelModels		g_levModels;
+extern CBaseLevelMap*			g_levMap;
+
 //----------------------------------------------------------
 
 void	ExportDMODELToOBJ(MODEL* model, const char* model_name, int model_index, int modelSize);
 void	WriteMODELToObjStream(IVirtualStream* pStream, MODEL* model, int modelSize, int model_index, const char* name_prefix,
 			bool debugInfo = true,
 			const Matrix4x4& translation = identity4(),
-			int* first_v = NULL,
-			int* first_t = NULL,
-			RegionModels_t* regModels = NULL);
+			int* first_v = nullptr,
+			int* first_t = nullptr,
+			RegionModels_t* regModels = nullptr);
 
 //----------------------------------------------------------
 // main functions

DriverLevelTool/driver_routines/d2_types.h

@@ -63,18 +63,18 @@ typedef struct dlevinfo_t
 //------------------------------------------------------------------------------------------------------------
 
 struct OUT_CELL_FILE_HEADER {
-	int cells_across; // size=0, offset=0
-	int cells_down; // size=0, offset=4
-	int cell_size; // size=0, offset=8
+	int cells_across;
+	int cells_down;
+	int cell_size;
 
-	int num_regions; // size=0, offset=12
-	int region_size; // size=0, offset=16
+	int num_regions;
+	int region_size;
 
-	int num_cell_objects; // size=0, offset=20
-	int num_cell_data; // size=0, offset=24
+	int num_cell_objects;
+	int num_cell_data;
 
-	int ambient_light_level; // size=0, offset=28
-	struct VECTOR_NOPAD light_source; // size=12, offset=32
+	int ambient_light_level;
+	VECTOR_NOPAD light_source;
 };
 
 //------------------------------------------------------------------------------------------------------------
@@ -192,6 +192,7 @@ struct POLYGT4
 	CVECTOR color;
 };
 
+#if 0
 enum ModelFlags1	// collision flags?
 {
 	everything = 1,
@@ -231,6 +232,31 @@ enum ModelFlags2	// effect flags?
 	dontKnow15 = 16384, // ??? again: many sidewalks, some grass
 	sidewalk = 32768
 };
+#else
+enum ModelShapeFlags
+{
+	SHAPE_FLAG_SMASH_QUIET = 0x8,
+	SHAPE_FLAG_NOCOLLIDE = 0x10,
+	SHAPE_FLAG_SUBSURFACE = 0x80,		// grass, dirt, water
+	SHAPE_FLAG_ALLEYWAY = 0x400,	// alleyway
+	SHAPE_FLAG_SMASH_SPRITE = 0x4000,
+};
+
+enum ModelFlags2
+{
+	MODEL_FLAG_ANIMOBJ = 0x1,
+	MODEL_FLAG_MEDIAN = 0x20,
+	MODEL_FLAG_ALLEY = 0x80,
+	MODEL_FLAG_HASROOF = 0x100,
+	MODEL_FLAG_NOCOL_200 = 0x200,
+	MODEL_FLAG_BARRIER = 0x400,
+	MODEL_FLAG_SMASHABLE = 0x800,
+	MODEL_FLAG_LAMP = 0x1000,
+	MODEL_FLAG_TREE = 0x2000,
+	MODEL_FLAG_GRASS = 0x4000,
+	MODEL_FLAG_SIDEWALK = 0x8000,
+};
+#endif
 
 struct MODEL
 {
@@ -259,6 +285,11 @@ struct MODEL
 	}
 
 	SVECTOR* pNormal(int i) const
+	{
+		return (SVECTOR*)(((ubyte*)this) + normals) + i;
+	}
+	
+	SVECTOR* pPointNormal(int i) const
 	{
 		return (SVECTOR *)(((ubyte *)this) + point_normals) + i;
 	}
@@ -332,4 +363,19 @@ struct Spool {
 
 #define REGION_EMPTY	(0xFFFF)
 
+struct PALLET_INFO
+{
+	int palette;
+	int texnum;
+	int tpage;
+	int clut_number;
+};
+
+struct PALLET_INFO_D1
+{
+	int palette;
+	int texnum;
+	int tpage;
+};
+
 #endif