Changeset 3057 for GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderManager.cpp

Timestamp:

10/21/08 18:10:50 (16 years ago)

Author:

mattausch

Message:

added a shader manager

File:

• GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderManager.cpp (modified) (3 diffs)

GTP/trunk/App/Demos/Vis/FriendlyCulling/src/ShaderManager.cpp

@@ -179 +179 @@
                                   isFragment ? sCgFragmentProfile : sCgVertexProfile, funcName);
 
-        ShaderMap::const_iterator it = mShaderMap.find(name);
-
-        if (it == mShaderMap.end())
+        if (GetShaderProgram(name))
         {
+                cerr << "Program name " << name << "already chosen" << endl;
+
                 DEL_PTR(p);
-
-                cerr << "Program name " << name << "already chosen" << endl;
                 return p;
         }
@@ -191 +189 @@
         if (!p->IsValid())
         {
+                cerr << "Program " << funcName << " in " << fullName << " failed to load" << endl;
+
                 DEL_PTR(p);
-                cerr << "Program " << funcName << " in " << fullName << " failed to load" << endl;
                 return p;
         }
 
+        
+        // everything ok
         cout << "Program " << funcName << " in " << fullName << " loaded" << endl;
                 
@@ -205 +206 @@
 
 
-}
-
+ShaderProgram *ShaderManager::GetShaderProgram(const std::string &name)
+{
+        ShaderMap::const_iterator it = mShaderMap.find(name);
+
+        if (it == mShaderMap.end())
+                return NULL;
+        
+        return (*it).second;
+}
+
+
+}
+