Skip to content

Commit 6eb7954

Browse files
committed
backup
1 parent 7423c15 commit 6eb7954

File tree

5 files changed

+3
-161
lines changed

5 files changed

+3
-161
lines changed

Assets/Shaders/DFs.cginc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ float ndot(float2 a, float2 b) {
5858
//cone
5959
float sdCone(float3 p, float2 c, float h)
6060
{
61+
p -= float3(0, h / 2, 0);
6162
float2 q = h * float2(c.x / c.y, -1.0);
6263

6364
float2 w = float2(length(p.xz), p.y);
@@ -137,6 +138,7 @@ float ndot(float2 a, float2 b) {
137138
//capped cone
138139
float sdCappedCone(float3 p, float h, float r1, float r2)
139140
{
141+
p -= float3(0, h / 2, 0);
140142
float2 q = float2(length(p.xz), p.y);
141143
float2 k1 = float2(r2, h);
142144
float2 k2 = float2(r2 - r1, 2.0 * h);
@@ -249,6 +251,7 @@ float ndot(float2 a, float2 b) {
249251
//pyramid
250252
float sdPyramid(float3 p, float h)
251253
{
254+
p += float3(0, h / 2, 0);
252255
float m2 = h * h + 0.25;
253256

254257
p.xz = abs(p.xz);

Logs/AssetImportWorker0-prev.log

Lines changed: 0 additions & 146 deletions
This file was deleted.
Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
Base path: 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data', plugins path 'C:/Program Files/Unity/Hub/Editor/2020.3.30f1/Editor/Data/PlaybackEngines'
22
Cmd: initializeCompiler
33

4-
Cmd: preprocess
5-
insize=11062 file=Assets/Shaders/ImageEffectRaymarcher.shader surfaceOnly=0 cachingPP=1 buildPlatform=19 pKW=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_COLORSPACE_GAMMA UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_FULL_HDR dKW=UNITY_NO_DXT5nm UNITY_ENABLE_NATIVE_SHADOW_LOOKUPS UNITY_METAL_SHADOWS_USE_POINT_FILTERING UNITY_NO_SCREENSPACE_SHADOWS UNITY_PBS_USE_BRDF2 UNITY_PBS_USE_BRDF3 UNITY_NO_FULL_STANDARD_SHADER UNITY_HARDWARE_TIER1 UNITY_HARDWARE_TIER2 UNITY_HARDWARE_TIER3 UNITY_HALF_PRECISION_FRAGMENT_SHADER_REGISTERS UNITY_LIGHTMAP_DLDR_ENCODING UNITY_LIGHTMAP_RGBM_ENCODING UNITY_VIRTUAL_TEXTURING UNITY_PRETRANSFORM_TO_DISPLAY_ORIENTATION UNITY_ASTC_NORMALMAP_ENCODING SHADER_API_GLES30 ok=1 outsize=318
6-

Logs/shadercompiler-UnityShaderCompiler.exe1.log

Lines changed: 0 additions & 6 deletions
This file was deleted.

Logs/shadercompiler-UnityShaderCompiler.exe2.log

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)