Gittes-archive/AssetRipper_AssetRipper
2
0
Fork 0
mirror of https://github.com/AssetRipper/AssetRipper.git synced 2025-12-11 20:15:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Implement SerializedPropertyType.Int

Browse Source
This commit is contained in:
Jeremy Pritts 2023-01-21 18:54:03 -05:00
parent 1506dce0e1
commit e422e89e00
3 changed files with 35 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Source/AssetRipper.Export.Modules.Shader/IO/SerializedExtensions.cs
View File

@ -149,28 +149,25 @@ namespace AssetRipper.Export.Modules.Shaders.IO
writer.Write("{0} (\"{1}\", ", _this.NameString, _this.Description);
switch ((SerializedPropertyType)_this.Type)
switch (_this.GetType_())
{
case SerializedPropertyType.Color:
case SerializedPropertyType.Vector:
writer.Write(nameof(SerializedPropertyType.Vector));
writer.Write("Vector");
break;
case SerializedPropertyType.Int:
//case SerializedPropertyType.Float:
writer.Write(nameof(SerializedPropertyType.Float));
case SerializedPropertyType.Float:
writer.Write("Float");
break;
case SerializedPropertyType.Range:
writer.Write("{0}({1}, {2})",
nameof(SerializedPropertyType.Range),
"Range",
_this.DefValue_1_.ToString(CultureInfo.InvariantCulture),
_this.DefValue_2_.ToString(CultureInfo.InvariantCulture));
break;
case SerializedPropertyType._2D:
//case SerializedPropertyType._3D:
//case SerializedPropertyType.Cube:
case SerializedPropertyType.Texture:
switch (_this.DefTexture.TexDim)
{
case 1:
@ -183,13 +180,13 @@ namespace AssetRipper.Export.Modules.Shaders.IO
writer.Write("3D");
break;
case 4:
writer.Write(nameof(SerializedPropertyType.Cube));
writer.Write("Cube");
break;
case 5:
writer.Write("2DArray");
break;
case 6:
writer.Write(nameof(SerializedPropertyType.CubeArray));
writer.Write("CubeArray");
break;
default:
throw new NotSupportedException("Texture dimension isn't supported");
@ -197,12 +194,16 @@ namespace AssetRipper.Export.Modules.Shaders.IO
}
break;
case SerializedPropertyType.Int:
writer.Write("Int");
break;
default:
throw new NotSupportedException($"Serialized property type {_this.Type} isn't supported");
}
writer.Write(") = ");
switch ((SerializedPropertyType)_this.Type)
switch (_this.GetType_())
{
case SerializedPropertyType.Color:
case SerializedPropertyType.Vector:
@ -213,15 +214,13 @@ namespace AssetRipper.Export.Modules.Shaders.IO
_this.DefValue_3_.ToString(CultureInfo.InvariantCulture));
break;
case SerializedPropertyType.Int:
//case SerializedPropertyType.Float:
case SerializedPropertyType.Float:
case SerializedPropertyType.Range:
case SerializedPropertyType.Int:
writer.Write(_this.DefValue_0_.ToString(CultureInfo.InvariantCulture));
break;
case SerializedPropertyType._2D:
//case SerializedPropertyType._3D:
//case SerializedPropertyType.Cube:
case SerializedPropertyType.Texture:
writer.Write("\"{0}\" {{}}", _this.DefTexture.DefaultName);
break;

30
Source/AssetRipper.Export.UnityProjects/Shaders/DummyShaderTextExporter.cs
View File

@ -166,28 +166,24 @@ namespace AssetRipper.Export.UnityProjects.Shaders
writer.Write($"{_this.NameString} (\"{_this.Description}\", ");
switch ((SerializedPropertyType)_this.Type)
switch (_this.GetType_())
{
case SerializedPropertyType.Color:
case SerializedPropertyType.Vector:
writer.Write(nameof(SerializedPropertyType.Vector));
writer.Write("Vector");
break;
case SerializedPropertyType.Int:
//case SerializedPropertyType.Float:
writer.Write(nameof(SerializedPropertyType.Float));
case SerializedPropertyType.Float:
writer.Write("Float");
break;
case SerializedPropertyType.Range:
writer.Write($"{
nameof(SerializedPropertyType.Range)}({
writer.Write($"Range({
_this.DefValue_1_.ToString(CultureInfo.InvariantCulture)}, {
_this.DefValue_2_.ToString(CultureInfo.InvariantCulture)})");
break;
case SerializedPropertyType._2D:
//case SerializedPropertyType._3D:
//case SerializedPropertyType.Cube:
case SerializedPropertyType.Texture:
switch (_this.DefTexture.TexDim)
{
case 1:
@ -214,12 +210,16 @@ namespace AssetRipper.Export.UnityProjects.Shaders
}
break;
case SerializedPropertyType.Int:
writer.Write("Int");
break;
default:
throw new NotSupportedException($"Serialized property type {_this.Type} isn't supported");
}
writer.Write(") = ");
switch ((SerializedPropertyType)_this.Type)
switch (_this.GetType_())
{
case SerializedPropertyType.Color:
case SerializedPropertyType.Vector:
@ -230,15 +230,13 @@ namespace AssetRipper.Export.UnityProjects.Shaders
_this.DefValue_3_.ToString(CultureInfo.InvariantCulture)})");
break;
case SerializedPropertyType.Int:
//case SerializedPropertyType.Float:
case SerializedPropertyType.Float:
case SerializedPropertyType.Range:
case SerializedPropertyType.Int:
writer.Write(_this.DefValue_0_.ToString(CultureInfo.InvariantCulture));
break;
case SerializedPropertyType._2D:
//case SerializedPropertyType._3D:
//case SerializedPropertyType.Cube:
case SerializedPropertyType.Texture:
writer.Write($"\"{_this.DefTexture.DefaultName}\" {{}}");
break;

19
Source/AssetRipper.SourceGenerated.Extensions/Enums/Shader/SerializedShader/SerializedPropertyType.cs
View File

@ -7,21 +7,12 @@
{
Color = 0,
Vector = 1,
Int = 2,
Float = 2,
Range = 3,
_2D = 4,
_2DArray = 4,
_3D = 4,
Cube = 4,
CubeArray = 4,
}
public static class SerializedPropertyTypeExtensions
{
public static bool IsTexture(this SerializedPropertyType _this)
{
return _this == SerializedPropertyType._2D || _this == SerializedPropertyType._3D || _this == SerializedPropertyType.Cube;
}
Texture = 4,
/// <summary>
/// Added in 2021.1.0a2
/// </summary>
Int = 5,
}
}