Skip to content

Commit 9e930a1

Browse files
aniketrajnishaniketrajnish
committed
cone fix
1 parent be38796 commit 9e930a1

10 files changed

+651
-159
lines changed

‎Assets/Scenes/Test.unity‎

Lines changed: 9 additions & 150 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.91193765, g: 0.99999946, b: 0.99078685, a: 1}
41+
m_IndirectSpecularColor: {r: 0.90028226, g: 0.99999946, b: 0.9896334, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -219,153 +219,12 @@ Transform:
219219
m_PrefabAsset: {fileID: 0}
220220
m_GameObject: {fileID: 124650880}
221221
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
222-
m_LocalPosition: {x: 0, y: 1, z: -10}
222+
m_LocalPosition: {x: 0, y: 0, z: -10}
223223
m_LocalScale: {x: 1, y: 1, z: 1}
224224
m_Children: []
225225
m_Father: {fileID: 0}
226226
m_RootOrder: 0
227227
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
228-
--- !u!1 &383563496
229-
GameObject:
230-
m_ObjectHideFlags: 0
231-
m_CorrespondingSourceObject: {fileID: 0}
232-
m_PrefabInstance: {fileID: 0}
233-
m_PrefabAsset: {fileID: 0}
234-
serializedVersion: 6
235-
m_Component:
236-
- component: {fileID: 383563498}
237-
- component: {fileID: 383563497}
238-
m_Layer: 0
239-
m_Name: Shape
240-
m_TagString: Untagged
241-
m_Icon: {fileID: 0}
242-
m_NavMeshLayer: 0
243-
m_StaticEditorFlags: 0
244-
m_IsActive: 1
245-
--- !u!114 &383563497
246-
MonoBehaviour:
247-
m_ObjectHideFlags: 0
248-
m_CorrespondingSourceObject: {fileID: 0}
249-
m_PrefabInstance: {fileID: 0}
250-
m_PrefabAsset: {fileID: 0}
251-
m_GameObject: {fileID: 383563496}
252-
m_Enabled: 1
253-
m_EditorHideFlags: 0
254-
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
255-
m_Name:
256-
m_EditorClassIdentifier:
257-
shape: 1
258-
interpolation: 0
259-
color: {r: 0, g: 1, b: 0.14067984, a: 0}
260-
blendFactor: 0.1
261-
--- !u!4 &383563498
262-
Transform:
263-
m_ObjectHideFlags: 0
264-
m_CorrespondingSourceObject: {fileID: 0}
265-
m_PrefabInstance: {fileID: 0}
266-
m_PrefabAsset: {fileID: 0}
267-
m_GameObject: {fileID: 383563496}
268-
m_LocalRotation: {x: -0.067837566, y: 0.5023489, z: 0.07825369, w: 0.8584405}
269-
m_LocalPosition: {x: 0.46, y: 7.38, z: 0.71}
270-
m_LocalScale: {x: 1, y: 1, z: 1}
271-
m_Children: []
272-
m_Father: {fileID: 0}
273-
m_RootOrder: 5
274-
m_LocalEulerAnglesHint: {x: -11.25, y: 60.29, z: 3.87}
275-
--- !u!1 &501550196
276-
GameObject:
277-
m_ObjectHideFlags: 0
278-
m_CorrespondingSourceObject: {fileID: 0}
279-
m_PrefabInstance: {fileID: 0}
280-
m_PrefabAsset: {fileID: 0}
281-
serializedVersion: 6
282-
m_Component:
283-
- component: {fileID: 501550198}
284-
- component: {fileID: 501550197}
285-
m_Layer: 0
286-
m_Name: Shape
287-
m_TagString: Untagged
288-
m_Icon: {fileID: 0}
289-
m_NavMeshLayer: 0
290-
m_StaticEditorFlags: 0
291-
m_IsActive: 1
292-
--- !u!114 &501550197
293-
MonoBehaviour:
294-
m_ObjectHideFlags: 0
295-
m_CorrespondingSourceObject: {fileID: 0}
296-
m_PrefabInstance: {fileID: 0}
297-
m_PrefabAsset: {fileID: 0}
298-
m_GameObject: {fileID: 501550196}
299-
m_Enabled: 1
300-
m_EditorHideFlags: 0
301-
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
302-
m_Name:
303-
m_EditorClassIdentifier:
304-
shape: 3
305-
interpolation: 2
306-
color: {r: 0.376157, g: 0.4970232, b: 0.745283, a: 0}
307-
blendFactor: 0.1
308-
--- !u!4 &501550198
309-
Transform:
310-
m_ObjectHideFlags: 0
311-
m_CorrespondingSourceObject: {fileID: 0}
312-
m_PrefabInstance: {fileID: 0}
313-
m_PrefabAsset: {fileID: 0}
314-
m_GameObject: {fileID: 501550196}
315-
m_LocalRotation: {x: 0.0652758, y: 0.40172842, z: -0.039984085, w: 0.91255397}
316-
m_LocalPosition: {x: 2.17, y: 0.99, z: 1.88}
317-
m_LocalScale: {x: 1, y: 1, z: 1}
318-
m_Children: []
319-
m_Father: {fileID: 0}
320-
m_RootOrder: 3
321-
m_LocalEulerAnglesHint: {x: 8.7, y: 47.43, z: -1.19}
322-
--- !u!1 &1094206270
323-
GameObject:
324-
m_ObjectHideFlags: 0
325-
m_CorrespondingSourceObject: {fileID: 0}
326-
m_PrefabInstance: {fileID: 0}
327-
m_PrefabAsset: {fileID: 0}
328-
serializedVersion: 6
329-
m_Component:
330-
- component: {fileID: 1094206272}
331-
- component: {fileID: 1094206271}
332-
m_Layer: 0
333-
m_Name: Shape
334-
m_TagString: Untagged
335-
m_Icon: {fileID: 0}
336-
m_NavMeshLayer: 0
337-
m_StaticEditorFlags: 0
338-
m_IsActive: 1
339-
--- !u!114 &1094206271
340-
MonoBehaviour:
341-
m_ObjectHideFlags: 0
342-
m_CorrespondingSourceObject: {fileID: 0}
343-
m_PrefabInstance: {fileID: 0}
344-
m_PrefabAsset: {fileID: 0}
345-
m_GameObject: {fileID: 1094206270}
346-
m_Enabled: 1
347-
m_EditorHideFlags: 0
348-
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
349-
m_Name:
350-
m_EditorClassIdentifier:
351-
shape: 0
352-
interpolation: 2
353-
color: {r: 0.97791195, g: 1, b: 0.08962262, a: 0}
354-
blendFactor: 0.1
355-
--- !u!4 &1094206272
356-
Transform:
357-
m_ObjectHideFlags: 0
358-
m_CorrespondingSourceObject: {fileID: 0}
359-
m_PrefabInstance: {fileID: 0}
360-
m_PrefabAsset: {fileID: 0}
361-
m_GameObject: {fileID: 1094206270}
362-
m_LocalRotation: {x: -0.067837566, y: 0.5023489, z: 0.07825369, w: 0.8584405}
363-
m_LocalPosition: {x: 2.17, y: 0.99, z: 1.88}
364-
m_LocalScale: {x: 1, y: 1, z: 1}
365-
m_Children: []
366-
m_Father: {fileID: 0}
367-
m_RootOrder: 4
368-
m_LocalEulerAnglesHint: {x: -11.25, y: 60.29, z: 3.87}
369228
--- !u!1 &1371672095
370229
GameObject:
371230
m_ObjectHideFlags: 0
@@ -452,13 +311,13 @@ Transform:
452311
m_PrefabInstance: {fileID: 0}
453312
m_PrefabAsset: {fileID: 0}
454313
m_GameObject: {fileID: 1371672095}
455-
m_LocalRotation: {x: 0.58630663, y: 0.6006669, z: -0.4421428, w: 0.31615433}
314+
m_LocalRotation: {x: -0.114519656, y: 0.3394707, z: 0.04168174, w: 0.9326883}
456315
m_LocalPosition: {x: 4.02, y: 13.2, z: 2.5}
457316
m_LocalScale: {x: 1, y: 1, z: 1}
458317
m_Children: []
459318
m_Father: {fileID: 0}
460319
m_RootOrder: 1
461-
m_LocalEulerAnglesHint: {x: 64.407, y: 198.722, z: 100.469}
320+
m_LocalEulerAnglesHint: {x: -14, y: 40, z: 0}
462321
--- !u!1 &1649910018
463322
GameObject:
464323
m_ObjectHideFlags: 0
@@ -488,9 +347,9 @@ MonoBehaviour:
488347
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
489348
m_Name:
490349
m_EditorClassIdentifier:
491-
shape: 20
350+
shape: 26
492351
interpolation: 0
493-
color: {r: 1, g: 0, b: 0.010215759, a: 0}
352+
color: {r: 1, g: 0.504717, b: 0.504717, a: 0}
494353
blendFactor: 0.1
495354
--- !u!4 &1649910020
496355
Transform:
@@ -499,10 +358,10 @@ Transform:
499358
m_PrefabInstance: {fileID: 0}
500359
m_PrefabAsset: {fileID: 0}
501360
m_GameObject: {fileID: 1649910018}
502-
m_LocalRotation: {x: 0.64941144, y: 0.22737792, z: -0.7243872, w: 0.042746697}
503-
m_LocalPosition: {x: -4.22, y: 16.82, z: 3.02}
361+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
362+
m_LocalPosition: {x: 0, y: 0, z: 0}
504363
m_LocalScale: {x: 1, y: 1, z: 1}
505364
m_Children: []
506365
m_Father: {fileID: 0}
507366
m_RootOrder: 2
508-
m_LocalEulerAnglesHint: {x: 157.36, y: 93.3, z: -14.648}
367+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

‎Assets/Shaders/DFs.cginc‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ float ndot(float2 a, float2 b) {
3737

3838
//torus
3939
float sdTorus(float3 p, float2 s) {
40+
p = float3(p.x, p.z, -p.y);
4041
float2 w = float2(length(p.xz) - s.x, p.y);
4142
return length(w) - s.y;
4243
}
@@ -222,6 +223,7 @@ float ndot(float2 a, float2 b) {
222223
//rhombus
223224
float sdRhombus(float3 p, float la, float lb, float h, float ra)
224225
{
226+
p = float3(p.x, p.z, -p.y);
225227
p = abs(p);
226228
float2 b = float2(la, lb);
227229
float f = clamp((ndot(b, b - 2.0 * p.xz)) / dot(b, b), -1.0, 1.0);
@@ -340,5 +342,9 @@ float ndot(float2 a, float2 b) {
340342
return min(max(d.x, max(d.y, max(d.z, d.w))), 0.0) + length(max(d, 0.0));
341343
}
342344

345+
346+
347+
348+
343349

344350

‎Assets/Shaders/ImageEffectRaymarcher.shader‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,14 @@ Shader "Makra/ImageEffectRaymarcher"
1212
Pass
1313
{
1414
CGPROGRAM
15+
1516
#pragma vertex vert
1617
#pragma fragment frag
1718
#pragma target 3.0
18-
19+
1920
#include"UnityCG.cginc"
21+
22+
2023
#include"DFs.cginc"
2124

2225
#define max_steps 225
@@ -82,7 +85,7 @@ Shader "Makra/ImageEffectRaymarcher"
8285
o.ray = mul(_CamToWorld, o.ray);
8386
return o;
8487
}
85-
88+
8689
float GetDist(Shape shape, float3 p) {
8790

8891
float d = 0;
@@ -95,7 +98,7 @@ Shader "Makra/ImageEffectRaymarcher"
9598

9699
switch (shape.shapeIndex) {
97100
case 0:
98-
d = sdSphere(p, shape.dimensions.a);
101+
d = sdSphere(p, shape.dimensions.a);
99102
break;
100103
case 1:
101104
d = sdTorus(p, float2(shape.dimensions.a, shape.dimensions.b));
@@ -107,7 +110,7 @@ Shader "Makra/ImageEffectRaymarcher"
107110
d = sdLink(p, shape.dimensions.a, shape.dimensions.b, shape.dimensions.c);
108111
break;
109112
case 4:
110-
d = sdCone(p, shape.dimensions.a, float2(shape.dimensions.b, shape.dimensions.c));
113+
d = sdCone(p, float2(shape.dimensions.a, shape.dimensions.b), shape.dimensions.c);
111114
break;
112115
case 5:
113116
d = sdInfCone(p, float2(shape.dimensions.a, shape.dimensions.b));

0 commit comments

Comments
 (0)