[email protected] 7 سال پیش
والد
کامیت
55b1836bfc

+ 5 - 3
examples/Demo/src/test.cpp

@@ -137,13 +137,15 @@ spButton Test::addButton(std::string id, std::string txt)
     _y += button->getHeight() + 2.0f;
 
     Sprite* ptr = button.get();
-    button->addEventListener(TouchEvent::OVER, [=](Event*) {
+    button->addEventListener(TouchEvent::OVER, [ = ](Event*)
+    {
         ptr->addTween(Sprite::TweenAddColor(Color(64, 64, 64, 0)), 300);
     });
 
 
-    button->addEventListener(TouchEvent::OUT, [=](Event*) {
-        ptr->addTween(Sprite::TweenAddColor(Color(0,0,0,0)), 300);
+    button->addEventListener(TouchEvent::OUT, [ = ](Event*)
+    {
+        ptr->addTween(Sprite::TweenAddColor(Color(0, 0, 0, 0)), 300);
     });
 
     if (_y + button->getHeight() >= getHeight())

+ 2 - 2
examples/DemoBox2D/src/Box2DDebugDraw.cpp

@@ -51,9 +51,9 @@ void Box2DDraw::doRender(const RenderState& rs)
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     _world->DrawDebugData();
     _world->SetDebugDraw(0);
-    
+
     rsCache().reset();
-    
+
 }
 
 void Box2DDraw::DrawPolygon(const b2Vec2* vertices, int32 vertexCount, const b2Color& color)

+ 1 - 1
oxygine/src/oxygine/Image.cpp

@@ -755,7 +755,7 @@ namespace oxygine
     {
         int bytesPerPixel = getBytesPerPixel(Format);
         int size = h * w * bytesPerPixel;
-        _buffer.resize(size);        
+        _buffer.resize(size);
         _image = ImageData(w, h, w * bytesPerPixel, Format, size ? &_buffer.front() : 0);
     }
 

+ 2 - 2
oxygine/src/oxygine/MaterialCache.cpp

@@ -44,7 +44,7 @@ namespace oxygine
         copy->_hash = hash;
         copy->_compare = cm;
         _materials.insert(std::make_pair(hash, copy));
-        
+
         return copy;
     }
 
@@ -69,7 +69,7 @@ namespace oxygine
         removeUnusedNoLock();
     }
 
-    MaterialCache::MaterialCache():_addCounter(0)
+    MaterialCache::MaterialCache(): _addCounter(0)
     {
 
     }

+ 5 - 5
oxygine/src/oxygine/actor/Actor.cpp

@@ -481,7 +481,7 @@ namespace oxygine
     {
         _anchor = anchor;
         _flags &= ~flag_anchorInPixels;
-        markTranformDirty();        
+        markTranformDirty();
     }
 
     void Actor::setAnchor(float ax, float ay)
@@ -1535,12 +1535,12 @@ namespace oxygine
         br = tr.transform(br);
 
         Vector2 size = Vector2(
-			abs(br.x - tl.x),
-			abs(br.y - tl.y));
+                           abs(br.x - tl.x),
+                           abs(br.y - tl.y));
 
         Vector2 ntl;
-		ntl.x = std::min(tl.x, br.x);
-		ntl.y = std::min(tl.y, br.y);
+        ntl.x = std::min(tl.x, br.x);
+        ntl.y = std::min(tl.y, br.y);
 
         return RectF(ntl, size);
     }

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

@@ -484,10 +484,10 @@ namespace oxygine
         getStage()->addChild(cr);
         std::string dmp = actor->dump(0);
         logs::messageln(">>>>>>>>>>>>>>>>>>>>\ntouched actor '%s' local pos: (%.0f,%.0f), pos: (%.0f,%.0f)\n%s",
-                       actor->getName().c_str(),
-                       te->localPosition.x, te->localPosition.y,
-                       te->position.x, te->position.y,
-                       dmp.c_str());
+                        actor->getName().c_str(),
+                        te->localPosition.x, te->localPosition.y,
+                        te->position.x, te->position.y,
+                        dmp.c_str());
 
         actor = actor->getParent();
         while (actor)

+ 1 - 1
oxygine/src/oxygine/core/ImageDataOperations.cpp

@@ -16,7 +16,7 @@ namespace oxygine
                 OX_ASSERT(dest.data);
                 OX_ASSERT(src.pitch);
                 OX_ASSERT(dest.pitch);
-            }            
+            }
             OX_ASSERT(src.bytespp);
             OX_ASSERT(dest.bytespp);
             if (dest.w != src.w ||

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

@@ -294,13 +294,13 @@ namespace oxygine
 #elif __ANDROID__
             flags |= SDL_WINDOW_RESIZABLE;//fix for latest SDL, related with new setOrientationBis java function
 #else
-            if(desc.show_window)
+            if (desc.show_window)
                 flags |= SDL_WINDOW_SHOWN;
 
-            if(desc.borderless)
+            if (desc.borderless)
                 flags |= SDL_WINDOW_BORDERLESS;
 
-            if(desc.resizable)
+            if (desc.resizable)
                 flags |= SDL_WINDOW_RESIZABLE;
 #endif
 

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

@@ -46,7 +46,7 @@ namespace oxygine
     {
         struct init_desc
         {
-            init_desc() :w(-1), h(-1),  mode24bpp(true), vsync(true), fullscreen(false), resizable(false), borderless(false), show_window(true), force_gles(false), allow_screensaver(true), title("Oxygine"), appName(0), companyName(0) {}
+            init_desc() : w(-1), h(-1),  mode24bpp(true), vsync(true), fullscreen(false), resizable(false), borderless(false), show_window(true), force_gles(false), allow_screensaver(true), title("Oxygine"), appName(0), companyName(0) {}
 
             /**display width*/
             int w;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
oxygine/src/oxygine/core/system_data.cpp


+ 1 - 1
oxygine/src/oxygine/res/Resources.cpp

@@ -17,7 +17,7 @@
 namespace oxygine
 {
     Resources::registeredResources Resources::_registeredResources;
-    ResAnim *_defaultMissingRS = 0;
+    ResAnim* _defaultMissingRS = 0;
 
     void Resources::registerResourceType(Resources::createResourceCallback creationCallback, const char* resTypeID)
     {

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است