From 0ec979993cdde98a4792e5572da79ac33925b842 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Wed, 30 Jun 2010 16:58:23 +0000
Subject: [PATCH] fix shaders loading
git-svn-id: http://svn.net-core.org/repos/t-engine4@874 51575b47-30f0-44d4-a5cc-537603b46e54
---
game/engine/Shader.lua | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/game/engine/Shader.lua b/game/engine/Shader.lua
index c6cea87112..106fe37d28 100644
--- a/game/engine/Shader.lua
+++ b/game/engine/Shader.lua
@@ -71,12 +71,12 @@ function _M:getFragment(name)
local f = fs.open("/data/gfx/shaders/"..name..".frag", "r")
local code = {}
while true do
- local l = f:read()
+ local l = f:read(1)
if not l then break end
code[#code+1] = l
end
f:close()
- self.frags[name] = core.shader.newShader(table.concat(code, "\n"))
+ self.frags[name] = core.shader.newShader(table.concat(code))
print("[SHADER] created fragment shader from /data/gfx/shaders/"..name..".frag")
return self.frags[name]
end
@@ -87,12 +87,12 @@ function _M:getVertex(name)
local f = fs.open("/data/gfx/shaders/"..name..".vert", "r")
local code = {}
while true do
- local l = f:read()
+ local l = f:read(1)
if not l then break end
code[#code+1] = l
end
f:close()
- self.verts[name] = core.shader.newShader(table.concat(code, "\n"), true)
+ self.verts[name] = core.shader.newShader(table.concat(code), true)
print("[SHADER] created vertex shader from /data/gfx/shaders/"..name..".vert")
return self.verts[name]
end
--
GitLab