[PlaneShift-svn] SF.net SVN: planeshift:[4925] trunk/src/client/bgloader/loader.cpp

[<mg...@us...>]

Revision: 4925
          http://planeshift.svn.sourceforge.net/planeshift/?rev=4925&view=rev
Author:   mgist
Date:     2009-12-08 20:02:25 +0000 (Tue, 08 Dec 2009)

Log Message:
-----------
- Removed workaround for #2847, bug fixed in CS.

Modified Paths:
--------------
    trunk/src/client/bgloader/loader.cpp

Modified: trunk/src/client/bgloader/loader.cpp
===================================================================
--- trunk/src/client/bgloader/loader.cpp	2009-12-08 19:52:49 UTC (rev 4924)
+++ trunk/src/client/bgloader/loader.cpp	2009-12-08 20:02:25 UTC (rev 4925)
@@ -355,9 +355,6 @@
 
                     // Parse the shader variables attached to this material.
                     nodeItr2 = node->GetNodes("shadervar");
-                    // Workaround for PS#2847
-                    bool hasSpecularTex = false;
-                    bool hasSpecularVar = false;
                     while(nodeItr2->HasNext())
                     {
                         node = nodeItr2->Next();
@@ -392,12 +389,6 @@
                                 }
                             }
 
-                            // Workaround for PS#2847
-                            if(!strcmp(node->GetAttributeValue("name"), "tex specular"))
-                            {
-                                hasSpecularTex = true;
-                            }
-
                             ShaderVar sv(node->GetAttributeValue("name"), csShaderVariable::TEXTURE);
                             sv.value = node->GetContentsValue();
                             m->shadervars.Push(sv);
@@ -424,33 +415,11 @@
                         else if(csString("vector3").Compare(node->GetAttributeValue("type")))
                         {
                             ShaderVar sv(node->GetAttributeValue("name"), csShaderVariable::VECTOR3);
-
-                            // Workaround for PS#2847
-                            if(sv.name == "specular")
-                            {
-                                hasSpecularVar = true;
-                            }
-
-                            if(sv.name == "specular" && !hasSpecularTex)
-                            {
-                                sv.vec3 = csVector3(0.0f);
-                            }
-                            else
-                            {
-                                csScanStr (node->GetContentsValue(), "%f,%f,%f", &sv.vec3.x, &sv.vec3.y, &sv.vec3.z);
-                            }
+                            csScanStr (node->GetContentsValue(), "%f,%f,%f", &sv.vec3.x, &sv.vec3.y, &sv.vec3.z);
                             m->shadervars.Push(sv);
                         }
                         node = node->GetParent();
                     }
-
-                    // Workaround for PS#2847
-                    if(!hasSpecularVar && !hasSpecularTex)
-                    {
-                        ShaderVar sv("specular", csShaderVariable::VECTOR3);
-                        sv.vec3 = csVector3(0.0f);
-                        m->shadervars.Push(sv);
-                    }
                 }
             }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.