Skip to content

Commit ec08294

Browse files
v 1.1
Whole host of changes with this - Updated Unity version used to 2018.1.1f1 - Moved the Unity sample VRSampleScenes out of the third party directory to allow easier ignoring of everything else in there - Added material for debug box - Added texture for window reset progress indicator - Updated prefabs - Created SmirkingCat.PictureWindow namespace to be able to use easier PictureWindow.cs: - Moved all the UI stuff into new PictureWindowUI - Cleaned up target box usage and management - Disabled cursor visibility - Added Initialization IEnumerator to wait for both controllers PictureWindowUI.cs: - Controls showing instructions for initial configuration, OSD for reseting the window and subtitles as applicable PictureWindowCamera.cs: - Updated matrix calculation to fix bugs - Added ConfigureCamera() to handle differences between using a Tracker and a Vive wand - Added optional enhancedPerspective that allows rotating the camera as well SmoothMovement.cs: - Added this utility component for smoothing out the motion of the camera PictureWindowControl.cs: - Simplified and added additional button handling RadialProgressBar.cs: - Added this utility component for displaying a radial progress indicator Window.cs: - Base class for a window, containing it's dimensions and other info - Contains utility methods for reseting the window and getting it's center RealWindow.cs: - Contains info specific to the real window VirtualWindow.cs: - Contains info specific to the virtual window - Updates the corner positions if moved JohnnyLeeBox.cs: - Basically entirely rewrote to use a prefab that has a semi-transparent grid from in or outside - Target count is now determined by display size FlipNormals.cs: - Utility script to flip the normals to cover the inside of the JohnnyLeeBox SmirkingCat_TrackedObject.cs: - Removed as was no longer necessary
1 parent 7b513d3 commit ec08294

File tree

78 files changed

+2542
-1551
lines changed

Some content is hidden

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

78 files changed

+2542
-1551
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
/Assets/ThirdParty*
88
/Assets/SmirkingCat/Scenes*
99

10+
# Visual Studio cache directory
11+
.vs/
12+
1013
# Autogenerated VS/MD solution and project files
1114
ExportedObj/
1215
*.csproj
@@ -23,6 +26,7 @@ ExportedObj/
2326

2427
# Unity3D generated meta files
2528
*.pidb.meta
29+
*.pdb.meta
2630

2731
# Unity3D Generated File On Crash Reports
2832
sysinfo.txt

Assets/SmirkingCat/Materials/WhiteOnBlackGrid.mat

