Skip to content

Commit e76238e

Browse files
committed
cleaned up files and excludes
1 parent cd0cd68 commit e76238e

File tree

8 files changed

+47
-24
lines changed

8 files changed

+47
-24
lines changed

Diff for: .gitignore

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,4 +78,4 @@ Assets/Settings.meta
7878
bakery_times.log
7979
bakery_times.log.meta
8080
Assets/ShaderlabVSCode
81-
Assets/ShaderlabVSCode.meta
81+
Assets/ShaderlabVSCode.meta

Diff for: .hintrc

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"extends": [
3+
"development"
4+
],
5+
"hints": {
6+
"compat-api/css": [
7+
"default",
8+
{
9+
"ignore": [
10+
"aspect-ratio"
11+
]
12+
}
13+
]
14+
}
15+
}

Diff for: Assets/Tools/Editor/ReleaseExporter.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55

66
namespace ORL.Tools
77
{
8-
public class ReleaseExporter
8+
public static class ReleaseExporter
99
{
10-
private static string[] _exportFolders =
10+
private readonly static string[] _exportFolders =
1111
{
1212
"Packages/sh.orels.shaders",
1313
"Packages/sh.orels.shaders.inspector",
1414
"Packages/sh.orels.shaders.generator",
1515
};
16-
16+
1717
[MenuItem("Tools/orels1/Export Release")]
1818
private static void ExportAsUnityPackage ()
1919
{

Diff for: Packages/sh.orels.shaders.generator/Editor/Resources/ShaderTemplates/PBR.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
%Includes()
1111
{
12-
"/Packages/sh.orels.shaders/Runtime/Shaders/ORL Standard",
12+
"@/Shaders/ORL Standard",
1313
"self"
1414
}
1515

Diff for: Packages/sh.orels.shaders.generator/Editor/Resources/ShaderTemplates/Toon.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
%Includes()
1212
{
13-
"/Packages/sh.orels.shaders/Runtime/Shaders/ORL Toon",
13+
"@/Runtime/Shaders/ORL Toon",
1414
"self"
1515
}
1616

Diff for: Packages/sh.orels.shaders.generator/Editor/ShaderCreator.cs

+8-10
Original file line numberDiff line numberDiff line change
@@ -8,39 +8,38 @@
88

99
namespace ORL.ShaderGenerator
1010
{
11-
public class ShaderCreator
11+
public static class ShaderCreator
1212
{
13-
1413
[MenuItem("Assets/Create/Shader/orels1/VFX Shader", priority = 9)]
1514
private static void CreateVFXShader()
1615
{
1716
CreateShaderFromTemplate("VFX");
1817
}
19-
18+
2019
[MenuItem("Assets/Create/Shader/orels1/Transparent VFX Shader", priority = 9)]
2120
private static void CreateTransparentVFXShader()
2221
{
2322
CreateShaderFromTemplate("TransparentVFX");
2423
}
25-
24+
2625
[MenuItem("Assets/Create/Shader/orels1/PBR Shader", priority = 9)]
2726
private static void CreatePBRShader()
2827
{
2928
CreateShaderFromTemplate("PBR");
3029
}
31-
30+
3231
[MenuItem("Assets/Create/Shader/orels1/Empty PBR Shader", priority = 9)]
3332
private static void CreateEmptyPBRShader()
3433
{
3534
CreateShaderFromTemplate("EmptyPBR");
3635
}
37-
36+
3837
[MenuItem("Assets/Create/Shader/orels1/Toon Shader", priority = 9)]
3938
private static void CreateToonShader()
4039
{
4140
CreateShaderFromTemplate("Toon");
4241
}
43-
42+
4443
[MenuItem("Assets/Create/Shader/orels1/Empty Toon Shader", priority = 9)]
4544
private static void CreateEmptyToonShader()
4645
{
@@ -72,20 +71,19 @@ public override void Action(int instanceId, string pathName, string resourceFile
7271
var template = Resources.Load<TextAsset>($"ShaderTemplates/{resourceFile}");
7372
// add modules with correct paths
7473
var shaderContent = template.text;
75-
74+
7675
var name = pathName.Substring(pathName.LastIndexOf("/", StringComparison.InvariantCulture) + 1).Replace(".orlshader", "");
7776
var sanitizedName = name.Replace("/", "_").Replace(" ", "_");
7877
shaderContent = shaderContent.Replace("SHADER_NAME", name);
7978
shaderContent = shaderContent.Replace("FRAGMENT_NAME", sanitizedName + "Fragment");
8079
shaderContent = shaderContent.Replace("VERTEX_NAME", sanitizedName + "Vertex");
8180
shaderContent = shaderContent.Replace("SECTION_NAME", sanitizedName);
82-
81+
8382
File.WriteAllText(pathName, shaderContent);
8483
AssetDatabase.Refresh();
8584
Object o = AssetDatabase.LoadAssetAtPath<Object>(pathName);
8685
Selection.activeObject = o;
8786
}
8887
}
89-
9088
}
9189
}

Diff for: Packages/sh.orels.shaders.inspector/Editor/ShaderConditions/Compiler.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace ORL.ShaderConditions
77
/// Thanks to pema.dev for making me ditch my regex jank
88
/// You can find said jank here: https://gist.github.com/orels1/8e25df946b8b5d828dc2e5b0efba0af1
99
/// </summary>
10-
public class Compiler
10+
public static class Compiler
1111
{
1212
public static bool HasError;
1313

@@ -24,7 +24,7 @@ public static void Error(Token token, string error)
2424
Error(error);
2525
return;
2626
}
27-
27+
2828
Error($"'{token.Lexeme}' {error}");
2929
}
3030
}

Diff for: Packages/sh.orels.shaders.inspector/Editor/ShaderConditions/Parser.cs

+16-6
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ namespace ORL.ShaderConditions
66
{
77
public class Parser
88
{
9-
private List<Token> _tokens;
9+
private readonly List<Token> _tokens;
1010
private int _current = 0;
1111

1212
public Parser(List<Token> tokens)
1313
{
1414
_tokens = tokens;
1515
}
16-
16+
1717
public Expression Parse()
1818
{
1919
try
@@ -48,7 +48,7 @@ private Expression Or()
4848
private Expression And()
4949
{
5050
var expr = Equality();
51-
51+
5252
while (Match(TokenType.AND))
5353
{
5454
var op = Previous();
@@ -62,7 +62,7 @@ private Expression And()
6262
private Expression Equality()
6363
{
6464
var expr = Comparison();
65-
65+
6666
while (Match(TokenType.BANG_EQUAL, TokenType.EQUAL_EQUAL))
6767
{
6868
var op = Previous();
@@ -172,7 +172,7 @@ private Token Advance()
172172
if (!IsAtEnd()) _current++;
173173
return Previous();
174174
}
175-
175+
176176
private bool IsAtEnd()
177177
{
178178
return Peek().Type == TokenType.EOL;
@@ -191,6 +191,16 @@ private Token Previous()
191191

192192
public class ParserException : Exception
193193
{
194-
194+
public ParserException() : base()
195+
{
196+
}
197+
198+
public ParserException(string message) : base(message)
199+
{
200+
}
201+
202+
public ParserException(string message, Exception innerException) : base(message, innerException)
203+
{
204+
}
195205
}
196206
}

0 commit comments

Comments
 (0)