diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2014-03-13 22:57:24 -0300 |
| commit | 31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b (patch) | |
| tree | b6d3a290333c72940b49ed4c930ff6858a59515e /platform/iphone/gl_view.h | |
| parent | a65edb4caabec21654c56552e11aacf0fd9291de (diff) | |
| download | redot-engine-31ce3c5fd0300aac1e86bced1efc5f9ec94bdb6b.tar.gz | |
-fix bug in cache for atlas import/export
-fix some menus
-fixed bug in out transition curves
-detect and remove file:/// in collada
-remove multiscript for now
-remove dependencies on mouse in OS, moved to Input
-avoid fscache from screwing up (fix might make it slower, but it works)
-funcref was missing, it's there now
Diffstat (limited to 'platform/iphone/gl_view.h')
| -rwxr-xr-x | platform/iphone/gl_view.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/platform/iphone/gl_view.h b/platform/iphone/gl_view.h index 0d95af9ab1..3e6181ab90 100755 --- a/platform/iphone/gl_view.h +++ b/platform/iphone/gl_view.h @@ -31,6 +31,7 @@ #import <OpenGLES/EAGL.h> #import <OpenGLES/ES1/gl.h> #import <OpenGLES/ES1/glext.h> +#import <MediaPlayer/MediaPlayer.h> @protocol GLViewDelegate; @@ -65,6 +66,9 @@ @property(nonatomic, assign) id<GLViewDelegate> delegate; +@property(strong, nonatomic) MPMoviePlayerController *moviePlayerController; +@property(strong, nonatomic) UIWindow *backgroundWindow; + -(void)startAnimation; -(void)stopAnimation; -(void)drawView; |