From a6dabb6760aeeffd0ebbe3c962e32da0f04f3ad3 Mon Sep 17 00:00:00 2001 From: CrispyPin Date: Sat, 10 Aug 2024 03:04:46 +0200 Subject: [PATCH] add bocs shader --- Assets/raymarched/Raymarching.unity | 283 ++++++++++++++++-- Assets/raymarched/bocs.mat | 84 ++++++ Assets/raymarched/bocs.mat.meta | 8 + Assets/raymarched/bocs.shader | 89 ++++++ Assets/raymarched/bocs.shader.meta | 9 + .../com.unity.services.core/Settings.json | 0 ProjectSettings/SceneTemplateSettings.json | 121 ++++++++ UserSettings/EditorUserSettings.asset | 3 + 8 files changed, 577 insertions(+), 20 deletions(-) create mode 100644 Assets/raymarched/bocs.mat create mode 100644 Assets/raymarched/bocs.mat.meta create mode 100644 Assets/raymarched/bocs.shader create mode 100644 Assets/raymarched/bocs.shader.meta create mode 100644 ProjectSettings/Packages/com.unity.services.core/Settings.json create mode 100644 ProjectSettings/SceneTemplateSettings.json diff --git a/Assets/raymarched/Raymarching.unity b/Assets/raymarched/Raymarching.unity index 19136dd..23b212a 100644 --- a/Assets/raymarched/Raymarching.unity +++ b/Assets/raymarched/Raymarching.unity @@ -38,12 +38,11 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.12732331, g: 0.13415194, b: 0.12107967, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: m_ObjectHideFlags: 0 - serializedVersion: 11 + serializedVersion: 12 m_GIWorkflowMode: 1 m_GISettings: serializedVersion: 2 @@ -98,7 +97,7 @@ LightmapSettings: m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 + m_LightingSettings: {fileID: 0} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -118,6 +117,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 debug: m_Flags: 0 m_NavMeshData: {fileID: 0} @@ -148,6 +149,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 4 @@ -208,6 +210,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 831474226} m_RootOrder: 0 @@ -223,10 +226,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -251,6 +256,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &249645328 MeshFilter: m_ObjectHideFlags: 0 @@ -296,6 +302,8 @@ MonoBehaviour: type: 3 objectId: d31bcc3e-72e6-4cc9-a179-62e88e68def5 randomNum: 15360929 + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &297009271 MonoBehaviour: m_ObjectHideFlags: 0 @@ -333,6 +341,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!65 &297009273 BoxCollider: @@ -358,10 +367,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -386,6 +397,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &297009275 MeshFilter: m_ObjectHideFlags: 0 @@ -404,6 +416,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 2, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 11 @@ -435,6 +448,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 8 @@ -503,6 +517,8 @@ MonoBehaviour: type: 3 objectId: 7271f6d6-1e8e-4444-8501-e33df2aad6db randomNum: + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &365616532 MonoBehaviour: m_ObjectHideFlags: 0 @@ -546,10 +562,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -574,6 +592,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &365616536 MeshFilter: m_ObjectHideFlags: 0 @@ -592,6 +611,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -5, y: 2.5, z: 5} m_LocalScale: {x: 5, y: 5, z: 5} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 9 @@ -623,6 +643,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 7 @@ -686,6 +707,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.5, y: 0.4, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 831474226} m_Father: {fileID: 779234489} @@ -715,10 +737,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -743,6 +767,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &453749075 MeshFilter: m_ObjectHideFlags: 0 @@ -788,6 +813,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!1 &683266143 GameObject: @@ -835,10 +861,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -863,6 +891,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &683266146 MeshFilter: m_ObjectHideFlags: 0 @@ -879,8 +908,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 683266143} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -3.25} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 5 @@ -900,6 +930,8 @@ MonoBehaviour: type: 3 objectId: 19ac0a45-6040-4093-92d0-0499e618a878 randomNum: 77173865 + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &683266149 MonoBehaviour: m_ObjectHideFlags: 0 @@ -937,6 +969,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!1 &703968045 GameObject: @@ -965,6 +998,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 6 @@ -1034,6 +1068,8 @@ MonoBehaviour: type: 3 objectId: 267a3820-e773-4d80-aa35-8f7551bc813a randomNum: 70263921 + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &772903852 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1071,6 +1107,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!65 &772903854 BoxCollider: @@ -1096,10 +1133,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1124,6 +1163,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &772903856 MeshFilter: m_ObjectHideFlags: 0 @@ -1142,6 +1182,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.75, y: 0, z: 1.75} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 10 @@ -1175,6 +1216,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 884043982} - {fileID: 453749072} @@ -1203,6 +1245,8 @@ MonoBehaviour: type: 3 objectId: d51b36f3-30c8-4e23-9277-34168a3024b4 randomNum: + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &779234491 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1268,7 +1312,7 @@ MonoBehaviour: preGeneratedInstanceId: --- !u!95 &779234492 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1281,10 +1325,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &831474225 GameObject: m_ObjectHideFlags: 0 @@ -1312,6 +1358,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 249645325} m_Father: {fileID: 453749072} @@ -1357,6 +1404,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1764646628} m_Father: {fileID: 950930977} @@ -1375,6 +1423,162 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: type: RaymarcherObjectB +--- !u!1 &853608959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 853608966} + - component: {fileID: 853608965} + - component: {fileID: 853608964} + - component: {fileID: 853608963} + - component: {fileID: 853608962} + - component: {fileID: 853608961} + - component: {fileID: 853608960} + m_Layer: 0 + m_Name: Raymarch Bocs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &853608960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 990f6f4efb7f4ec98ad99f6dff1bc6f6, type: 3} + m_Name: + m_EditorClassIdentifier: + type: 3 + objectId: e51ea4c1-d42c-4790-91a1-78d2bf6fef59 + randomNum: 24286039 + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 +--- !u!114 &853608961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a37fd8d654d5c2840a0ab3a5ad65a5ae, type: 3} + m_Name: + m_EditorClassIdentifier: + spawnHeight: 0.55 + useAdditionalValues: 0 + syncValues: [] + propPrivacy: 1 + subSyncs: [] + spawnableType: 0 + preGeneratedInstanceId: +--- !u!114 &853608962 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12974925555b471580cacf5d2d5fa9e3, type: 3} + m_Name: + m_EditorClassIdentifier: + gripType: 1 + gripOrigin: {fileID: 0} + disallowTheft: 0 + maximumGrabDistance: 0 + snappingReferences: [] + autoHold: 0 + updateWithPhysics: 1 + ikReference: {fileID: 0} +--- !u!65 &853608963 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &853608964 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: cc6e736a961949d7caf19f7af2eb9f28, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &853608965 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &853608966 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 853608959} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 12 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &884043981 GameObject: m_ObjectHideFlags: 0 @@ -1403,6 +1607,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 0 @@ -1418,10 +1623,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1446,6 +1653,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &884043985 MeshFilter: m_ObjectHideFlags: 0 @@ -1501,10 +1709,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1529,6 +1739,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &887058544 MeshFilter: m_ObjectHideFlags: 0 @@ -1547,6 +1758,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -2, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 8 @@ -1566,6 +1778,8 @@ MonoBehaviour: type: 3 objectId: b6156cfd-0daa-4e22-ace6-220b7ba376bc randomNum: 66961635 + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &887058547 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1603,6 +1817,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!114 &887058549 MonoBehaviour: @@ -1656,6 +1871,7 @@ Transform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 849578982} m_Father: {fileID: 779234489} @@ -1711,6 +1927,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!23 &950930981 MeshRenderer: @@ -1723,10 +1940,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1751,6 +1970,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &950930982 MeshFilter: m_ObjectHideFlags: 0 @@ -1805,10 +2025,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1833,6 +2055,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1057832713 MeshFilter: m_ObjectHideFlags: 0 @@ -1851,6 +2074,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.208, y: 0.33, z: -1.721} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 7 @@ -1870,6 +2094,8 @@ MonoBehaviour: type: 3 objectId: e84233ea-a6bb-4e2d-a550-0d201827fc90 randomNum: 72864126 + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &1057832716 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1907,6 +2133,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!1 &1274159448 GameObject: @@ -1951,10 +2178,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1979,6 +2208,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1274159451 MeshFilter: m_ObjectHideFlags: 0 @@ -1997,6 +2227,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.5, y: 0.01, z: 2.093} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 6 @@ -2039,6 +2270,8 @@ MonoBehaviour: type: 3 objectId: 1dc813d7-f29d-4afc-b082-a37f699f48fb randomNum: + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &1450495542 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2076,6 +2309,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!108 &1450495544 Light: @@ -2136,6 +2370,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!4 &1450495545 @@ -2148,6 +2383,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.844, y: 0.389, z: 0.117} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 2 @@ -2184,10 +2420,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2212,6 +2450,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1485771011 GameObject: m_ObjectHideFlags: 0 @@ -2223,7 +2462,6 @@ GameObject: - component: {fileID: 1485771015} - component: {fileID: 1485771014} - component: {fileID: 1485771013} - - component: {fileID: 1485771012} m_Layer: 0 m_Name: Cube m_TagString: Untagged @@ -2231,19 +2469,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!65 &1485771012 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1485771011} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} --- !u!23 &1485771013 MeshRenderer: m_ObjectHideFlags: 0 @@ -2255,10 +2480,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2283,6 +2510,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1485771014 MeshFilter: m_ObjectHideFlags: 0 @@ -2301,6 +2529,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.429, y: 0.221, z: 3.69} m_LocalScale: {x: 19.2, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 3 @@ -2384,6 +2613,7 @@ Transform: m_LocalRotation: {x: 0.30261943, y: 0, z: 0, w: 0.95311147} m_LocalPosition: {x: 0, y: 0.37, z: -0.8} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 @@ -2428,6 +2658,7 @@ MonoBehaviour: maximumGrabDistance: 0 snappingReferences: [] autoHold: 0 + updateWithPhysics: 1 ikReference: {fileID: 0} --- !u!114 &1651833086 MonoBehaviour: @@ -2444,6 +2675,8 @@ MonoBehaviour: type: 3 objectId: e0ad42bf-6854-4fd0-ab9b-b81c76130077 randomNum: + unityVersion: 2021.3.41f1 + cckVersion: 3.10:132 --- !u!114 &1651833087 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2487,10 +2720,12 @@ MeshRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2515,6 +2750,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1651833090 MeshFilter: m_ObjectHideFlags: 0 @@ -2533,6 +2769,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.525, y: 0.463, z: -0.326} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -2565,6 +2802,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.1, y: 1, z: 0.1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 849578982} m_RootOrder: 0 @@ -2580,10 +2818,12 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -2608,6 +2848,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!33 &1764646630 MeshFilter: m_ObjectHideFlags: 0 @@ -2643,6 +2884,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 5 @@ -2702,6 +2944,7 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -10, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 779234489} m_RootOrder: 3 diff --git a/Assets/raymarched/bocs.mat b/Assets/raymarched/bocs.mat new file mode 100644 index 0000000..1f393c2 --- /dev/null +++ b/Assets/raymarched/bocs.mat @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: bocs + m_Shader: {fileID: 4800000, guid: c0e7c9699552b0df2af5f498b36239b9, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: + - _MaxSteps: 128 + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _MaxDist: 32 + - _MaxSteps: 128 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SurfDist: 0.001 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/raymarched/bocs.mat.meta b/Assets/raymarched/bocs.mat.meta new file mode 100644 index 0000000..78ae63d --- /dev/null +++ b/Assets/raymarched/bocs.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cc6e736a961949d7caf19f7af2eb9f28 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/raymarched/bocs.shader b/Assets/raymarched/bocs.shader new file mode 100644 index 0000000..39d77f6 --- /dev/null +++ b/Assets/raymarched/bocs.shader @@ -0,0 +1,89 @@ +Shader "CrispyPin/Bocs" +{ + Properties + { + [Header(Raymarcher Properties)] + _MaxSteps ("Max steps", Integer) = 128 + _MaxDist ("Max distance", Float) = 128 + _SurfDist ("Surface distance threshold", Range(.0001, .05)) = .001 + } + SubShader + { + Tags { "RenderType"="Opaque" } + Cull Front + LOD 100 + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + int _MaxSteps; + float _MaxDist; + float _SurfDist; + #define MAX_STEPS _MaxSteps + #define MAX_DIST _MaxDist + #define SURF_DIST _SurfDist + + + #define SCENE_FN main + //#define LIGHT_FN lighting + + // #define SCENE_SCALE 1 + + #define DISCARD_ON_MISS + + #include "lib/libgarbage.cginc" + + #define SPEED 1.5 + #define BOX_SIZE .15 + #define RADIUS BOX_SIZE*2 + + float3 checkers(float3 p, float3 a, float3 b, float2 size) { + float2 q = p.xz / size; + q = int2(abs(q) + .5); + int s = ((q.x + q.y) % 2); + return s * a + (1 - s) * b; + } + + SurfacePoint Boc(float3 p, float t) { + float x = smoothstep(0, .5, fmod(t, 4) - .5) * RADIUS; + float z = smoothstep(1, .5, fmod(t, 4) - 2) * RADIUS; + float y = smoothstep(.25, .75, abs(fmod(t - .75, 2) - 1)) * BOX_SIZE * 2 - BOX_SIZE / 2; + return mBox(p - float3(x,y,z), BOX_SIZE, mat(.05, .8, .8)); + } + + SurfacePoint main(float3 p) { + SurfacePoint d; + + // base + const float base_width = BOX_SIZE * 6 - 0.01; + d = mBox(p - float3(0,-.15,0), float3(base_width, .3, base_width), mat(checkers(p + BOX_SIZE/2 , 0.35, 0.45, BOX_SIZE ))); + float t = _Time.y * SPEED; + + // holes + float3 ph = float3(abs(p.x), p.y, abs(p.z)); + d = qSub(d, mBox(ph - float3(RADIUS, 0, RADIUS), float3(BOX_SIZE, RADIUS, BOX_SIZE))); + d = qSub(d, mBox(ph - float3(0, 0, RADIUS), float3(BOX_SIZE, RADIUS, BOX_SIZE))); + d = qSub(d, mBox(ph - float3(RADIUS, 0, 0), float3(BOX_SIZE, RADIUS, BOX_SIZE))); + + // boxes + d = qUnion(d, Boc(p, t)); + d = qUnion(d, Boc(p, t + 2)); + float3 p2 = p * float3(-1,1,-1); + d = qUnion(d, Boc(p2, t)); + d = qUnion(d, Boc(p2, t + 2)); + float3 p3 = p.zyx * float3(-1,1,1); + d = qUnion(d, Boc(p3, t)); + d = qUnion(d, Boc(p3, t + 2)); + float3 p4 = p.zyx * float3(1,1,-1); + d = qUnion(d, Boc(p4, t)); + d = qUnion(d, Boc(p4, t + 2)); + + return d; + } + ENDCG + } + } +} diff --git a/Assets/raymarched/bocs.shader.meta b/Assets/raymarched/bocs.shader.meta new file mode 100644 index 0000000..58f70a3 --- /dev/null +++ b/Assets/raymarched/bocs.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: c0e7c9699552b0df2af5f498b36239b9 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/Packages/com.unity.services.core/Settings.json b/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000..e69de29 diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..5e97f83 --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index feeab27..d252266 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,6 +9,9 @@ EditorUserSettings: value: 5452010404540f5f0f0b5e7415250d12404e4d7f757d2732287b4a6bb2b13569 flags: 0 RecentlyUsedSceneGuid-1: + value: 5b545552530c5f030c08552111705b474f15497f2e2d77327e284967bab5606e + flags: 0 + RecentlyUsedSceneGuid-2: value: 5a050c0250565f5a58585d7244700c1245154e292d7970687d7c1f6be1e1656b flags: 0 vcSharedLogLevel: