Skip to content

Commit 09d7438

Browse files
authored
Merge pull request #17 from jbienzms/feature/Nudge
Feature/nudge
2 parents 4fdb74c + 76967bb commit 09d7438

File tree

74 files changed

+4860
-53
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+4860
-53
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -298,4 +298,5 @@ FakesAssemblies/
298298
*.opt
299299
mixedreality-azure-samples.sln
300300
mixedreality-azure-samples.csproj
301-
mixedreality-azure-samples.Player.csproj
301+
mixedreality-azure-samples.Player.csproj
302+
*.blend1

External/Models/Cancel.blend

458 KB
Binary file not shown.

External/Models/Direction.blend

461 KB
Binary file not shown.
460 KB
Binary file not shown.
463 KB
Binary file not shown.
452 KB
Binary file not shown.

External/Models/Ok.blend

415 KB
Binary file not shown.

SpatialAlignment-Unity/Assembly-CSharp.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -580,9 +580,11 @@
580580
<Compile Include="Assets\SpatialAlignment\Persistence\Json\SpatialFrameConverter.cs" />
581581
<Compile Include="Assets\SpatialAlignment\Persistence\Json\UnityContractResolver.cs" />
582582
<Compile Include="Assets\SpatialAlignment\Persistence\Json\Vector3Converter.cs" />
583+
<Compile Include="Assets\SpatialAlignment\Refinement\Scripts\NudgeController.cs" />
584+
<Compile Include="Assets\SpatialAlignment\Refinement\Scripts\NudgeRefinement.cs" />
583585
<Compile Include="Assets\SpatialAlignment\Refinement\Scripts\RayRefinement.cs" />
584586
<Compile Include="Assets\SpatialAlignment\Refinement\Scripts\RefinableModel.cs" />
585-
<Compile Include="Assets\SpatialAlignment\Refinement\Scripts\RefinementController.cs" />
587+
<Compile Include="Assets\SpatialAlignment\Refinement\Scripts\RefinementBase.cs" />
586588
<Compile Include="Assets\SpatialAlignment\SpatialAlignmentManager.cs" />
587589
<Compile Include="Assets\SpatialAlignment\SpatialFrame.cs" />
588590
<Compile Include="Assets\SpatialAlignment\SpatialFrameCollection.cs" />
Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: fa22bce62b991ca4b9aadff296ae1e8b, type: 3}
13+
m_Name: NewButtonMeshProfile
14+
m_EditorClassIdentifier:
15+
ColorPropertyName: _Color
16+
ValuePropertyName:
17+
SmoothStateChanges: 0
18+
StickyPressedEvents: 0
19+
StickyPressedTime: 0.15
20+
AnimationSpeed: 1
21+
ButtonStates:
22+
- Name: Pressed
23+
ActiveState: 0
24+
StateColor: {r: 1, g: 1, b: 1, a: 1}
25+
StateValue: 0
26+
Offset: {x: 0, y: 0, z: 0}
27+
Scale: {x: 0, y: 0, z: 0}
28+
- Name: Targeted
29+
ActiveState: 1
30+
StateColor: {r: 1, g: 1, b: 1, a: 1}
31+
StateValue: 0
32+
Offset: {x: 0, y: 0, z: 0}
33+
Scale: {x: 0, y: 0, z: 0}
34+
- Name: Interactive
35+
ActiveState: 2
36+
StateColor: {r: 1, g: 1, b: 1, a: 1}
37+
StateValue: 0
38+
Offset: {x: 0, y: 0, z: 0}
39+
Scale: {x: 0, y: 0, z: 0}
40+
- Name: ObservationTargeted
41+
ActiveState: 3
42+
StateColor: {r: 1, g: 1, b: 1, a: 1}
43+
StateValue: 0
44+
Offset: {x: 0, y: 0, z: 0}
45+
Scale: {x: 0, y: 0, z: 0}
46+
- Name: Observation
47+
ActiveState: 4
48+
StateColor: {r: 1, g: 1, b: 1, a: 1}
49+
StateValue: 0
50+
Offset: {x: 0, y: 0, z: 0}
51+
Scale: {x: 0, y: 0, z: 0}
52+
- Name: Disabled
53+
ActiveState: 5
54+
StateColor: {r: 1, g: 1, b: 1, a: 1}
55+
StateValue: 0
56+
Offset: {x: 0, y: 0, z: 0}
57+
Scale: {x: 0, y: 0, z: 0}

SpatialAlignment-Unity/Assets/NewButtonMeshProfile.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)