Skip to content

Commit 3e06f75

Browse files
committed
[Add] Dimensions controlled by scriptable objects, soft shadows, ambient occlusion,
1 parent 748e67d commit 3e06f75

File tree

77 files changed

+3831
-1684
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+3831
-1684
lines changed

Assets/Editor/PropertiesEditor.cs

Lines changed: 187 additions & 226 deletions
Large diffs are not rendered by default.

Assets/Scenes/Test.unity

Lines changed: 139 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ NavMeshSettings:
104104
serializedVersion: 2
105105
m_ObjectHideFlags: 0
106106
m_BuildSettings:
107-
serializedVersion: 2
107+
serializedVersion: 3
108108
agentTypeID: 0
109109
agentRadius: 0.5
110110
agentHeight: 2
@@ -117,7 +117,7 @@ NavMeshSettings:
117117
cellSize: 0.16666667
118118
manualTileSize: 0
119119
tileSize: 256
120-
accuratePlacement: 0
120+
buildHeightMesh: 0
121121
maxJobWorkers: 0
122122
preserveTilesOutsideBounds: 0
123123
debug:
@@ -154,12 +154,28 @@ MonoBehaviour:
154154
m_Script: {fileID: 11500000, guid: b51d3b1b63f090e4983f9b40bc5e24ea, type: 3}
155155
m_Name:
156156
m_EditorClassIdentifier:
157+
renderers:
158+
- {fileID: 1854160780}
159+
- {fileID: 317482175}
160+
- {fileID: 1649910019}
157161
shader: {fileID: 4800000, guid: f0ce1e6dffcb3c14da9dfdc2b0144bfc, type: 3}
158162
sun: {fileID: 1371672096}
159-
wPos: 0
160-
wRot: {x: 0, y: 0, z: 0}
161163
loop: {x: 0, y: 0, z: 0}
162-
shadow: 1
164+
isLit: 1
165+
isShadowHard: 0
166+
isAO: 1
167+
lightCol: {r: 1, g: 1, b: 1, a: 1}
168+
lightIntensity: 1.2
169+
shadowIntensity: 1
170+
shadowMin: 1
171+
shadowMax: 50
172+
shadowSmooth: 12.5
173+
AOStep: 0.25
174+
AOIntensity: 0.45
175+
AOIteration: 1
176+
maxSteps: 225
177+
maxDist: 1000
178+
surfDist: 0.01
163179
--- !u!81 &124650882
164180
AudioListener:
165181
m_ObjectHideFlags: 0
@@ -182,9 +198,17 @@ Camera:
182198
m_projectionMatrixMode: 1
183199
m_GateFitMode: 2
184200
m_FOVAxisMode: 0
201+
m_Iso: 200
202+
m_ShutterSpeed: 0.005
203+
m_Aperture: 16
204+
m_FocusDistance: 10
205+
m_FocalLength: 50
206+
m_BladeCount: 5
207+
m_Curvature: {x: 2, y: 11}
208+
m_BarrelClipping: 0.25
209+
m_Anamorphism: 0
185210
m_SensorSize: {x: 36, y: 24}
186211
m_LensShift: {x: 0, y: 0}
187-
m_FocalLength: 50
188212
m_NormalizedViewPortRect:
189213
serializedVersion: 2
190214
x: 0
@@ -219,12 +243,63 @@ Transform:
219243
m_PrefabAsset: {fileID: 0}
220244
m_GameObject: {fileID: 124650880}
221245
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
222-
m_LocalPosition: {x: 0, y: 0, z: -10}
246+
m_LocalPosition: {x: 1.7, y: 0.87, z: -10.34}
223247
m_LocalScale: {x: 1, y: 1, z: 1}
248+
m_ConstrainProportionsScale: 0
224249
m_Children: []
225250
m_Father: {fileID: 0}
226251
m_RootOrder: 0
227252
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
253+
--- !u!1 &317482174
254+
GameObject:
255+
m_ObjectHideFlags: 0
256+
m_CorrespondingSourceObject: {fileID: 0}
257+
m_PrefabInstance: {fileID: 0}
258+
m_PrefabAsset: {fileID: 0}
259+
serializedVersion: 6
260+
m_Component:
261+
- component: {fileID: 317482176}
262+
- component: {fileID: 317482175}
263+
m_Layer: 0
264+
m_Name: Shape (1)
265+
m_TagString: Untagged
266+
m_Icon: {fileID: 0}
267+
m_NavMeshLayer: 0
268+
m_StaticEditorFlags: 0
269+
m_IsActive: 1
270+
--- !u!114 &317482175
271+
MonoBehaviour:
272+
m_ObjectHideFlags: 0
273+
m_CorrespondingSourceObject: {fileID: 0}
274+
m_PrefabInstance: {fileID: 0}
275+
m_PrefabAsset: {fileID: 0}
276+
m_GameObject: {fileID: 317482174}
277+
m_Enabled: 1
278+
m_EditorHideFlags: 0
279+
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
280+
m_Name:
281+
m_EditorClassIdentifier:
282+
editorStateChange: 1
283+
shape: 1
284+
operation: 0
285+
color: {r: 0, g: 1, b: 0.24603176, a: 0}
286+
blendFactor: 0.1
287+
dimensions: {fileID: 11400000, guid: d9666fd73d33bd44a9614960176d73bb, type: 2}
288+
--- !u!4 &317482176
289+
Transform:
290+
m_ObjectHideFlags: 0
291+
m_CorrespondingSourceObject: {fileID: 0}
292+
m_PrefabInstance: {fileID: 0}
293+
m_PrefabAsset: {fileID: 0}
294+
m_GameObject: {fileID: 317482174}
295+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
296+
m_LocalPosition: {x: 2.43, y: 1.82, z: -1.63}
297+
m_LocalScale: {x: 1, y: 1, z: 1}
298+
m_ConstrainProportionsScale: 0
299+
m_Children: []
300+
m_Father: {fileID: 0}
301+
m_RootOrder: 3
302+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
228303
--- !u!1 &1371672095
229304
GameObject:
230305
m_ObjectHideFlags: 0
@@ -314,6 +389,7 @@ Transform:
314389
m_LocalRotation: {x: -0.114519656, y: 0.3394707, z: 0.04168174, w: 0.9326883}
315390
m_LocalPosition: {x: 4.02, y: 13.2, z: 2.5}
316391
m_LocalScale: {x: 1, y: 1, z: 1}
392+
m_ConstrainProportionsScale: 0
317393
m_Children: []
318394
m_Father: {fileID: 0}
319395
m_RootOrder: 1
@@ -347,10 +423,12 @@ MonoBehaviour:
347423
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
348424
m_Name:
349425
m_EditorClassIdentifier:
350-
shape: 26
351-
interpolation: 0
426+
editorStateChange: 0
427+
shape: 0
428+
operation: 0
352429
color: {r: 1, g: 0.504717, b: 0.504717, a: 0}
353-
blendFactor: 0.1
430+
blendFactor: 0
431+
dimensions: {fileID: 11400000, guid: ed1847826d7b6984e80e73d480b34418, type: 2}
354432
--- !u!4 &1649910020
355433
Transform:
356434
m_ObjectHideFlags: 0
@@ -361,7 +439,58 @@ Transform:
361439
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
362440
m_LocalPosition: {x: 0, y: 0, z: 0}
363441
m_LocalScale: {x: 1, y: 1, z: 1}
442+
m_ConstrainProportionsScale: 0
364443
m_Children: []
365444
m_Father: {fileID: 0}
366445
m_RootOrder: 2
367446
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
447+
--- !u!1 &1854160779
448+
GameObject:
449+
m_ObjectHideFlags: 0
450+
m_CorrespondingSourceObject: {fileID: 0}
451+
m_PrefabInstance: {fileID: 0}
452+
m_PrefabAsset: {fileID: 0}
453+
serializedVersion: 6
454+
m_Component:
455+
- component: {fileID: 1854160781}
456+
- component: {fileID: 1854160780}
457+
m_Layer: 0
458+
m_Name: Shape (2)
459+
m_TagString: Untagged
460+
m_Icon: {fileID: 0}
461+
m_NavMeshLayer: 0
462+
m_StaticEditorFlags: 0
463+
m_IsActive: 1
464+
--- !u!114 &1854160780
465+
MonoBehaviour:
466+
m_ObjectHideFlags: 0
467+
m_CorrespondingSourceObject: {fileID: 0}
468+
m_PrefabInstance: {fileID: 0}
469+
m_PrefabAsset: {fileID: 0}
470+
m_GameObject: {fileID: 1854160779}
471+
m_Enabled: 1
472+
m_EditorHideFlags: 0
473+
m_Script: {fileID: 11500000, guid: 99eed1c698dde9040bfd7899717f77aa, type: 3}
474+
m_Name:
475+
m_EditorClassIdentifier:
476+
editorStateChange: 1
477+
shape: 15
478+
operation: 0
479+
color: {r: 1, g: 0.9424448, b: 0, a: 0}
480+
blendFactor: 0.1
481+
dimensions: {fileID: 11400000, guid: 8226c438039ffe144b3f6960fba7e89f, type: 2}
482+
--- !u!4 &1854160781
483+
Transform:
484+
m_ObjectHideFlags: 0
485+
m_CorrespondingSourceObject: {fileID: 0}
486+
m_PrefabInstance: {fileID: 0}
487+
m_PrefabAsset: {fileID: 0}
488+
m_GameObject: {fileID: 1854160779}
489+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
490+
m_LocalPosition: {x: 2.43, y: 1.82, z: -1.63}
491+
m_LocalScale: {x: 1, y: 1, z: 1}
492+
m_ConstrainProportionsScale: 0
493+
m_Children: []
494+
m_Father: {fileID: 0}
495+
m_RootOrder: 4
496+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/ScriptableObjects.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: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 4a3b194c3b1e85344922a81a55a06bdc, type: 3}
13+
m_Name: New ShapeDimensions 1
14+
m_EditorClassIdentifier:
15+
sphereRadius: 3.08
16+
torusThickness: {x: 1.53, y: 0.31}
17+
cappedTorusRo: 0.25
18+
cappedTorusRi: 0.1
19+
cappedTorusThickness: {x: 0.1, y: 0.1}
20+
linkSeparation: 0.13
21+
linkRadius: 0.2
22+
linkThickness: 0.09
23+
coneTan: {x: 1, y: 2}
24+
coneHeight: 1
25+
infConeTan: {x: 0.1, y: 0.1}
26+
planeNormal: {x: 0, y: 0.5, z: 0.5}
27+
planeDistance: 1
28+
hexPrismH: {x: 0.25, y: 0.25}
29+
triPrismH: {x: 0.25, y: 0.25}
30+
capsuleA: {x: 0.25, y: 0.1, z: 0.25}
31+
capsuleB: {x: 0.1, y: 0.25, z: 0.25}
32+
capsuleR: 0.25
33+
infCylC: {x: 0, y: 0.25, z: 0.25}
34+
boxSize: 0.25
35+
roundBoxSize: 0.3
36+
roundBoxRoundFactor: 0.1
37+
roundCylRa: 0.25
38+
roundCylRb: 0.1
39+
roundCylH: 0.25
40+
capConeH: 0.5
41+
capConeR1: 0.5
42+
capConeR2: 0.2
43+
boxFrameSize: {x: 0.5, y: 0.3, z: 0.2}
44+
boxFrameCavity: 0.1
45+
solidAngleC: {x: 0.25, y: 0.25}
46+
solidAngleRa: 0.5
47+
cutSphereR: 0.25
48+
cutSphereH: 0.1
49+
hollowSphereR: 0.35
50+
hollowSphereH: 0.05
51+
hollowSphereT: 0.05
52+
deathStarRa: 0.5
53+
deathStarRb: 0.35
54+
deathStarD: 0.5
55+
roundConeR1: 0.1
56+
roundConeR2: 0.25
57+
roundConeH: 0.4
58+
ellipsoidRadius: {x: 0.18, y: 0.3, z: 0.1}
59+
rhombusLa: 0.6
60+
rhombusLb: 0.2
61+
rhombusH: 0.02
62+
rhombusRa: 0.02
63+
octahedronSize: 0.5
64+
pyramidSize: 0.5
65+
triangleSideA: {x: 0.3, y: 0.5, z: 0.15}
66+
triangleSideB: {x: 0.8, y: 0.2, z: 0.1}
67+
triangleSideC: {x: 0.7, y: 0.3, z: 0.5}
68+
quadSideA: {x: 0.3, y: 0.5, z: 0.15}
69+
quadSideB: {x: 0.8, y: 0.2, z: 0}
70+
quadSideC: {x: 0.9, y: 0.3, z: 0.5}
71+
quadSideD: {x: 0.1, y: 0.2, z: 0.5}
72+
fractalI: 10
73+
fractalS: 1.25
74+
fractalO: 2
75+
tesseractSize: {x: 0.25, y: 0.25, z: 0.25, w: 0.25}
76+
hyperSphereRadius: 0.5
77+
duoCylR1R2: {x: 0.5, y: 0.5}
78+
vertCapsuleH: 0.5
79+
vertCapsuleR: 0.5
80+
fiveCellA: {x: 0.5, y: 0.5, z: 0.5, w: 0.5}
81+
sixteenCellS: 0.5

