diff --git a/.gitattributes b/.gitattributes index 1ff0c42..7ef431e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -3,61 +3,9 @@ ############################################################################### * text=auto -############################################################################### -# Set default behavior for command prompt diff. -# -# This is need for earlier builds of msysgit that does not have it on by -# default for csharp files. -# Note: This is only used by command line -############################################################################### -#*.cs diff=csharp - -############################################################################### -# Set the merge driver for project and solution files -# -# Merging from the command prompt will add diff markers to the files if there -# are conflicts (Merging from VS is not affected by the settings below, in VS -# the diff markers are never inserted). Diff markers may cause the following -# file extensions to fail to load in VS. An alternative would be to treat -# these files as binary and thus will always conflict and require user -# intervention with every merge. To do so, just uncomment the entries below -############################################################################### -#*.sln merge=binary -#*.csproj merge=binary -#*.vbproj merge=binary -#*.vcxproj merge=binary -#*.vcproj merge=binary -#*.dbproj merge=binary -#*.fsproj merge=binary -#*.lsproj merge=binary -#*.wixproj merge=binary -#*.modelproj merge=binary -#*.sqlproj merge=binary -#*.wwaproj merge=binary - -############################################################################### -# behavior for image files -# -# image files are treated as binary by default. -############################################################################### -#*.jpg binary -#*.png binary -#*.gif binary - -############################################################################### -# diff behavior for common document formats -# -# Convert binary document formats to text before diffing them. This feature -# is only available from the command line. Turn it on by uncommenting the -# entries below. -############################################################################### -#*.doc diff=astextplain -#*.DOC diff=astextplain -#*.docx diff=astextplain -#*.DOCX diff=astextplain -#*.dot diff=astextplain -#*.DOT diff=astextplain -#*.pdf diff=astextplain -#*.PDF diff=astextplain -#*.rtf diff=astextplain -#*.RTF diff=astextplain +# Collapse Unity-generated files on GitHub +*.asset linguist-generated +*.mat linguist-generated +*.meta linguist-generated +*.prefab linguist-generated +*.unity linguist-generated diff --git a/Assets/Scenes/TerrainTest.unity b/Assets/Scenes/TerrainTest.unity new file mode 100644 index 0000000..70239c7 --- /dev/null +++ b/Assets/Scenes/TerrainTest.unity @@ -0,0 +1,392 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 0 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 1 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 2 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &52438836 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 52438839} + - component: {fileID: 52438838} + - component: {fileID: 52438837} + - component: {fileID: 52438840} + m_Layer: 0 + m_Name: Terrain + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!154 &52438837 +TerrainCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52438836} + m_Material: {fileID: 0} + m_Enabled: 1 + m_TerrainData: {fileID: 0} + m_EnableTreeColliders: 1 +--- !u!218 &52438838 +Terrain: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52438836} + m_Enabled: 1 + serializedVersion: 6 + m_TerrainData: {fileID: 0} + m_TreeDistance: 5000 + m_TreeBillboardDistance: 50 + m_TreeCrossFadeLength: 5 + m_TreeMaximumFullLODCount: 50 + m_DetailObjectDistance: 80 + m_DetailObjectDensity: 1 + m_HeightmapPixelError: 5 + m_SplatMapDistance: 1000 + m_HeightmapMaximumLOD: 0 + m_ShadowCastingMode: 2 + m_DrawHeightmap: 1 + m_DrawInstanced: 0 + m_DrawTreesAndFoliage: 1 + m_ReflectionProbeUsage: 1 + m_MaterialTemplate: {fileID: 10652, guid: 0000000000000000f000000000000000, type: 0} + m_BakeLightProbesForTrees: 1 + m_PreserveTreePrototypeLayers: 0 + m_DeringLightProbesForTrees: 1 + m_ScaleInLightmap: 1 + m_LightmapParameters: {fileID: 15203, guid: 0000000000000000f000000000000000, type: 0} + m_GroupingID: 0 + m_RenderingLayerMask: 1 + m_AllowAutoConnect: 0 +--- !u!4 &52438839 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52438836} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &52438840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 52438836} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3019e4c10bf13742ac5872f0a25a439, type: 3} + m_Name: + m_EditorClassIdentifier: + terrain: {fileID: 52438838} + PackageToLoad: '%UserDataDir%/Neighborhoods/N001/N001_Neighborhood.package' +--- !u!1 &738411850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 738411853} + - component: {fileID: 738411852} + - component: {fileID: 738411851} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &738411851 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 738411850} + m_Enabled: 1 +--- !u!20 &738411852 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 738411850} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &738411853 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 738411850} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 53.1, z: -148.7} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1363103650 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1363103652} + - component: {fileID: 1363103651} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!108 &1363103651 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1363103650} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 1 + m_Shape: 0 + m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.05 + m_NormalBias: 0.4 + m_NearPlane: 0.2 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 +--- !u!4 &1363103652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1363103650} + m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} diff --git a/Assets/Scenes/TerrainTest.unity.meta b/Assets/Scenes/TerrainTest.unity.meta new file mode 100644 index 0000000..750e96c --- /dev/null +++ b/Assets/Scenes/TerrainTest.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0282b053b65b2c04580624faa6ff0056 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/OpenTS2/Content/DBPF/NeighborhoodTerrainAsset.cs b/Assets/Scripts/OpenTS2/Content/DBPF/NeighborhoodTerrainAsset.cs new file mode 100644 index 0000000..687cf93 --- /dev/null +++ b/Assets/Scripts/OpenTS2/Content/DBPF/NeighborhoodTerrainAsset.cs @@ -0,0 +1,41 @@ +using System; +using OpenTS2.Files.Formats.DBPF.Types; +using UnityEngine; + +namespace OpenTS2.Content.DBPF +{ + public class NeighborhoodTerrainAsset : AbstractAsset + { + public int Width { get; } + public int Height { get; } + public float SeaLevel { get; } + public string TerrainType { get; } + public FloatArray2D VertexHeights { get; } + + public NeighborhoodTerrainAsset(int width, int height, float seaLevel, string terrainType, + FloatArray2D vertexHeights) => + (Width, Height, SeaLevel, TerrainType, VertexHeights) = + (width, height, seaLevel, terrainType, vertexHeights); + + public void ApplyToTerrain(Terrain terrain) + { + var heightMap = new float[VertexHeights.values.GetLength(1), VertexHeights.values.GetLength(0)]; + for (var i = 0; i < VertexHeights.values.GetLength(0); i++) + { + for (var j = 0; j < VertexHeights.values.GetLength(1); j++) + { + // TODO: divide by the max-height here to get a proper 0 to 1 float. Picked 600 arbitrarily for now. + heightMap[j, i] = VertexHeights.values[i, j] / 600.0f; + } + } + + terrain.terrainData = new TerrainData + { + size = new Vector3(4096, 4096, 4096), + heightmapResolution = Math.Max(VertexHeights.values.GetLength(0), VertexHeights.values.GetLength(1)) + }; + terrain.terrainData.SetHeights(0, 0, heightMap); + terrain.terrainData.SyncHeightmap(); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Content/DBPF/NeighborhoodTerrainAsset.cs.meta b/Assets/Scripts/OpenTS2/Content/DBPF/NeighborhoodTerrainAsset.cs.meta new file mode 100644 index 0000000..68d5535 --- /dev/null +++ b/Assets/Scripts/OpenTS2/Content/DBPF/NeighborhoodTerrainAsset.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2a47e5fcb9ae45528d7838e6be7813a2 +timeCreated: 1676439919 \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Engine/Tests/TerrainTestScript.cs b/Assets/Scripts/OpenTS2/Engine/Tests/TerrainTestScript.cs new file mode 100644 index 0000000..0cdc3bd --- /dev/null +++ b/Assets/Scripts/OpenTS2/Engine/Tests/TerrainTestScript.cs @@ -0,0 +1,29 @@ +using System.IO; +using OpenTS2.Common; +using OpenTS2.Content; +using OpenTS2.Content.DBPF; +using OpenTS2.Files.Formats.DBPF; +using UnityEngine; + +public class TerrainTestScript : MonoBehaviour +{ + public Terrain terrain; + + public string PackageToLoad = "%UserDataDir%/Neighborhoods/N001/N001_Neighborhood.package"; + + // Start is called before the first frame update + void Start() + { + var contentProvider = ContentProvider.Get(); + contentProvider.AddPackage(PackageToLoad); + + // Use N001_Neighborhood etc as the group name. + var groupName = Path.GetFileNameWithoutExtension(PackageToLoad); + + var terrainAsset = + contentProvider.GetAsset( + new ResourceKey(0x0, groupName, TypeIDs.NHOOD_TERRAIN)); + terrainAsset.ApplyToTerrain(terrain); + } + +} \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Engine/Tests/TerrainTestScript.cs.meta b/Assets/Scripts/OpenTS2/Engine/Tests/TerrainTestScript.cs.meta new file mode 100644 index 0000000..a9b79fa --- /dev/null +++ b/Assets/Scripts/OpenTS2/Engine/Tests/TerrainTestScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a3019e4c10bf13742ac5872f0a25a439 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/GroupsTypes.cs b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/GroupsTypes.cs index 467dc0a..516846a 100644 --- a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/GroupsTypes.cs +++ b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/GroupsTypes.cs @@ -20,6 +20,8 @@ namespace OpenTS2.Files.Formats.DBPF /// public const uint SCENEGRAPH_TXTR = Scenegraph.Block.ImageDataBlock.TYPE_ID; public const uint SCENEGRAPH_LIFO = Scenegraph.Block.MipLevelInfoBlock.TYPE_ID; + + public const uint NHOOD_TERRAIN = 0xABCB5DA4; public const uint STR = 0x53545223; public const uint IMG = 0x856DDBAC; diff --git a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/NeighborhoodTerrainCodec.cs b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/NeighborhoodTerrainCodec.cs new file mode 100644 index 0000000..5a9f1d8 --- /dev/null +++ b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/NeighborhoodTerrainCodec.cs @@ -0,0 +1,50 @@ +using System; +using System.IO; +using OpenTS2.Common; +using OpenTS2.Content; +using OpenTS2.Content.DBPF; +using OpenTS2.Files.Formats.DBPF.Types; +using OpenTS2.Files.Utils; +using UnityEngine; + +namespace OpenTS2.Files.Formats.DBPF +{ + /// + /// Neighborhood geometry/terrain file reading codec. + /// + [Codec(TypeIDs.NHOOD_TERRAIN)] + public class NeighborhoodTerrainCodec : AbstractCodec + { + public override AbstractAsset Deserialize(byte[] bytes, ResourceKey tgi, DBPFFile sourceFile) + { + var stream = new MemoryStream(bytes); + var reader = IoBuffer.FromStream(stream, ByteOrder.LITTLE_ENDIAN); + + var classId = reader.ReadUInt32(); + if (classId != TypeIDs.NHOOD_TERRAIN) + { + throw new ArgumentException($"Neighborhood terrain id not {TypeIDs.NHOOD_TERRAIN:X}"); + } + + var version = reader.ReadUInt32(); + + var width = reader.ReadInt32(); + var height = reader.ReadInt32(); + + var seaLevel = reader.ReadFloat(); + + // Versions below this don't actually carry the terrain data! Don't think those exist + // in the wild so just throw an exception if we encounter one of them. + if (version <= 2) + { + throw new ArgumentException($"Neighorhood terrain version too old {version}"); + } + + + var terrainType = reader.ReadUint32PrefixedString(); + var vertexHeights = FloatArray2D.Deserialize(reader); + + return new NeighborhoodTerrainAsset(width, height, seaLevel, terrainType, vertexHeights); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/NeighborhoodTerrainCodec.cs.meta b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/NeighborhoodTerrainCodec.cs.meta new file mode 100644 index 0000000..33f4d68 --- /dev/null +++ b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/NeighborhoodTerrainCodec.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f8031349945148259e02cd93c08ecfd5 +timeCreated: 1676439315 \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types.meta b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types.meta new file mode 100644 index 0000000..15ae47c --- /dev/null +++ b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: f8ca0187939346d2b6c3a983e8693900 +timeCreated: 1676491071 \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types/FloatArray2D.cs b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types/FloatArray2D.cs new file mode 100644 index 0000000..95e4b86 --- /dev/null +++ b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types/FloatArray2D.cs @@ -0,0 +1,50 @@ +using System; +using OpenTS2.Files.Utils; +using UnityEngine; + +namespace OpenTS2.Files.Formats.DBPF.Types +{ + public struct FloatArray2D + { + private const uint TypeId = 0x6b943b43; + private const string TypeName = "c2DArray"; + + public readonly float[,] values; + + public FloatArray2D(float[,] values) + { + this.values = values; + } + + public override string ToString() + { + return $"FloatArray2D({nameof(values)}: {values})"; + } + + public static FloatArray2D Deserialize(IoBuffer reader) + { + var id = reader.ReadUInt32(); + if (id != TypeId) + { + throw new ArgumentException($"FloatArray2D has wrong id {id:x}"); + } + + var version = reader.ReadUInt32(); + Debug.Assert(version == 1, "Wrong version for FloatArray2D"); + + var name = reader.ReadUint32PrefixedString(); + Debug.Assert(name == TypeName, "Wrong type name for FloatArray2D"); + + var width = reader.ReadInt32(); + var height = reader.ReadInt32(); + + var values = new float[width, height]; + for (var i = 0; i < width * height; i++) + { + values[i % width, i / width] = reader.ReadFloat(); + } + + return new FloatArray2D(values); + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types/FloatArray2D.cs.meta b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types/FloatArray2D.cs.meta new file mode 100644 index 0000000..537abd3 --- /dev/null +++ b/Assets/Scripts/OpenTS2/Files/Formats/DBPF/Types/FloatArray2D.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 08850cbef6834f8bb9509c0eed1c4966 +timeCreated: 1676491104 \ No newline at end of file diff --git a/Assets/Scripts/OpenTS2/Files/Utils/IoBuffer.cs b/Assets/Scripts/OpenTS2/Files/Utils/IoBuffer.cs index 01a8607..551e0e9 100644 --- a/Assets/Scripts/OpenTS2/Files/Utils/IoBuffer.cs +++ b/Assets/Scripts/OpenTS2/Files/Utils/IoBuffer.cs @@ -246,6 +246,16 @@ namespace OpenTS2.Files.Utils return Encoding.ASCII.GetString(Reader.ReadBytes(length)); } + /// + /// Reads a string whose length is prefixed by a uint32. + /// + /// A string. + public string ReadUint32PrefixedString() + { + var length = ReadInt32(); + return Encoding.ASCII.GetString(Reader.ReadBytes(length)); + } + /// /// Reads a C string from the current stream. ///