ZeroDream/CodeWalker
2
0
Fork 0
mirror of https://mirror.ghproxy.com/https://github.com/dexyfex/CodeWalker synced 2026-05-16 19:19:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed casing issues with MetaNames which probably was causing XML issues. Moved shader param names to new ShaderParamNames enum to preserve casing. Moved meta type names to new MetaTypeName enum to avoid polluting MetaNames.

Browse Source
This commit is contained in:
dexy
2019-10-31 17:11:12 +11:00
Unverified
parent 262e6666c9
commit 4834b8c520
25 changed files with 3728 additions and 2272 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Rendering/Shaders/BasicShader.cs
+15 -15
View File
@@ -159,7 +159,7 @@ namespace CodeWalker.Rendering
public int RenderVertexColourIndex = 1;
public int RenderTextureCoordIndex = 1;
public int RenderTextureSamplerCoord = 1;
public MetaName RenderTextureSampler = MetaName.DiffuseSampler;
public ShaderParamNames RenderTextureSampler = ShaderParamNames.DiffuseSampler;
public bool SpecularEnable = true;
@@ -549,21 +549,21 @@ namespace CodeWalker.Rendering
if (itex.Key?.NameHash == 1678728908 /*"blank"*/) continue;
switch (ihash)
{
case MetaName.DiffuseSampler:
case MetaName.PlateBgSampler:
case ShaderParamNames.DiffuseSampler:
case ShaderParamNames.PlateBgSampler:
texture = itex;
break;
case MetaName.BumpSampler:
case MetaName.PlateBgBumpSampler:
case ShaderParamNames.BumpSampler:
case ShaderParamNames.PlateBgBumpSampler:
bumptex = itex;
break;
case MetaName.SpecSampler:
case ShaderParamNames.SpecSampler:
spectex = itex;
break;
case MetaName.DetailSampler:
case ShaderParamNames.DetailSampler:
detltex = itex;
break;
case MetaName.TintPaletteSampler:
case ShaderParamNames.TintPaletteSampler:
tintpal = itex;
if (tintpal.Key != null)
{
@@ -571,24 +571,24 @@ namespace CodeWalker.Rendering
tntpalind = (VSEntityVars.Vars.TintPaletteIndex + 0.5f) / tintpal.Key.Height;
}
break;
case MetaName.distanceMapSampler:
case ShaderParamNames.distanceMapSampler:
texture = itex;
isdistmap = true;
break;
case MetaName.DiffuseSampler2:
case ShaderParamNames.DiffuseSampler2:
texture2 = itex;
break;
case MetaName.heightSampler:
case MetaName.EnvironmentSampler:
case ShaderParamNames.heightSampler:
case ShaderParamNames.EnvironmentSampler:
//case MetaName.SnowSampler0:
//case MetaName.SnowSampler1:
//case MetaName.DiffuseSampler3:
//case MetaName.DirtSampler:
//case MetaName.DirtBumpSampler:
break;
case MetaName.FlowSampler:
case MetaName.FogSampler:
case MetaName.FoamSampler:
case ShaderParamNames.FlowSampler:
case ShaderParamNames.FogSampler:
case ShaderParamNames.FoamSampler:
if (texture == null) texture = itex;
break;
default:
Rendering/Shaders/CableShader.cs
+2 -2
View File
@@ -76,7 +76,7 @@ namespace CodeWalker.Rendering
public int RenderVertexColourIndex = 1;
public int RenderTextureCoordIndex = 1;
public int RenderTextureSamplerCoord = 1;
public MetaName RenderTextureSampler = MetaName.DiffuseSampler;
public ShaderParamNames RenderTextureSampler = ShaderParamNames.DiffuseSampler;
private Dictionary<VertexType, InputLayout> layouts = new Dictionary<VertexType, InputLayout>();
@@ -230,7 +230,7 @@ namespace CodeWalker.Rendering
var ihash = geom.TextureParamHashes[i];
switch (ihash)
{
case MetaName.DiffuseSampler:
case ShaderParamNames.DiffuseSampler:
texture = itex;
break;
}
Rendering/Shaders/CloudsShader.cs
+7 -7
View File
@@ -241,25 +241,25 @@ namespace CodeWalker.Rendering
var ihash = geom.TextureParamHashes[i];
switch (ihash)
{
case MetaName.DensitySampler:
case ShaderParamNames.DensitySampler:
DensitySampler = itex;
break;
case MetaName.normalSampler:
case ShaderParamNames.normalSampler:
NormalSampler = itex;
break;
case MetaName.DetailDensitySampler:
case ShaderParamNames.DetailDensitySampler:
DetailDensitySampler = itex;
break;
case MetaName.DetailNormalSampler:
case ShaderParamNames.DetailNormalSampler:
DetailNormalSampler = itex;
break;
case MetaName.DetailDensity2Sampler:
case ShaderParamNames.DetailDensity2Sampler:
DetailDensity2Sampler = itex;
break;
case MetaName.DetailNormal2Sampler:
case ShaderParamNames.DetailNormal2Sampler:
DetailNormal2Sampler = itex;
break;
case MetaName.DepthMapTexSampler:
case ShaderParamNames.DepthMapTexSampler:
DepthMapTexSampler = itex;
break;
default:
Rendering/Shaders/ShadowShader.cs
+5 -5
View File
@@ -213,11 +213,11 @@ namespace CodeWalker.Rendering
var ihash = geom.TextureParamHashes[i];
switch (ihash)
{
case MetaName.DiffuseSampler:
case MetaName.TextureSampler_layer0:
case MetaName.TextureSampler_layer1:
case MetaName.TextureSampler_layer2:
case MetaName.TextureSampler_layer3:
case ShaderParamNames.DiffuseSampler:
case ShaderParamNames.TextureSampler_layer0:
case ShaderParamNames.TextureSampler_layer1:
case ShaderParamNames.TextureSampler_layer2:
case ShaderParamNames.TextureSampler_layer3:
texture = itex;
break;
}
Rendering/Shaders/TerrainShader.cs
+19 -19
View File
@@ -92,7 +92,7 @@ namespace CodeWalker.Rendering
public int RenderVertexColourIndex = 1;
public int RenderTextureCoordIndex = 1;
public int RenderTextureSamplerCoord = 1;
public MetaName RenderTextureSampler = MetaName.DiffuseSampler;
public ShaderParamNames RenderTextureSampler = ShaderParamNames.DiffuseSampler;
private Dictionary<VertexType, InputLayout> layouts = new Dictionary<VertexType, InputLayout>();
@@ -298,13 +298,13 @@ namespace CodeWalker.Rendering
case WorldRenderMode.SingleTexture:
switch (RenderTextureSampler)
{
case MetaName.DiffuseSampler:
case ShaderParamNames.DiffuseSampler:
rendermode = 5;
break;
case MetaName.BumpSampler:
case ShaderParamNames.BumpSampler:
rendermode = 6;
break;
case MetaName.SpecSampler:
case ShaderParamNames.SpecSampler:
rendermode = 7;
break;
default:
@@ -387,40 +387,40 @@ namespace CodeWalker.Rendering
var ihash = geom.TextureParamHashes[i];
switch (ihash)
{
case MetaName.DiffuseSampler:
case ShaderParamNames.DiffuseSampler:
texture0 = itex;
break;
case MetaName.TextureSampler_layer0:
case ShaderParamNames.TextureSampler_layer0:
texture1 = itex;
break;
case MetaName.TextureSampler_layer1:
case ShaderParamNames.TextureSampler_layer1:
texture2 = itex;
break;
case MetaName.TextureSampler_layer2:
case ShaderParamNames.TextureSampler_layer2:
texture3 = itex;
break;
case MetaName.TextureSampler_layer3:
case ShaderParamNames.TextureSampler_layer3:
texture4 = itex;
break;
case MetaName.BumpSampler:
case ShaderParamNames.BumpSampler:
normals0 = itex;
break;
case MetaName.BumpSampler_layer0:
case ShaderParamNames.BumpSampler_layer0:
normals1 = itex;
break;
case MetaName.BumpSampler_layer1:
case ShaderParamNames.BumpSampler_layer1:
normals2 = itex;
break;
case MetaName.BumpSampler_layer2:
case ShaderParamNames.BumpSampler_layer2:
normals3 = itex;
break;
case MetaName.BumpSampler_layer3:
case ShaderParamNames.BumpSampler_layer3:
normals4 = itex;
break;
case MetaName.lookupSampler:
case ShaderParamNames.lookupSampler:
texturemask = itex;
break;
case MetaName.TintPaletteSampler:
case ShaderParamNames.TintPaletteSampler:
tintpal = itex;
if (tintpal.Key != null)
{
@@ -494,9 +494,9 @@ namespace CodeWalker.Rendering
usevc = false;
switch (RenderTextureSampler)
{
case MetaName.DiffuseSampler:
case MetaName.BumpSampler:
case MetaName.SpecSampler:
case ShaderParamNames.DiffuseSampler:
case ShaderParamNames.BumpSampler:
case ShaderParamNames.SpecSampler:
break;
default:
for (int i = 0; i < geom.RenderableTextures.Length; i++)
Rendering/Shaders/TreesLodShader.cs
+7 -7
View File
@@ -189,14 +189,14 @@ namespace CodeWalker.Rendering
for (int i = 0; i < nparams; i++)
{
var h = shader.ParametersList.Hashes[i];
var h = (ShaderParamNames)shader.ParametersList.Hashes[i];
switch (h)
{
case MetaName.AlphaTest: VSGeomVars.Vars.AlphaTest = (Vector4)sparams[i].Data; break;
case MetaName.AlphaScale: VSGeomVars.Vars.AlphaScale = (Vector4)sparams[i].Data; break;
case MetaName.UseTreeNormals: VSGeomVars.Vars.UseTreeNormals = (Vector4)sparams[i].Data; break;
case MetaName.treeLod2Normal: VSGeomVars.Vars.treeLod2Normal = (Vector4)sparams[i].Data; break;
case MetaName.treeLod2Params: VSGeomVars.Vars.treeLod2Params = (Vector4)sparams[i].Data; break;
case ShaderParamNames.AlphaTest: VSGeomVars.Vars.AlphaTest = (Vector4)sparams[i].Data; break;
case ShaderParamNames.AlphaScale: VSGeomVars.Vars.AlphaScale = (Vector4)sparams[i].Data; break;
case ShaderParamNames.UseTreeNormals: VSGeomVars.Vars.UseTreeNormals = (Vector4)sparams[i].Data; break;
case ShaderParamNames.treeLod2Normal: VSGeomVars.Vars.treeLod2Normal = (Vector4)sparams[i].Data; break;
case ShaderParamNames.treeLod2Params: VSGeomVars.Vars.treeLod2Params = (Vector4)sparams[i].Data; break;
}
}
@@ -222,7 +222,7 @@ namespace CodeWalker.Rendering
var ihash = geom.TextureParamHashes[i];
switch (ihash)
{
case MetaName.DiffuseSampler:
case ShaderParamNames.DiffuseSampler:
texture = itex;
break;
}
Rendering/Shaders/WaterShader.cs
+6 -6
View File
@@ -103,7 +103,7 @@ namespace CodeWalker.Rendering
public int RenderVertexColourIndex = 1;
public int RenderTextureCoordIndex = 1;
public int RenderTextureSamplerCoord = 1;
public MetaName RenderTextureSampler = MetaName.DiffuseSampler;
public ShaderParamNames RenderTextureSampler = ShaderParamNames.DiffuseSampler;
public double CurrentRealTime = 0;
public float CurrentElapsedTime = 0;
public bool SpecularEnable = true;
@@ -351,19 +351,19 @@ namespace CodeWalker.Rendering
if (itex == null) continue;
switch (ihash)
{
case MetaName.DiffuseSampler:
case ShaderParamNames.DiffuseSampler:
texture = itex;
break;
case MetaName.BumpSampler:
case ShaderParamNames.BumpSampler:
bumptex = itex;
break;
case MetaName.FlowSampler:
case ShaderParamNames.FlowSampler:
flowtex = itex;
break;
case MetaName.FoamSampler:
case ShaderParamNames.FoamSampler:
foamtex = itex;
break;
case MetaName.FogSampler:
case ShaderParamNames.FogSampler:
fogtex = itex;
break;
default: