Show
Ignore:
Timestamp:
03/21/12 18:36:20 (2 years ago)
Author:
robert
Message:

Ran script to remove trailing spaces and tabs

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • OpenSceneGraph/trunk/src/osgPlugins/dxf/scene.cpp

    r12171 r13041  
    1111 
    1212 
    13 osg::Vec4         
     13osg::Vec4 
    1414sceneLayer::getColor(unsigned short color) 
    1515{ 
     
    2424 
    2525scene::scene(dxfLayerTable* lt) : _layerTable(lt) 
    26 {  
    27     _m.makeIdentity();  
    28     _r.makeIdentity();  
    29 } 
    30  
    31 void  
     26{ 
     27    _m.makeIdentity(); 
     28    _r.makeIdentity(); 
     29} 
     30 
     31void 
    3232scene::setLayerTable(dxfLayerTable* lt) 
    33 {  
    34     _layerTable = lt;  
    35 } 
    36  
    37 Vec3d scene::addVertex(Vec3d v)  
     33{ 
     34    _layerTable = lt; 
     35} 
     36 
     37Vec3d scene::addVertex(Vec3d v) 
    3838{ 
    3939    v += _t; 
     
    4646} 
    4747 
    48 Vec3d scene::addNormal(Vec3d v)  
     48Vec3d scene::addNormal(Vec3d v) 
    4949{ 
    5050    // to do: vertices are not always listed in order. find why. 
    5151    return v; 
    5252} 
    53 void  
    54 scene::addPoint(const std::string & l, unsigned short color, Vec3d & s)  
     53void 
     54scene::addPoint(const std::string & l, unsigned short color, Vec3d & s) 
    5555{ 
    5656    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     
    5858    sceneLayer* ly = findOrCreateSceneLayer(l); 
    5959    Vec3d a(addVertex(s)); 
    60     ly->_points[correctedColorIndex(l, color)].push_back(a);     
    61 } 
    62  
    63 void  
    64 scene::addLine(const std::string & l, unsigned short color, Vec3d & s, Vec3d & e)  
     60    ly->_points[correctedColorIndex(l, color)].push_back(a); 
     61} 
     62 
     63void 
     64scene::addLine(const std::string & l, unsigned short color, Vec3d & s, Vec3d & e) 
    6565{ 
    6666    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     
    7171    ly->_lines[correctedColorIndex(l, color)].push_back(b); 
    7272} 
    73 void scene::addLineStrip(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices)  
     73void scene::addLineStrip(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices) 
    7474{ 
    7575    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     
    8383    ly->_linestrips[correctedColorIndex(l, color)].push_back(converted); 
    8484} 
    85 void scene::addLineLoop(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices)  
     85void scene::addLineLoop(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices) 
    8686{ 
    8787    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     
    9898 
    9999 
    100 void scene::addTriangles(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted)  
     100void scene::addTriangles(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted) 
    101101{ 
    102102    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     
    116116                b = itr++; 
    117117                c = itr++; 
    118             }             
     118            } 
    119119            if (a != vertices.end() && 
    120120                b != vertices.end() && 
     
    129129    } 
    130130} 
    131 void scene::addQuads(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted)  
    132 { 
    133     dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
    134     if (layer->getFrozen()) return; 
    135      
     131void scene::addQuads(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted) 
     132{ 
     133    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     134    if (layer->getFrozen()) return; 
     135 
    136136    sceneLayer* ly = findOrCreateSceneLayer(l); 
    137137    for (VList::iterator itr = vertices.begin(); 
     
    173173            } 
    174174    } 
    175 }     
    176  
    177  
    178 void scene::addText(const std::string & l, unsigned short color, Vec3d & point, osgText::Text *text)  
     175} 
     176 
     177 
     178void scene::addText(const std::string & l, unsigned short color, Vec3d & point, osgText::Text *text) 
    179179{ 
    180180    dxfLayer* layer = _layerTable->findOrCreateLayer(l); 
     
    194194    qm.decompose( t, ro, s, so ); 
    195195    text->setRotation( text->getRotation() * ro ); 
    196      
     196 
    197197    sceneLayer::textInfo ti( correctedColorIndex(l,color), pscene, text ); 
    198198    ly->_textList.push_back(ti); 
     
    200200 
    201201 
    202 unsigned short  
     202unsigned short 
    203203scene::correctedColorIndex(const std::string & l, unsigned short color) 
    204204{