Mercurial > ldforge / file diff

--- a/src/colors.cpp	Sun Jul 07 16:46:30 2013 +0300
+++ b/src/colors.cpp	Sun Jul 07 17:45:48 2013 +0300
@@ -1,17 +1,17 @@
 /*
  *  LDForge: LDraw parts authoring CAD
  *  Copyright (C) 2013 Santeri Piippo
- *  
+ *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
- *  
+ *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
- *  
+ *
  *  You should have received a copy of the GNU General Public License
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
@@ -25,8 +25,9 @@
 
 static color* g_LDColors[MAX_COLORS];
 
-void initColors () {
-	print ("%1: initializing color information.\n", __func__);
+void initColors()
+{
+	print( "%1: initializing color information.\n", __func__ );
 	
 	color* col;
 	
@@ -42,47 +43,51 @@
 	col->edgeColor = col->faceColor = Qt::black;
 	g_LDColors[edgecolor] = col;
 	
-	parseLDConfig ();
+	parseLDConfig();
 }
 
 // =============================================================================
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
 // =============================================================================
-color* getColor (short dColorNum) {
+color* getColor( short colnum )
+{
 	// Check bounds
-	if (dColorNum < 0 || dColorNum >= MAX_COLORS)
+	if( colnum < 0 || colnum >= MAX_COLORS )
 		return null;
 	
-	return g_LDColors[dColorNum];
+	return g_LDColors[colnum];
 }
 
 // =============================================================================
-uchar luma (QColor& col) {
-	return (0.2126f * col.red ()) +
-		(0.7152f * col.green ()) +
-		(0.0722f * col.blue ());
+uchar luma( QColor& col )
+{
+	return ( 0.2126f * col.red()) +
+	       ( 0.7152f * col.green()) +
+	       ( 0.0722f * col.blue() );
 }
 
 // =============================================================================
 // Helper function for parseLDConfig
-static bool parseLDConfigTag (StringParser& pars, char const* tag, str& val) {
+static bool parseLDConfigTag( StringParser& pars, char const* tag, str& val )
+{
 	short pos;
-	
+
 	// Try find the token and get its position
-	if (!pars.findToken (pos, tag, 1))
+	if( !pars.findToken( pos, tag, 1 ))
 		return false;
-	
+
 	// Get the token after it and store it into val
-	return pars.getToken (val, pos + 1);
+	return pars.getToken( val, pos + 1 );
 }
 
 // =============================================================================
-void parseLDConfig () {
-	File* f = openLDrawFile ("LDConfig.ldr", false);
+void parseLDConfig()
+{
+	File* f = openLDrawFile( "LDConfig.ldr", false );
 	
-	if ( !f )
+	if( !f )
 	{
-		critical( fmt( QObject::tr( "Unable to open LDConfig.ldr for parsing! (%1)" ), strerror( errno )));
+		critical( fmt( QObject::tr( "Unable to open LDConfig.ldr for parsing! (%1)" ), strerror( errno )) );
 		delete f;
 		return;
 	}
@@ -90,62 +95,63 @@
 	// Read in the lines
 	for( str line : *f )
 	{
-		if (line.length () == 0 || line[0] != '0')
+		if( line.length() == 0 || line[0] != '0' )
 			continue; // empty or illogical
 		
-		line.remove ('\r');
-		line.remove ('\n');
+		line.remove( '\r' );
+		line.remove( '\n' );
 		
 		// Parse the line
-		StringParser pars (line, ' ');
+		StringParser pars( line, ' ' );
 		
 		short code = 0, alpha = 255;
 		str name, facename, edgename, valuestr;
 		
 		// Check 0 !COLOUR, parse the name
-		if (!pars.tokenCompare (0, "0") || !pars.tokenCompare (1, "!COLOUR") || !pars.getToken (name, 2))
+		if( !pars.tokenCompare( 0, "0" ) || !pars.tokenCompare( 1, "!COLOUR" ) || !pars.getToken( name, 2 ))
 			continue;
 		
 		// Replace underscores in the name with spaces for readability
-		name.replace ("_", " ");
+		name.replace( "_", " " );
 		
 		// Get the CODE tag
-		if (!parseLDConfigTag (pars, "CODE", valuestr))
+		if( !parseLDConfigTag( pars, "CODE", valuestr ))
 			continue;
 		
-		if (!isNumber (valuestr))
+		if( !isNumber( valuestr ))
 			continue; // not a number
 		
 		// Ensure that the code is within [0 - 511]
 		bool ok;
-		code = valuestr.toShort (&ok);
-		if (!ok || code < 0 || code >= 512)
+		code = valuestr.toShort( &ok );
+		
+		if( !ok || code < 0 || code >= 512 )
 			continue;
 		
 		// VALUE and EDGE tags
-		if (!parseLDConfigTag (pars, "VALUE", facename) || !parseLDConfigTag (pars, "EDGE", edgename))
+		if( !parseLDConfigTag( pars, "VALUE", facename ) || !parseLDConfigTag( pars, "EDGE", edgename ))
 			continue;
 		
 		// Ensure that our colors are correct
-		QColor faceColor (facename),
-			edgeColor (edgename);
+		QColor faceColor( facename ),
+			edgeColor( edgename );
 		
-		if (!faceColor.isValid () || !edgeColor.isValid ())
+		if( !faceColor.isValid() || !edgeColor.isValid() )
 			continue;
 		
 		// Parse alpha if given.
-		if (parseLDConfigTag (pars, "ALPHA", valuestr))
-			alpha = clamp<short> (valuestr.toShort (), 0, 255);
+		if( parseLDConfigTag( pars, "ALPHA", valuestr ))
+			alpha = clamp<short> ( valuestr.toShort(), 0, 255 );
 		
 		color* col = new color;
 		col->name = name;
 		col->faceColor = faceColor;
 		col->edgeColor = edgeColor;
 		col->hexcode = facename;
-		col->faceColor.setAlpha (alpha);
+		col->faceColor.setAlpha( alpha );
 		col->index = code;
 		g_LDColors[code] = col;
 	}
 	
 	delete f;
-}
\ No newline at end of file
+}