Address Feedback

This commit is contained in:
riperiperi 2023-09-16 22:30:53 +01:00
parent 074f2602c1
commit eed8dd0646
7 changed files with 6 additions and 41 deletions

View file

@ -2,7 +2,7 @@ namespace OpenTS2.Content.DBPF
{
public struct PoolEntry
{
public int Unknown1;
public int Id;
public float XPos;
public float YPos;
public int Level;

View file

@ -6,12 +6,11 @@ namespace OpenTS2.Content.DBPF
{
public string Value;
public ushort Id;
public ushort Unknown1;
public ushort Unknown2;
public uint Unknown;
public override string ToString()
{
return $"{Value}: {Id} ({Unknown1} {Unknown2})";
return $"{Value}: {Id} ({Unknown})";
}
}

View file

@ -40,7 +40,7 @@ namespace OpenTS2.Files.Formats.DBPF
{
entries[i] = new PoolEntry()
{
Unknown1 = reader.ReadInt32(),
Id = reader.ReadInt32(),
XPos = reader.ReadFloat(),
YPos = reader.ReadFloat(),
Level = reader.ReadInt32(),

View file

@ -49,8 +49,7 @@ namespace OpenTS2.Files.Formats.DBPF
{
Value = reader.ReadVariableLengthPascalString(),
Id = reader.ReadUInt16(),
Unknown1 = reader.ReadUInt16(),
Unknown2 = reader.ReadUInt16()
Unknown = reader.ReadUInt32()
};
}

View file

@ -97,12 +97,7 @@ namespace OpenTS2.Rendering.Materials
}
}
float alpha = alphaMul * untexturedAlpha;
if (alpha != 1)
{
material.SetFloat(AlphaMultiplier, alpha);
}
material.SetFloat(AlphaMultiplier, alphaMul * untexturedAlpha);
if (bumpMapEnabled && bumpMapTexture != null)
{

View file

@ -68,25 +68,6 @@ namespace OpenTS2.Scenes.Lot
_indexBuilder.Add(baseVertex + c);
}
public void AddWindingRect(int baseVert)
{
_indexBuilder.Add(baseVert);
_indexBuilder.Add(baseVert + 1);
_indexBuilder.Add(baseVert + 4);
_indexBuilder.Add(baseVert + 1);
_indexBuilder.Add(baseVert + 2);
_indexBuilder.Add(baseVert + 4);
_indexBuilder.Add(baseVert + 2);
_indexBuilder.Add(baseVert + 3);
_indexBuilder.Add(baseVert + 4);
_indexBuilder.Add(baseVert + 3);
_indexBuilder.Add(baseVert);
_indexBuilder.Add(baseVert + 4);
}
public void Clear()
{
_vertexBuilder.Clear();

View file

@ -38,15 +38,6 @@ Shader "OpenTS2/StandardMaterial/Wall"
float4 _DiffuseCoefficient;
float4 _InvLotSize;
struct VertInput
{
float2 texcoord_MainTex : TEXCOORD1;
float2 texcoord_WallsDownTex : TEXCOORD2;
float4 vertex;
float4 tangent;
float3 normal;
};
struct Input
{
float2 uv_MainTex;