Merge pull request #10269 from RoosterDragon/shader-path
Load shaders relative to the game directory, rather than the CWD
This commit is contained in:
@@ -25,7 +25,7 @@ namespace OpenRA.Platforms.Default
|
|||||||
protected int CompileShaderObject(ShaderType type, string name)
|
protected int CompileShaderObject(ShaderType type, string name)
|
||||||
{
|
{
|
||||||
var ext = type == ShaderType.VertexShader ? "vert" : "frag";
|
var ext = type == ShaderType.VertexShader ? "vert" : "frag";
|
||||||
var filename = "glsl{0}{1}.{2}".F(Path.DirectorySeparatorChar, name, ext);
|
var filename = Path.Combine(Platform.GameDir, "glsl", name + "." + ext);
|
||||||
var code = File.ReadAllText(filename);
|
var code = File.ReadAllText(filename);
|
||||||
|
|
||||||
var shader = GL.CreateShader(type);
|
var shader = GL.CreateShader(type);
|
||||||
|
|||||||
Reference in New Issue
Block a user