Changeset 13041 for OpenSceneGraph/trunk/src/osgPlugins/dxf/scene.cpp

Timestamp:

03/21/12 18:36:20 (14 months ago)

Author:

robert

Message:

Ran script to remove trailing spaces and tabs

Files:

• OpenSceneGraph/trunk/src/osgPlugins/dxf/scene.cpp (modified) (12 diffs)

OpenSceneGraph/trunk/src/osgPlugins/dxf/scene.cpp

@@ -11 +11 @@
 
 
-osg::Vec4        
+osg::Vec4
 sceneLayer::getColor(unsigned short color)
 {
@@ -24 +24 @@
 
 scene::scene(dxfLayerTable* lt) : _layerTable(lt)
-{ 
-    _m.makeIdentity(); 
-    _r.makeIdentity(); 
-}
-
-void 
+{
+    _m.makeIdentity();
+    _r.makeIdentity();
+}
+
+void
 scene::setLayerTable(dxfLayerTable* lt)
-{ 
-    _layerTable = lt; 
-}
-
-Vec3d scene::addVertex(Vec3d v) 
+{
+    _layerTable = lt;
+}
+
+Vec3d scene::addVertex(Vec3d v)
 {
     v += _t;
@@ -46 +46 @@
 }
 
-Vec3d scene::addNormal(Vec3d v) 
+Vec3d scene::addNormal(Vec3d v)
 {
     // to do: vertices are not always listed in order. find why.
     return v;
 }
-void 
-scene::addPoint(const std::string & l, unsigned short color, Vec3d & s) 
+void
+scene::addPoint(const std::string & l, unsigned short color, Vec3d & s)
 {
     dxfLayer* layer = _layerTable->findOrCreateLayer(l);
@@ -58 +58 @@
     sceneLayer* ly = findOrCreateSceneLayer(l);
     Vec3d a(addVertex(s));
-    ly->_points[correctedColorIndex(l, color)].push_back(a);    
-}
-
-void 
-scene::addLine(const std::string & l, unsigned short color, Vec3d & s, Vec3d & e) 
+    ly->_points[correctedColorIndex(l, color)].push_back(a);
+}
+
+void
+scene::addLine(const std::string & l, unsigned short color, Vec3d & s, Vec3d & e)
 {
     dxfLayer* layer = _layerTable->findOrCreateLayer(l);
@@ -71 +71 @@
     ly->_lines[correctedColorIndex(l, color)].push_back(b);
 }
-void scene::addLineStrip(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices) 
+void scene::addLineStrip(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices)
 {
     dxfLayer* layer = _layerTable->findOrCreateLayer(l);
@@ -83 +83 @@
     ly->_linestrips[correctedColorIndex(l, color)].push_back(converted);
 }
-void scene::addLineLoop(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices) 
+void scene::addLineLoop(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices)
 {
     dxfLayer* layer = _layerTable->findOrCreateLayer(l);
@@ -98 +98 @@
 
 
-void scene::addTriangles(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted) 
+void scene::addTriangles(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted)
 {
     dxfLayer* layer = _layerTable->findOrCreateLayer(l);
@@ -116 +116 @@
                 b = itr++;
                 c = itr++;
-            }            
+            }
             if (a != vertices.end() &&
                 b != vertices.end() &&
@@ -129 +129 @@
     }
 }
-void scene::addQuads(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted) 
-{
-    dxfLayer* layer = _layerTable->findOrCreateLayer(l);
-    if (layer->getFrozen()) return;
-    
+void scene::addQuads(const std::string & l, unsigned short color, std::vector<Vec3d> & vertices, bool inverted)
+{
+    dxfLayer* layer = _layerTable->findOrCreateLayer(l);
+    if (layer->getFrozen()) return;
+
     sceneLayer* ly = findOrCreateSceneLayer(l);
     for (VList::iterator itr = vertices.begin();
@@ -173 +173 @@
             }
     }
-}    
-
-
-void scene::addText(const std::string & l, unsigned short color, Vec3d & point, osgText::Text *text) 
+}
+
+
+void scene::addText(const std::string & l, unsigned short color, Vec3d & point, osgText::Text *text)
 {
     dxfLayer* layer = _layerTable->findOrCreateLayer(l);
@@ -194 +194 @@
     qm.decompose( t, ro, s, so );
     text->setRotation( text->getRotation() * ro );
-    
+
     sceneLayer::textInfo ti( correctedColorIndex(l,color), pscene, text );
     ly->_textList.push_back(ti);
@@ -200 +200 @@
 
 
-unsigned short 
+unsigned short
 scene::correctedColorIndex(const std::string & l, unsigned short color)
 {