Skip to content

Commit be5584b

Browse files
authored
[scenes] Fix all Unity Demo examples (BeamAdapter, Capsule, interaction demo) to be left handed and remove warnings for v24.12 (#160)
* [scenes] Fix Capsule scene and remove warnings * [scenes] Fix interaction demo * backup work to fix BeamAdapter * [scenes] Fix BeamAdapter SOFA scenes and unity demo * last up with SofaCUDA
1 parent 061d3a9 commit be5584b

29 files changed

Lines changed: 37774 additions & 36339 deletions

Core/Prefabs/CuttingManager.prefab

Lines changed: 53 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,13 @@ Transform:
2626
m_PrefabInstance: {fileID: 0}
2727
m_PrefabAsset: {fileID: 0}
2828
m_GameObject: {fileID: 136682821}
29+
serializedVersion: 2
2930
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
30-
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalPosition: {x: 1, y: 0, z: 0}
3132
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
33+
m_ConstrainProportionsScale: 0
3234
m_Children: []
3335
m_Father: {fileID: 4436061565707235477}
34-
m_RootOrder: 1
3536
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3637
--- !u!33 &136682824
3738
MeshFilter:
@@ -52,11 +53,14 @@ MeshRenderer:
5253
m_CastShadows: 1
5354
m_ReceiveShadows: 1
5455
m_DynamicOccludee: 1
56+
m_StaticShadowCaster: 0
5557
m_MotionVectors: 1
5658
m_LightProbeUsage: 1
5759
m_ReflectionProbeUsage: 1
5860
m_RayTracingMode: 2
5961
m_RayTraceProcedural: 0
62+
m_RayTracingAccelStructBuildFlagsOverride: 0
63+
m_RayTracingAccelStructBuildFlags: 1
6064
m_RenderingLayerMask: 1
6165
m_RendererPriority: 0
6266
m_Materials:
@@ -90,9 +94,17 @@ SphereCollider:
9094
m_PrefabAsset: {fileID: 0}
9195
m_GameObject: {fileID: 136682821}
9296
m_Material: {fileID: 0}
97+
m_IncludeLayers:
98+
serializedVersion: 2
99+
m_Bits: 0
100+
m_ExcludeLayers:
101+
serializedVersion: 2
102+
m_Bits: 0
103+
m_LayerOverridePriority: 0
93104
m_IsTrigger: 0
105+
m_ProvidesContacts: 0
94106
m_Enabled: 1
95-
serializedVersion: 2
107+
serializedVersion: 3
96108
m_Radius: 0.5
97109
m_Center: {x: 0, y: 0, z: 0}
98110
--- !u!1 &1528289162
@@ -121,12 +133,13 @@ Transform:
121133
m_PrefabInstance: {fileID: 0}
122134
m_PrefabAsset: {fileID: 0}
123135
m_GameObject: {fileID: 1528289162}
136+
serializedVersion: 2
124137
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
125-
m_LocalPosition: {x: 0, y: 0, z: 0}
138+
m_LocalPosition: {x: 0.5, y: 1, z: 0}
126139
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
140+
m_ConstrainProportionsScale: 0
127141
m_Children: []
128142
m_Father: {fileID: 4436061565707235477}
129-
m_RootOrder: 2
130143
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
131144
--- !u!33 &1528289165
132145
MeshFilter:
@@ -147,11 +160,14 @@ MeshRenderer:
147160
m_CastShadows: 1
148161
m_ReceiveShadows: 1
149162
m_DynamicOccludee: 1
163+
m_StaticShadowCaster: 0
150164
m_MotionVectors: 1
151165
m_LightProbeUsage: 1
152166
m_ReflectionProbeUsage: 1
153167
m_RayTracingMode: 2
154168
m_RayTraceProcedural: 0
169+
m_RayTracingAccelStructBuildFlagsOverride: 0
170+
m_RayTracingAccelStructBuildFlags: 1
155171
m_RenderingLayerMask: 1
156172
m_RendererPriority: 0
157173
m_Materials:
@@ -185,9 +201,17 @@ SphereCollider:
185201
m_PrefabAsset: {fileID: 0}
186202
m_GameObject: {fileID: 1528289162}
187203
m_Material: {fileID: 0}
204+
m_IncludeLayers:
205+
serializedVersion: 2
206+
m_Bits: 0
207+
m_ExcludeLayers:
208+
serializedVersion: 2
209+
m_Bits: 0
210+
m_LayerOverridePriority: 0
188211
m_IsTrigger: 0
212+
m_ProvidesContacts: 0
189213
m_Enabled: 1
190-
serializedVersion: 2
214+
serializedVersion: 3
191215
m_Radius: 0.5
192216
m_Center: {x: 0, y: 0, z: 0}
193217
--- !u!1 &1823116809
@@ -216,12 +240,13 @@ Transform:
216240
m_PrefabInstance: {fileID: 0}
217241
m_PrefabAsset: {fileID: 0}
218242
m_GameObject: {fileID: 1823116809}
243+
serializedVersion: 2
219244
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
220245
m_LocalPosition: {x: 0, y: 0, z: 0}
221246
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
247+
m_ConstrainProportionsScale: 0
222248
m_Children: []
223249
m_Father: {fileID: 4436061565707235477}
224-
m_RootOrder: 0
225250
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
226251
--- !u!33 &1823116812
227252
MeshFilter:
@@ -242,11 +267,14 @@ MeshRenderer:
242267
m_CastShadows: 1
243268
m_ReceiveShadows: 1
244269
m_DynamicOccludee: 1
270+
m_StaticShadowCaster: 0
245271
m_MotionVectors: 1
246272
m_LightProbeUsage: 1
247273
m_ReflectionProbeUsage: 1
248274
m_RayTracingMode: 2
249275
m_RayTraceProcedural: 0
276+
m_RayTracingAccelStructBuildFlagsOverride: 0
277+
m_RayTracingAccelStructBuildFlags: 1
250278
m_RenderingLayerMask: 1
251279
m_RendererPriority: 0
252280
m_Materials:
@@ -280,9 +308,17 @@ SphereCollider:
280308
m_PrefabAsset: {fileID: 0}
281309
m_GameObject: {fileID: 1823116809}
282310
m_Material: {fileID: 0}
311+
m_IncludeLayers:
312+
serializedVersion: 2
313+
m_Bits: 0
314+
m_ExcludeLayers:
315+
serializedVersion: 2
316+
m_Bits: 0
317+
m_LayerOverridePriority: 0
283318
m_IsTrigger: 0
319+
m_ProvidesContacts: 0
284320
m_Enabled: 1
285-
serializedVersion: 2
321+
serializedVersion: 3
286322
m_Radius: 0.5
287323
m_Center: {x: 0, y: 0, z: 0}
288324
--- !u!1 &4436061565707235479
@@ -311,15 +347,16 @@ Transform:
311347
m_PrefabInstance: {fileID: 0}
312348
m_PrefabAsset: {fileID: 0}
313349
m_GameObject: {fileID: 4436061565707235479}
350+
serializedVersion: 2
314351
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
315352
m_LocalPosition: {x: 0, y: 0, z: 0}
316353
m_LocalScale: {x: 1, y: 1, z: 1}
354+
m_ConstrainProportionsScale: 0
317355
m_Children:
318356
- {fileID: 1823116813}
319357
- {fileID: 136682825}
320358
- {fileID: 1528289166}
321359
m_Father: {fileID: 0}
322-
m_RootOrder: 0
323360
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
324361
--- !u!114 &4436061565707235478
325362
MonoBehaviour:
@@ -337,11 +374,10 @@ MonoBehaviour:
337374
m_pointA: {fileID: 1823116809}
338375
m_pointB: {fileID: 136682821}
339376
m_pointC: {fileID: 1528289162}
340-
CutPointA: {x: 0, y: 0, z: 0}
341-
CutPointB: {x: 1, y: 1.36, z: 0}
342-
CutDirection: {x: 0, y: -1, z: 0}
343-
CutDepth: 1
344-
processCut: 0
377+
m_cutPointA: {x: 0, y: 0, z: 0}
378+
m_cutPointB: {x: 1, y: 0, z: 0}
379+
m_cutDirection: {x: 0, y: 1, z: 0}
380+
m_cutDepth: 1
345381
--- !u!33 &4436061565707235475
346382
MeshFilter:
347383
m_ObjectHideFlags: 0
@@ -361,11 +397,14 @@ MeshRenderer:
361397
m_CastShadows: 1
362398
m_ReceiveShadows: 1
363399
m_DynamicOccludee: 1
400+
m_StaticShadowCaster: 0
364401
m_MotionVectors: 1
365402
m_LightProbeUsage: 1
366403
m_ReflectionProbeUsage: 1
367404
m_RayTracingMode: 2
368405
m_RayTraceProcedural: 0
406+
m_RayTracingAccelStructBuildFlagsOverride: 0
407+
m_RayTracingAccelStructBuildFlags: 1
369408
m_RenderingLayerMask: 257
370409
m_RendererPriority: 0
371410
m_Materials:

Core/Scripts/Modules/Components/SofaBeamAdapterModel.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ protected override void CreateBeamMesh()
2525
return;
2626

2727
int nbrV = m_sofaMesh.NbVertices();
28-
Debug.Log("SofaBeamAdapterModel: " + nbrV);
29-
3028

3129
// nothing to do
3230
if (nbrV < 2)

0 commit comments

Comments
 (0)