Skip to content

Commit da8c0c9

Browse files
Merge pull request Unity-Technologies#220 from Unity-Technologies/minor-fixes
Minor fixes requested by Josep
2 parents 2551a0b + 1a57259 commit da8c0c9

File tree

2 files changed

+15
-14
lines changed

2 files changed

+15
-14
lines changed

PhysicsSamples/Assets/Tests/MultipleWorlds/Animation/Animation/AnimationSub.unity

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -789,7 +789,7 @@ MonoBehaviour:
789789
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
790790
m_Name:
791791
m_EditorClassIdentifier:
792-
DrivingEntity: {fileID: 631348920}
792+
DrivingEntity: {fileID: 631348917}
793793
PositionGain: 1
794794
RotationGain: 1
795795
LinearVelocityGain: 1
@@ -1459,7 +1459,7 @@ MonoBehaviour:
14591459
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
14601460
m_Name:
14611461
m_EditorClassIdentifier:
1462-
DrivingEntity: {fileID: 1744228160}
1462+
DrivingEntity: {fileID: 339970407}
14631463
PositionGain: 0.9
14641464
RotationGain: 0.9
14651465
LinearVelocityGain: 0
@@ -3285,7 +3285,7 @@ MonoBehaviour:
32853285
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
32863286
m_Name:
32873287
m_EditorClassIdentifier:
3288-
DrivingEntity: {fileID: 1140792372}
3288+
DrivingEntity: {fileID: 1140792369}
32893289
PositionGain: 0.1
32903290
RotationGain: 0.1
32913291
LinearVelocityGain: 0.01
@@ -4108,7 +4108,7 @@ MonoBehaviour:
41084108
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
41094109
m_Name:
41104110
m_EditorClassIdentifier:
4111-
DrivingEntity: {fileID: 982094010}
4111+
DrivingEntity: {fileID: 982094007}
41124112
PositionGain: 0.5
41134113
RotationGain: 0.5
41144114
LinearVelocityGain: 0.05
@@ -4452,7 +4452,7 @@ MonoBehaviour:
44524452
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
44534453
m_Name:
44544454
m_EditorClassIdentifier:
4455-
DrivingEntity: {fileID: 1273179520}
4455+
DrivingEntity: {fileID: 1273179517}
44564456
PositionGain: 0.5
44574457
RotationGain: 0.5
44584458
LinearVelocityGain: 0.05
@@ -5250,7 +5250,7 @@ MonoBehaviour:
52505250
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
52515251
m_Name:
52525252
m_EditorClassIdentifier:
5253-
DrivingEntity: {fileID: 1996694455}
5253+
DrivingEntity: {fileID: 1996694452}
52545254
PositionGain: 0.2
52555255
RotationGain: 0.2
52565256
LinearVelocityGain: 0.01
@@ -5920,7 +5920,7 @@ MonoBehaviour:
59205920
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
59215921
m_Name:
59225922
m_EditorClassIdentifier:
5923-
DrivingEntity: {fileID: 975069401}
5923+
DrivingEntity: {fileID: 975069398}
59245924
PositionGain: 0.25
59255925
RotationGain: 0.25
59265926
LinearVelocityGain: 0.01
@@ -6285,7 +6285,7 @@ MonoBehaviour:
62856285
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
62866286
m_Name:
62876287
m_EditorClassIdentifier:
6288-
DrivingEntity: {fileID: 631348920}
6288+
DrivingEntity: {fileID: 631348917}
62896289
PositionGain: 0.1
62906290
RotationGain: 0.1
62916291
LinearVelocityGain: 0
@@ -6629,7 +6629,7 @@ MonoBehaviour:
66296629
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
66306630
m_Name:
66316631
m_EditorClassIdentifier:
6632-
DrivingEntity: {fileID: 1905938356}
6632+
DrivingEntity: {fileID: 1905938354}
66336633
PositionGain: 0.75
66346634
RotationGain: 0.75
66356635
LinearVelocityGain: 0.05
@@ -7071,7 +7071,7 @@ MonoBehaviour:
70717071
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
70727072
m_Name:
70737073
m_EditorClassIdentifier:
7074-
DrivingEntity: {fileID: 1927466373}
7074+
DrivingEntity: {fileID: 1927466371}
70757075
PositionGain: 0.9
70767076
RotationGain: 0.9
70777077
LinearVelocityGain: 0
@@ -7707,7 +7707,7 @@ MonoBehaviour:
77077707
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
77087708
m_Name:
77097709
m_EditorClassIdentifier:
7710-
DrivingEntity: {fileID: 339970410}
7710+
DrivingEntity: {fileID: 339970407}
77117711
PositionGain: 0.75
77127712
RotationGain: 0.75
77137713
LinearVelocityGain: 0.05
@@ -8020,7 +8020,7 @@ MonoBehaviour:
80208020
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
80218021
m_Name:
80228022
m_EditorClassIdentifier:
8023-
DrivingEntity: {fileID: 665462441}
8023+
DrivingEntity: {fileID: 665462438}
80248024
PositionGain: 1
80258025
RotationGain: 1
80268026
LinearVelocityGain: 0
@@ -8690,7 +8690,7 @@ MonoBehaviour:
86908690
m_Script: {fileID: 11500000, guid: 73671d6fefcc2d8429878cae31f1001f, type: 3}
86918691
m_Name:
86928692
m_EditorClassIdentifier:
8693-
DrivingEntity: {fileID: 1255482224}
8693+
DrivingEntity: {fileID: 1255482222}
86948694
PositionGain: 0.25
86958695
RotationGain: 0.25
86968696
LinearVelocityGain: 0.01

PhysicsSamples/Assets/Tests/MultipleWorlds/Animation/Scripts/DriveAnimationBodyAuthoring.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,11 @@
55
using Unity.Physics.Tests;
66
using Unity.Transforms;
77
using UnityEngine;
8+
using UnityEngine.Serialization;
89

910
public class DriveAnimationBodyAuthoring : MonoBehaviour
1011
{
11-
public ConvertToEntity DrivingEntity;
12+
public GameObject DrivingEntity;
1213
[Range(0f, 1f)] public float PositionGain;
1314
[Range(0f, 1f)] public float RotationGain;
1415
[Range(0f, 1f)] public float LinearVelocityGain;

0 commit comments

Comments
 (0)