Commit 839a621f authored by rv3Dcv's avatar rv3Dcv

Update several scenes' objects

parent 61042a8b
fileFormatVersion: 2
guid: b25aab2f7749b374a87680e3fddd1581
guid: cf5ff60a9387dac469e8828d0746e1b8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4300000
......
fileFormatVersion: 2
guid: 60ac377f536f6ea428deea0d1221b77d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 4300000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8521499473169066277
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3733694693741510095}
- component: {fileID: 2705108519560826568}
- component: {fileID: 8454547073764301284}
- component: {fileID: 736570783990670520}
- component: {fileID: 7645630847130000673}
m_Layer: 6
m_Name: BloodVessel_Prototype_long
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3733694693741510095
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8521499473169066277}
m_LocalRotation: {x: 0.66177, y: 0, z: 0, w: 0.7497069}
m_LocalPosition: {x: 12, y: 11.3, z: 30}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 82.87, y: 0, z: 0}
--- !u!33 &2705108519560826568
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8521499473169066277}
m_Mesh: {fileID: 4300000, guid: cf5ff60a9387dac469e8828d0746e1b8, type: 2}
--- !u!23 &8454547073764301284
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8521499473169066277}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 504e6eb0039488f41b6dbd89a30c17c8, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 2
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!54 &736570783990670520
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8521499473169066277}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &7645630847130000673
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8521499473169066277}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: cf5ff60a9387dac469e8828d0746e1b8, type: 2}
fileFormatVersion: 2
guid: ee43711a098b8054583b858ca88d5953
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3681112715642818846
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3681112715642818849}
- component: {fileID: 3681112715642818850}
- component: {fileID: 3681112715642818851}
- component: {fileID: 3681112715642818844}
- component: {fileID: 3681112715642818845}
m_Layer: 6
m_Name: BloodVessel_Prototype_short
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3681112715642818849
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3681112715642818846}
m_LocalRotation: {x: 0.66177, y: 0, z: 0, w: 0.7497069}
m_LocalPosition: {x: 12, y: 9.3, z: 30}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 82.87, y: 0, z: 0}
--- !u!33 &3681112715642818850
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3681112715642818846}
m_Mesh: {fileID: 4300000, guid: 60ac377f536f6ea428deea0d1221b77d, type: 2}
--- !u!23 &3681112715642818851
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3681112715642818846}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 504e6eb0039488f41b6dbd89a30c17c8, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!54 &3681112715642818844
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3681112715642818846}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!64 &3681112715642818845
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3681112715642818846}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4300000, guid: 60ac377f536f6ea428deea0d1221b77d, type: 2}
fileFormatVersion: 2
guid: 8ffd193e50c209e41913d06e8bf17205
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -173,6 +173,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02fb1d019bf486469f64a89aa7a9ec1, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMargin: 0.01
--- !u!1 &137101338
GameObject:
m_ObjectHideFlags: 0
......@@ -436,7 +437,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: timeStep
value: 0.004
value: 0.002
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: fixedTimeStep
......@@ -444,7 +445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: constraintSolverSteps
value: 500
value: 1000
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: spheres.Array.data[0]
......
......@@ -173,6 +173,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02fb1d019bf486469f64a89aa7a9ec1, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMargin: 0.01
--- !u!1 &137101338
GameObject:
m_ObjectHideFlags: 0
......@@ -436,7 +437,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: timeStep
value: 0.004
value: 0.002
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: fixedTimeStep
......@@ -444,7 +445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: constraintSolverSteps
value: 500
value: 1000
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: spheres.Array.data[0]
......@@ -1102,7 +1103,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 532959394}
m_LocalRotation: {x: 0.38268343, y: 0, z: 0, w: 0.92387956}
m_LocalPosition: {x: 0, y: 7, z: 38.62}
m_LocalPosition: {x: 0, y: 7, z: 40}
m_LocalScale: {x: 15, y: 15, z: 15}
m_Children: []
m_Father: {fileID: 0}
......
......@@ -173,6 +173,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02fb1d019bf486469f64a89aa7a9ec1, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMargin: 0.01
--- !u!1 &137101338
GameObject:
m_ObjectHideFlags: 0
......@@ -436,7 +437,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: timeStep
value: 0.004
value: 0.002
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: fixedTimeStep
......@@ -444,7 +445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: constraintSolverSteps
value: 500
value: 1000
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: spheres.Array.data[0]
......
......@@ -173,6 +173,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f02fb1d019bf486469f64a89aa7a9ec1, type: 3}
m_Name:
m_EditorClassIdentifier:
collisionMargin: 0.1
--- !u!1 &137101338
GameObject:
m_ObjectHideFlags: 0
......@@ -436,7 +437,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: timeStep
value: 0.004
value: 0.002
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: fixedTimeStep
......@@ -444,7 +445,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: constraintSolverSteps
value: 500
value: 1000
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007091, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: spheres.Array.data[0]
......@@ -470,6 +471,10 @@ PrefabInstance:
propertyPath: solveCollisionConstraints
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007112, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007114, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: m_Name
value: Simulation
......@@ -1098,7 +1103,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 532959394}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 7.24, z: 40}
m_LocalPosition: {x: 0, y: 7, z: 40}
m_LocalScale: {x: 15, y: 15, z: 15}
m_Children: []
m_Father: {fileID: 0}
......
fileFormatVersion: 2
guid: 4e8c0a79cdd897740818248f5bd1c334
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -15,6 +15,9 @@ namespace GuidewireSim
Vector3 closestSurfacePoint = contactPoint.point;
// Vector3 normalVector = (closestSurfacePoint - otherPosition).normalized;
Vector3 normalVector = contactPoint.normal;
// Debug.Log(normalVector.ToString("e2"));
// Debug.Log(closestSurfacePoint.ToString("e5"));
// Debug.Log((40-Mathf.Sqrt(50) - closestSurfacePoint[2]).ToString("e5"));
if (solverStep == 0)
{
......
......@@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b19d2ce05eae2343a036a52dc2c0c3b133ae1352804e41f0b343416fc0301f3152c438b0dcb13dc06
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14e80c1ecbf228dfeac1cfe2ebcae2e6d6cae085f6f3f5a0edfbf8b1e2
flags: 0
RecentlyUsedScenePath-1:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b08f0e822e6f3232f390a01ea320101526fc11a010ee40e19450400f41a08
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14e80c1ecbf228dfeac1cfe2ebcae2e6d6cae093e6e6f1e7fffde5ebeea4a1e8d9
flags: 0
RecentlyUsedScenePath-2:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14e80c1ecbf228dfeac1cfe2ebcae2e6d6cae081f0fbe6ebddf1f6a0b5bfa6f5d4b3
flags: 0
RecentlyUsedScenePath-3:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14e80c1ecbf228dfeac1cfe2ebcae2e6d6cae085f6f3f5a0edfbf8b1e2
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14e80c1ecbf228dfeac1cfe2ebcae2e6d6cae092fde0f1fafdf1bfb0f5a3bce5
flags: 0
RecentlyUsedScenePath-4:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14fb100ccb8308dfeac1cf
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14fb100ccbf228dfeac1cfe2ebcae2e6d6ca9ff1bce1fee7ecec
flags: 0
RecentlyUsedScenePath-5:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141db5011dfb595d04cb11d103
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14fb100ccb8308dfeac1cf
flags: 0
RecentlyUsedScenePath-6:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14f80914cbdf18eed6dbdfc0f3eeeaf5d1dfd1b4bce1fee7ecec
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14fb100ccbf231deedd2e9e1e4d1fffeeedfcda9f3fae4a0edfbf8b1e2
flags: 0
RecentlyUsedScenePath-7:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23810ed191c04d637c710cd1c08d85709c0c409c8
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14fb100ccbf228dfeac1cfe2ebcae2e6d6ca91b5fcfde4f7
flags: 0
RecentlyUsedScenePath-8:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14f80914cbdf18eed6dbdfc0f3eeeaf5d1dfd1b4b2a5befbf6fce5bc
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14f80914cbdf189ff6dbdfc0f3
flags: 0
RecentlyUsedScenePath-9:
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f7355b38e6030f19141dc23e03f61d1a05cc0ec037cd0c14f80914cbdf18eed6dbdfc0f3eeeaf5d1dfd1b4b2a6befbf6fce5bc
value: 224247031146467c18070827072a4d1529360b39293c357f1e2a183de7f37b1bedeb3ae0f43330320d07fc28373d0431f735585bc51b020e030bee3121ed191e18d111d31fe51a0fc32915dec822fdecdbd1ebdfd6e2f3c1e8deb2fbf5fefab6e0ffacefb3
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment