min

examples/Demo/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/DemoBox2D/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/Game/part1/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/Game/part2/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/Game/part3/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/Game/part4/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/Game/part5/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

examples/HelloWorld/src/example.cpp

@@ -30,7 +30,7 @@ public:
         button->setPosition(pos);
 
         //register  click handler to button
-        EventCallback cb = CLOSURE(this, &MainActor::buttonClicked);        
+        EventCallback cb = CLOSURE(this, &MainActor::buttonClicked);
         button->addEventListener(TouchEvent::CLICK, cb);
 
         //animate mouse over and mouse out events

examples/Match3/src/main.cpp

@@ -50,12 +50,9 @@ void run()
     core::init_desc desc;
     desc.title = "Oxygine Application";
 
-#if OXYGINE_SDL || OXYGINE_EMSCRIPTEN
-    // The initial window size can be set up here on SDL builds
+    // The initial window size can be set up here on SDL builds, ignored on Mobile devices
     desc.w = 960;
     desc.h = 640;
-    // Marmalade settings can be modified from the emulator's menu
-#endif
 
 
     example_preinit();
@@ -125,15 +122,6 @@ void run()
     //end
 }
 
-#ifdef __S3E__
-int main(int argc, char* argv[])
-{
-    run();
-    return 0;
-}
-#endif
-
-
 #ifdef OXYGINE_SDL
 
 #include "SDL_main.h"

oxygine/src/oxygine/Clock.cpp

@@ -1,7 +1,6 @@
 #include "Clock.h"
 #include <sstream>
 
-
 #ifdef _WIN32
 #   include <windows.h>
 #elif __ANDROID__

oxygine/src/oxygine/InputText.cpp

@@ -1,11 +1,11 @@
 #include "InputText.h"
+#include "SDL_events.h"
+#include "SDL_keyboard.h"
 #include "actor/ColorRectSprite.h"
 #include "actor/TextField.h"
 #include "core/oxygine.h"
 #include "res/ResFont.h"
 #include "utils/stringUtils.h"
-#include "SDL_keyboard.h"
-#include "SDL_events.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/InputText.h

@@ -2,8 +2,8 @@
 #include "oxygine-include.h"
 #include "Event.h"
 #include "EventDispatcher.h"
-#include <string>
 #include "SDL.h"
+#include <string>
 
 namespace oxygine
 {

oxygine/src/oxygine/ThreadLoader.cpp

@@ -27,8 +27,8 @@ namespace oxygine
     {
         _ress.push_back(res);
     }
-    
-    void ThreadLoader::add(const std::function< void() > &v)
+
+    void ThreadLoader::add(const std::function< void() >& v)
     {
         _funcs.push_back(v);
     }

oxygine/src/oxygine/ThreadLoader.h

@@ -24,7 +24,7 @@ namespace oxygine
 
         virtual void add(Resources* res);
         virtual void add(Resource* res);
-        virtual void add(const std::function< void() > &f);
+        virtual void add(const std::function< void() >& f);
 
         void start();
         //void stop();

oxygine/src/oxygine/actor/ColorRectSprite.cpp

@@ -1,6 +1,6 @@
 #include "ColorRectSprite.h"
-#include "../RenderDelegate.h"
 #include "../MaterialCache.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
 #include "../Serialize.h"
 #include "../utils/stringUtils.h"

oxygine/src/oxygine/actor/DebugActor.cpp

@@ -2,6 +2,8 @@
 #include "Button.h"
 #include "ColorRectSprite.h"
 #include "MaskedSprite.h"
+#include "SDL_scancode.h"
+#include "SDL_video.h"
 #include "Stage.h"
 #include "TextField.h"
 #include "../Event.h"
@@ -25,8 +27,6 @@
 #include <sstream>
 #include <stdarg.h>
 #include <stdio.h>
-#include "SDL_scancode.h"
-#include "SDL_video.h"
 
 #ifdef __APPLE__
 #include "../core/ios/ios.h"
@@ -44,7 +44,7 @@ namespace oxygine
 
     spDebugActor DebugActor::instance;
     int _corner = 0;
-    
+
 
     void DebugActor::initialize()
     {
@@ -117,7 +117,7 @@ namespace oxygine
         btn->setX(x);
         btn->addEventListener(TouchEvent::CLICK, CLOSURE(this, &DebugActor::_btnClicked));
     }
-    
+
     DebugActor::DebugActor() : _showTexel2PixelErrors(false), _showTouchedActor(false), _dragging(false)
     {
         DebugActor::initialize();
@@ -306,10 +306,10 @@ namespace oxygine
             s << "(" << fps << ")";
         }
         */
-        
+
         s << std::endl;
 
-        
+
         const IVideoDriver::Stats& vstats = IVideoDriver::_stats;
 
 #ifdef OXYGINE_DEBUG_TRACE_LEAKS

oxygine/src/oxygine/actor/Sprite.cpp

@@ -1,7 +1,7 @@
 #include "Sprite.h"
 #include "Stage.h"
-#include "../RenderDelegate.h"
 #include "../MaterialCache.h"
+#include "../RenderDelegate.h"
 #include "../RenderState.h"
 #include "../Serialize.h"
 #include "../core/UberShaderProgram.h"

oxygine/src/oxygine/core/android/jniHelper.cpp

@@ -1,4 +1,5 @@
 #include "jniHelper.h"
+
 extern "C"
 {
     JNIEnv* Android_JNI_GetEnv(void);

oxygine/src/oxygine/core/gl/ShaderProgramGL.cpp

@@ -1,7 +1,7 @@
 #include "ShaderProgramGL.h"
+#include "SDL.h"
 #include "VertexDeclarationGL.h"
 #include "oxgl.h"
-#include "SDL.h"
 
 namespace oxygine
 {

oxygine/src/oxygine/core/oxygine.cpp

@@ -11,6 +11,7 @@
 #include "../MaterialCache.h"
 #include "../PointerState.h"
 #include "../PostProcess.h"
+#include "../STDRenderDelegate.h"
 #include "../actor/DebugActor.h"
 #include "../actor/Stage.h"
 #include "../actor/TextField.h"
@@ -21,13 +22,10 @@
 #include "../res/ResStarlingAtlas.h"
 #include "../res/Resources.h"
 #include "../winnie_alloc/winnie_alloc.h"
+#include "gl/VideoDriverGLES20.h"
 #include "gl/oxgl.h"
 #include <stdio.h>
 
-#include "gl/VideoDriverGLES20.h"
-#include "../STDRenderDelegate.h"
-
-
 #ifdef EMSCRIPTEN
 #include <sys/time.h>
 #include <emscripten.h>

oxygine/src/oxygine/key.cpp

@@ -1,6 +1,5 @@
 #include "key.h"
 #include "SDL_keyboard.h"
-
 #include <algorithm>
 
 namespace oxygine

oxygine/src/oxygine/res/Resources.h

@@ -9,7 +9,6 @@
 #include <string>
 #include <unordered_map>
 
-
 namespace oxygine
 {
     class ResourcesLoadOptions