UDRI-XRT/Stratasys-Fortus-450mc
1
0
Fork 0
mirror of https://udrimavric.com/MAVRIC/Stratasys-Fortus-450mc.git synced 2025-01-22 07:09:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/MAVRIC-1961_Create_Animations' into feature/MAVRIC-1961_UI-Fixes

Browse Source 
# Conflicts:
#	ProjectSettings/ProjectSettings.asset
This commit is contained in:
Brown, Caleb M 2023-07-24 17:10:51 -04:00
commit a3ceff7fe3
5 changed files with 44 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/MainScreenController.cs
View File

@ -46,8 +46,8 @@ public class MainScreenController : MonoBehaviour
stepChangeChannel.OnStepChanged -= OnStepChanged;
machineChangeChannel.OnMachineChange -= OnMachineChanged;
documentChannel.OnEventRaised += OnDocumentButtonClicked;
videoChannel.OnEventRaised += OnVideoButtonClicked;
documentChannel.OnEventRaised -= OnDocumentButtonClicked;
videoChannel.OnEventRaised -= OnVideoButtonClicked;
}
private void OnMachineChanged(MachineSO machine)

4
Assets/Scripts/Managers/GuideAnimationManager.cs
View File

@ -15,10 +15,6 @@ namespace Managers
{
if (item.animationClip == animationPlayer.clip)
{
//foreach (GameObject obj in item.guideObjects)
//{
// obj.SetActive(true);
//}
item.guideObjects.SetActive(true);
}
}

1
Assets/Scripts/Managers/VideoManager.cs
View File

@ -26,6 +26,7 @@ namespace Managers
stepChangeChannel.OnStepChanged -= OnStepChanged;
playChannel.OnEventRaised -= Play;
stopChannel.OnEventRaised -= Stop;
videoChannel.OnEventRaised -= VideoPanelEnabled;
}
private void OnStepChanged(StepSO step)

4
Assets/Scripts/XR/ReferenceImageLibrary.asset
View File

File diff suppressed because one or more lines are too long

49
ProjectSettings/ProjectSettings.asset
View File

@ -57,8 +57,8 @@ PlayerSettings:
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
iosUseCustomAppBackgroundBehavior: 0
allowedAutorotateToPortrait: 1
allowedAutorotateToPortraitUpsideDown: 1
allowedAutorotateToPortrait: 0
allowedAutorotateToPortraitUpsideDown: 0
allowedAutorotateToLandscapeRight: 1
allowedAutorotateToLandscapeLeft: 1
useOSAutorotation: 1
@ -138,12 +138,6 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3}
- {fileID: 4800000, guid: 6743a50a812740be8c0aa3fccc46fae9, type: 3}
- {fileID: -8091937080874747369, guid: e6aaa94396b17264791d972a69c1873e, type: 2}
- {fileID: 11400000, guid: 4602a861915eb4f4b897d24e48435c09, type: 2}
- {fileID: -5643329498234956570, guid: a700e85e08e15cc42afa43b723945cc8, type: 2}
- {fileID: 11400000, guid: c677e5c4eb85b7849a8da406775c299d, type: 2}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
@ -477,6 +471,43 @@ PlayerSettings:
m_Height: 36
m_Kind: 0
m_SubKind:
- m_BuildTarget: tvOS
m_Icons:
- m_Textures: []
m_Width: 1280
m_Height: 768
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 800
m_Height: 480
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 400
m_Height: 240
m_Kind: 0
m_SubKind:
- m_Textures: []
m_Width: 4640
m_Height: 1440
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 2320
m_Height: 720
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 3840
m_Height: 1440
m_Kind: 1
m_SubKind:
- m_Textures: []
m_Width: 1920
m_Height: 720
m_Kind: 1
m_SubKind:
m_BuildTargetBatching:
- m_BuildTarget: Standalone
m_StaticBatching: 1
@ -843,7 +874,7 @@ PlayerSettings:
Android: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL
Windows Store Apps: USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;USE_INPUT_SYSTEM_POSE_CONTROL;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
iPhone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;UNITY_XR_ARKIT_LOADER_ENABLED
iPhone: UNITY_XR_ARKIT_LOADER_ENABLED;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1
additionalCompilerArguments: {}
platformArchitecture: {}
scriptingBackend: