Style guide

projects/mtg/include/Easing.h

@@ -13,20 +13,33 @@ public:
 
 
     Easing(float val): start_value(val), delta_value(0), value(val), duration(0), time_acc(0)
-    {}
+    {
+    }
+
+    void reset()
+    {
+        value = start_value;
+        time_acc = 0;
+    }
+
+    void finish()
+    {
+        value = start_value + delta_value;
+        time_acc = 0; duration = 0;
+    }
 
-    void reset(){ value = start_value; time_acc = 0;}
-    void finish(){ value = start_value + delta_value; time_acc = 0; duration = 0;}
     virtual void update(float dt) = 0;
 
-    void start(float targetValue, float _duration){
+    void start(float targetValue, float _duration)
+    {
         start_value = value;
         delta_value = targetValue - start_value;
         time_acc = 0;
         duration = _duration;
     }
 
-    void translate(float delta_value){
+    void translate(float delta_value)
+    {
         start_value += delta_value;
         value += delta_value;
     }
@@ -42,8 +55,10 @@ class InOutQuadEasing : public Easing
 public:
     InOutQuadEasing(float val): Easing(val) {}
 
-    void update(float dt){
+    void update(float dt)
-        if(duration > 0){
+    {
+        if(duration > 0)
+        {
             time_acc += dt;
 
             if(time_acc > duration)

projects/mtg/src/CarouselDeckView.cpp

@@ -15,7 +15,8 @@ void CarouselDeckView::UpdateViewState(float dt)
     switch(mStage)
     {
     case SCROLL_TO_SELECTED:
-        if(mScrollTarget < 2){ //scroll left
+        if(mScrollTarget < 2)
+        { //scroll left
             mRotation -= dt * scroll_speed;
             if(mRotation <= -1.0f)
             {
@@ -24,7 +25,9 @@ void CarouselDeckView::UpdateViewState(float dt)
                 reloadIndexes();
                 mScrollTarget += 1;
             }
-        }else if(mScrollTarget > 2){
+        }
+        else if(mScrollTarget > 2)
+        {//scroll right
             mRotation += dt * scroll_speed;
             if(mRotation >= 1.0f)
             {
@@ -33,7 +36,9 @@ void CarouselDeckView::UpdateViewState(float dt)
                 reloadIndexes();
                 mScrollTarget -= 1;
             }
-        }else if(mScrollTarget == 2){
+        }
+        else if(mScrollTarget == 2)
+        {
             mRotation = 0;
             mStage = NONE;
         }
@@ -155,10 +160,13 @@ MTGCard * CarouselDeckView::Click(int x, int y)
 
 void CarouselDeckView::changePosition(int offset)
 {
-    if(offset > 0){
+    if(offset > 0)
+    {
         mScrollTarget += 1;
         mStage = SCROLL_TO_SELECTED;
-    }else if(offset < 0){
+    }
+    else if(offset < 0)
+    {
         mScrollTarget -= 1;
         mStage = SCROLL_TO_SELECTED;
     }
@@ -168,10 +176,13 @@ void CarouselDeckView::changePosition(int offset)
 
 void CarouselDeckView::changeFilter(int offset)
 {
-    if(offset > 0){
+    if(offset > 0)
+    {
         mStage = SLIDE_UP;
         SwitchFilter(1);
-    } else if(offset < 0){
+    }
+    else if(offset < 0)
+    {
         mStage = SLIDE_DOWN;
         SwitchFilter(-1);
     }

projects/mtg/src/DeckView.cpp

@@ -33,7 +33,8 @@ void DeckView::Update(float dt)
 
     UpdateViewState(dt);
 
-    if(dirtyCardPos){
+    if(dirtyCardPos)
+    {
         for(unsigned int i = 0; i < mCards.size(); ++i)
         {
             UpdateCardPosition(mCards[i], i);
@@ -86,7 +87,8 @@ void DeckView::SwitchFilter(int delta)
     dirtyFilters = true;
 }
 
-int DeckView::filter(){
+int DeckView::filter()
+{
     return mFilter;
 }
 
@@ -211,7 +213,10 @@ int DeckView::getCardIndexNextTo(int x, int y)
 
 int DeckView::getPosition()
 {
-    if(!mCurrentDeck){ return 0; }
+    if(!mCurrentDeck)
+    {
+        return 0;
+    }
 
     int total = mCurrentDeck->Size();
     int currentPos = (mCurrentDeck->getOffset() + 3) % total;

projects/mtg/src/GameStateDeckViewer.cpp

@@ -464,7 +464,9 @@ void GameStateDeckViewer::Update(float dt)
                 {
                     addRemove(mView->getActiveCard());
                 }
-            }else{
+            }
+            else
+            {
                 last_user_activity = 0;
                 addRemove(mView->getActiveCard());
             }
@@ -528,7 +530,8 @@ void GameStateDeckViewer::Update(float dt)
     }
 
     mView->Update(dt);
-    if(mView->dirtyFilters){
+    if(mView->dirtyFilters)
+    {
         updateFilters();
         mView->reloadIndexes();
         mView->dirtyFilters = false;

projects/mtg/src/GridDeckView.cpp

@@ -55,15 +55,20 @@ void GridDeckView::UpdateViewState(float dt)
     {
         mSlide.update(dt);
 
-        if(mSlide.value < mSlide.start_value){
+        if(mSlide.value < mSlide.start_value)
+        {
             //going downwards
-            if(mSlide.value < -1.0f){
+            if(mSlide.value < -1.0f)
+            {
                 mSlide.translate(2.0f);
                 SwitchFilter(1);
             }
-        } else if(mSlide.value > mSlide.start_value){
+        }
+        else if(mSlide.value > mSlide.start_value)
+        {
             //upwards
-            if(mSlide.value > 1.0f){
+            if(mSlide.value > 1.0f)
+            {
                 mSlide.translate(-2.0f);
                 SwitchFilter(-1);
             }
@@ -86,12 +91,17 @@ void GridDeckView::UpdateCardPosition(CardRep &rep, int index)
     if(mCurrentSelection == index)
     {
         rep.scale = card_scale_big;
-        if(row == 0){
+        if(row == 0)
+        {
             rep.y += rowHeight * (card_scale_big - card_scale_small);
-        }else{
+        }
+        else
+        {
             rep.y -= rowHeight * (card_scale_big - card_scale_small);
         }
-    }else{
+    }
+    else
+    {
         rep.scale = card_scale_small;
     }
 }
@@ -108,7 +118,8 @@ void GridDeckView::Render()
         }
     }
 
-    if(2 <= mCurrentSelection && mCurrentSelection < 12){
+    if(2 <= mCurrentSelection && mCurrentSelection < 12)
+    {
         renderCard(mCurrentSelection, 255);
     }
 }
@@ -144,9 +155,12 @@ MTGCard * GridDeckView::Click(int x, int y)
 
 void GridDeckView::changePosition(int offset)
 {
-    if(offset < 0){
+    if(offset < 0)
+    {
         mScrollOffset.start( 1.0f, scroll_animation_duration);
-    }else if(offset > 0){
+    }
+    else if(offset > 0)
+    {
         mScrollOffset.start(-1.0f, scroll_animation_duration);
     }
     last_user_activity = 0;
@@ -154,9 +168,12 @@ void GridDeckView::changePosition(int offset)
 
 void GridDeckView::changeFilter(int offset)
 {
-    if(offset < 0){
+    if(offset < 0)
+    {
         mSlide.start(-2.0f, slide_animation_duration);
-    }else if(offset > 0){
+    }
+    else if(offset > 0)
+    {
         mSlide.start(2.0f, slide_animation_duration);
     }
     last_user_activity = 0;