Skip to content

Commit d049e76

Browse files
committed
Update UnityPhysicsSamples
Compatible with Unity.Physics 0.4.0-preview.5
1 parent bec317b commit d049e76

File tree

299 files changed

+394021
-111857
lines changed

Some content is hidden

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

299 files changed

+394021
-111857
lines changed
Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &-1337605801007312193
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
13+
m_Name:
14+
m_EditorClassIdentifier:
15+
version: 1
16+
--- !u!21 &2100000
17+
Material:
18+
serializedVersion: 6
19+
m_ObjectHideFlags: 0
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name: PhysicsDynamicMaterialBackFace
24+
m_Shader: {fileID: 4800000, guid: cefe5d8a02707f444b9231a1a45e6c33, type: 3}
25+
m_ShaderKeywords: _SPECULARHIGHLIGHTS_OFF
26+
m_LightmapFlags: 4
27+
m_EnableInstancingVariants: 1
28+
m_DoubleSidedGI: 0
29+
m_CustomRenderQueue: -1
30+
stringTagMap: {}
31+
disabledShaderPasses: []
32+
m_SavedProperties:
33+
serializedVersion: 3
34+
m_TexEnvs:
35+
- _BaseMap:
36+
m_Texture: {fileID: 0}
37+
m_Scale: {x: 1, y: 1}
38+
m_Offset: {x: 0, y: 0}
39+
- _BaseTexture:
40+
m_Texture: {fileID: 2800000, guid: 24228c76bdb8f9f4d87f468ba127e71d, type: 3}
41+
m_Scale: {x: 1, y: 1}
42+
m_Offset: {x: 0, y: 0}
43+
- _BumpMap:
44+
m_Texture: {fileID: 0}
45+
m_Scale: {x: 1, y: 1}
46+
m_Offset: {x: 0, y: 0}
47+
- _DetailAlbedoMap:
48+
m_Texture: {fileID: 0}
49+
m_Scale: {x: 1, y: 1}
50+
m_Offset: {x: 0, y: 0}
51+
- _DetailBump:
52+
m_Texture: {fileID: 0}
53+
m_Scale: {x: 1, y: 1}
54+
m_Offset: {x: 0, y: 0}
55+
- _DetailMask:
56+
m_Texture: {fileID: 0}
57+
m_Scale: {x: 1, y: 1}
58+
m_Offset: {x: 0, y: 0}
59+
- _DetailNormalMap:
60+
m_Texture: {fileID: 0}
61+
m_Scale: {x: 1, y: 1}
62+
m_Offset: {x: 0, y: 0}
63+
- _DetailTex:
64+
m_Texture: {fileID: 0}
65+
m_Scale: {x: 1, y: 1}
66+
m_Offset: {x: 0, y: 0}
67+
- _EmissionMap:
68+
m_Texture: {fileID: 0}
69+
m_Scale: {x: 1, y: 1}
70+
m_Offset: {x: 0, y: 0}
71+
- _FloorCeilingTexture:
72+
m_Texture: {fileID: 0}
73+
m_Scale: {x: 1, y: 1}
74+
m_Offset: {x: 0, y: 0}
75+
- _FrontBackWallTexture:
76+
m_Texture: {fileID: 0}
77+
m_Scale: {x: 1, y: 1}
78+
m_Offset: {x: 0, y: 0}
79+
- _LeftRightWallTexture:
80+
m_Texture: {fileID: 0}
81+
m_Scale: {x: 1, y: 1}
82+
m_Offset: {x: 0, y: 0}
83+
- _MainBump:
84+
m_Texture: {fileID: 0}
85+
m_Scale: {x: 1, y: 1}
86+
m_Offset: {x: 0, y: 0}
87+
- _MainTex:
88+
m_Texture: {fileID: 0}
89+
m_Scale: {x: 1, y: 1}
90+
m_Offset: {x: 0, y: 0}
91+
- _MetallicGlossMap:
92+
m_Texture: {fileID: 0}
93+
m_Scale: {x: 1, y: 1}
94+
m_Offset: {x: 0, y: 0}
95+
- _OcclusionMap:
96+
m_Texture: {fileID: 0}
97+
m_Scale: {x: 1, y: 1}
98+
m_Offset: {x: 0, y: 0}
99+
- _ParallaxMap:
100+
m_Texture: {fileID: 0}
101+
m_Scale: {x: 1, y: 1}
102+
m_Offset: {x: 0, y: 0}
103+
- _SampleTexture2D_792420A6_Texture:
104+
m_Texture: {fileID: 2800000, guid: 3082327edf99c3a4c94fc7c95801c018, type: 3}
105+
m_Scale: {x: 1, y: 1}
106+
m_Offset: {x: 0, y: 0}
107+
- _SpecGlossMap:
108+
m_Texture: {fileID: 0}
109+
m_Scale: {x: 1, y: 1}
110+
m_Offset: {x: 0, y: 0}
111+
m_Floats:
112+
- Vector1_7B30AC00: 0
113+
- _AlphaClip: 0
114+
- _BandWidth: 2
115+
- _Blend: 0
116+
- _BumpScale: 1
117+
- _ColorMask: 15
118+
- _Cull: 2
119+
- _Cutoff: 0.5
120+
- _DetailNormalMapScale: 1
121+
- _DstBlend: 0
122+
- _EnvironmentReflections: 1
123+
- _GlossMapScale: 1
124+
- _Glossiness: 0.5
125+
- _GlossinessSource: 0
126+
- _GlossyReflections: 1
127+
- _Metallic: 0
128+
- _Mode: 0
129+
- _OcclusionStrength: 1
130+
- _Parallax: 0.02
131+
- _QueueOffset: 0
132+
- _ReceiveShadows: 1
133+
- _Scale: 1
134+
- _Shininess: 0
135+
- _Smoothness: 0
136+
- _SmoothnessSource: 1
137+
- _SmoothnessTextureChannel: 0
138+
- _SpecSource: 0
139+
- _SpecularHighlights: 0
140+
- _Spread: 0.8
141+
- _SrcBlend: 1
142+
- _Stencil: 0
143+
- _StencilComp: 8
144+
- _StencilOp: 0
145+
- _StencilReadMask: 255
146+
- _StencilWriteMask: 255
147+
- _Strength: 0.2
148+
- _Surface: 0
149+
- _TopDown: 0
150+
- _UVSec: 0
151+
- _UseUIAlphaClip: 0
152+
- _WorkflowMode: 1
153+
- _ZWrite: 1
154+
m_Colors:
155+
- Color_4F18FDD0: {r: 0, g: 0, b: 0, a: 0}
156+
- Color_AC52ADAA: {r: 0.5943396, g: 0.5376669, b: 0.08130119, a: 0}
157+
- _BandColor: {r: 0.9921569, g: 0.7215686, b: 0.07450981, a: 0}
158+
- _CellColorA: {r: 1, g: 1, b: 1, a: 1}
159+
- _CellColorB: {r: 0.8, g: 0.8, b: 0.8, a: 1}
160+
- _Color: {r: 0.92156863, g: 0.7137255, b: 0.19215687, a: 0.5019608}
161+
- _EmissionColor: {r: 0.23529412, g: 0.003921569, b: 0, a: 1}
162+
- _MainLineColor: {r: 0, g: 0, b: 0, a: 1}
163+
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
164+
- _Specular: {r: 0, g: 0, b: 0, a: 0}
165+
- _SubLineColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}

