Changeset 2356 for OGRE

Timestamp:

05/08/07 16:25:27 (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

@@ -31 +31 @@
 #include "OgreRenderSystem.h"
 #include "OgreRenderSystemCapabilities.h"
+
+#ifdef GAMETOOLS_ILLUMINATION_MODULE
+#include "OgreFileSystem.h"
+#endif
 
 namespace Ogre {
@@ -114 +118 @@
                         if(mFlowControl == -1)
                                 mCompilerFlags = mCompilerFlags|D3DXSHADER_AVOID_FLOW_CONTROL;
-
+                        
+                        FileInfoListPtr fileInfos = ResourceGroupManager::getSingleton().findResourceFileInfo(mGroup, mFilename);
+                        FileInfo FI = fileInfos->at(0);
+                        String fullPathName = ((FileSystemArchive*)FI.archive)->getTmpPath()+"\\"+
+                                                                ((FileSystemArchive*)FI.archive)->getBasePath() +"\\"+
+                                                                mFilename;
+                    String Fname2 = "C:\GameToolsSVN\Ogre\Ogre1.2\Samples\Media\DeferredShadingMedia\DeferredShading\material\hlsl\vs.hlsl";
                         HRESULT hr = D3DXCompileShaderFromFile(
-                                mFilename.c_str(),
+                                fullPathName.c_str(),
                                 NULL, //no preprocessor defines
                                 NULL, //no includes