Skip to content

Commit

Permalink
v 1.1
Browse files Browse the repository at this point in the history
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
  • Loading branch information
deprecatedcoder committed Aug 10, 2018
1 parent 7b513d3 commit ec08294
Show file tree
Hide file tree
Showing 78 changed files with 2,542 additions and 1,551 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
/Assets/ThirdParty*
/Assets/SmirkingCat/Scenes*

# Visual Studio cache directory
.vs/

# Autogenerated VS/MD solution and project files
ExportedObj/
*.csproj
Expand All @@ -23,6 +26,7 @@ ExportedObj/

# Unity3D generated meta files
*.pidb.meta
*.pdb.meta

# Unity3D Generated File On Crash Reports
sysinfo.txt
Expand Down
120 changes: 35 additions & 85 deletions Assets/SmirkingCat/Materials/WhiteOnBlackGrid.mat
Original file line number Diff line number Diff line change
Expand Up @@ -8,120 +8,70 @@ Material:
m_PrefabInternal: {fileID: 0}
m_Name: WhiteOnBlackGrid
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_CustomRenderQueue: -1
stringTagMap: {}
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 3000
stringTagMap:
RenderType: Transparent
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 2
serializedVersion: 3
m_TexEnvs:
- first:
name: _BumpMap
second:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailAlbedoMap
second:
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailMask
second:
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _DetailNormalMap
second:
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _EmissionMap
second:
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 2}
m_Offset: {x: 0, y: 0}
- first:
name: _MainTex
second:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 37cc30a42ec449e45b753d62c60ab99b, type: 3}
m_Scale: {x: 1, y: 2}
m_Offset: {x: 0, y: 0}
- first:
name: _MetallicGlossMap
second:
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _OcclusionMap
second:
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- first:
name: _ParallaxMap
second:
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- first:
name: _BumpScale
second: 1
- first:
name: _Cutoff
second: 0.5
- first:
name: _DetailNormalMapScale
second: 1
- first:
name: _DstBlend
second: 0
- first:
name: _GlossMapScale
second: 1
- first:
name: _Glossiness
second: 0.5
- first:
name: _GlossyReflections
second: 1
- first:
name: _Metallic
second: 0
- first:
name: _Mode
second: 0
- first:
name: _OcclusionStrength
second: 1
- first:
name: _Parallax
second: 0.02
- first:
name: _SmoothnessTextureChannel
second: 0
- first:
name: _SpecularHighlights
second: 1
- first:
name: _SrcBlend
second: 1
- first:
name: _UVSec
second: 0
- first:
name: _ZWrite
second: 1
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 3
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 0
m_Colors:
- first:
name: _Color
second: {r: 1, g: 1, b: 1, a: 1}
- first:
name: _EmissionColor
second: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 0.5019608}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
4 changes: 2 additions & 2 deletions Assets/SmirkingCat/Materials/WhiteOnBlackGrid.mat.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ec08294

Please sign in to comment.