Merge branch '3DBody' of http://git.zxkedu.com:33769/shenjianxing/VirtualFramework into 3DBody
This commit is contained in:
commit
2956fcedc3
File diff suppressed because one or more lines are too long
@ -165,10 +165,10 @@ namespace HighlightPlus {
|
||||
// This method is called when setting up the renderer once per-camera.
|
||||
public override void AddRenderPasses(ScriptableRenderer renderer, ref RenderingData renderingData) {
|
||||
#if UNITY_2019_4_OR_NEWER
|
||||
if (renderingData.cameraData.renderType == CameraRenderType.Base) {
|
||||
Camera cam = renderingData.cameraData.camera;
|
||||
renderPass.usesCameraOverlay = cam.GetUniversalAdditionalCameraData().cameraStack.Count > 0;
|
||||
}
|
||||
//if (renderingData.cameraData.renderType == CameraRenderType.Base) {
|
||||
// Camera cam = renderingData.cameraData.camera;
|
||||
// renderPass.usesCameraOverlay = cam.GetUniversalAdditionalCameraData().cameraStack.Count > 0;
|
||||
//}
|
||||
#endif
|
||||
renderPass.Setup(this, renderer);
|
||||
renderer.EnqueuePass(renderPass);
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4c87a0e1993f7439285693c04d6dab68
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 52f45c84fa7e04a17922d3833762b05c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 51c6f3b897886a44991168f065c0a99d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2bf6cf57b414f194baf76e0a325b7964
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a84ca8d2ecd964e4688324f75f6f582a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1fae029c3eecbe44ea3ff0b493f20601
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d3f0c8e9f16a58243b803d5d47a79c03
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 976cb377135fda24791255ebe76b2e57
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5176cd918f52ea842b73948dd3bc26a8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 92ad6261b6f1d234e95b0d3d93ecb063
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 92073d73c00ba4745a1846e66e0d487e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c8cdbc6f43d08374d8ad57ba52c291e9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 921cbf26409b3dc42bced514dfbc0294
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 260510f68d4501045937a08a041e9193
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3ec7c95d917901144b2b4c87d6223452
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d649e0c4be6794b47be815440ab085d3
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 84093f18d10915540be5035bf0bebf1c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 160fc31f922750444afec5e3d7280c07
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 637404373c3be1b4abb149a6ec887955
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 43709ae6df606fe4680b4f2cdb456ef2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 27a53bb609d45b240a6ae0f54e40ac3b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1981,6 +1981,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -4889895864073793145, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_long_levator_costarum_muscle_Left
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -2120593788238782996, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_External_intercostal_muscle_Left
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -1493126646322851868, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Innermost_intercostal_muscle_of_the_third_rib_Left
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_JiRou
|
||||
@ -1989,6 +2001,10 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4394918157920065491, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Innermost_intercostal_muscle_of_the_second_rib_Left
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5815114519766787646, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
@ -1997,6 +2013,18 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7458447936296418614, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Internal_intercostal_muscle_Left
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7465725733020427662, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Short_levator_costarum_muscle_Left
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8048981230271909881, guid: 71808ec34781194409f2b2a8f4a83dce, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Innermost_intercostal_muscle_of_the_first_rib_Left
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -28015,10 +28043,18 @@ PrefabInstance:
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7434262278496472474, guid: 3a238d0d1a934684a8db230279184d7d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_common_carotid_artery_DongMai
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -7132321807249616161, guid: 3a238d0d1a934684a8db230279184d7d, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -993150060220400093, guid: 3a238d0d1a934684a8db230279184d7d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_vertebral_artery(Right)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 919132149155446097, guid: 3a238d0d1a934684a8db230279184d7d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_DongMai
|
||||
@ -28027,6 +28063,10 @@ PrefabInstance:
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8502967781257836952, guid: 3a238d0d1a934684a8db230279184d7d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_brachiocephalic_trunk1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
@ -43494,6 +43534,10 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1645790457}
|
||||
m_Modifications:
|
||||
- target: {fileID: -8925860682485427200, guid: 88b2298eef6aa80459861c3c8b901f67, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SM_Superior_cerebral_vein_Right
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: -8679921383154817045, guid: 88b2298eef6aa80459861c3c8b901f67, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
|
||||
12750
Data/Xml/3DJiePao.xml
12750
Data/Xml/3DJiePao.xml
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user