Changeset 27 for trunk/src

Timestamp:

05/20/13 22:09:10 (12 years ago)

Author:

melon

Message:

Reformating.

Removed unused variables.

File:

• trunk/src/gl/texture_atlas.cc (modified) (3 diffs)

trunk/src/gl/texture_atlas.cc

@@ -21 +21 @@
 {
         region r ( glm::ivec2(0,0), size );
-    size_t i;
 
-    int best_height = INT_MAX;
-    int best_index  = -1;
-    int best_width  = INT_MAX;
+        int best_height = INT_MAX;
+        int best_index  = -1;
+        int best_width  = INT_MAX;
         for( size_t i=0; i < m_nodes.size(); ++i )
         {
-        int y = fit( i, size );
+                int y = fit( i, size );
                 if( y >= 0 )
                 {
-            glm::ivec3 node = m_nodes[ i ];
+                        glm::ivec3 node = m_nodes[ i ];
                         if ( ( (y + size.y) < best_height ) ||
-                ( ((y + size.y) == best_height) && (node.z < best_width)) )
+                                ( ((y + size.y) == best_height) && (node.z < best_width)) )
                         {
                                 best_height = y + size.y;
@@ -41 +40 @@
                                 r.pos.y = y;
                         }
-        }
-    }
+                }
+        }
    
-        if( best_index == -1 )
-    {
-        return region( glm::ivec2( -1, -1 ), glm::ivec2( 0, 0 ) );
-    }
+        if ( best_index == -1 )
+        {
+                return region( glm::ivec2( -1, -1 ), glm::ivec2( 0, 0 ) );
+        }
 
-    m_nodes.insert( m_nodes.begin() + best_index, glm::ivec3( r.pos.x, r.pos.y + size.y, size.x ) );
+        m_nodes.insert( m_nodes.begin() + best_index, glm::ivec3( r.pos.x, r.pos.y + size.y, size.x ) );
 
-    for( size_t i = best_index+1; i < m_nodes.size(); ++i )
-    {
-        glm::ivec3 node = m_nodes[ i ];
-        glm::ivec3 prev = m_nodes[ i-1 ];
+        for( size_t i = best_index+1; i < m_nodes.size(); ++i )
+        {
+                glm::ivec3 node = m_nodes[ i ];
+                glm::ivec3 prev = m_nodes[ i-1 ];
 
-        if (node.x < (prev.x + prev.z) )
-        {
-            int shrink = prev.x + prev.z - node.x;
+                if (node.x < (prev.x + prev.z) )
+                {
+                        int shrink = prev.x + prev.z - node.x;
                         m_nodes[ i ].x += shrink;
                         m_nodes[ i ].z -= shrink;
 
-            if (m_nodes[ i ].z <= 0)
-            {
+                        if (m_nodes[ i ].z <= 0)
+                        {
                                 m_nodes.erase( m_nodes.begin() + i );
-                --i;
-            }
-            else
-            {
-                break;
-            }
-        }
-        else
-        {
-            break;
-        }
-    }
-    merge();
-    m_used += size.x * size.y;
-    return r;
+                                --i;
+                        }
+                        else
+                        {
+                                break;
+                        }
+                }
+                else
+                {
+                        break;
+                }
+        }
+        merge();
+        m_used += size.x * size.y;
+        return r;
 }
 
@@ -93 +92 @@
         int y     = node.y;
         int wleft = size.x;
-        size_t i  = index;
 
         while( wleft > 0 )
         {
-        node = m_nodes[ i ];
-        if( node.y > y )
-        {
-            y = node.y;
-        }
+                node = m_nodes[ index ];
+                if( node.y > y )
+                {
+                        y = node.y;
+                }
                 if( (y + size.y) > (m_size.y-1) )
-        {
+                {
                         return -1;
-        }
+                }
                 wleft -= node.z;
-                ++i;
+                ++index;
         }
         return y;