UnityPhysicsSamples/Assets/Common/Materials/PhysicsDynamicMaterialBackFace.mat.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.

UnityPhysicsSamples/Assets/Common/Prefabs/Floor.prefab

Lines changed: 113 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,19 @@ MonoBehaviour:
115115
Height: 1
116116
Radius: 0.5
117117
Axis: 2
118+
m_CylinderSideCount: 20
118119
m_SphereRadius: 0.5
119-
m_ConvexRadius: 0.05
120+
m_MinimumSkinnedVertexWeight: 0.1
121+
m_ConvexHullGenerationParameters:
122+
m_SimplificationTolerance: 0.015
123+
m_BevelRadius: 0.05
124+
m_MinimumAngle: 2.5000002
120125
m_CustomMesh: {fileID: 0}
126+
m_ForceUnique: 0
121127
m_Material:
122128
m_SupportsTemplate: 1
123129
m_Template: {fileID: 0}
124-
m_IsTrigger:
130+
m_CollisionResponse:
125131
m_Override: 0
126132
m_Value: 0
127133
m_Friction:
@@ -134,18 +140,105 @@ MonoBehaviour:
134140
m_Value:
135141
Value: 0
136142
CombineMode: 2
137-
m_BelongsTo:
143+
m_BelongsToCategories:
138144
m_Override: 0
139-
m_Value: 0101010101010101010101010101010101010101010101010101010101010101
140-
m_CollidesWith:
145+
m_Value:
146+
Category00: 1
147+
Category01: 1
148+
Category02: 1
149+
Category03: 1
150+
Category04: 1
151+
Category05: 1
152+
Category06: 1
153+
Category07: 1
154+
Category08: 1
155+
Category09: 1
156+
Category10: 1
157+
Category11: 1
158+
Category12: 1
159+
Category13: 1
160+
Category14: 1
161+
Category15: 1
162+
Category16: 1
163+
Category17: 1
164+
Category18: 1
165+
Category19: 1
166+
Category20: 1
167+
Category21: 1
168+
Category22: 1
169+
Category23: 1
170+
Category24: 1
171+
Category25: 1
172+
Category26: 1
173+
Category27: 1
174+
Category28: 1
175+
Category29: 1
176+
Category30: 1
177+
Category31: 1
178+
m_CollidesWithCategories:
179+
m_Override: 0
180+
m_Value:
181+
Category00: 1
182+
Category01: 1
183+
Category02: 1
184+
Category03: 1
185+
Category04: 1
186+
Category05: 1
187+
Category06: 1
188+
Category07: 1
189+
Category08: 1
190+
Category09: 1
191+
Category10: 1
192+
Category11: 1
193+
Category12: 1
194+
Category13: 1
195+
Category14: 1
196+
Category15: 1
197+
Category16: 1
198+
Category17: 1
199+
Category18: 1
200+
Category19: 1
201+
Category20: 1
202+
Category21: 1
203+
Category22: 1
204+
Category23: 1
205+
Category24: 1
206+
Category25: 1
207+
Category26: 1
208+
Category27: 1
209+
Category28: 1
210+
Category29: 1
211+
Category30: 1
212+
Category31: 1
213+
m_CustomMaterialTags:
214+
m_Override: 0
215+
m_Value:
216+
Tag00: 0
217+
Tag01: 0
218+
Tag02: 0
219+
Tag03: 0
220+
Tag04: 0
221+
Tag05: 0
222+
Tag06: 0
223+
Tag07: 0
224+
m_SerializedVersion: 1
225+
m_BelongsTo_Deprecated:
141226
m_Override: 0
142-
m_Value: 0101010101010101010101010101010101010101010101010101010101010101
143-
m_RaisesCollisionEvents:
227+
m_Value:
228+
m_CollidesWith_Deprecated:
229+
m_Override: 0
230+
m_Value:
231+
m_CustomTags_Deprecated:
232+
m_Override: 0
233+
m_Value:
234+
m_IsTrigger_Deprecated:
144235
m_Override: 0
145236
m_Value: 0
146-
m_CustomFlags:
237+
m_RaisesCollisionEvents_Deprecated:
147238
m_Override: 0
148-
m_Value: 0000000000000000
239+
m_Value: 0
240+
m_SerializedVersion: 1
241+
m_ConvexRadius_Deprecated: -1
149242
--- !u!114 &1716085102806623427
150243
MonoBehaviour:
151244
m_ObjectHideFlags: 0
@@ -177,15 +270,24 @@ MonoBehaviour:
177270
y: 0
178271
z: 0
179272
m_Orientation:
180-
value:
273+
Value:
181274
x: 0
182275
y: 0
183276
z: 0
184-
w: 1
277+
RotationOrder: 4
185278
m_InertiaTensor:
186279
x: 0.4
187280
y: 0.4
188281
z: 0.4
282+
m_CustomTags:
283+
Tag00: 0
284+
Tag01: 0
285+
Tag02: 0
286+
Tag03: 0
287+
Tag04: 0
288+
Tag05: 0
289+
Tag06: 0
290+
Tag07: 0
189291
--- !u!114 &4860166015717767729
190292
MonoBehaviour:
191293
m_ObjectHideFlags: 0

UnityPhysicsSamples/Assets/Common/Prefabs/Physics Scene Basic Elements.prefab

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,15 @@ MonoBehaviour:
216216
m_Script: {fileID: 11500000, guid: 4d30974bf68d61043b1572197db94cdc, type: 3}
217217
m_Name:
218218
m_EditorClassIdentifier:
219-
SimulationType: 1
220-
Gravity:
219+
m_SimulationType: 1
220+
m_Gravity:
221221
x: -0
222222
y: -9.81
223223
z: -0
224-
SolverIterationCount: 4
225-
ThreadCountHint: 8
224+
m_SolverIterationCount: 4
225+
m_EnableSolverStabilizationHeuristic: 0
226+
m_ThreadCountHint: 8
227+
m_SynchronizeCollisionWorld: 0
226228
--- !u!114 &2390444599841514890
227229
MonoBehaviour:
228230
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)