diff --git a/Core/Scripts/Modules/Tools/SofaKeyEvent.cs b/Core/Scripts/Modules/Tools/SofaKeyEvent.cs index e8ca3050..382a5f01 100644 --- a/Core/Scripts/Modules/Tools/SofaKeyEvent.cs +++ b/Core/Scripts/Modules/Tools/SofaKeyEvent.cs @@ -38,10 +38,10 @@ void Update() /// Keys for BeamAdapter: // moving tool up, down, left, right: 19, 21, 18, 20 - if (Input.GetKeyDown(KeyCode.LeftArrow)) m_sofaContext.SofaKeyPressEvent(18); - if (Input.GetKeyDown(KeyCode.RightArrow)) m_sofaContext.SofaKeyPressEvent(20); - if (Input.GetKeyDown(KeyCode.UpArrow)) m_sofaContext.SofaKeyPressEvent(19); - if (Input.GetKeyDown(KeyCode.DownArrow)) m_sofaContext.SofaKeyPressEvent(21); + if (Input.GetKey(KeyCode.LeftArrow)) m_sofaContext.SofaKeyPressEvent(18); + if (Input.GetKey(KeyCode.RightArrow)) m_sofaContext.SofaKeyPressEvent(20); + if (Input.GetKey(KeyCode.UpArrow)) m_sofaContext.SofaKeyPressEvent(19); + if (Input.GetKey(KeyCode.DownArrow)) m_sofaContext.SofaKeyPressEvent(21); if (Input.GetKeyUp(KeyCode.LeftArrow)) m_sofaContext.SofaKeyReleaseEvent(18); if (Input.GetKeyUp(KeyCode.RightArrow)) m_sofaContext.SofaKeyReleaseEvent(20); diff --git a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Bladder_doubleSide.mat b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Bladder_doubleSide.mat index e6044526..220c6eea 100644 --- a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Bladder_doubleSide.mat +++ b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Bladder_doubleSide.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Bladder_doubleSide - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 7c3f9a1b4d2e5f4089ab12cd34ef5601, type: 3} m_Parent: {fileID: 2100000, guid: a49780c09f5caf941af4490165ee2a22, type: 2} m_ModifiedSerializedProperties: 8 m_ValidKeywords: @@ -20,8 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left.mat b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left.mat index 094b143f..08020b9d 100644 --- a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left.mat +++ b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left.mat @@ -21,7 +21,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Kidney_Left - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 7c3f9a1b4d2e5f4089ab12cd34ef5601, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -33,8 +33,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left_doubleSide.mat b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left_doubleSide.mat index a4769e79..58a39a37 100644 --- a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left_doubleSide.mat +++ b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Kidney_Left_doubleSide.mat @@ -8,7 +8,7 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Kidney_Left_doubleSide - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 7c3f9a1b4d2e5f4089ab12cd34ef5601, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: @@ -20,8 +20,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: RenderType: Opaque - disabledShaderPasses: - - MOTIONVECTORS + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 diff --git a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Urinary_Ureter_Left_doubleSide.mat b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Urinary_Ureter_Left_doubleSide.mat index dbe53ece..904c9f42 100644 --- a/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Urinary_Ureter_Left_doubleSide.mat +++ b/Scenes/Demos/Endoscopy/BeamAdapter/SofaScenes/mesh/Urinary_system/Materials/Urinary_Ureter_Left_doubleSide.mat @@ -8,24 +8,19 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Urinary_Ureter_Left_doubleSide - m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Shader: {fileID: 4800000, guid: 7c3f9a1b4d2e5f4089ab12cd34ef5601, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - - _ALPHAPREMULTIPLY_ON - _NORMALMAP - - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: 3000 + m_CustomRenderQueue: 2000 stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - MOTIONVECTORS - - DepthOnly - - SHADOWCASTER + RenderType: Opaque + disabledShaderPasses: [] m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -100,8 +95,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 10 - - _DstBlendAlpha: 10 + - _DstBlend: 0 + - _DstBlendAlpha: 0 - _EnvironmentReflections: 1 - _GlossMapScale: 1 - _Glossiness: 0.7 @@ -119,10 +114,10 @@ Material: - _SpecularIntensity: 0.1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 1 + - _Surface: 0 - _UVSec: 0 - _WorkflowMode: 1 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.43137255} - _Color: {r: 1, g: 1, b: 1, a: 0.43137255}