Skip to content

Commit 3275a1e

Browse files
Merge pull request #32 from pollen-robotics/31-add-rigid-body-to-objects-on-the-desk
enhancement #31: adding rigid body to objects on the desk
2 parents a6ec17b + 16c23f2 commit 3275a1e

File tree

1 file changed

+49
-1
lines changed

1 file changed

+49
-1
lines changed

Assets/Scenes/OfficeScene.unity

Lines changed: 49 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RenderSettings:
3838
m_ReflectionIntensity: 1
3939
m_CustomReflection: {fileID: 0}
4040
m_Sun: {fileID: 0}
41-
m_IndirectSpecularColor: {r: 0.43927172, g: 0.4875726, b: 0.56781876, a: 1}
41+
m_IndirectSpecularColor: {r: 0.43927163, g: 0.4875726, b: 0.5678186, a: 1}
4242
m_UseRadianceAmbientProbe: 0
4343
--- !u!157 &3
4444
LightmapSettings:
@@ -210,6 +210,22 @@ BoxCollider:
210210
serializedVersion: 2
211211
m_Size: {x: 0.05148581, y: 0.06916507, z: 0.061853126}
212212
m_Center: {x: 0, y: -0.008841158, z: 0.030926563}
213+
--- !u!54 &21395346
214+
Rigidbody:
215+
m_ObjectHideFlags: 0
216+
m_CorrespondingSourceObject: {fileID: 0}
217+
m_PrefabInstance: {fileID: 0}
218+
m_PrefabAsset: {fileID: 0}
219+
m_GameObject: {fileID: 21395341}
220+
serializedVersion: 2
221+
m_Mass: 0.5
222+
m_Drag: 0
223+
m_AngularDrag: 0.05
224+
m_UseGravity: 1
225+
m_IsKinematic: 0
226+
m_Interpolate: 0
227+
m_Constraints: 0
228+
m_CollisionDetection: 0
213229
--- !u!1 &86149490 stripped
214230
GameObject:
215231
m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 73df82133d3277519a05576c4b2ed5bf, type: 3}
@@ -1218,6 +1234,22 @@ BoxCollider:
12181234
serializedVersion: 2
12191235
m_Size: {x: 0.001191912, y: 0.0011919008, z: 0.0010165432}
12201236
m_Center: {x: -0.0000010371732, y: 0.0000044442413, z: 0.0005064056}
1237+
--- !u!54 &1055090590
1238+
Rigidbody:
1239+
m_ObjectHideFlags: 0
1240+
m_CorrespondingSourceObject: {fileID: 0}
1241+
m_PrefabInstance: {fileID: 0}
1242+
m_PrefabAsset: {fileID: 0}
1243+
m_GameObject: {fileID: 1055090585}
1244+
serializedVersion: 2
1245+
m_Mass: 1
1246+
m_Drag: 0
1247+
m_AngularDrag: 0.05
1248+
m_UseGravity: 1
1249+
m_IsKinematic: 0
1250+
m_Interpolate: 0
1251+
m_Constraints: 0
1252+
m_CollisionDetection: 0
12211253
--- !u!1 &1090381266
12221254
GameObject:
12231255
m_ObjectHideFlags: 0
@@ -1452,6 +1484,22 @@ BoxCollider:
14521484
serializedVersion: 2
14531485
m_Size: {x: 0.0013831564, y: 0.0018840211, z: 0.0024936472}
14541486
m_Center: {x: 0.00004609354, y: 0.00006857338, z: 0.0012468236}
1487+
--- !u!54 &1330740382
1488+
Rigidbody:
1489+
m_ObjectHideFlags: 0
1490+
m_CorrespondingSourceObject: {fileID: 0}
1491+
m_PrefabInstance: {fileID: 0}
1492+
m_PrefabAsset: {fileID: 0}
1493+
m_GameObject: {fileID: 1330740377}
1494+
serializedVersion: 2
1495+
m_Mass: 0.5
1496+
m_Drag: 0
1497+
m_AngularDrag: 0.05
1498+
m_UseGravity: 1
1499+
m_IsKinematic: 0
1500+
m_Interpolate: 0
1501+
m_Constraints: 0
1502+
m_CollisionDetection: 0
14551503
--- !u!1 &1359840893 stripped
14561504
GameObject:
14571505
m_CorrespondingSourceObject: {fileID: 3884292885747824737, guid: 38b5d0ddf75e8d042afa5cc2ae1d948b, type: 3}

0 commit comments

Comments
 (0)