Skip to content

Commit 21e35e2

Browse files
committed
Update UnityPhysicsSamples
Compatible with Unity Physics 0.4.1-preview
1 parent d049e76 commit 21e35e2

File tree

119 files changed

+16663
-5899
lines changed

Some content is hidden

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

119 files changed

+16663
-5899
lines changed
28.5 KB
Binary file not shown.

UnityPhysicsSamples/Assets/Common/Meshes/Cone.FBX.meta

Lines changed: 94 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/Physics Scene Basic Elements.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -447,8 +447,8 @@ Transform:
447447
m_PrefabInstance: {fileID: 0}
448448
m_PrefabAsset: {fileID: 0}
449449
m_GameObject: {fileID: 2102388684916877290}
450-
m_LocalRotation: {x: -0.17364816, y: -0, z: -0, w: 0.9848078}
451-
m_LocalPosition: {x: 0, y: 0.20221138, z: 9.313384}
450+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
451+
m_LocalPosition: {x: 0, y: 0, z: 0}
452452
m_LocalScale: {x: 1, y: 1, z: 1}
453453
m_Children: []
454454
m_Father: {fileID: 1357867726654781254}
Lines changed: 220 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,220 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &8255027753502265700
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 4959758250517504887}
12+
- component: {fileID: 4147709045541148993}
13+
- component: {fileID: 7688513236356588984}
14+
- component: {fileID: 1006060585891333221}
15+
- component: {fileID: 253249462352085257}
16+
- component: {fileID: 8048528176069909508}
17+
m_Layer: 0
18+
m_Name: DynamicCone
19+
m_TagString: Untagged
20+
m_Icon: {fileID: 0}
21+
m_NavMeshLayer: 0
22+
m_StaticEditorFlags: 0
23+
m_IsActive: 1
24+
--- !u!4 &4959758250517504887
25+
Transform:
26+
m_ObjectHideFlags: 0
27+
m_CorrespondingSourceObject: {fileID: 0}
28+
m_PrefabInstance: {fileID: 0}
29+
m_PrefabAsset: {fileID: 0}
30+
m_GameObject: {fileID: 8255027753502265700}
31+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
32+
m_LocalPosition: {x: 0, y: 0, z: 0}
33+
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_Children: []
35+
m_Father: {fileID: 0}
36+
m_RootOrder: 0
37+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38+
--- !u!33 &4147709045541148993
39+
MeshFilter:
40+
m_ObjectHideFlags: 0
41+
m_CorrespondingSourceObject: {fileID: 0}
42+
m_PrefabInstance: {fileID: 0}
43+
m_PrefabAsset: {fileID: 0}
44+
m_GameObject: {fileID: 8255027753502265700}
45+
m_Mesh: {fileID: -3512972169273454949, guid: fb001de916bba484a9bce2fefd2cfa27, type: 3}
46+
--- !u!23 &7688513236356588984
47+
MeshRenderer:
48+
m_ObjectHideFlags: 0
49+
m_CorrespondingSourceObject: {fileID: 0}
50+
m_PrefabInstance: {fileID: 0}
51+
m_PrefabAsset: {fileID: 0}
52+
m_GameObject: {fileID: 8255027753502265700}
53+
m_Enabled: 1
54+
m_CastShadows: 1
55+
m_ReceiveShadows: 1
56+
m_DynamicOccludee: 1
57+
m_MotionVectors: 1
58+
m_LightProbeUsage: 1
59+
m_ReflectionProbeUsage: 1
60+
m_RenderingLayerMask: 1
61+
m_RendererPriority: 0
62+
m_Materials:
63+
- {fileID: 2100000, guid: 959eccfeb940d0e4b9bff9d7d3841c5a, type: 2}
64+
m_StaticBatchInfo:
65+
firstSubMesh: 0
66+
subMeshCount: 0
67+
m_StaticBatchRoot: {fileID: 0}
68+
m_ProbeAnchor: {fileID: 0}
69+
m_LightProbeVolumeOverride: {fileID: 0}
70+
m_ScaleInLightmap: 1
71+
m_PreserveUVs: 0
72+
m_IgnoreNormalsForChartDetection: 0
73+
m_ImportantGI: 0
74+
m_StitchLightmapSeams: 1
75+
m_SelectedEditorRenderState: 3
76+
m_MinimumChartSize: 4
77+
m_AutoUVMaxDistance: 0.5
78+
m_AutoUVMaxAngle: 89
79+
m_LightmapParameters: {fileID: 0}
80+
m_SortingLayerID: 0
81+
m_SortingLayer: 0
82+
m_SortingOrder: 0
83+
--- !u!114 &1006060585891333221
84+
MonoBehaviour:
85+
m_ObjectHideFlags: 0
86+
m_CorrespondingSourceObject: {fileID: 0}
87+
m_PrefabInstance: {fileID: 0}
88+
m_PrefabAsset: {fileID: 0}
89+
m_GameObject: {fileID: 8255027753502265700}
90+
m_Enabled: 1
91+
m_EditorHideFlags: 0
92+
m_Script: {fileID: 11500000, guid: b275e5f92732148048d7b77e264ac30e, type: 3}
93+
m_Name:
94+
m_EditorClassIdentifier:
95+
m_ShapeType: 30
96+
m_PrimitiveCenter:
97+
x: 0
98+
y: 0
99+
z: 0.5000001
100+
m_PrimitiveSize:
101+
x: 1
102+
y: 1.0000002
103+
z: 1.0000002
104+
m_PrimitiveOrientation:
105+
Value:
106+
x: -0
107+
y: 0
108+
z: 0
109+
RotationOrder: 4
110+
m_Capsule:
111+
Height: 1.0000002
112+
Radius: 0.5000001
113+
Axis: 2
114+
m_Cylinder:
115+
Height: 1.0000002
116+
Radius: 0.5000001
117+
Axis: 2
118+
m_CylinderSideCount: 20
119+
m_SphereRadius: 0.5000001
120+
m_MinimumSkinnedVertexWeight: 0.1
121+
m_ConvexHullGenerationParameters:
122+
m_SimplificationTolerance: 0.015000003
123+
m_BevelRadius: 0.05
124+
m_MinimumAngle: 2.5000002
125+
m_CustomMesh: {fileID: 0}
126+
m_ForceUnique: 0
127+
m_Material:
128+
m_SupportsTemplate: 1
129+
m_Template: {fileID: 0}
130+
m_IsTrigger:
131+
m_Override: 0
132+
m_Value: 0
133+
m_Friction:
134+
m_Override: 0
135+
m_Value:
136+
Value: 0.5
137+
CombineMode: 0
138+
m_Restitution:
139+
m_Override: 0
140+
m_Value:
141+
Value: 0
142+
CombineMode: 2
143+
m_BelongsTo:
144+
m_Override: 0
145+
m_Value: 0101010101010101010101010101010101010101010101010101010101010101
146+
m_CollidesWith:
147+
m_Override: 0
148+
m_Value: 0101010101010101010101010101010101010101010101010101010101010101
149+
m_GroupIndex:
150+
m_Override: 0
151+
m_Value: 0
152+
m_RaisesCollisionEvents:
153+
m_Override: 0
154+
m_Value: 0
155+
m_CustomTags:
156+
m_Override: 0
157+
m_Value: 0000000000000000
158+
m_ConvexRadius_Deprecated: -1
159+
--- !u!114 &253249462352085257
160+
MonoBehaviour:
161+
m_ObjectHideFlags: 0
162+
m_CorrespondingSourceObject: {fileID: 0}
163+
m_PrefabInstance: {fileID: 0}
164+
m_PrefabAsset: {fileID: 0}
165+
m_GameObject: {fileID: 8255027753502265700}
166+
m_Enabled: 1
167+
m_EditorHideFlags: 0
168+
m_Script: {fileID: 11500000, guid: ccea9ea98e38942e0b0938c27ed1903e, type: 3}
169+
m_Name:
170+
m_EditorClassIdentifier:
171+
m_MotionType: 0
172+
m_Mass: 1
173+
m_LinearDamping: 0.01
174+
m_AngularDamping: 0.05
175+
m_InitialLinearVelocity:
176+
x: 0
177+
y: 0
178+
z: 0
179+
m_InitialAngularVelocity:
180+
x: 0
181+
y: 0
182+
z: 0
183+
m_GravityFactor: 1
184+
m_OverrideDefaultMassDistribution: 0
185+
m_CenterOfMass:
186+
x: 0
187+
y: 0
188+
z: 0
189+
m_Orientation:
190+
Value:
191+
x: 0
192+
y: 0
193+
z: 0
194+
RotationOrder: 4
195+
m_InertiaTensor:
196+
x: 0.4
197+
y: 0.4
198+
z: 0.4
199+
m_CustomTags:
200+
Tag00: 0
201+
Tag01: 0
202+
Tag02: 0
203+
Tag03: 0
204+
Tag04: 0
205+
Tag05: 0
206+
Tag06: 0
207+
Tag07: 0
208+
--- !u!114 &8048528176069909508
209+
MonoBehaviour:
210+
m_ObjectHideFlags: 0
211+
m_CorrespondingSourceObject: {fileID: 0}
212+
m_PrefabInstance: {fileID: 0}
213+
m_PrefabAsset: {fileID: 0}
214+
m_GameObject: {fileID: 8255027753502265700}
215+
m_Enabled: 1
216+
m_EditorHideFlags: 0
217+
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
218+
m_Name:
219+
m_EditorClassIdentifier:
220+
ConversionMode: 0

UnityPhysicsSamples/Assets/ForwardRenderer.asset.meta renamed to UnityPhysicsSamples/Assets/Common/Prefabs/Shapes/DynamicCone.prefab.meta

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

UnityPhysicsSamples/Assets/Common/Prefabs/Shapes/StaticMesh.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ MeshRenderer:
6060
m_RenderingLayerMask: 1
6161
m_RendererPriority: 0
6262
m_Materials:
63-
- {fileID: 2100000, guid: f3fb613d2e20ddd40ac40dc646dca26b, type: 2}
63+
- {fileID: 2100000, guid: 64716136fbbea404388c6534383d7b5e, type: 2}
6464
m_StaticBatchInfo:
6565
firstSubMesh: 0
6666
subMeshCount: 0

0 commit comments

Comments
 (0)