Skip to content

Commit b49760a

Browse files
committed
Create PortingFromGLSL.cginc
1 parent 81564e8 commit b49760a

File tree

6 files changed

+41
-7
lines changed

6 files changed

+41
-7
lines changed

.idea/.idea.unity-demoscene/.idea/contentModel.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Demoscene/Projects/2018-07-10-Cellular/Cellular.shader

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#pragma multi_compile_fog
1919

2020
#include "UnityCG.cginc"
21+
#include "Assets/Demoscene/Shaders/Includes/PortingFromGLSL.cginc"
2122

2223
struct appdata
2324
{
@@ -35,13 +36,6 @@
3536
sampler2D _MainTex;
3637
float4 _MainTex_ST;
3738

38-
// porting from GLSL
39-
#define vec2 float2
40-
#define vec3 float3
41-
#define vec4 float4
42-
#define mod(x, y) (x - y * floor(x / y))
43-
#define fract frac
44-
4539
// https://thebookofshaders.com/edit.php#12/3d-cnoise.frag
4640
vec3 permute(vec3 x) {
4741
return mod((34.0 * x + 1.0) * x, 289.0);

Assets/Demoscene/Shaders.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Demoscene/Shaders/Includes.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#ifndef __PORTING_FROM_GLSL__
2+
#define __PORTING_FROM_GLSL__
3+
4+
#define vec2 float2
5+
#define vec3 float3
6+
#define vec4 float4
7+
#define mod(x, y) (x - y * floor(x / y))
8+
#define fract frac
9+
10+
#endif

Assets/Demoscene/Shaders/Includes/PortingFromGLSL.cginc.meta

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)