dm 7 years ago
parent
commit
bc114d9b55

+ 2 - 2
oxygine/src/oxygine/Draggable.h

@@ -44,7 +44,7 @@ namespace oxygine
         RectF _bounds;
         Vector2 _dragPos;
         Vector2 _clientPos;
-        
+
         Actor* _dragClient;
         Actor* _actor;
         timeMS _startTm;
@@ -54,7 +54,7 @@ namespace oxygine
         bool _pressed;
         bool _singleDrag;
         bool _ignoreTouchUp;
-        
+
 
 
 

+ 1 - 1
oxygine/src/oxygine/HttpRequestTask.h

@@ -104,7 +104,7 @@ namespace oxygine
         std::vector<unsigned char> _postData;
 
         bool _continueDownload;
-        
+
         size_t _expectedContentSize;
         size_t _receivedContentSize;
         file::handle _fhandle;

+ 5 - 5
oxygine/src/oxygine/STDRenderer.cpp

@@ -42,12 +42,12 @@ namespace oxygine
         reset();
     }
 
-	void RenderStateCache::setDriver(IVideoDriver *d)
-	{
-		_driver = d;
-	}
+    void RenderStateCache::setDriver(IVideoDriver* d)
+    {
+        _driver = d;
+    }
 
-	void RenderStateCache::reset()
+    void RenderStateCache::reset()
     {
         resetTextures();
 

+ 1 - 1
oxygine/src/oxygine/STDRenderer.h

@@ -11,7 +11,7 @@ namespace oxygine
     public:
         RenderStateCache();
 
-		void setDriver(IVideoDriver *d);
+        void setDriver(IVideoDriver* d);
 
         const spNativeTexture& getTexture(int sampler) { return _textures[sampler]; }
 

+ 1 - 1
oxygine/src/oxygine/TouchEvent.h

@@ -42,7 +42,7 @@ namespace oxygine
 
         bool __clickDispatched;
         Vector2 wheelDirection;//actual only for WHEEL_DIR event
-        
+
         float __localScale;
     };
 }

+ 1 - 1
oxygine/src/oxygine/actor/Button.h

@@ -34,7 +34,7 @@ namespace oxygine
         state _state;
         const ResAnim* _resAnim;
         int _row;
-        
+
     private:
         pointer_index _btnPressed;
         pointer_index _btnOvered;

+ 1 - 1
oxygine/src/oxygine/actor/DebugActor.cpp

@@ -481,7 +481,7 @@ namespace oxygine
         cr->setSize(actor->getSize());
         cr->addTween(ColorRectSprite::TweenColor(Color(Color::White, 200)), 700, 1, true, 0, Tween::ease_inCubic)->detachWhenDone();
         cr->setTransform(tr);
