oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Unite nodes shaders.

Browse source 
Pass drawtype and material type to shaders.
Move shaders generation to startup only.
Allow assign shaders per tile.
Initial code to support water surface shader.
This commit is contained in:
RealBadAngel 2014-05-14 23:19:31 +02:00
parent 9ffa88b558
commit 6c98fd6658
22 changed files with 315 additions and 793 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/shader.h
View file

@ -46,9 +46,15 @@ std::string getShaderPath(const std::string &name_of_shader,
struct ShaderInfo
{
std::string name;
video::E_MATERIAL_TYPE base_material;
video::E_MATERIAL_TYPE material;
u8 drawtype;
u8 material_type;
s32 user_data;
ShaderInfo(): name(""), material(video::EMT_SOLID) {}
ShaderInfo(): name(""), base_material(video::EMT_SOLID),
material(video::EMT_SOLID),
drawtype(0), material_type(0) {}
virtual ~ShaderInfo() {}
};
@ -77,11 +83,11 @@ class IShaderSource
public:
IShaderSource(){}
virtual ~IShaderSource(){}
virtual u32 getShaderId(const std::string &name){return 0;}
virtual u32 getShaderIdDirect(const std::string &name){return 0;}
virtual std::string getShaderName(u32 id){return "";}
virtual ShaderInfo getShader(u32 id){return ShaderInfo();}
virtual ShaderInfo getShader(const std::string &name){return ShaderInfo();}
virtual u32 getShaderIdDirect(const std::string &name,
const u8 material_type, const u8 drawtype){return 0;}
virtual ShaderInfo getShaderInfo(u32 id){return ShaderInfo();}
virtual u32 getShader(const std::string &name,
const u8 material_type, const u8 drawtype){return 0;}
};
class IWritableShaderSource : public IShaderSource
@ -89,11 +95,11 @@ class IWritableShaderSource : public IShaderSource
public:
IWritableShaderSource(){}
virtual ~IWritableShaderSource(){}
virtual u32 getShaderId(const std::string &name){return 0;}
virtual u32 getShaderIdDirect(const std::string &name){return 0;}
virtual std::string getShaderName(u32 id){return "";}
virtual ShaderInfo getShader(u32 id){return ShaderInfo();}
virtual ShaderInfo getShader(const std::string &name){return ShaderInfo();}
virtual u32 getShaderIdDirect(const std::string &name,
const u8 material_type, const u8 drawtype){return 0;}
virtual ShaderInfo getShaderInfo(u32 id){return ShaderInfo();}
virtual u32 getShader(const std::string &name,
const u8 material_type, const u8 drawtype){return 0;}
virtual void processQueue()=0;
virtual void insertSourceShader(const std::string &name_of_shader,