Skip to content

Commit a7955a7

Browse files
Merge branch 'main' into Test_Pelota
2 parents a27b070 + 70e0bc8 commit a7955a7

File tree

223 files changed

+6988
-4313
lines changed

Some content is hidden

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

223 files changed

+6988
-4313
lines changed

.vsconfig

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Workload.ManagedGame"
5+
]
6+
}

Assets/Materials.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/XR Hands/1.7.1/HandVisualizer/Models.meta renamed to Assets/Materials/BasketMaterials.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/XR Hands/1.7.1/HandVisualizer/Scripts.meta renamed to Assets/Materials/BasketMaterials/Basketball.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Materials/BasketMaterials/Basketball/Built-In.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/Samples/XR Hands/1.7.1/HandVisualizer/Materials.meta renamed to Assets/Materials/BasketMaterials/Basketball/Built-In/Materials.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/XR Hands/1.7.1/HandVisualizer/Materials/TransparentRed.mat renamed to Assets/Materials/BasketMaterials/Basketball/Built-In/Materials/BlackBasketball.mat

Lines changed: 20 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: TransparentRed
11-
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
10+
m_Name: BlackBasketball
11+
m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3}
1212
m_Parent: {fileID: 0}
1313
m_ModifiedSerializedProperties: 0
1414
m_ValidKeywords:
15-
- _EMISSION
15+
- _NORMALMAP
16+
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
1617
m_InvalidKeywords: []
17-
m_LightmapFlags: 6
18+
m_LightmapFlags: 4
1819
m_EnableInstancingVariants: 0
1920
m_DoubleSidedGI: 0
2021
m_CustomRenderQueue: -1
@@ -26,15 +27,15 @@ Material:
2627
m_SavedProperties:
2728
serializedVersion: 3
2829
m_TexEnvs:
29-
- _AlphaTex:
30-
m_Texture: {fileID: 0}
31-
m_Scale: {x: 1, y: 1}
32-
m_Offset: {x: 0, y: 0}
3330
- _BaseMap:
34-
m_Texture: {fileID: 0}
31+
m_Texture: {fileID: 2800000, guid: da8224c1ad7003c428c46b6ca8fbf68a, type: 3}
3532
m_Scale: {x: 1, y: 1}
3633
m_Offset: {x: 0, y: 0}
3734
- _BumpMap:
35+
m_Texture: {fileID: 2800000, guid: 74ea5ec1d207c1045a235eff5b82ead7, type: 3}
36+
m_Scale: {x: 1, y: 1}
37+
m_Offset: {x: 0, y: 0}
38+
- _ClearCoatMap:
3839
m_Texture: {fileID: 0}
3940
m_Scale: {x: 1, y: 1}
4041
m_Offset: {x: 0, y: 0}
@@ -55,7 +56,7 @@ Material:
5556
m_Scale: {x: 1, y: 1}
5657
m_Offset: {x: 0, y: 0}
5758
- _MainTex:
58-
m_Texture: {fileID: 0}
59+
m_Texture: {fileID: 2800000, guid: b33d6d3683089d04ea5a91052d9239d0, type: 3}
5960
m_Scale: {x: 1, y: 1}
6061
m_Offset: {x: 0, y: 0}
6162
- _MetallicGlossMap:
@@ -88,75 +89,50 @@ Material:
8889
m_Offset: {x: 0, y: 0}
8990
m_Ints: []
9091
m_Floats:
91-
- PixelSnap: 0
9292
- _AddPrecomputedVelocity: 0
9393
- _AlphaClip: 0
9494
- _AlphaToMask: 0
9595
- _Blend: 0
9696
- _BlendModePreserveSpecular: 1
9797
- _BlendOp: 0
9898
- _BumpScale: 1
99-
- _CameraFadingEnabled: 0
100-
- _CameraFarFadeDistance: 2
101-
- _CameraNearFadeDistance: 1
99+
- _ClearCoat: 0
102100
- _ClearCoatMask: 0
103-
- _ClearCoatSmoothness: 0
104-
- _ColorMask: 15
101+
- _ClearCoatSmoothness: 1
105102
- _Cull: 2
106103
- _Cutoff: 0.5
107104
- _DetailAlbedoMapScale: 1
108105
- _DetailNormalMapScale: 1
109-
- _DistortionBlend: 0.5
110-
- _DistortionEnabled: 0
111-
- _DistortionStrength: 1
112-
- _DistortionStrengthScaled: 0
113106
- _DstBlend: 0
114107
- _DstBlendAlpha: 0
115-
- _EmissionEnabled: 0
116-
- _EnableExternalAlpha: 0
117108
- _EnvironmentReflections: 1
118-
- _FlipbookMode: 0
119109
- _GlossMapScale: 1
120-
- _Glossiness: 0
110+
- _Glossiness: 0.5
121111
- _GlossyReflections: 1
122-
- _LightingEnabled: 1
123112
- _Metallic: 0
124-
- _Mode: 3
113+
- _Mode: 0
125114
- _OcclusionStrength: 1
126115
- _Parallax: 0.02
127116
- _QueueOffset: 0
128117
- _ReceiveShadows: 1
129118
- _Smoothness: 0.5
130-
- _SmoothnessTextureChannel: 0
131-
- _SoftParticlesEnabled: 0
132-
- _SoftParticlesFarFadeDistance: 1
133-
- _SoftParticlesNearFadeDistance: 0
119+
- _SmoothnessTextureChannel: 1
134120
- _SpecularHighlights: 1
135121
- _SrcBlend: 1
136122
- _SrcBlendAlpha: 1
137-
- _Stencil: 0
138-
- _StencilComp: 8
139-
- _StencilOp: 0
140-
- _StencilReadMask: 255
141-
- _StencilWriteMask: 255
142123
- _Surface: 0
143124
- _UVSec: 0
144-
- _UseUIAlphaClip: 0
145125
- _WorkflowMode: 1
146126
- _XRMotionVectorsPass: 1
147127
- _ZWrite: 1
148128
m_Colors:
149-
- _BaseColor: {r: 1, g: 0, b: 0, a: 0.54509807}
150-
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
151-
- _Color: {r: 1, g: 0, b: 0, a: 0.54509807}
129+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
130+
- _Color: {r: 1, g: 1, b: 1, a: 1}
152131
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
153-
- _Flip: {r: 1, g: 1, b: 1, a: 1}
154-
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
155-
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
156132
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
157133
m_BuildTextureStacks: []
158134
m_AllowLocking: 1
159-
--- !u!114 &2151432713694262380
135+
--- !u!114 &8155548833101265704
160136
MonoBehaviour:
161137
m_ObjectHideFlags: 11
162138
m_CorrespondingSourceObject: {fileID: 0}
@@ -167,5 +143,5 @@ MonoBehaviour:
167143
m_EditorHideFlags: 0
168144
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
169145
m_Name:
170-
m_EditorClassIdentifier:
146+
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
171147
version: 10

