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

Merge pull request 'Visual Adjustments' (#3) from visual-adjustments into development

Browse Source 
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-Fortus-450mc-HL2/pulls/3
This commit is contained in:
Joshua Latham 2023-09-15 17:25:56 +00:00
commit 3c4b3d691e
15 changed files with 2991 additions and 1660 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Assets/MixedRealityToolkit.Generated/CustomProfiles/VuforiaMixedRealitySpeechCommandsProfile.asset
View File

@ -107,3 +107,59 @@ MonoBehaviour:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Previous
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Video
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Document
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Animation
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Details
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Next
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Follow
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0
- localizationKey:
keyword: Toggle Model
keyCode: 0
action:
id: 0
description: Navigation Action
axisConstraint: 0

13
Assets/Resources/MAVRIC.Equipment/Stratasys-Fortus-450mc/img002.jpg.meta
View File

@ -119,6 +119,19 @@ TextureImporter:
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: iPhone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048

4470
Assets/Stratasys-Fortus-450mc/Scenes/2-Fortus-ImageTargets.unity
View File

File diff suppressed because it is too large Load Diff

1
Assets/Stratasys-Fortus-450mc/Scripts/Managers/VideoManager.cs
View File

@ -42,6 +42,7 @@ namespace Managers
private void Play()
{
Stop();
videoPlayer.frame = 0;
videoPlayer.Play();
}

14
Assets/Stratasys-Fortus-450mc/Scripts/ObjectToggle.cs Normal file
View File

@ -0,0 +1,14 @@
using UnityEngine;
namespace Stratasys_Fortus_450mc.Scripts
{
public class ObjectToggle : MonoBehaviour
{
public GameObject target;
public void Toggle()
{
target.SetActive(!target.activeSelf);
}
}
}

11
Assets/Stratasys-Fortus-450mc/Scripts/ObjectToggle.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 19ca7617f01176547b53042de11956be
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

14
Assets/Stratasys-Fortus-450mc/Scripts/SO Data/Channels/ResetObjectsChannel.asset Normal file
View File

@ -0,0 +1,14 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f0cacf97afa8ecd4b9be403677b76e4e, type: 3}
m_Name: ResetObjectsChannel
m_EditorClassIdentifier:

8
Assets/Stratasys-Fortus-450mc/Scripts/SO Data/Channels/ResetObjectsChannel.asset.meta Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 91eadf6d3387ad54c8f119df5c3a1d71
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

17
Assets/Stratasys-Fortus-450mc/Scripts/TransformCopier.cs Normal file
View File

@ -0,0 +1,17 @@
using UnityEngine;
namespace Stratasys_Fortus_450mc.Scripts
{
public class TransformCopier : MonoBehaviour
{
public Transform copyTarget;
public void Copy()
{
Transform t = transform;
t.position = copyTarget.position;
t.rotation = copyTarget.rotation;
t.localScale = copyTarget.localScale;
}
}
}

11
Assets/Stratasys-Fortus-450mc/Scripts/TransformCopier.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 5ac5f7cbc49d8f5438fb12419474c216
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

18
Assets/XR/Settings/Open XR Package Settings.asset
View File

@ -853,11 +853,27 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9f0ebc320a151d3408ea1e9fce54d40e, type: 3}
m_Name: Open XR Package Settings
m_EditorClassIdentifier:
Keys: 0e0000000100000007000000
Keys: 0e000000010000000700000004000000
Values:
- {fileID: -4571323897014950122}
- {fileID: -5170761409755487343}
- {fileID: 3245460505873034310}
- {fileID: 127489043413740829}
--- !u!114 &127489043413740829
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b5a1f07dc5afe854f9f12a4194aca3fb, type: 3}
m_Name: iPhone
m_EditorClassIdentifier:
features: []
m_renderMode: 1
m_depthSubmissionMode: 0
--- !u!114 &566985183039296702
MonoBehaviour:
m_ObjectHideFlags: 0

2
Packages/manifest.json
View File

@ -11,7 +11,7 @@
"com.unity.timeline": "1.7.5",
"com.unity.ugui": "1.0.0",
"com.unity.vectorgraphics": "2.0.0-preview.21",
"com.unity.visualscripting": "1.8.0",
"com.unity.visualscripting": "1.9.0",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",
"com.unity.modules.animation": "1.0.0",

10
Packages/packages-lock.json
View File

@ -111,7 +111,7 @@
"url": "https://packages.unity.com"
},
"com.unity.inputsystem": {
"version": "1.6.1",
"version": "1.7.0",
"depth": 2,
"source": "registry",
"dependencies": {
@ -211,7 +211,7 @@
"url": "https://packages.unity.com"
},
"com.unity.visualscripting": {
"version": "1.8.0",
"version": "1.9.0",
"depth": 0,
"source": "registry",
"dependencies": {
@ -221,7 +221,7 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.arfoundation": {
"version": "5.0.6",
"version": "5.0.7",
"depth": 1,
"source": "registry",
"dependencies": {
@ -238,7 +238,7 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.core-utils": {
"version": "2.2.1",
"version": "2.2.3",
"depth": 1,
"source": "registry",
"dependencies": {
@ -269,7 +269,7 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.openxr": {
"version": "1.8.1",
"version": "1.8.2",
"depth": 1,
"source": "registry",
"dependencies": {

2
ProjectSettings/ProjectSettings.asset
View File

@ -17,7 +17,7 @@ PlayerSettings:
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
m_ShowUnitySplashScreen: 0
m_ShowUnitySplashScreen: 1
m_ShowUnitySplashLogo: 1
m_SplashScreenOverlayOpacity: 1
m_SplashScreenAnimation: 1

4
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 2022.3.3f1
m_EditorVersionWithRevision: 2022.3.3f1 (7cdc2969a641)
m_EditorVersion: 2022.3.9f1
m_EditorVersionWithRevision: 2022.3.9f1 (ea401c316338)