Add VR button and start with VR flow

beautypi · Nov 15, 2015 · 2e8ac48 · 2e8ac48
1 parent 78059d6
commit 2e8ac48
Show file tree

Hide file tree

Showing 14 changed files with 143 additions and 8 deletions.
diff --git a/shadertoy/Base.lproj/Main.storyboard b/shadertoy/Base.lproj/Main.storyboard
diff --git a/shadertoy/Images.xcassets/vr.imageset/Contents.json b/shadertoy/Images.xcassets/vr.imageset/Contents.json
@@ -0,0 +1,22 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "vr.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "[email protected]",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
diff --git a/shadertoy/Images.xcassets/vr.imageset/vr.png b/shadertoy/Images.xcassets/vr.imageset/vr.png
diff --git a/shadertoy/Images.xcassets/vr.imageset/[email protected] b/shadertoy/Images.xcassets/vr.imageset/[email protected]
diff --git a/shadertoy/ShaderCanvasViewController.h b/shadertoy/ShaderCanvasViewController.h
@@ -8,6 +8,7 @@
 
 #import <GLKit/GLKit.h>
 #import "APIShaderObject.h"
+#import "VRSettings.h"
 
 typedef NS_ENUM(NSUInteger, ShaderInputFilterMode) {
     NEAREST,
@@ -22,6 +23,7 @@ typedef NS_ENUM(NSUInteger, ShaderInputWrapMode) {
 
 @interface ShaderCanvasViewController : GLKViewController
 
+- (void) setVRSettings:(VRSettings *)vrSettings;
 - (BOOL) compileShaderPass:(APIShaderPass *)shader theError:(NSString **)error;
 
 - (void) start;

diff --git a/shadertoy/ShaderCanvasViewController.m b/shadertoy/ShaderCanvasViewController.m
@@ -26,6 +26,7 @@
 
 @interface ShaderCanvasViewController () {
     APIShaderPass* _shaderPass;
+    VRSettings* _vrSettings;
 
     GLuint _programId;
     GLuint _vertexBuffer;
@@ -94,13 +95,19 @@ - (BOOL) createShaderProgram:(APIShaderPass *)shaderPass theError:(NSString **)e
     GLuint VertexShaderID = glCreateShader(GL_VERTEX_SHADER);
     GLuint FragmentShaderID = glCreateShader(GL_FRAGMENT_SHADER);
 
-    NSString *VertexShaderCode = [[NSString alloc] readFromFile:@"/shaders/vertex_main" ofType:@"glsl"];
+    NSString *VertexShaderCode;
+
+    if( _vrSettings ) {
+        VertexShaderCode = [_vrSettings getVertexShaderCode];
+    } else {
+        VertexShaderCode = [[NSString alloc] readFromFile:@"/shaders/vertex_main" ofType:@"glsl"];
+    }
 
     char const * VertexSourcePointer = [VertexShaderCode UTF8String];
     glShaderSource(VertexShaderID, 1, &VertexSourcePointer , NULL);
     glCompileShader(VertexShaderID);
 
-    NSString *FragmentShaderCode = [[NSString alloc] readFromFile:@"/shaders/fragment_base_uniforms" ofType:@"glsl"];
+    NSString *FragmentShaderCode =[[NSString alloc] readFromFile:@"/shaders/fragment_base_uniforms" ofType:@"glsl"];
 
     for( APIShaderPassInput* input in shaderPass.inputs )  {
         if( [input.ctype isEqualToString:@"cubemap"] ) {
@@ -117,6 +124,8 @@ - (BOOL) createShaderProgram:(APIShaderPass *)shaderPass theError:(NSString **)e
 
     if( [shaderPass.type isEqualToString:@"sound"] ) {
         FragmentShaderCode = [FragmentShaderCode stringByAppendingString:[[NSString alloc] readFromFile:@"/shaders/fragment_main_sound" ofType:@"glsl"]];
+    } else if( _vrSettings ) {
+        FragmentShaderCode = [FragmentShaderCode stringByAppendingString:[_vrSettings getFragmentShaderCode]];
     } else {
         FragmentShaderCode = [FragmentShaderCode stringByAppendingString:[[NSString alloc] readFromFile:@"/shaders/fragment_main_image" ofType:@"glsl"]];
     }
@@ -326,6 +335,12 @@ - (void)bindUniforms {
     }
 }
 
+#pragma mark - VR
+
+- (void) setVRSettings:(VRSettings *)vrSettings {
+    _vrSettings = vrSettings;
+}
+
 #pragma mark - ShaderCanvasViewController
 
 - (BOOL)compileShaderPass:(APIShaderPass *)shader theError:(NSString **)error {

diff --git a/shadertoy/ShaderViewController.h b/shadertoy/ShaderViewController.h
@@ -8,7 +8,9 @@
 
 #import <UIKit/UIKit.h>
 #import <GLKit/GLKit.h>
+
 #import "APIShaderObject.h"
+#import "VRSettings.h"
 
 typedef NS_ENUM(NSUInteger, ShaderViewMode) {
     VIEW_FULLSCREEN_IF_LANDSCAPE,
@@ -25,6 +27,7 @@ typedef NS_ENUM(NSUInteger, ShaderViewMode) {
 
 @property (strong, nonatomic) IBOutlet UILabel *shaderCompiling;
 @property (strong, nonatomic) IBOutlet UIButton *shaderCompileInfoButton;
+@property (strong, nonatomic) IBOutlet UIButton *shaderVRButton;
 
 @property (strong, nonatomic) IBOutlet UIButton *shaderPlayerRewind;
 @property (strong, nonatomic) IBOutlet UIButton *shaderPlayerPlay;
@@ -34,5 +37,6 @@ typedef NS_ENUM(NSUInteger, ShaderViewMode) {
 @property (strong, nonatomic) IBOutlet UIBarButtonItem *shaderShareButton;
 
 - (void) setShaderObject:(APIShaderObject *)shader;
+- (void) setVRSettings:(VRSettings *)vrSettings;
 
 @end
diff --git a/shadertoy/ShaderViewController.m b/shadertoy/ShaderViewController.m
@@ -26,6 +26,7 @@
 @interface ShaderViewController () {
     APIShaderObject* _shader;
     SoundPassPlayer* _soundPassPlayer;
+    VRSettings* _vrSettings;
 
     UIView* _imageShaderView;
     ShaderCanvasViewController* _imageShaderViewController;
@@ -238,6 +239,9 @@ - (void) compileImageShader {
                 if( ![headerComment isEqualToString:@""] ) {
                     [_shaderCompileInfoButton setHidden:NO];
                 }
+                if( [_shader vrImplemented] && !_vrSettings ) {
+                    [_shaderVRButton setHidden:NO];
+                }
             } completion:^(BOOL finished) {
                 [_shaderImageView setHidden:YES];
                 [weakSelf.view bringSubviewToFront:_imageShaderView];
@@ -304,6 +308,24 @@ - (void) playSoundSyncedWithShader {
     }
 }
 
+#pragma mark - VR
+
+- (void) setVRSettings:(VRSettings *)vrSettings {
+    _vrSettings = vrSettings;
+    [_imageShaderViewController setVRSettings:vrSettings];
+}
+
+- (IBAction)shaderVRClick:(id)sender {
+    VRSettings *vrSettings = [[VRSettings alloc] init];
+
+    UIStoryboard *mainStoryboard = [UIStoryboard storyboardWithName:@"Main" bundle: nil];
+    UIViewController* viewController = (UIViewController*)[mainStoryboard instantiateViewControllerWithIdentifier: @"ShaderViewController"];
+
+    [((ShaderViewController *)viewController) setShaderObject:_shader];
+    [((ShaderViewController *)viewController) setVRSettings:vrSettings];
+    [self.navigationController pushViewController:viewController animated:YES];
+}
+
 #pragma mark - UI
 
 - (IBAction)shaderPlayerRewindClick:(id)sender {

diff --git a/shadertoy/VRSettings.h b/shadertoy/VRSettings.h
@@ -64,4 +64,7 @@ typedef NS_ENUM(NSUInteger, VRSettingsInput) {
 @property (atomic) VRSettingsRenderMode renderMode;
 @property (atomic) VRSettingsInput inputMode;
 
+-(NSString *) getVertexShaderCode;
+-(NSString *) getFragmentShaderCode;
+
 @end
diff --git a/shadertoy/VRSettings.m b/shadertoy/VRSettings.m
@@ -7,7 +7,29 @@
 //
 
 #import "VRSettings.h"
+#import "Utils.h"
 
 @implementation VRSettings
 
+@synthesize renderMode, rightEyeParams, leftEyeParams, inputMode, positionState;
+
+- (id)init {
+    self = [super init];
+    if(self){
+    }
+    return self;
+}
+
+-(NSString *) getVertexShaderCode {
+    NSString *vertexShaderCode = [[NSString alloc] readFromFile:@"/shaders/vertex_main" ofType:@"glsl"];
+    return vertexShaderCode;
+}
+
+-(NSString *) getFragmentShaderCode {
+    NSString *fragmentShaderCode = [[NSString alloc] readFromFile:@"/shaders/fragment_main_vr" ofType:@"glsl"];
+    return fragmentShaderCode;
+}
+
+
+
 @end
diff --git a/shadertoy/shaders/fragment_main_image.glsl b/shadertoy/shaders/fragment_main_image.glsl
@@ -1,4 +1,4 @@
 void main()  {
     mainImage(gl_FragColor, gl_FragCoord.xy + ifFragCoordOffsetUniform );
     gl_FragColor.w = 1.;
-}
+}
diff --git a/shadertoy/shaders/fragment_main_sound.glsl b/shadertoy/shaders/fragment_main_sound.glsl
@@ -5,4 +5,4 @@ void main()  {
     vec2 vl = mod(v,256.0)/255.0;
     vec2 vh = floor(v/256.0)/255.0;
     gl_FragColor = vec4(vl.x,vh.x,vl.y,vh.y);
-}
+}
diff --git a/shadertoy/shaders/fragment_main_vr.glsl b/shadertoy/shaders/fragment_main_vr.glsl
@@ -51,4 +51,4 @@ void main()  {
     gl_FragColor.xyz *= vec3( eyeID, 1.0-eyeID, 1.0-eyeID );
 
     gl_FragColor.w = 1.;
-}
+}
diff --git a/shadertoy/shaders/vertex_main.glsl b/shadertoy/shaders/vertex_main.glsl
@@ -6,4 +6,4 @@ attribute vec3 position;
 void main() {
     gl_Position.xyz = position;
     gl_Position.w = 1.0;
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -51,4 +51,4 @@ void main() { @@
         gl_FragColor.xyz *= vec3( eyeID, 1.0-eyeID, 1.0-eyeID );
         gl_FragColor.w = 1.;
-    }
+    }