Assets/ScriptableObjects/New ShapeDimensions 1.asset.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: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 4a3b194c3b1e85344922a81a55a06bdc, type: 3}
13+
m_Name: New ShapeDimensions 2
14+
m_EditorClassIdentifier:
15+
sphereRadius: 0.5
16+
torusThickness: {x: 0.4, y: 0.1}
17+
cappedTorusRo: 0.25
18+
cappedTorusRi: 0.1
19+
cappedTorusThickness: {x: 0.1, y: 0.1}
20+
linkSeparation: 0.13
21+
linkRadius: 0.2
22+
linkThickness: 0.09
23+
coneTan: {x: 1, y: 2}
24+
coneHeight: 1
25+
infConeTan: {x: 0.1, y: 0.1}
26+
planeNormal: {x: 0, y: 0.5, z: 0.5}
27+
planeDistance: 1
28+
hexPrismH: {x: 0.25, y: 0.25}
29+
triPrismH: {x: 0.25, y: 0.25}
30+
capsuleA: {x: 0.25, y: 0.1, z: 0.25}
31+
capsuleB: {x: 0.1, y: 0.25, z: 0.25}
32+
capsuleR: 0.25
33+
infCylC: {x: 0, y: 0.25, z: 0.25}
34+
boxSize: 0.25
35+
roundBoxSize: 0.3
36+
roundBoxRoundFactor: 0.1
37+
roundCylRa: 0.25
38+
roundCylRb: 0.1
39+
roundCylH: 0.25
40+
capConeH: 0.5
41+
capConeR1: 0.5
42+
capConeR2: 0.2
43+
boxFrameSize: {x: 3.75, y: 2.12, z: 1.01}
44+
boxFrameCavity: 0.1
45+
solidAngleC: {x: 0.25, y: 0.25}
46+
solidAngleRa: 0.5
47+
cutSphereR: 0.25
48+
cutSphereH: 0.1
49+
hollowSphereR: 0.35
50+
hollowSphereH: 0.05
51+
hollowSphereT: 0.05
52+
deathStarRa: 0.5
53+
deathStarRb: 0.35
54+
deathStarD: 0.5
55+
roundConeR1: 0.1
56+
roundConeR2: 0.25
57+
roundConeH: 0.4
58+
ellipsoidRadius: {x: 0.18, y: 0.3, z: 0.1}
59+
rhombusLa: 0.6
60+
rhombusLb: 0.2
61+
rhombusH: 0.02
62+
rhombusRa: 0.02
63+
octahedronSize: 0.5
64+
pyramidSize: 0.5
65+
triangleSideA: {x: 0.3, y: 0.5, z: 0.15}
66+
triangleSideB: {x: 0.8, y: 0.2, z: 0.1}
67+
triangleSideC: {x: 0.7, y: 0.3, z: 0.5}
68+
quadSideA: {x: 0.3, y: 0.5, z: 0.15}
69+
quadSideB: {x: 0.8, y: 0.2, z: 0}
70+
quadSideC: {x: 0.9, y: 0.3, z: 0.5}
71+
quadSideD: {x: 0.1, y: 0.2, z: 0.5}
72+
fractalI: 10
73+
fractalS: 1.25
74+
fractalO: 2
75+
tesseractSize: {x: 0.25, y: 0.25, z: 0.25, w: 0.25}
76+
hyperSphereRadius: 0.5
77+
duoCylR1R2: {x: 0.5, y: 0.5}
78+
vertCapsuleH: 0.5
79+
vertCapsuleR: 0.5
80+
fiveCellA: {x: 0.5, y: 0.5, z: 0.5, w: 0.5}
81+
sixteenCellS: 0.5

0 commit comments

Comments
 (0)