Skip to content

Commit c7f2972

Browse files
FabienDanieauFabienDanieau
authored
Merge pull request #35 from pollen-robotics/develop
v1.2 release
2 parents e146f91 + 632aceb commit c7f2972

30 files changed

+6219
-924
lines changed

‎Assets/Plugins.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/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}

‎Packages/ReachySimulator/Editor/DownloadTask.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.Net;
55
using System.IO.Compression;
66

7+
#if UNITY_EDITOR
78
public class DownloadTask
89
{
910
private static string savePath;
@@ -32,4 +33,5 @@ private static async Task _Unzip()
3233
{
3334
await Task.Run(() => ZipFile.ExtractToDirectory(savePath, @"Assets/"));
3435
}
35-
}
36+
}
37+
#endif

‎Packages/ReachySimulator/Editor/MenuConfiguration.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using UnityEngine;
44
using UnityEditor;
55

6+
#if UNITY_EDITOR
67
public class MenuConfiguration : Editor
78
{
89

@@ -14,3 +15,4 @@ static void InstallGRPC()
1415
DownloadTask.RunTask();
1516
}
1617
}
18+
#endif

‎Packages/ReachySimulator/Meshes/reachy_articulations_ready.fbx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:7f5777a8ca90e12892362a7a26129ae7d8860ef6e807da672f3da596df50948b
3-
size 29457276
2+
oid sha256:b70d72752433ac99b5cbe852d424a088f82e9b59c5d704fa6a20f8424f7de050
3+
size 5046604

‎Packages/ReachySimulator/Prefabs/Reachy.prefab

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,8 @@ ArticulationBody:
101101
m_Enabled: 1
102102
serializedVersion: 3
103103
m_Mass: 0.05
104-
m_ParentAnchorPosition: {x: 0, y: 0, z: 0}
105-
m_ParentAnchorRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
104+
m_ParentAnchorPosition: {x: -0.00008700037, y: -0.0009409991, z: 5.2386906e-10}
105+
m_ParentAnchorRotation: {x: -0.00000028245358, y: 0.0000029166317, z: 0.8946342, w: 0.44679946}
106106
m_AnchorPosition: {x: 0, y: 0, z: 0}
107107
m_AnchorRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
108108
m_MatchAnchors: 1
@@ -888,7 +888,7 @@ Camera:
888888
m_ClearFlags: 1
889889
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
890890
m_projectionMatrixMode: 2
891-
m_GateFitMode: 2
891+
m_GateFitMode: 1
892892
m_FOVAxisMode: 0
893893
m_SensorSize: {x: 36, y: 24}
894894
m_LensShift: {x: 0, y: 0}
@@ -2988,7 +2988,7 @@ Camera:
29882988
m_ClearFlags: 1
29892989
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
29902990
m_projectionMatrixMode: 2
2991-
m_GateFitMode: 2
2991+
m_GateFitMode: 1
29922992
m_FOVAxisMode: 0
29932993
m_SensorSize: {x: 36, y: 24}
29942994
m_LensShift: {x: 0, y: 0}

0 commit comments

Comments
 (0)