diff options
Diffstat (limited to 'platform/iphone')
-rw-r--r-- | platform/iphone/Appirater.h | 18 | ||||
-rwxr-xr-x | platform/iphone/gl_view.h | 14 | ||||
-rw-r--r-- | platform/iphone/icloud.h | 4 | ||||
-rw-r--r-- | platform/iphone/os_iphone.cpp | 12 | ||||
-rw-r--r-- | platform/iphone/os_iphone.h | 6 | ||||
-rw-r--r-- | platform/iphone/rasterizer_iphone.cpp | 2 |
6 files changed, 28 insertions, 28 deletions
diff --git a/platform/iphone/Appirater.h b/platform/iphone/Appirater.h index 6ff25532f7..9c7e3febf6 100644 --- a/platform/iphone/Appirater.h +++ b/platform/iphone/Appirater.h @@ -27,10 +27,10 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ This file is part of Appirater. - + Copyright (c) 2010, Arash Payan All rights reserved. - + Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without @@ -39,10 +39,10 @@ copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND @@ -119,7 +119,7 @@ extern NSString *const kAppiraterDeclinedToRate; a 'use'. You tell Appirater about these events using the two methods: [Appirater appLaunched:] [Appirater appEnteredForeground:] - + Users need to 'use' the same version of the app this many times before before they will be prompted to rate it. */ @@ -161,7 +161,7 @@ extern NSString *const kAppiraterDeclinedToRate; /* DEPRECATED: While still functional, it's better to use appLaunched:(BOOL)canPromptForRating instead. - + Calls [Appirater appLaunched:YES]. See appLaunched: for details of functionality. */ + (void)appLaunched:(int)p_app_id; @@ -171,7 +171,7 @@ extern NSString *const kAppiraterDeclinedToRate; support multitasking, the 'uses' count will be incremented. You should call this method at the end of your application delegate's application:didFinishLaunchingWithOptions: method. - + If the app has been used enough to be rated (and enough significant events), you can suppress the rating alert by passing NO for canPromptForRating. The rating alert will simply be postponed @@ -185,7 +185,7 @@ extern NSString *const kAppiraterDeclinedToRate; Tells Appirater that the app was brought to the foreground on multitasking devices. You should call this method from the application delegate's applicationWillEnterForeground: method. - + If the app has been used enough to be rated (and enough significant events), you can suppress the rating alert by passing NO for canPromptForRating. The rating alert will simply be postponed @@ -201,7 +201,7 @@ extern NSString *const kAppiraterDeclinedToRate; calls, then you might want to call this method whenever the user places a call. If it's a game, you might want to call this whenever the user beats a level boss. - + If the user has performed enough significant events and used the app enough, you can suppress the rating alert by passing NO for canPromptForRating. The rating alert will simply be postponed until it is called again with YES for diff --git a/platform/iphone/gl_view.h b/platform/iphone/gl_view.h index e69ddc839a..9c27c6a025 100755 --- a/platform/iphone/gl_view.h +++ b/platform/iphone/gl_view.h @@ -42,15 +42,15 @@ // The pixel dimensions of the backbuffer GLint backingWidth; GLint backingHeight; - + EAGLContext *context; - + // OpenGL names for the renderbuffer and framebuffers used to render to this view GLuint viewRenderbuffer, viewFramebuffer; - + // OpenGL name for the depth buffer that is attached to viewFramebuffer, if it exists (0 if it does not exist) GLuint depthRenderbuffer; - + BOOL useCADisplayLink; // CADisplayLink available on 3.1+ synchronizes the animation timer & drawing with the refresh rate of the display, only supports animation intervals of 1/60 1/30 & 1/15 CADisplayLink *displayLink; @@ -58,12 +58,12 @@ // An animation timer that, when animation is started, will periodically call -drawView at the given rate. // Only used if CADisplayLink is not NSTimer *animationTimer; - + NSTimeInterval animationInterval; - + // Delegate to do our drawing, called by -drawView, which can be called manually or via the animation timer. id<GLViewDelegate> delegate; - + // Flag to denote that the -setupView method of a delegate has been called. // Resets to NO whenever the delegate changes. BOOL delegateSetup; diff --git a/platform/iphone/icloud.h b/platform/iphone/icloud.h index c772555835..dcf3677c85 100644 --- a/platform/iphone/icloud.h +++ b/platform/iphone/icloud.h @@ -44,13 +44,13 @@ class ICloud : public Object { List<Variant> pending_events; public: - + Error remove_key(Variant p_param); Variant set_key_values(Variant p_param); Variant get_key_value(Variant p_param); Error synchronize_key_values(); Variant get_all_key_values(); - + int get_pending_event_count(); Variant pop_pending_event(); diff --git a/platform/iphone/os_iphone.cpp b/platform/iphone/os_iphone.cpp index 9f6b8433aa..56dffc8aa4 100644 --- a/platform/iphone/os_iphone.cpp +++ b/platform/iphone/os_iphone.cpp @@ -160,13 +160,13 @@ void OSIPhone::initialize(const VideoMode& p_desired,int p_video_driver,int p_au #ifdef STOREKIT_ENABLED store_kit = memnew(InAppStore); Globals::get_singleton()->add_singleton(Globals::Singleton("InAppStore", store_kit)); -#endif +#endif #ifdef ICLOUD_ENABLED icloud = memnew(ICloud); Globals::get_singleton()->add_singleton(Globals::Singleton("ICloud", icloud)); //icloud->connect(); -#endif +#endif }; MainLoop *OSIPhone::get_main_loop() const { @@ -303,7 +303,7 @@ void OSIPhone::queue_event(const InputEvent& p_event) { ERR_FAIL_INDEX( event_count, MAX_EVENTS ); - event_queue[event_count++] = p_event; + event_queue[event_count++] = p_event; }; void OSIPhone::touches_cancelled() { @@ -490,7 +490,7 @@ String OSIPhone::get_name() { }; Size2 OSIPhone::get_window_size() const { - + return Vector2(video_mode.width, video_mode.height); } @@ -522,7 +522,7 @@ Error OSIPhone::native_video_play(String p_path, float p_volume, String p_audio_ String tempFile = get_data_dir(); if (!exists) return FAILED; - + if (p_path.begins_with("res://")) { if (PackedData::get_singleton()->has_path(p_path)) { print("Unable to play %S using the native player as it resides in a .pck file\n", p_path.c_str()); @@ -535,7 +535,7 @@ Error OSIPhone::native_video_play(String p_path, float p_volume, String p_audio_ memdelete(f); - print("Playing video: %S\n", p_path.c_str()); + print("Playing video: %S\n", p_path.c_str()); if (_play_video(p_path, p_volume, p_audio_track, p_subtitle_track) ) return OK; return FAILED; diff --git a/platform/iphone/os_iphone.h b/platform/iphone/os_iphone.h index d34e8bfe95..9f919940c0 100644 --- a/platform/iphone/os_iphone.h +++ b/platform/iphone/os_iphone.h @@ -166,7 +166,7 @@ public: virtual void set_video_mode(const VideoMode& p_video_mode,int p_screen=0); virtual VideoMode get_video_mode(int p_screen=0) const; virtual void get_fullscreen_mode_list(List<VideoMode> *p_list,int p_screen=0) const; - + virtual void set_keep_screen_on(bool p_enabled); virtual bool can_draw() const; @@ -176,7 +176,7 @@ public: virtual void hide_virtual_keyboard(); virtual void set_cursor_shape(CursorShape p_shape); - + virtual Size2 get_window_size() const; virtual bool has_touchscreen_ui_hint() const; @@ -188,7 +188,7 @@ public: Error shell_open(String p_uri); String get_data_dir() const; - + void set_locale(String p_locale); String get_locale() const; diff --git a/platform/iphone/rasterizer_iphone.cpp b/platform/iphone/rasterizer_iphone.cpp index 29364d091a..f06f12547f 100644 --- a/platform/iphone/rasterizer_iphone.cpp +++ b/platform/iphone/rasterizer_iphone.cpp @@ -2071,7 +2071,7 @@ void RasterizerIPhone::_setup_light(LightInstance* p_instance, int p_idx) { glPopMatrix(); - + } break; default: break; |