Merged from svn/trunk warnings fixes provided by Changeset 12582 from…

… Michael Platings, along with addition of returns at ends of files and changes to tabs to four spaces.
openscenegraph · Jun 21, 2011 · 5d30aef · 5d30aef
1 parent f534f81
commit 5d30aef
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 5 deletions.
diff --git a/src/osgPlugins/fbx/WriterCompareTriangle.cpp b/src/osgPlugins/fbx/WriterCompareTriangle.cpp
@@ -147,4 +147,4 @@ WriterCompareTriangle::inWhichBox(const osg::Vec3::value_type x,
         }
     }
     throw "Point is not in any box";
-}
+}
diff --git a/src/osgPlugins/fbx/WriterCompareTriangle.h b/src/osgPlugins/fbx/WriterCompareTriangle.h
@@ -48,4 +48,4 @@ class WriterCompareTriangle {
     std::vector<osg::BoundingBox>        boxList;
 };
 
-#endif // _3DS_WRITER_COMPARE_TRIANGLE_HEADER__
+#endif // _3DS_WRITER_COMPARE_TRIANGLE_HEADER__
diff --git a/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.cpp b/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.cpp
@@ -84,7 +84,7 @@ FbxMaterialToOsgStateSet::convert(const KFbxSurfaceMaterial* pFbxMat)
             if (lTexture)
             {
                 // support only spherical reflection maps...
-                if (KFbxFileTexture::eUMT_ENVIRONMENT == lTexture->GetMappingType())
+                if (KFbxFileTexture::eUMT_ENVIRONMENT == lTexture->CurrentMappingType.Get())
                 {
                     result.reflectionTexture = fbxTextureToOsgTexture(lTexture);
                     result.reflectionChannel = lTexture->UVSet.Get();
@@ -237,4 +237,4 @@ void FbxMaterialToOsgStateSet::checkInvertTransparency()
             pMaterial->setDiffuse(osg::Material::FRONT_AND_BACK, diffuse);
         }
     }
-}
+}
diff --git a/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.h b/src/osgPlugins/fbx/fbxMaterialToOsgStateSet.h
@@ -97,4 +97,4 @@ class FbxMaterialToOsgStateSet
 };
 
 
-#endif //FBXMATERIALTOOSGSTATESET_H
+#endif //FBXMATERIALTOOSGSTATESET_H
diff --git a/src/osgPlugins/fbx/fbxRLight.cpp b/src/osgPlugins/fbx/fbxRLight.cpp
@@ -56,6 +56,8 @@ osgDB::ReaderWriter::ReadResult OsgFbxReader::readFbxLight(KFbxNode* pNode, int&
 
         switch (fbxLight->DecayType.Get())
         {
+        case KFbxLight::eNONE:
+            break;
         case KFbxLight::eLINEAR:
             osgLight->setLinearAttenuation(fbxDecayStart);
             break;

diff --git a/src/osgPlugins/fbx/fbxRMesh.cpp b/src/osgPlugins/fbx/fbxRMesh.cpp
@@ -62,6 +62,8 @@ bool layerElementValid(const KFbxLayerElementTemplate<T>* pLayerElement)
     case KFbxLayerElement::eDIRECT:
     case KFbxLayerElement::eINDEX_TO_DIRECT:
         return true;
+    default:
+        break;
     }
 
     return false;
@@ -85,6 +87,8 @@ int getVertexIndex(const KFbxLayerElementTemplate<T>* pLayerElement,
     case KFbxLayerElement::eBY_POLYGON:
         index = nPolygon;
         break;
+    default:
+        OSG_WARN << "getVertexIndex: unsupported FBX mapping mode" << std::endl;
     }
 
     if (pLayerElement->GetReferenceMode() == KFbxLayerElement::eDIRECT)
@@ -107,6 +111,8 @@ int getPolygonIndex(const KFbxLayerElementTemplate<T>* pLayerElement, int nPolyg
             return nPolygon;
         case KFbxLayerElement::eINDEX_TO_DIRECT:
             return pLayerElement->GetIndexArray().GetAt(nPolygon);
+        default:
+            break;
         }
     }
 

diff --git a/src/osgPlugins/fbx/fbxRNode.cpp b/src/osgPlugins/fbx/fbxRNode.cpp
@@ -568,6 +568,8 @@ osgDB::ReaderWriter::ReadResult OsgFbxReader::readFbxNode(
             }
         }
         break;
+    default:
+        break;
     }
 
     if (bEmpty)