-		cr->setPriority(999);
+        cr->setPriority(999);
         getStage()->addChild(cr);
         std::string dmp = actor->dump(0);
         logs::messageln(">>>>>>>>>>>>>>>>>>>>\ntouched actor '%s' local pos: (%.0f,%.0f), pos: (%.0f,%.0f)\n%s",

+ 1 - 1
oxygine/src/oxygine/actor/SlidingActor.h

@@ -63,7 +63,7 @@ namespace oxygine
         float _rad;
         float _maxSpeed;
         timeMS _downTime;
-        
+
         bool _ignoreTouchUp;
 
         Vector2 _downPos;

+ 1 - 1
oxygine/src/oxygine/actor/TextField.cpp

@@ -286,7 +286,7 @@ namespace oxygine
             return _root;
 
 
-		globalScale = scalar::abs(globalScale);
+        globalScale = scalar::abs(globalScale);
 
         float scale = 1.0f;
         const Font* font = _style.font->getClosestFont(globalScale, _style.fontSize, scale);

+ 2 - 2
oxygine/src/oxygine/core/gl/NativeTextureGLES.cpp

@@ -363,8 +363,8 @@ namespace oxygine
 
     void NativeTextureGLES::updateRegion(int x, int y, const ImageData& data_)
     {
-		if (data_.w == 0 || data_.h == 0)
-			return;
+        if (data_.w == 0 || data_.h == 0)
+            return;
 
         ImageData data = data_;
         assert(_width >= data.w - x);

+ 2 - 2
oxygine/src/oxygine/core/gl/oxgl.cpp

@@ -92,7 +92,7 @@ extern "C"
     {}
     GLAPI void APIENTRY def_glBufferData(GLenum target, GLsizeiptr size, const void* data, GLenum usage)
     {}
-    GLAPI void APIENTRY def_glDrawBuffers( 	GLsizei n,const GLenum *bufs)
+    GLAPI void APIENTRY def_glDrawBuffers(GLsizei n, const GLenum* bufs)
     {}
     GLAPI void APIENTRY def_glGetProgramiv(GLuint program, GLenum pname, GLint* params)
     {}
@@ -222,7 +222,7 @@ int initGLExtensions(myGetProcAdress func)
     GETFUNC(_glBindBuffer, def_glBindBuffer, PFNGLBINDBUFFERPROC, "glBindBuffer");
     GETFUNC(_glGenBuffers, def_glGenBuffers, PFNGLGENBUFFERSPROC, "glGenBuffers");
     GETFUNC(_glBufferData, def_glBufferData, PFNGLBUFFERDATAPROC, "glBufferData");
-	GETFUNC(_glDrawBuffers, def_glDrawBuffers, PFNGLDRAWBUFFERSPROC, "glDrawBuffers");
+    GETFUNC(_glDrawBuffers, def_glDrawBuffers, PFNGLDRAWBUFFERSPROC, "glDrawBuffers");
     GETFUNC(_glGetProgramiv, def_glGetProgramiv, PFNGLGETPROGRAMIVPROC, "glGetProgramiv");
     GETFUNC(_glGenerateMipmap, def_glGenerateMipmap, PFNGLGENERATEMIPMAPPROC, "glGenerateMipmap");
     GETFUNC(_glStencilOpSeparate, def_glStencilOpSeparate, PFNGLSTENCILOPSEPARATEPROC, "glStencilOpSeparate");

+ 5 - 5
oxygine/src/oxygine/core/oxygine.cpp

@@ -319,10 +319,10 @@ namespace oxygine
 
 
             PreCreateWindowEvent ev;
-			ev.flags = flags;
+            ev.flags = flags;
             _dispatcher->dispatchEvent(&ev);
 
-			flags = ev.flags;
+            flags = ev.flags;
 
 
 #if TARGET_OS_IPHONE
@@ -420,7 +420,7 @@ namespace oxygine
 
             CHECKGL();
 
-			rsCache().setDriver(IVideoDriver::instance);
+            rsCache().setDriver(IVideoDriver::instance);
 
 
             STDRenderer::initialize();
@@ -784,7 +784,7 @@ namespace oxygine
 #endif
 
             rsCache().reset();
-			rsCache().setDriver(0);
+            rsCache().setDriver(0);
             _threadMessages.clear();
             _uiMessages.clear();
 
@@ -829,7 +829,7 @@ namespace oxygine
             SDL_Quit();
 #endif
 
-			_dispatcher->removeAllEventListeners();
+            _dispatcher->removeAllEventListeners();
             _dispatcher = 0;
         }
 

+ 6 - 6
oxygine/src/oxygine/core/oxygine.h

@@ -138,12 +138,12 @@ namespace oxygine
             EVENT_EXIT = sysEventID('c', 'E', 'x'), //dispatched from core::release
         };
 
-		class PreCreateWindowEvent : public Event
-		{
-		public:
-			PreCreateWindowEvent():Event(EVENT_PRECREATEWINDOW){}
-			int flags;
-		};
+        class PreCreateWindowEvent : public Event
+        {
+        public:
+            PreCreateWindowEvent(): Event(EVENT_PRECREATEWINDOW) {}
+            int flags;
+        };
 
         spEventDispatcher getDispatcher();