Changeset 50 for trunk/nv/interface/program.hh

Timestamp:

05/28/13 22:29:08 (12 years ago)

Author:

epyon

Message:

• error checking for attribute and uniform queries

File:

• trunk/nv/interface/program.hh (modified) (4 diffs)

trunk/nv/interface/program.hh

@@ -15 +15 @@
 #include <unordered_map>
 #include <nv/logging.hh>
+#include <nv/exception.hh>
 #include <nv/common.hh>
 #include <nv/string.hh>
@@ -108 +109 @@
                                         i != m_uniform_map.end(); ++i ) delete i->second;
                 }
+                attribute* try_get_attribute( const string& name ) const
+                {
+                        attribute_map::const_iterator i = m_attribute_map.find( name );
+                        if ( i != m_attribute_map.end() )
+                        {
+                                return i->second;
+                        }
+                        return nullptr;
+                }
+
                 attribute* get_attribute( const string& name ) const
                 {
                         attribute_map::const_iterator i = m_attribute_map.find( name );
                         if ( i != m_attribute_map.end() )
+                        {
+                                return i->second;
+                        }
+                        NV_LOG( LOG_ERROR, "Attribute '" << name << "' not found in program!" );
+                        throw runtime_error( "Attribute '"+name+"' not found!" );
+                }
+
+                uniform_base* try_get_uniform( const string& name ) const
+                {
+                        uniform_map::const_iterator i = m_uniform_map.find( name );
+                        if ( i != m_uniform_map.end() )
                         {
                                 return i->second;
@@ -125 +147 @@
                                 return i->second;
                         }
-                        return nullptr;
+                        NV_LOG( LOG_ERROR, "Uniform '" << name << "' not found in program!" );
+                        throw runtime_error( "Uniform '"+name+"' not found!" );
                 }
 
@@ -133 +156 @@
                         uniform_base* base = get_uniform( name );
                         // restore typechecking, but remember to accept int for float!
-                        if ( base == nullptr /* || base->get_type() != type_to_enum<T>::type */ )
-                        {
-                                NV_LOG( LOG_ERROR, "Uniform '" << name << "' not found in program!" );
-                                return;
-                        }
+                        // if ( /* base->get_type() != type_to_enum<T>::type */ )
+                        // {
+                        //              NV_LOG( LOG_ERROR, "Uniform '" << name << "' not found in program!" );
+                        //              return;
+                        // }
                         ((uniform<T>*)( base ))->set_value( value );
                 }