Lines changed: 35 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -8,120 +8,70 @@ Material:
88
m_PrefabInternal: {fileID: 0}
99
m_Name: WhiteOnBlackGrid
1010
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
11-
m_ShaderKeywords: _EMISSION
11+
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
1212
m_LightmapFlags: 1
13-
m_CustomRenderQueue: -1
14-
stringTagMap: {}
13+
m_EnableInstancingVariants: 0
14+
m_DoubleSidedGI: 0
15+
m_CustomRenderQueue: 3000
16+
stringTagMap:
17+
RenderType: Transparent
18+
disabledShaderPasses: []
1519
m_SavedProperties:
16-
serializedVersion: 2
20+
serializedVersion: 3
1721
m_TexEnvs:
18-
- first:
19-
name: _BumpMap
20-
second:
22+
- _BumpMap:
2123
m_Texture: {fileID: 0}
2224
m_Scale: {x: 1, y: 1}
2325
m_Offset: {x: 0, y: 0}
24-
- first:
25-
name: _DetailAlbedoMap
26-
second:
26+
- _DetailAlbedoMap:
2727
m_Texture: {fileID: 0}
2828
m_Scale: {x: 1, y: 1}
2929
m_Offset: {x: 0, y: 0}
30-
- first:
31-
name: _DetailMask
32-
second:
30+
- _DetailMask:
3331
m_Texture: {fileID: 0}
3432
m_Scale: {x: 1, y: 1}
3533
m_Offset: {x: 0, y: 0}
36-
- first:
37-
name: _DetailNormalMap
38-
second:
34+
- _DetailNormalMap:
3935
m_Texture: {fileID: 0}
4036
m_Scale: {x: 1, y: 1}
4137
m_Offset: {x: 0, y: 0}
42-
- first:
43-
name: _EmissionMap
44-
second:
38+
- _EmissionMap:
4539
m_Texture: {fileID: 0}
4640
m_Scale: {x: 1, y: 2}
4741
m_Offset: {x: 0, y: 0}
48-
- first:
49-
name: _MainTex
50-
second:
42+
- _MainTex:
5143
m_Texture: {fileID: 2800000, guid: 37cc30a42ec449e45b753d62c60ab99b, type: 3}
5244
m_Scale: {x: 1, y: 2}
5345
m_Offset: {x: 0, y: 0}
54-
- first:
55-
name: _MetallicGlossMap
56-
second:
46+
- _MetallicGlossMap:
5747
m_Texture: {fileID: 0}
5848
m_Scale: {x: 1, y: 1}
5949
m_Offset: {x: 0, y: 0}
60-
- first:
61-
name: _OcclusionMap
62-
second:
50+
- _OcclusionMap:
6351
m_Texture: {fileID: 0}
6452
m_Scale: {x: 1, y: 1}
6553
m_Offset: {x: 0, y: 0}
66-
- first:
67-
name: _ParallaxMap
68-
second:
54+
- _ParallaxMap:
6955
m_Texture: {fileID: 0}
7056
m_Scale: {x: 1, y: 1}
7157
m_Offset: {x: 0, y: 0}
7258
m_Floats:
73-
- first:
74-
name: _BumpScale
75-
second: 1
76-
- first:
77-
name: _Cutoff
78-
second: 0.5
79-
- first:
80-
name: _DetailNormalMapScale
81-
second: 1
82-
- first:
83-
name: _DstBlend
84-
second: 0
85-
- first:
86-
name: _GlossMapScale
87-
second: 1
88-
- first:
89-
name: _Glossiness
90-
second: 0.5
91-
- first:
92-
name: _GlossyReflections
93-
second: 1
94-
- first:
95-
name: _Metallic
96-
second: 0
97-
- first:
98-
name: _Mode
99-
second: 0
100-
- first:
101-
name: _OcclusionStrength
102-
second: 1
103-
- first:
104-
name: _Parallax
105-
second: 0.02
106-
- first:
107-
name: _SmoothnessTextureChannel
108-
second: 0
109-
- first:
110-
name: _SpecularHighlights
111-
second: 1
112-
- first:
113-
name: _SrcBlend
114-
second: 1
115-
- first:
116-
name: _UVSec
117-
second: 0
118-
- first:
119-
name: _ZWrite
120-
second: 1
59+
- _BumpScale: 1
60+
- _Cutoff: 0.5
61+
- _DetailNormalMapScale: 1
62+
- _DstBlend: 10
63+
- _GlossMapScale: 1
64+
- _Glossiness: 0.5
65+
- _GlossyReflections: 1
66+
- _Metallic: 0
67+
- _Mode: 3
68+
- _OcclusionStrength: 1
69+
- _Parallax: 0.02
70+
- _SmoothnessTextureChannel: 0
71+
- _SpecularHighlights: 1
72+
- _SrcBlend: 1
73+
- _UVSec: 0
74+
- _ZWrite: 0
12175
m_Colors:
122-
- first:
123-
name: _Color
124-
second: {r: 1, g: 1, b: 1, a: 1}
125-
- first:
126-
name: _EmissionColor
127-
second: {r: 0, g: 0, b: 0, a: 1}
76+
- _Color: {r: 1, g: 1, b: 1, a: 0.5019608}
77+
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

Assets/SmirkingCat/Materials/WhiteOnBlackGrid.mat.meta

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

0 commit comments

Comments
 (0)