Work around apparent OSG 3.2.0 normal binding bug.

[simgear.git] / simgear / scene / material / Technique.cxx

diff --git a/simgear/scene/material/Technique.cxx b/simgear/scene/material/Technique.cxx
index 3a09dfead0b64bfb43b27b1013f4fbbe5994f475..4caa9d0cd3b91485239b98df54272196c7a6ed07 100644 (file)
--- a/simgear/scene/material/Technique.cxx
+++ b/simgear/scene/material/Technique.cxx
@@ -167,12 +167,12 @@ Technique::processDrawables(const EffectGeode::DrawablesIterator& begin,
     BOOST_FOREACH(ref_ptr<Pass>& pass, passes)
     {
         osg::ref_ptr<osg::StateSet> ss = pass;
-        if (ecv && ( pass->getBufferUnitList().size() != 0 || pass->getPositionedUniformMap().size() != 0 ) ) {
+        if (ecv && ( ! pass->getBufferUnitList().empty() || ! pass->getPositionedUniformMap().empty() ) ) {
             ss = static_cast<osg::StateSet*>(
-                pass->clone( osg::CopyOp( ( pass->getBufferUnitList().size() != 0 ?
+                pass->clone( osg::CopyOp( ( ! pass->getBufferUnitList().empty() ?
                                                         osg::CopyOp::DEEP_COPY_TEXTURES :
                                                         osg::CopyOp::SHALLOW_COPY ) |
-                                           ( pass->getPositionedUniformMap().size() != 0 ?
+                                           ( ! pass->getPositionedUniformMap().empty() ?
                                                         osg::CopyOp::DEEP_COPY_UNIFORMS :
                                                         osg::CopyOp::SHALLOW_COPY ) )
                 )
@@ -271,19 +271,19 @@ class ExtensionSupportedExpression
 {
 public:
     ExtensionSupportedExpression() {}
-    ExtensionSupportedExpression(const string& extString)
+    ExtensionSupportedExpression(const std::string& extString)
         : _extString(extString)
     {
     }
-    const string& getExtensionString() { return _extString; }
-    void setExtensionString(const string& extString) { _extString = extString; }
+    const std::string& getExtensionString() { return _extString; }
+    void setExtensionString(const std::string& extString) { _extString = extString; }
     void eval(bool&value, const expression::Binding* b) const
     {
         int contextId = getOperand(0)->getValue(b);
         value = isGLExtensionSupported((unsigned)contextId, _extString.c_str());
     }
 protected:
-    string _extString;
+    std::string _extString;
 };
 
 Expression* extensionSupportedParser(const SGPropertyNode* exp,