Changeset 2362 for OGRE

Timestamp:

05/10/07 08:51:31 (17 years ago)

Author:

szirmay

Message:

 

File:

• OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/src/OgreD3D9HLSLProgram.cpp (modified) (2 diffs)

OGRE/trunk/ogre_changes/Ogre1.2/RenderSystems/Direct3D9/src/OgreD3D9HLSLProgram.cpp

@@ -108 +108 @@
     void D3D9HLSLProgram::loadFromFile(void)
         {
+                DataStreamPtr stream = 
+                ResourceGroupManager::getSingleton().openResource(
+                    mFilename, mGroup, true, this);
+
+                mSource = "";
+
+                while(!stream->eof())
+                {
+                        String line = stream->getLine();
+                        if(line.find("#include")!= line.npos)
+                        {
+                                int firstocc = line.find("\"",0);
+                                int secondocc = line.find("\"",firstocc+1);
+                                String filename = line.substr(firstocc+1,secondocc - firstocc - 1);
+
+                                DataStreamPtr includedstream = ResourceGroupManager::getSingleton().openResource(
+                    filename, mGroup, true, 0);
+                                while(!includedstream->eof())
+                                {
+                                        line = includedstream->getLine();
+                                        mSource.append(line);
+                                }
+                        }
+                        else
+                                mSource.append(line);
+                        mSource.append("\n");
+                }
+//              mSource.append(0);
+        //      mSource = stream->getAsString();
+                loadFromSource();
+                /*
                  LPD3DXBUFFER errors = 0;
                 
@@ -143 +174 @@
             OGRE_EXCEPT(hr, message,
                 "D3D9HLSLProgram::loadFromSource");
-        }
+        }*/
         }
 #endif