Assets/Materials/BasketMaterials/Basketball/Built-In/Materials/BlackBasketball.mat.meta

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

Assets/Samples/XR Hands/1.7.1/HandVisualizer/Materials/HandsDefaultMaterial.mat renamed to Assets/Materials/BasketMaterials/Basketball/Built-In/Materials/OrangeBasketball.mat

Lines changed: 30 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!114 &-6565127186501960882
3+
--- !u!114 &-4200220452138939951
44
MonoBehaviour:
55
m_ObjectHideFlags: 11
66
m_CorrespondingSourceObject: {fileID: 0}
@@ -11,7 +11,7 @@ MonoBehaviour:
1111
m_EditorHideFlags: 0
1212
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
1313
m_Name:
14-
m_EditorClassIdentifier:
14+
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
1515
version: 10
1616
--- !u!21 &2100000
1717
Material:
@@ -20,38 +20,35 @@ Material:
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
23-
m_Name: HandsDefaultMaterial
24-
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
23+
m_Name: OrangeBasketball
24+
m_Shader: {fileID: 4800000, guid: ee7e4c9a5f6364b688a332c67fc32cca, type: 3}
2525
m_Parent: {fileID: 0}
2626
m_ModifiedSerializedProperties: 0
2727
m_ValidKeywords:
28-
- _EMISSION
29-
- _SURFACE_TYPE_TRANSPARENT
30-
m_InvalidKeywords:
31-
- _ALPHABLEND_ON
32-
m_LightmapFlags: 6
28+
- _NORMALMAP
29+
- _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
30+
m_InvalidKeywords: []
31+
m_LightmapFlags: 4
3332
m_EnableInstancingVariants: 0
3433
m_DoubleSidedGI: 0
35-
m_CustomRenderQueue: 3000
34+
m_CustomRenderQueue: -1
3635
stringTagMap:
37-
RenderType: Transparent
36+
RenderType: Opaque
3837
disabledShaderPasses:
39-
- DepthOnly
40-
- SHADOWCASTER
4138
- MOTIONVECTORS
4239
m_LockedProperties:
4340
m_SavedProperties:
4441
serializedVersion: 3
4542
m_TexEnvs:
46-
- _AlphaTex:
47-
m_Texture: {fileID: 0}
48-
m_Scale: {x: 1, y: 1}
49-
m_Offset: {x: 0, y: 0}
5043
- _BaseMap:
51-
m_Texture: {fileID: 0}
44+
m_Texture: {fileID: 2800000, guid: 6f2f8bfe764017a458a255aff873b3ca, type: 3}
5245
m_Scale: {x: 1, y: 1}
5346
m_Offset: {x: 0, y: 0}
5447
- _BumpMap:
48+
m_Texture: {fileID: 2800000, guid: 74ea5ec1d207c1045a235eff5b82ead7, type: 3}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _ClearCoatMap:
5552
m_Texture: {fileID: 0}
5653
m_Scale: {x: 1, y: 1}
5754
m_Offset: {x: 0, y: 0}
@@ -72,7 +69,7 @@ Material:
7269
m_Scale: {x: 1, y: 1}
7370
m_Offset: {x: 0, y: 0}
7471
- _MainTex:
75-
m_Texture: {fileID: 0}
72+
m_Texture: {fileID: 2800000, guid: 6f2f8bfe764017a458a255aff873b3ca, type: 3}
7673
m_Scale: {x: 1, y: 1}
7774
m_Offset: {x: 0, y: 0}
7875
- _MetallicGlossMap:
@@ -105,71 +102,46 @@ Material:
105102
m_Offset: {x: 0, y: 0}
106103
m_Ints: []
107104
m_Floats:
108-
- PixelSnap: 0
109105
- _AddPrecomputedVelocity: 0
110106
- _AlphaClip: 0
111107
- _AlphaToMask: 0
112108
- _Blend: 0
113-
- _BlendModePreserveSpecular: 0
109+
- _BlendModePreserveSpecular: 1
114110
- _BlendOp: 0
115111
- _BumpScale: 1
116-
- _CameraFadingEnabled: 0
117-
- _CameraFarFadeDistance: 2
118-
- _CameraNearFadeDistance: 1
112+
- _ClearCoat: 0
119113
- _ClearCoatMask: 0
120-
- _ClearCoatSmoothness: 0
121-
- _ColorMask: 15
114+
- _ClearCoatSmoothness: 1
122115
- _Cull: 2
123116
- _Cutoff: 0.5
124117
- _DetailAlbedoMapScale: 1
125118
- _DetailNormalMapScale: 1
126-
- _DistortionBlend: 0.5
127-
- _DistortionEnabled: 0
128-
- _DistortionStrength: 1
129-
- _DistortionStrengthScaled: 0
130-
- _DstBlend: 10
131-
- _DstBlendAlpha: 10
132-
- _EmissionEnabled: 0
133-
- _EnableExternalAlpha: 0
119+
- _DstBlend: 0
120+
- _DstBlendAlpha: 0
134121
- _EnvironmentReflections: 1
135-
- _FlipbookMode: 0
136122
- _GlossMapScale: 1
137-
- _Glossiness: 0
123+
- _Glossiness: 0.5
138124
- _GlossyReflections: 1
139-
- _LightingEnabled: 1
140125
- _Metallic: 0
141-
- _Mode: 2
126+
- _Mode: 0
142127
- _OcclusionStrength: 1
143128
- _Parallax: 0.02
144129
- _QueueOffset: 0
145130
- _ReceiveShadows: 1
146-
- _Smoothness: 0
147-
- _SmoothnessTextureChannel: 0
148-
- _SoftParticlesEnabled: 0
149-
- _SoftParticlesFarFadeDistance: 1
150-
- _SoftParticlesNearFadeDistance: 0
131+
- _Smoothness: 0.5
132+
- _SmoothnessTextureChannel: 1
151133
- _SpecularHighlights: 1
152-
- _SrcBlend: 5
134+
- _SrcBlend: 1
153135
- _SrcBlendAlpha: 1
154-
- _Stencil: 0
155-
- _StencilComp: 8
156-
- _StencilOp: 0
157-
- _StencilReadMask: 255
158-
- _StencilWriteMask: 255
159-
- _Surface: 1
136+
- _Surface: 0
160137
- _UVSec: 0
161-
- _UseUIAlphaClip: 0
162138
- _WorkflowMode: 1
163139
- _XRMotionVectorsPass: 1
164-
- _ZWrite: 0
140+
- _ZWrite: 1
165141
m_Colors:
166-
- _BaseColor: {r: 0.66518503, g: 0.66518503, b: 0.66518503, a: 0.64705884}
167-
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
168-
- _Color: {r: 0.66518503, g: 0.66518503, b: 0.66518503, a: 0.64705884}
142+
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
143+
- _Color: {r: 1, g: 1, b: 1, a: 1}
169144
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
170-
- _Flip: {r: 1, g: 1, b: 1, a: 1}
171-
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
172-
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
173145
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
174146
m_BuildTextureStacks: []
175147
m_AllowLocking: 1

Assets/Materials/BasketMaterials/Basketball/Built-In/Materials/OrangeBasketball.mat.meta

Lines changed: 15 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)