Skip to content

Commit

Permalink
Fixes + add ymap parentIndex support
Browse files Browse the repository at this point in the history
  • Loading branch information
indilo53 committed Jun 26, 2019
1 parent f8cd2e7 commit 59d0f7e
Show file tree
Hide file tree
Showing 20 changed files with 1,662 additions and 184 deletions.
24 changes: 6 additions & 18 deletions GTAUtil.sln
Original file line number Diff line number Diff line change
@@ -1,32 +1,20 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.26403.7
# Visual Studio Version 16
VisualStudioVersion = 16.0.28803.352
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GTAUtil", "gtautil\GTAUtil.csproj", "{59E144FB-CD95-4A35-8388-56E9F474639E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|x64.ActiveCfg = Debug|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|x64.Build.0 = Debug|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|x86.ActiveCfg = Debug|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|x86.Build.0 = Debug|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|Any CPU.Build.0 = Release|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|x64.ActiveCfg = Release|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|x64.Build.0 = Release|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|x86.ActiveCfg = Release|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|x86.Build.0 = Release|Any CPU
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|x64.ActiveCfg = Debug|x64
{59E144FB-CD95-4A35-8388-56E9F474639E}.Debug|x64.Build.0 = Debug|x64
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|x64.ActiveCfg = Release|x64
{59E144FB-CD95-4A35-8388-56E9F474639E}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
38 changes: 38 additions & 0 deletions gtautil/Commandline/Options.cs
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,28 @@ public class ImportMetaOptions
{
[Option('i', "input", HelpText = "Input files")]
public List<string> InputFiles { get; set; }

[Option("metadata", Default = false, HelpText = "Generate metadata")]
public bool Metadata { get; set; }

[Option("delete", HelpText = "Entities to delete")]
public List<string> Delete { get; set; }

[Option("deletemode", Default = "delete", HelpText = "Delete mode [delete|dummy]")]
public string DeleteMode { get; set; }

[Option("deletescope", Default = "full", HelpText = "Delete mode [full|children]")]
public string DeleteScope { get; set; }
}

[Verb("exportmeta")]
public class ExportMetaOptions
{
[Option('i', "input", HelpText = "Input files")]
public List<string> InputFiles { get; set; }

[Option("metadata", Default = false, HelpText = "Parse metadata")]
public bool Metadata { get; set; }
}

[Verb("injectentities")]
Expand Down Expand Up @@ -225,6 +240,29 @@ public class GenColOptions

}

[Verb("ymaptoydr")]
public class YmapToYdrOptions
{
[Option('i', "input", HelpText = "Input file")]
public string InputFile { get; set; }

[Option('o', "output", HelpText = "Output file")]
public string OutputFile { get; set; }
}

[Verb("compiledrawableshaders")]
public class CompileDrawableShadersOptions
{

}

[Verb("daemon")]
public class DaemonOptions
{
[Option('p', "port", Default = 1337, HelpText = "Input file")]
public int Port { get; set; }
}

[Verb("test")]
public class TestOptions
{
Expand Down
6 changes: 5 additions & 1 deletion gtautil/FodyWeavers.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
<Costura />
<Costura>
<ExcludeAssemblies>
DirectXTex
</ExcludeAssemblies>
</Costura>
</Weavers>
33 changes: 19 additions & 14 deletions gtautil/GTAUtil.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,36 +31,41 @@
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<PropertyGroup>
<StartupObject>GTAUtil.Program</StartupObject>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<StartupObject>GTAUtil.Program</StartupObject>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Compile Include="Commandline\Arguments.cs" />
<Compile Include="Commandline\Commandline.cs" />
<Compile Include="Commandline\Options.cs" />
<Compile Include="Program\CompileDrawableShaders.cs" />
<Compile Include="Program\GenCol.cs" />
<Compile Include="Program\ExtractArchive.cs" />
<Compile Include="Program\CreateArchive.cs" />
<Compile Include="Program\FixArchive.cs" />
<Compile Include="Program\Deamon.cs" />
<Compile Include="Program\YmapToYdr.cs" />
<Compile Include="Program\World2MLO.cs" />
<Compile Include="Program\MoveYmap.cs" />
<Compile Include="Program\MergeYmap.cs" />
Expand Down
2 changes: 1 addition & 1 deletion gtautil/Libraries/gta-toolkit
Submodule gta-toolkit updated 27 files
+1 −0 Libraries/DirectXTex/DirectXTex.vcxproj
+1 −0 RageLib.GTA5.UnitTests/RageLib.GTA5.UnitTests.csproj
+11 −0 RageLib.GTA5.UnitTests/app.config
+20 −6 RageLib.GTA5/RageLib.GTA5.csproj
+0 −2 RageLib.GTA5/ResourceWrappers/PC/Common/Convert/MetaXmlBase.cs
+2 −2 RageLib.GTA5/ResourceWrappers/PC/Meta/Structures/MCBlockDesc.cs
+157 −23 RageLib.GTA5/ResourceWrappers/PC/Meta/Structures/MCEntityDef.cs
+93 −4 RageLib.GTA5/ResourceWrappers/PC/Meta/Structures/MCMapData.cs
+3 −3 RageLib.GTA5/Resources/PC/Drawables/ShaderFX.cs
+1,456 −0 RageLib.GTA5/Resources/PC/Drawables/VertexTypes.cs
+1,085 −0 RageLib.GTA5/Resources/PC/GameFiles/FxcFile.cs
+47 −0 RageLib.GTA5/Resources/PC/GameFiles/FxcParser.cs
+36 −36 RageLib.GTA5/Resources/PC/GameFiles/GameFileBase.cs
+2 −2 RageLib.GTA5/Resources/PC/GameFiles/Gxt2File.cs
+53 −0 RageLib.GTA5/Resources/PC/GameFiles/TxdFile.cs
+2 −2 RageLib.GTA5/Resources/PC/GameFiles/YbnFile.cs
+2 −2 RageLib.GTA5/Resources/PC/GameFiles/YddFile.cs
+2 −2 RageLib.GTA5/Resources/PC/GameFiles/YdrFile.cs
+14 −3 RageLib.GTA5/Resources/PC/GameFiles/YmapFile.cs
+2 −2 RageLib.GTA5/Resources/PC/GameFiles/YmtPedDefinitionFile.cs
+2 −2 RageLib.GTA5/Resources/PC/GameFiles/YtypFile.cs
+3 −0 RageLib.GTA5/Resources/PC/Meta/MetaStructures.cs
+11 −0 RageLib.GTA5/app.config
+6 −3 RageLib.GTA5/packages.config
+10 −2 Tools/MetaTool/App.config
+10 −2 Tools/TextureTool/App.config
+10 −2 _TestTools.GTA5/ExtractKeysFromDump/App.config
Loading

0 comments on commit 59d0f7e

Please sign in to comment.