Commit bd21426f authored by rv3Dcv's avatar rv3Dcv

Add Aorta model

parent edc1f4e6
fileFormatVersion: 2
guid: 6bec5b6c36d11744c9fc90810d99410e
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Aorta Material
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.5660378, g: 0.06674973, b: 0.06674973, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []
fileFormatVersion: 2
guid: 9c302730209490844911524b04ef43d8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &451085754869228611
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8715797220326520696}
- component: {fileID: 5774622118021172786}
- component: {fileID: 6991326158837459622}
- component: {fileID: 451085754869228610}
- component: {fileID: 451085754869228609}
m_Layer: 6
m_Name: "Aorta_ohne_\xD6ffnungen"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8715797220326520696
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 451085754869228611}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 63, y: 207, z: 380}
m_LocalScale: {x: 8, y: 8, z: 8}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5774622118021172786
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 451085754869228611}
m_Mesh: {fileID: -2432090755550338912, guid: 8a067025c40b34c458be5fe5834858a3, type: 3}
--- !u!23 &6991326158837459622
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 451085754869228611}
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: 9c302730209490844911524b04ef43d8, 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!64 &451085754869228610
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 451085754869228611}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -2432090755550338912, guid: 8a067025c40b34c458be5fe5834858a3, type: 3}
--- !u!54 &451085754869228609
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 451085754869228611}
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
fileFormatVersion: 2
guid: 3be372ed063d39e4cbab84c86f6b7d8d
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 8a067025c40b34c458be5fe5834858a3
ModelImporter:
serializedVersion: 20200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -550,11 +550,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 3901088838006394844, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: doCollisionTestFour
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3901088838006394844, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: doCollisionTestThree
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4233146888435007088, guid: 0e128b35dc3ea6746b6de609560d672d, type: 3}
propertyPath: m_RootOrder
......@@ -1778,67 +1778,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 8551267917678092658, guid: 71f983e886cdf6b418bb6e5402e7361d, type: 3}
m_PrefabInstance: {fileID: 2111928395}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1689907913154649744
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalPosition.z
value: 37.5
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858243, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858271, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_Name
value: Wall
objectReference: {fileID: 0}
- target: {fileID: 1689907913249858271, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e8ddc9fb194b74c49b9d5b7e844483e2, type: 3}
--- !u!1001 &2996864073917000083
PrefabInstance:
m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: 1e6ad9e1181b4c94fb35a15b789bc0db
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 196a07d955b94e04f9fbb6b38dae5c60
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 679bdab5623c7e8429602fe2b91eeb70
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: e3feca567d2d6724ea9efe5374f2838f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -14,7 +14,7 @@ namespace GuidewireSim
Vector3 initialPositionPrediction = new Vector3();
float sphereRadius = 5f; //!< The radius of a sphere of the guidewire.
float collisionMargin = 0.01f; /**< A margin by which a colliding element of the guidewire is set away from the object colliding with
float collisionMargin = 0.1f; /**< A margin by which a colliding element of the guidewire is set away from the object colliding with
* in the direction of the normal.
* @note Without this margin, the colliding element of the guidewire (e.g. a sphere) is corrected such that
* its surface exactly touches the object colliding with, which results in the guidewire still
......
......@@ -196,7 +196,7 @@ public class SimulationLoop : MonoBehaviour
PerformConstraintSolvingStep();
PerformUpdateStep();
PerformPredictionStep();
AdoptCalculations();
AdaptCalculations();
SetCollidersStep();
}
......@@ -317,13 +317,13 @@ public class SimulationLoop : MonoBehaviour
}
/**
* Adopts the data to the Unity GameObjects. For example, sets the positions of the GameObjects #spheres to #spherePositions.
* Adapts the data to the Unity GameObjects. For example, sets the positions of the GameObjects #spheres to #spherePositions.
* @req Sets the positions of the GameObjects #spheres to #spherePositions.
* @req Calculates #cylinderPositions based on #spherePositions.
* @req Sets the positions of the GameObjects #cylinders to #cylinderPositions.
* @req Sets the rotations of the GameObjects #cylinders to #cylinderOrientations.
*/
private void AdoptCalculations()
private void AdaptCalculations()
{
objectSetter.SetSpherePositions(spheres, SpheresCount, spherePositions);
mathHelper.CalculateCylinderPositions(CylinderCount, spherePositions, cylinderPositions);
......
......@@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019e60dc71ff72a12c20d05f8cc0fd8e2dbc2ebf8d7ffe6ccdbdbeee7faf9fae1
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019e60dc71ff72a12c20d05f8cc0fd8e2dbc2ebd8d7ffe6ccdbdbeee7faf9fae1
flags: 0
RecentlyUsedScenePath-1:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019e60dc71ff72a12c20d05f8cc0fd8e2dbc2ebefdcece296cbd1a9e6ed
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019f608cd1fda1a23fe1715dad42bd0f1dcd7dafe98baa9cdd0d6b4eb
flags: 0
RecentlyUsedScenePath-2:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019e60dc71ff72a12c20d05f8cc0fd8e2dbc2ebc8dde7e8cffbdba7f7bae5e0f1e1e8
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019f608cd1fda1a23fe1715dad42bd0f1dcd7dafe96fee9d1cac6
flags: 0
RecentlyUsedScenePath-3:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019f511d51ff72a12c20d05f8cc0fd8e2dbc29affd6e2f3c1
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a43f9070e425f1bf30705e6
flags: 0
RecentlyUsedScenePath-4:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019e60dc71ff72a12c20d05f8cc0fd8e2dbc2ebd9ccf9e6d1d9d7b4bce1fee7ecec
value: 224247031146467c18070827072a4d1529360b39293c357f1d3b1227edf42d28e7d435ece93f006f6931ff34012c042cbc1f0702e212
flags: 0
RecentlyUsedScenePath-5:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019e60dc71ff72a12c20d05f8cc0fd8e2dbc2ebd8d7ffe6ccdbdbeee7faf9fae1
value: 224247031146467c18070827072a4d1529360b39293c357f0c193400e1e53a3dddb666daf7323a2e3c11a1290a371526
flags: 0
RecentlyUsedScenePath-6:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019f608cd1fda1a23fe1715dad42bd0f1dcd7dafe96fee9d1cac6
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06d540d1137f7180c18c93b18021c07e90707fa3d1602cd28cc0acd2029c51008d7fb1cc3ead4d8c0a4cde5eeccc7
flags: 0
RecentlyUsedScenePath-7:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06e372e093ae00f1a34c6190306181af41814d2150019f608cd1fda1a23fe1715dad42bd0f1dcd7dafe98baa9cdd0d6b4eb
value: 224247031146467c18070827072a4d1529360b39293c357f0c193400e1e53a3dddb666daf7323a2e3c11d01d0b2c153ebc1f0702e212
flags: 0
RecentlyUsedScenePath-8:
value: 224247031146467c18070827072a4d1529360b39293c357f0e26113febf33d37ecd333faf3093c393707d06d540d1137f7180c18c93b18021c07e90707fa3d1602cd28cc0acd2029c51008d7fb1cc3ead4d8c0a4cde5eeccc7
value: 224247031146467c18070827072a4d1529360b39293c357f0c193400e1e53a3dddb466daf7323a2e3c11d01d0b2c153ebc1f0702e212
flags: 0
RecentlyUsedScenePath-9:
value: 224247031146467c18070827072a4d1529360b39293c357f0c193400e1e53a3dddb666daf7323a2e3c11a1290a371526
value: 224247031146467c18070827072a4d1529360b39293c357f0c193400e1e53a3dddb466daf7323a2e3c11d01d0b2c153ecd2f110afb1b060e2e5fb31b1ff6040a
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