From b50e2383cf4ba147a33ddd74e5b244f801b9d68c Mon Sep 17 00:00:00 2001 From: "Ben Russell (300178622)" Date: Thu, 5 Mar 2015 11:04:03 +1300 Subject: [PATCH] postproc shader selector; anaglyph stereo postproc --- clsave/pub/user.json | 1 + pkg/base/client_start.lua | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/clsave/pub/user.json b/clsave/pub/user.json index de59c2d..f7b7912 100644 --- a/clsave/pub/user.json +++ b/clsave/pub/user.json @@ -30,6 +30,7 @@ "fog": 0.0, "invert_y": false, "fast_load_screen": false, + "postproc": "toon", "glsl_shaders": true, "skins" : { diff --git a/pkg/base/client_start.lua b/pkg/base/client_start.lua index cea02c2..b046052 100644 --- a/pkg/base/client_start.lua +++ b/pkg/base/client_start.lua @@ -1018,7 +1018,12 @@ shader_world, result = loadfile("pkg/base/shader/world_diff.lua")() shader_white, result = loadfile("pkg/base/shader/white.lua")() shader_simple, result = loadfile("pkg/base/shader/simple.lua")() shader_img, result = loadfile("pkg/base/shader/img.lua")() -shader_postproc, result = loadfile("pkg/base/shader/post_toon.lua")() +postproc_map = { + toon = "pkg/base/shader/post_toon.lua", + stereo = "pkg/base/shader/post_stereo.lua", +} +postproc = (user_config.postproc and postproc_map[user_config.postproc]) or "pkg/base/shader/post_toon.lua" +shader_postproc, result = loadfile(postproc)() end if shader_world then