More 3D Improvements
-=-=-=-=-=-=-=-=-=-= -Sprite3D and AnimatedSprite3D support. -Opaque pre-pass works, is compatible with shadows -Improved shadow map rendering (can differentiate between plain opaque and opaque with shaders/discard/etc) -Added option to use alpha discard in FixedMaterial -Improved Glow FX, many more options (three modes, Additive, Screen and SoftLight), strength and scale -Ability for Background (image or cubemap) to send to glow buffer -Dumb Deploy of clients now actually works in Android -Many Many rendering fixes, 3D is much more usable now.
This commit is contained in:
Juan Linietsky
parent
d9adf2627a
commit
6f0b4678e2
50 changed files with 2261 additions and 93 deletions
|
|
@ -2165,6 +2165,74 @@ int RasterizerGLES1::multimesh_get_visible_instances(RID p_multimesh) const {
|
|||
|
||||
}
|
||||
|
||||
/* IMMEDIATE API */
|
||||
|
||||
|
||||
RID RasterizerGLES1::immediate_create() {
|
||||
|
||||
Immediate *im = memnew( Immediate );
|
||||
return immediate_owner.make_rid(im);
|
||||
|
||||
}
|
||||
|
||||
void RasterizerGLES1::immediate_begin(RID p_immediate, VS::PrimitiveType p_rimitive, RID p_texture){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_vertex(RID p_immediate,const Vector3& p_vertex){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_normal(RID p_immediate,const Vector3& p_normal){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_tangent(RID p_immediate,const Plane& p_tangent){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_color(RID p_immediate,const Color& p_color){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_uv(RID p_immediate,const Vector2& tex_uv){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_uv2(RID p_immediate,const Vector2& tex_uv){
|
||||
|
||||
|
||||
}
|
||||
|
||||
void RasterizerGLES1::immediate_end(RID p_immediate){
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES1::immediate_clear(RID p_immediate) {
|
||||
|
||||
|
||||
}
|
||||
|
||||
AABB RasterizerGLES1::immediate_get_aabb(RID p_immediate) const {
|
||||
|
||||
return AABB(Vector3(-1,-1,-1),Vector3(2,2,2));
|
||||
}
|
||||
|
||||
void RasterizerGLES1::immediate_set_material(RID p_immediate,RID p_material) {
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
im->material=p_material;
|
||||
}
|
||||
|
||||
RID RasterizerGLES1::immediate_get_material(RID p_immediate) const {
|
||||
|
||||
const Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND_V(!im,RID());
|
||||
return im->material;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* PARTICLES API */
|
||||
|
||||
|
|
@ -5327,6 +5395,12 @@ bool RasterizerGLES1::is_mesh(const RID& p_rid) const {
|
|||
|
||||
return mesh_owner.owns(p_rid);
|
||||
}
|
||||
|
||||
bool RasterizerGLES1::is_immediate(const RID& p_rid) const {
|
||||
|
||||
return immediate_owner.owns(p_rid);
|
||||
}
|
||||
|
||||
bool RasterizerGLES1::is_multimesh(const RID& p_rid) const {
|
||||
|
||||
return multimesh_owner.owns(p_rid);
|
||||
|
|
@ -5447,6 +5521,13 @@ void RasterizerGLES1::free(const RID& p_rid) {
|
|||
|
||||
particles_owner.free(p_rid);
|
||||
memdelete(particles);
|
||||
} else if (immediate_owner.owns(p_rid)) {
|
||||
|
||||
Immediate *immediate = immediate_owner.get(p_rid);
|
||||
ERR_FAIL_COND(!immediate);
|
||||
|
||||
immediate_owner.free(p_rid);
|
||||
memdelete(immediate);
|
||||
} else if (particles_instance_owner.owns(p_rid)) {
|
||||
|
||||
ParticlesInstance *particles_isntance = particles_instance_owner.get(p_rid);
|
||||
|
|
|
|||
|
|
@ -371,6 +371,15 @@ class RasterizerGLES1 : public Rasterizer {
|
|||
|
||||
mutable RID_Owner<MultiMesh> multimesh_owner;
|
||||
|
||||
|
||||
struct Immediate {
|
||||
|
||||
RID material;
|
||||
int empty;
|
||||
};
|
||||
|
||||
mutable RID_Owner<Immediate> immediate_owner;
|
||||
|
||||
struct Particles : public Geometry {
|
||||
|
||||
ParticleSystemSW data; // software particle system
|
||||
|
|
@ -963,6 +972,23 @@ public:
|
|||
virtual void multimesh_set_visible_instances(RID p_multimesh,int p_visible);
|
||||
virtual int multimesh_get_visible_instances(RID p_multimesh) const;
|
||||
|
||||
/* IMMEDIATE API */
|
||||
|
||||
virtual RID immediate_create();
|
||||
virtual void immediate_begin(RID p_immediate,VS::PrimitiveType p_rimitive,RID p_texture=RID());
|
||||
virtual void immediate_vertex(RID p_immediate,const Vector3& p_vertex);
|
||||
virtual void immediate_normal(RID p_immediate,const Vector3& p_normal);
|
||||
virtual void immediate_tangent(RID p_immediate,const Plane& p_tangent);
|
||||
virtual void immediate_color(RID p_immediate,const Color& p_color);
|
||||
virtual void immediate_uv(RID p_immediate,const Vector2& tex_uv);
|
||||
virtual void immediate_uv2(RID p_immediate,const Vector2& tex_uv);
|
||||
virtual void immediate_end(RID p_immediate);
|
||||
virtual void immediate_clear(RID p_immediate);
|
||||
virtual AABB immediate_get_aabb(RID p_immediate) const;
|
||||
virtual void immediate_set_material(RID p_immediate,RID p_material);
|
||||
virtual RID immediate_get_material(RID p_immediate) const;
|
||||
|
||||
|
||||
/* PARTICLES API */
|
||||
|
||||
virtual RID particles_create();
|
||||
|
|
@ -1120,6 +1146,7 @@ public:
|
|||
|
||||
virtual void add_mesh( const RID& p_mesh, const InstanceData *p_data);
|
||||
virtual void add_multimesh( const RID& p_multimesh, const InstanceData *p_data);
|
||||
virtual void add_immediate( const RID& p_immediate, const InstanceData *p_data) {}
|
||||
virtual void add_particles( const RID& p_particle_instance, const InstanceData *p_data);
|
||||
|
||||
virtual void end_scene();
|
||||
|
|
@ -1176,6 +1203,7 @@ public:
|
|||
virtual bool is_material(const RID& p_rid) const;
|
||||
virtual bool is_mesh(const RID& p_rid) const;
|
||||
virtual bool is_multimesh(const RID& p_rid) const;
|
||||
virtual bool is_immediate(const RID& p_rid) const;
|
||||
virtual bool is_particles(const RID &p_beam) const;
|
||||
|
||||
virtual bool is_light(const RID& p_rid) const;
|
||||
|
|
|
|||
|
|
@ -2489,6 +2489,156 @@ int RasterizerGLES2::multimesh_get_visible_instances(RID p_multimesh) const {
|
|||
|
||||
}
|
||||
|
||||
/* IMMEDIATE API */
|
||||
|
||||
|
||||
RID RasterizerGLES2::immediate_create() {
|
||||
|
||||
Immediate *im = memnew( Immediate );
|
||||
return immediate_owner.make_rid(im);
|
||||
|
||||
}
|
||||
|
||||
void RasterizerGLES2::immediate_begin(RID p_immediate, VS::PrimitiveType p_rimitive, RID p_texture){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(im->building);
|
||||
|
||||
Immediate::Chunk ic;
|
||||
ic.texture=p_texture;
|
||||
ic.primitive=p_rimitive;
|
||||
im->chunks.push_back(ic);
|
||||
im->mask=0;
|
||||
im->building=true;
|
||||
|
||||
|
||||
}
|
||||
void RasterizerGLES2::immediate_vertex(RID p_immediate,const Vector3& p_vertex){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
Immediate::Chunk *c = &im->chunks.back()->get();
|
||||
|
||||
|
||||
if (c->vertices.empty() && im->chunks.size()==1) {
|
||||
|
||||
im->aabb.pos=p_vertex;
|
||||
im->aabb.size=Vector3();
|
||||
} else {
|
||||
im->aabb.expand_to(p_vertex);
|
||||
}
|
||||
|
||||
if (im->mask&VS::ARRAY_FORMAT_NORMAL)
|
||||
c->normals.push_back(chunk_normal);
|
||||
if (im->mask&VS::ARRAY_FORMAT_TANGENT)
|
||||
c->tangents.push_back(chunk_tangent);
|
||||
if (im->mask&VS::ARRAY_FORMAT_COLOR)
|
||||
c->colors.push_back(chunk_color);
|
||||
if (im->mask&VS::ARRAY_FORMAT_TEX_UV)
|
||||
c->uvs.push_back(chunk_uv);
|
||||
if (im->mask&VS::ARRAY_FORMAT_TEX_UV2)
|
||||
c->uvs2.push_back(chunk_uv2);
|
||||
im->mask|=VS::ARRAY_FORMAT_VERTEX;
|
||||
c->vertices.push_back(p_vertex);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void RasterizerGLES2::immediate_normal(RID p_immediate,const Vector3& p_normal){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
im->mask|=VS::ARRAY_FORMAT_NORMAL;
|
||||
chunk_normal=p_normal;
|
||||
|
||||
}
|
||||
void RasterizerGLES2::immediate_tangent(RID p_immediate,const Plane& p_tangent){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
im->mask|=VS::ARRAY_FORMAT_TANGENT;
|
||||
chunk_tangent=p_tangent;
|
||||
|
||||
}
|
||||
void RasterizerGLES2::immediate_color(RID p_immediate,const Color& p_color){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
im->mask|=VS::ARRAY_FORMAT_COLOR;
|
||||
chunk_color=p_color;
|
||||
|
||||
}
|
||||
void RasterizerGLES2::immediate_uv(RID p_immediate,const Vector2& tex_uv){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
im->mask|=VS::ARRAY_FORMAT_TEX_UV;
|
||||
chunk_uv=tex_uv;
|
||||
|
||||
}
|
||||
void RasterizerGLES2::immediate_uv2(RID p_immediate,const Vector2& tex_uv){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
im->mask|=VS::ARRAY_FORMAT_TEX_UV2;
|
||||
chunk_uv2=tex_uv;
|
||||
|
||||
}
|
||||
|
||||
void RasterizerGLES2::immediate_end(RID p_immediate){
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(!im->building);
|
||||
|
||||
im->building=false;
|
||||
|
||||
}
|
||||
void RasterizerGLES2::immediate_clear(RID p_immediate) {
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
ERR_FAIL_COND(im->building);
|
||||
|
||||
im->chunks.clear();
|
||||
}
|
||||
|
||||
AABB RasterizerGLES2::immediate_get_aabb(RID p_immediate) const {
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND_V(!im,AABB());
|
||||
return im->aabb;
|
||||
}
|
||||
|
||||
void RasterizerGLES2::immediate_set_material(RID p_immediate,RID p_material) {
|
||||
|
||||
Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!im);
|
||||
im->material=p_material;
|
||||
|
||||
}
|
||||
|
||||
RID RasterizerGLES2::immediate_get_material(RID p_immediate) const {
|
||||
|
||||
const Immediate *im = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND_V(!im,RID());
|
||||
return im->material;
|
||||
|
||||
}
|
||||
|
||||
|
||||
/* PARTICLES API */
|
||||
|
||||
|
|
@ -3793,9 +3943,16 @@ void RasterizerGLES2::_update_shader( Shader* p_shader) const {
|
|||
|
||||
//print_line("UCF: "+itos(p_shader->uniforms.size()));
|
||||
|
||||
int first_tex_index=0xFFFFF;
|
||||
p_shader->first_texture=StringName();
|
||||
|
||||
for(Map<StringName,ShaderLanguage::Uniform>::Element *E=p_shader->uniforms.front();E;E=E->next()) {
|
||||
|
||||
uniform_names.push_back("_"+String(E->key()));
|
||||
if (E->get().type==ShaderLanguage::TYPE_TEXTURE && E->get().order<first_tex_index) {
|
||||
p_shader->first_texture=E->key();
|
||||
first_tex_index=E->get().order;
|
||||
}
|
||||
}
|
||||
|
||||
if (p_shader->mode==VS::SHADER_MATERIAL) {
|
||||
|
|
@ -3819,6 +3976,9 @@ void RasterizerGLES2::_update_shader( Shader* p_shader) const {
|
|||
if (flags.uses_screen_uv) {
|
||||
enablers.push_back("#define ENABLE_SCREEN_UV\n");
|
||||
}
|
||||
if (flags.uses_discard) {
|
||||
enablers.push_back("#define ENABLE_DISCARD\n");
|
||||
}
|
||||
|
||||
material_shader.set_custom_shader_code(p_shader->custom_code_id,vertex_code, vertex_globals,fragment_code, fragment_globals,uniform_names,enablers);
|
||||
} else {
|
||||
|
|
@ -3827,6 +3987,8 @@ void RasterizerGLES2::_update_shader( Shader* p_shader) const {
|
|||
|
||||
p_shader->valid=true;
|
||||
p_shader->has_alpha=flags.uses_alpha || flags.uses_texscreen;
|
||||
p_shader->writes_vertex=flags.vertex_code_writes_vertex;
|
||||
p_shader->uses_discard=flags.uses_discard;
|
||||
p_shader->has_texscreen=flags.uses_texscreen;
|
||||
p_shader->has_screen_uv=flags.uses_screen_uv;
|
||||
p_shader->can_zpass=!flags.uses_discard && !flags.vertex_code_writes_vertex;
|
||||
|
|
@ -3887,16 +4049,19 @@ void RasterizerGLES2::_add_geometry( const Geometry* p_geometry, const InstanceD
|
|||
|
||||
RenderList *render_list=NULL;
|
||||
|
||||
bool has_alpha = m->blend_mode!=VS::MATERIAL_BLEND_MODE_MIX || (m->shader_cache && m->shader_cache->has_alpha) || m->flags[VS::MATERIAL_FLAG_ONTOP];
|
||||
bool has_base_alpha=(m->shader_cache && m->shader_cache->has_alpha);
|
||||
bool has_blend_alpha=m->blend_mode!=VS::MATERIAL_BLEND_MODE_MIX || m->flags[VS::MATERIAL_FLAG_ONTOP];
|
||||
bool has_alpha = has_base_alpha || has_blend_alpha;
|
||||
|
||||
|
||||
if (shadow) {
|
||||
|
||||
if (has_alpha)
|
||||
if (has_blend_alpha || (has_base_alpha && !m->hints[VS::MATERIAL_HINT_OPAQUE_PRE_PASS]))
|
||||
return; //bye
|
||||
|
||||
if (true) {
|
||||
m = shadow_mat_ptr; //for now do this always
|
||||
if (m->shader_cache && !m->shader_cache->writes_vertex && !m->shader_cache->uses_discard && !m->hints[VS::MATERIAL_HINT_OPAQUE_PRE_PASS]) {
|
||||
//shader does not use discard and does not write a vertex position, use generic material
|
||||
m = shadow_mat_ptr;
|
||||
if (m->last_pass!=frame) {
|
||||
|
||||
if (m->shader.is_valid()) {
|
||||
|
|
@ -3939,6 +4104,9 @@ void RasterizerGLES2::_add_geometry( const Geometry* p_geometry, const InstanceD
|
|||
|
||||
RenderList::Element *e = render_list->add_element();
|
||||
|
||||
if (!e)
|
||||
return;
|
||||
|
||||
e->geometry=p_geometry;
|
||||
e->geometry_cmp=p_geometry_cmp;
|
||||
e->material=m;
|
||||
|
|
@ -3974,6 +4142,18 @@ void RasterizerGLES2::_add_geometry( const Geometry* p_geometry, const InstanceD
|
|||
e->light_type=0xFF; // no lights!
|
||||
e->light=0xFFFF;
|
||||
|
||||
if (!shadow && !has_blend_alpha && has_alpha && m->hints[VS::MATERIAL_HINT_OPAQUE_PRE_PASS]) {
|
||||
|
||||
//if nothing exists, add this element as opaque too
|
||||
RenderList::Element *oe = opaque_render_list.add_element();
|
||||
|
||||
if (!oe)
|
||||
return;
|
||||
|
||||
memcpy(oe,e,sizeof(RenderList::Element));
|
||||
oe->additive_ptr=&oe->additive;
|
||||
}
|
||||
|
||||
if (shadow || m->flags[VS::MATERIAL_FLAG_UNSHADED]) {
|
||||
|
||||
e->light_type=0x7F; //unshaded is zero
|
||||
|
|
@ -4098,6 +4278,17 @@ void RasterizerGLES2::add_multimesh( const RID& p_multimesh, const InstanceData
|
|||
|
||||
}
|
||||
|
||||
void RasterizerGLES2::add_immediate( const RID& p_immediate, const InstanceData *p_data) {
|
||||
|
||||
|
||||
Immediate *immediate = immediate_owner.get(p_immediate);
|
||||
ERR_FAIL_COND(!immediate);
|
||||
|
||||
_add_geometry(immediate,p_data,immediate,NULL);
|
||||
|
||||
}
|
||||
|
||||
|
||||
void RasterizerGLES2::add_particles( const RID& p_particle_instance, const InstanceData *p_data){
|
||||
|
||||
//print_line("adding particles");
|
||||
|
|
@ -4169,7 +4360,7 @@ _FORCE_INLINE_ void RasterizerGLES2::_update_material_shader_params(Material *p_
|
|||
|
||||
}
|
||||
|
||||
bool RasterizerGLES2::_setup_material(const Geometry *p_geometry,const Material *p_material,bool p_no_const_light) {
|
||||
bool RasterizerGLES2::_setup_material(const Geometry *p_geometry,const Material *p_material,bool p_no_const_light,bool p_opaque_pass) {
|
||||
|
||||
if (p_material->flags[VS::MATERIAL_FLAG_DOUBLE_SIDED]) {
|
||||
glDisable(GL_CULL_FACE);
|
||||
|
|
@ -4196,11 +4387,19 @@ bool RasterizerGLES2::_setup_material(const Geometry *p_geometry,const Material
|
|||
material_shader.set_conditional(MaterialShaderGLES2::USE_SHADOW_PCF_HQ,shadow_filter>SHADOW_FILTER_PCF5);
|
||||
//material_shader.set_conditional(MaterialShaderGLES2::USE_SHADOW_ESM,true);
|
||||
|
||||
if (p_opaque_pass && p_material->hints[VS::MATERIAL_HINT_OPAQUE_PRE_PASS] && p_material->shader_cache && p_material->shader_cache->has_alpha) {
|
||||
|
||||
material_shader.set_conditional(MaterialShaderGLES2::ENABLE_CLIP_ALPHA,true);
|
||||
} else {
|
||||
material_shader.set_conditional(MaterialShaderGLES2::ENABLE_CLIP_ALPHA,false);
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (!shadow) {
|
||||
|
||||
bool depth_test=!p_material->flags[VS::MATERIAL_FLAG_ONTOP];
|
||||
bool depth_write=!p_material->hints[VS::MATERIAL_HINT_NO_DEPTH_DRAW];
|
||||
bool depth_write=!p_material->hints[VS::MATERIAL_HINT_NO_DEPTH_DRAW] && (p_opaque_pass || !p_material->hints[VS::MATERIAL_HINT_NO_DEPTH_DRAW_FOR_ALPHA]);
|
||||
|
||||
if (current_depth_mask!=depth_write) {
|
||||
current_depth_mask=depth_write;
|
||||
|
|
@ -4276,6 +4475,10 @@ bool RasterizerGLES2::_setup_material(const Geometry *p_geometry,const Material
|
|||
if (t) {
|
||||
if (t->render_target)
|
||||
t->render_target->last_pass=frame;
|
||||
if (E->key()==p_material->shader_cache->first_texture) {
|
||||
tc0_idx=texcoord;
|
||||
tc0_id_cache=t->tex_id;
|
||||
}
|
||||
glBindTexture(t->target,t->tex_id);
|
||||
} else
|
||||
glBindTexture(GL_TEXTURE_2D,white_tex); //no texture
|
||||
|
|
@ -5019,6 +5222,109 @@ void RasterizerGLES2::_render(const Geometry *p_geometry,const Material *p_mater
|
|||
};
|
||||
}
|
||||
} break;
|
||||
case Geometry::GEOMETRY_IMMEDIATE: {
|
||||
|
||||
bool restore_tex=false;
|
||||
const Immediate *im = static_cast<const Immediate*>( p_geometry );
|
||||
if (im->building) {
|
||||
return;
|
||||
}
|
||||
|
||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||
|
||||
for(const List<Immediate::Chunk>::Element *E=im->chunks.front();E;E=E->next()) {
|
||||
|
||||
const Immediate::Chunk &c=E->get();
|
||||
if (c.vertices.empty()) {
|
||||
continue;
|
||||
}
|
||||
for(int i=0;i<c.vertices.size();i++)
|
||||
|
||||
if (c.texture.is_valid() && texture_owner.owns(c.texture)) {
|
||||
|
||||
const Texture *t = texture_owner.get(c.texture);
|
||||
glActiveTexture(GL_TEXTURE0+tc0_idx);
|
||||
glBindTexture(t->target,t->tex_id);
|
||||
restore_tex=true;
|
||||
|
||||
|
||||
} else if (restore_tex) {
|
||||
|
||||
glActiveTexture(GL_TEXTURE0+tc0_idx);
|
||||
glBindTexture(GL_TEXTURE_2D,tc0_id_cache);
|
||||
restore_tex=false;
|
||||
}
|
||||
|
||||
if (!c.normals.empty()) {
|
||||
|
||||
glEnableVertexAttribArray(VS::ARRAY_NORMAL);
|
||||
glVertexAttribPointer(VS::ARRAY_NORMAL, 3, GL_FLOAT, false,sizeof(Vector3),c.normals.ptr());
|
||||
|
||||
} else {
|
||||
|
||||
glDisableVertexAttribArray(VS::ARRAY_NORMAL);
|
||||
}
|
||||
|
||||
if (!c.tangents.empty()) {
|
||||
|
||||
glEnableVertexAttribArray(VS::ARRAY_TANGENT);
|
||||
glVertexAttribPointer(VS::ARRAY_TANGENT, 4, GL_FLOAT, false,sizeof(Plane),c.tangents.ptr());
|
||||
|
||||
} else {
|
||||
|
||||
glDisableVertexAttribArray(VS::ARRAY_TANGENT);
|
||||
}
|
||||
|
||||
if (!c.colors.empty()) {
|
||||
|
||||
glEnableVertexAttribArray(VS::ARRAY_COLOR);
|
||||
glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false,sizeof(Color),c.colors.ptr());
|
||||
|
||||
} else {
|
||||
|
||||
glDisableVertexAttribArray(VS::ARRAY_COLOR);
|
||||
_set_color_attrib(Color(1, 1, 1,1));
|
||||
}
|
||||
|
||||
|
||||
if (!c.uvs.empty()) {
|
||||
|
||||
glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
|
||||
glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false,sizeof(Vector2),c.uvs.ptr());
|
||||
|
||||
} else {
|
||||
|
||||
glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
|
||||
}
|
||||
|
||||
if (!c.uvs2.empty()) {
|
||||
|
||||
glEnableVertexAttribArray(VS::ARRAY_TEX_UV2);
|
||||
glVertexAttribPointer(VS::ARRAY_TEX_UV2, 2, GL_FLOAT, false,sizeof(Vector2),c.uvs2.ptr());
|
||||
|
||||
} else {
|
||||
|
||||
glDisableVertexAttribArray(VS::ARRAY_TEX_UV2);
|
||||
}
|
||||
|
||||
|
||||
glEnableVertexAttribArray(VS::ARRAY_VERTEX);
|
||||
glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, false,sizeof(Vector3),c.vertices.ptr());
|
||||
glDrawArrays(gl_primitive[c.primitive],0,c.vertices.size());
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
||||
if (restore_tex) {
|
||||
|
||||
glActiveTexture(GL_TEXTURE0+tc0_idx);
|
||||
glBindTexture(GL_TEXTURE_2D,tc0_id_cache);
|
||||
restore_tex=false;
|
||||
}
|
||||
|
||||
|
||||
} break;
|
||||
case Geometry::GEOMETRY_PARTICLES: {
|
||||
|
||||
|
||||
|
|
@ -5275,8 +5581,10 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
|
|||
|
||||
if (desired_blend) {
|
||||
glEnable(GL_BLEND);
|
||||
glColorMask(1,1,1,0);
|
||||
} else {
|
||||
glDisable(GL_BLEND);
|
||||
glColorMask(1,1,1,1);
|
||||
}
|
||||
|
||||
prev_blend=desired_blend;
|
||||
|
|
@ -5337,7 +5645,7 @@ void RasterizerGLES2::_render_list_forward(RenderList *p_render_list,const Trans
|
|||
|
||||
if (material!=prev_material || rebind) {
|
||||
|
||||
rebind = _setup_material(e->geometry,material,additive);
|
||||
rebind = _setup_material(e->geometry,material,additive,!p_alpha_pass);
|
||||
|
||||
DEBUG_TEST_ERROR("Setup material");
|
||||
_rinfo.mat_change_count++;
|
||||
|
|
@ -5530,9 +5838,12 @@ void RasterizerGLES2::_process_glow_bloom() {
|
|||
_copy_screen_quad();
|
||||
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_COPY,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_HDR,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_HDR,false);
|
||||
int passes = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_PASSES];
|
||||
Vector2 psize(1.0/framebuffer.blur_size,1.0/framebuffer.blur_size);
|
||||
float pscale = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_SCALE];
|
||||
float pmag = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_STRENGTH];
|
||||
|
||||
|
||||
for(int i=0;i<passes;i++) {
|
||||
|
||||
|
|
@ -5555,6 +5866,8 @@ void RasterizerGLES2::_process_glow_bloom() {
|
|||
copy_shader.set_conditional(CopyShaderGLES2::BLUR_H_PASS,false);
|
||||
copy_shader.bind();
|
||||
copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE,psize);
|
||||
copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE,pscale);
|
||||
copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE,pmag);
|
||||
|
||||
_draw_gui_primitive(4,dst_pos,NULL,src_uv);
|
||||
|
||||
|
|
@ -5565,6 +5878,8 @@ void RasterizerGLES2::_process_glow_bloom() {
|
|||
copy_shader.set_conditional(CopyShaderGLES2::BLUR_H_PASS,true);
|
||||
copy_shader.bind();
|
||||
copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE,psize);
|
||||
copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE,pscale);
|
||||
copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE,pmag);
|
||||
|
||||
_draw_gui_primitive(4,dst_pos,NULL,src_uv);
|
||||
|
||||
|
|
@ -5693,6 +6008,8 @@ void RasterizerGLES2::_draw_tex_bg() {
|
|||
copy_shader.set_conditional(CopyShaderGLES2::USE_RGBE,false);
|
||||
}
|
||||
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_CUSTOM_ALPHA,true);
|
||||
|
||||
copy_shader.bind();
|
||||
|
||||
if (current_env->bg_mode==VS::ENV_BG_TEXTURE || current_env->bg_mode==VS::ENV_BG_TEXTURE_RGBE) {
|
||||
|
|
@ -5705,6 +6022,7 @@ void RasterizerGLES2::_draw_tex_bg() {
|
|||
if (current_env->fx_enabled[VS::ENV_FX_HDR])
|
||||
nrg*=0.25; //go down a quarter for hdr
|
||||
copy_shader.set_uniform(CopyShaderGLES2::ENERGY,nrg);
|
||||
copy_shader.set_uniform(CopyShaderGLES2::CUSTOM_ALPHA,float(current_env->bg_param[VS::ENV_BG_PARAM_GLOW]));
|
||||
|
||||
Vector3 vertices[4]={
|
||||
Vector3(-1,-1,1),
|
||||
|
|
@ -5774,6 +6092,7 @@ void RasterizerGLES2::_draw_tex_bg() {
|
|||
copy_shader.set_conditional(CopyShaderGLES2::USE_ENERGY,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_RGBE,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_CUBEMAP,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_CUSTOM_ALPHA,false);
|
||||
}
|
||||
|
||||
void RasterizerGLES2::end_scene() {
|
||||
|
|
@ -5854,7 +6173,7 @@ void RasterizerGLES2::end_scene() {
|
|||
bgcolor = current_env->bg_param[VS::ENV_BG_PARAM_COLOR];
|
||||
else
|
||||
bgcolor = Globals::get_singleton()->get("render/default_clear_color");
|
||||
float a = use_fb ? 0.0 : 1.0;
|
||||
float a = use_fb ? float(current_env->bg_param[VS::ENV_BG_PARAM_GLOW]) : 1.0;
|
||||
glClearColor(bgcolor.r,bgcolor.g,bgcolor.b,a);
|
||||
_glClearDepth(1.0);
|
||||
glClear(GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
|
||||
|
|
@ -5923,7 +6242,7 @@ void RasterizerGLES2::end_scene() {
|
|||
}
|
||||
|
||||
alpha_render_list.sort_z();
|
||||
_render_list_forward(&alpha_render_list,camera_transform,camera_transform_inverse,camera_projection,false,false,true);
|
||||
_render_list_forward(&alpha_render_list,camera_transform,camera_transform_inverse,camera_projection,false,fragment_lighting,true);
|
||||
glColorMask(1,1,1,1);
|
||||
|
||||
// material_shader.set_conditional( MaterialShaderGLES2::USE_FOG,false);
|
||||
|
|
@ -5953,7 +6272,12 @@ void RasterizerGLES2::end_scene() {
|
|||
_process_hdr();
|
||||
}
|
||||
if (current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]) {
|
||||
_process_glow_bloom();
|
||||
_process_glow_bloom();
|
||||
int glow_transfer_mode=current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_BLEND_MODE];
|
||||
if (glow_transfer_mode==1)
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SCREEN,true);
|
||||
if (glow_transfer_mode==2)
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SOFTLIGHT,true);
|
||||
}
|
||||
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, current_rt?current_rt->fbo:base_framebuffer);
|
||||
|
|
@ -6024,6 +6348,8 @@ void RasterizerGLES2::end_scene() {
|
|||
copy_shader.set_conditional(CopyShaderGLES2::USE_HDR,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_NO_ALPHA,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_FXAA,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SCREEN,false);
|
||||
copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SOFTLIGHT,false);
|
||||
|
||||
material_shader.set_conditional(MaterialShaderGLES2::USE_HDR,false);
|
||||
|
||||
|
|
@ -6216,8 +6542,8 @@ void RasterizerGLES2::end_shadow_map() {
|
|||
//glDisable(GL_POLYGON_OFFSET_FILL);
|
||||
|
||||
|
||||
if (!use_rgba_shadowmaps)
|
||||
glColorMask(1, 1, 1, 1);
|
||||
//if (!use_rgba_shadowmaps)
|
||||
glColorMask(1, 1, 1, 1);
|
||||
|
||||
DEBUG_TEST_ERROR("Drawing Shadow");
|
||||
shadow=NULL;
|
||||
|
|
@ -6950,6 +7276,10 @@ bool RasterizerGLES2::is_mesh(const RID& p_rid) const {
|
|||
|
||||
return mesh_owner.owns(p_rid);
|
||||
}
|
||||
bool RasterizerGLES2::is_immediate(const RID& p_rid) const {
|
||||
|
||||
return immediate_owner.owns(p_rid);
|
||||
}
|
||||
bool RasterizerGLES2::is_multimesh(const RID& p_rid) const {
|
||||
|
||||
return multimesh_owner.owns(p_rid);
|
||||
|
|
@ -7074,6 +7404,13 @@ void RasterizerGLES2::free(const RID& p_rid) {
|
|||
multimesh_owner.free(p_rid);
|
||||
memdelete(multimesh);
|
||||
|
||||
} else if (immediate_owner.owns(p_rid)) {
|
||||
|
||||
Immediate *immediate = immediate_owner.get(p_rid);
|
||||
ERR_FAIL_COND(!immediate);
|
||||
|
||||
immediate_owner.free(p_rid);
|
||||
memdelete(immediate);
|
||||
} else if (particles_owner.owns(p_rid)) {
|
||||
|
||||
Particles *particles = particles_owner.get(p_rid);
|
||||
|
|
@ -8121,6 +8458,8 @@ RasterizerGLES2::RasterizerGLES2(bool p_compress_arrays,bool p_keep_ram_copy,boo
|
|||
draw_next_frame=false;
|
||||
use_framebuffers=true;
|
||||
framebuffer.active=false;
|
||||
tc0_id_cache=0;
|
||||
tc0_idx=0;
|
||||
};
|
||||
|
||||
RasterizerGLES2::~RasterizerGLES2() {
|
||||
|
|
|
|||
|
|
@ -173,8 +173,11 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
bool can_zpass;
|
||||
bool has_texscreen;
|
||||
bool has_screen_uv;
|
||||
bool writes_vertex;
|
||||
bool uses_discard;
|
||||
|
||||
Map<StringName,ShaderLanguage::Uniform> uniforms;
|
||||
StringName first_texture;
|
||||
|
||||
|
||||
SelfList<Shader> dirty_list;
|
||||
|
|
@ -190,6 +193,8 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
can_zpass=true;
|
||||
has_texscreen=false;
|
||||
has_screen_uv=false;
|
||||
writes_vertex=false;
|
||||
uses_discard=false;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -235,6 +240,7 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
flags[VS::MATERIAL_FLAG_VISIBLE]=true;
|
||||
for(int i=0;i<VS::MATERIAL_HINT_MAX;i++)
|
||||
hints[i]=false;
|
||||
hints[VS::MATERIAL_HINT_NO_DEPTH_DRAW_FOR_ALPHA]=true;
|
||||
|
||||
line_width=1;
|
||||
has_alpha=false;
|
||||
|
|
@ -256,7 +262,7 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
enum Type {
|
||||
GEOMETRY_INVALID,
|
||||
GEOMETRY_SURFACE,
|
||||
GEOMETRY_POLY,
|
||||
GEOMETRY_IMMEDIATE,
|
||||
GEOMETRY_PARTICLES,
|
||||
GEOMETRY_MULTISURFACE,
|
||||
};
|
||||
|
|
@ -457,6 +463,31 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
mutable RID_Owner<MultiMesh> multimesh_owner;
|
||||
mutable SelfList<MultiMesh>::List _multimesh_dirty_list;
|
||||
|
||||
struct Immediate : public Geometry {
|
||||
|
||||
struct Chunk {
|
||||
|
||||
RID texture;
|
||||
VS::PrimitiveType primitive;
|
||||
Vector<Vector3> vertices;
|
||||
Vector<Vector3> normals;
|
||||
Vector<Plane> tangents;
|
||||
Vector<Color> colors;
|
||||
Vector<Vector2> uvs;
|
||||
Vector<Vector2> uvs2;
|
||||
};
|
||||
|
||||
List<Chunk> chunks;
|
||||
bool building;
|
||||
int mask;
|
||||
AABB aabb;
|
||||
|
||||
Immediate() { type=GEOMETRY_IMMEDIATE; building=false;}
|
||||
|
||||
};
|
||||
|
||||
mutable RID_Owner<Immediate> immediate_owner;
|
||||
|
||||
struct Particles : public Geometry {
|
||||
|
||||
ParticleSystemSW data; // software particle system
|
||||
|
|
@ -585,11 +616,15 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
bg_param[VS::ENV_BG_PARAM_CUBEMAP]=RID();
|
||||
bg_param[VS::ENV_BG_PARAM_ENERGY]=1.0;
|
||||
bg_param[VS::ENV_BG_PARAM_SCALE]=1.0;
|
||||
bg_param[VS::ENV_BG_PARAM_GLOW]=0.0;
|
||||
|
||||
for(int i=0;i<VS::ENV_FX_MAX;i++)
|
||||
fx_enabled[i]=false;
|
||||
|
||||
fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_PASSES]=1;
|
||||
fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_SCALE]=1.0;
|
||||
fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_STRENGTH]=1.0;
|
||||
fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_BLEND_MODE]=0;
|
||||
fx_param[VS::ENV_FX_PARAM_GLOW_BLOOM]=0.0;
|
||||
fx_param[VS::ENV_FX_PARAM_GLOW_BLOOM_TRESHOLD]=0.5;
|
||||
fx_param[VS::ENV_FX_PARAM_DOF_BLUR_PASSES]=1;
|
||||
|
|
@ -932,7 +967,7 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
void _setup_light(uint16_t p_light);
|
||||
|
||||
_FORCE_INLINE_ void _setup_shader_params(const Material *p_material);
|
||||
bool _setup_material(const Geometry *p_geometry,const Material *p_material,bool p_no_const_light);
|
||||
bool _setup_material(const Geometry *p_geometry, const Material *p_material, bool p_no_const_light, bool p_opaque_pass);
|
||||
void _setup_skeleton(const Skeleton *p_skeleton);
|
||||
|
||||
|
||||
|
|
@ -1096,6 +1131,16 @@ class RasterizerGLES2 : public Rasterizer {
|
|||
void _copy_screen_quad();
|
||||
void _copy_to_texscreen();
|
||||
|
||||
|
||||
Vector3 chunk_vertex;
|
||||
Vector3 chunk_normal;
|
||||
Plane chunk_tangent;
|
||||
Color chunk_color;
|
||||
Vector2 chunk_uv;
|
||||
Vector2 chunk_uv2;
|
||||
GLuint tc0_id_cache;
|
||||
GLuint tc0_idx;
|
||||
|
||||
public:
|
||||
|
||||
/* TEXTURE API */
|
||||
|
|
@ -1205,6 +1250,22 @@ public:
|
|||
virtual void multimesh_set_visible_instances(RID p_multimesh,int p_visible);
|
||||
virtual int multimesh_get_visible_instances(RID p_multimesh) const;
|
||||
|
||||
/* IMMEDIATE API */
|
||||
|
||||
virtual RID immediate_create();
|
||||
virtual void immediate_begin(RID p_immediate,VS::PrimitiveType p_rimitive,RID p_texture=RID());
|
||||
virtual void immediate_vertex(RID p_immediate,const Vector3& p_vertex);
|
||||
virtual void immediate_normal(RID p_immediate,const Vector3& p_normal);
|
||||
virtual void immediate_tangent(RID p_immediate,const Plane& p_tangent);
|
||||
virtual void immediate_color(RID p_immediate,const Color& p_color);
|
||||
virtual void immediate_uv(RID p_immediate,const Vector2& tex_uv);
|
||||
virtual void immediate_uv2(RID p_immediate,const Vector2& tex_uv);
|
||||
virtual void immediate_end(RID p_immediate);
|
||||
virtual void immediate_clear(RID p_immediate);
|
||||
virtual AABB immediate_get_aabb(RID p_immediate) const;
|
||||
virtual void immediate_set_material(RID p_immediate,RID p_material);
|
||||
virtual RID immediate_get_material(RID p_immediate) const;
|
||||
|
||||
/* PARTICLES API */
|
||||
|
||||
virtual RID particles_create();
|
||||
|
|
@ -1364,6 +1425,7 @@ public:
|
|||
|
||||
virtual void add_mesh( const RID& p_mesh, const InstanceData *p_data);
|
||||
virtual void add_multimesh( const RID& p_multimesh, const InstanceData *p_data);
|
||||
virtual void add_immediate( const RID& p_immediate, const InstanceData *p_data);
|
||||
virtual void add_particles( const RID& p_particle_instance, const InstanceData *p_data);
|
||||
|
||||
virtual void end_scene();
|
||||
|
|
@ -1411,6 +1473,7 @@ public:
|
|||
virtual bool is_texture(const RID& p_rid) const;
|
||||
virtual bool is_material(const RID& p_rid) const;
|
||||
virtual bool is_mesh(const RID& p_rid) const;
|
||||
virtual bool is_immediate(const RID& p_rid) const;
|
||||
virtual bool is_multimesh(const RID& p_rid) const;
|
||||
virtual bool is_particles(const RID &p_beam) const;
|
||||
|
||||
|
|
|
|||
|
|
@ -145,6 +145,12 @@ String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node,int p_level,bool p_a
|
|||
} break;
|
||||
case SL::Node::TYPE_VARIABLE: {
|
||||
SL::VariableNode *vnode=(SL::VariableNode*)p_node;
|
||||
if (type==ShaderLanguage::SHADER_MATERIAL_VERTEX) {
|
||||
|
||||
if (vnode->name==vname_vertex && p_assign_left) {
|
||||
vertex_code_writes_vertex=true;
|
||||
}
|
||||
}
|
||||
if (type==ShaderLanguage::SHADER_MATERIAL_FRAGMENT) {
|
||||
|
||||
if (vnode->name==vname_discard) {
|
||||
|
|
@ -644,5 +650,6 @@ ShaderCompilerGLES2::ShaderCompilerGLES2() {
|
|||
vname_binormal_interp="BINORMAL";
|
||||
vname_var1_interp="VAR1";
|
||||
vname_var2_interp="VAR2";
|
||||
vname_vertex="VERTEX";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -61,6 +61,7 @@ private:
|
|||
StringName vname_binormal_interp;
|
||||
StringName vname_var1_interp;
|
||||
StringName vname_var2_interp;
|
||||
StringName vname_vertex;
|
||||
|
||||
Map<StringName,ShaderLanguage::Uniform> *uniforms;
|
||||
|
||||
|
|
|
|||
|
|
@ -315,6 +315,7 @@ ShaderGLES2::Version* ShaderGLES2::get_current_version() {
|
|||
for(int i=0;i<cc->custom_defines.size();i++) {
|
||||
|
||||
strings.push_back(cc->custom_defines[i]);
|
||||
DEBUG_PRINT("CD #"+itos(i)+": "+String(cc->custom_defines[i]));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -349,9 +350,11 @@ ShaderGLES2::Version* ShaderGLES2::get_current_version() {
|
|||
|
||||
strings.push_back(vertex_code2.get_data());
|
||||
#ifdef DEBUG_SHADER
|
||||
|
||||
DEBUG_PRINT("\nVertex Code:\n\n"+String(code_string.get_data()));
|
||||
for(int i=0;i<strings.size();i++) {
|
||||
|
||||
print_line("vert strings "+itos(i)+":"+String(strings[i]));
|
||||
//print_line("vert strings "+itos(i)+":"+String(strings[i]));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -435,9 +438,10 @@ ShaderGLES2::Version* ShaderGLES2::get_current_version() {
|
|||
|
||||
strings.push_back(fragment_code2.get_data());
|
||||
#ifdef DEBUG_SHADER
|
||||
DEBUG_PRINT("\nFragment Code:\n\n"+String(code_string.get_data()));
|
||||
for(int i=0;i<strings.size();i++) {
|
||||
|
||||
print_line("frag strings "+itos(i)+":"+String(strings[i]));
|
||||
//print_line("frag strings "+itos(i)+":"+String(strings[i]));
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -99,6 +99,8 @@ uniform float bloom_treshold;
|
|||
#if defined(BLUR_V_PASS) || defined(BLUR_H_PASS) || defined(USE_HDR_REDUCE)
|
||||
|
||||
uniform vec2 pixel_size;
|
||||
uniform float pixel_scale;
|
||||
uniform float blur_magnitude;
|
||||
|
||||
#ifdef USE_HDR_STORE
|
||||
|
||||
|
|
@ -123,6 +125,10 @@ uniform highp float energy;
|
|||
|
||||
#endif
|
||||
|
||||
#ifdef USE_CUSTOM_ALPHA
|
||||
uniform float custom_alpha;
|
||||
#endif
|
||||
|
||||
|
||||
void main() {
|
||||
|
||||
|
|
@ -195,28 +201,28 @@ void main() {
|
|||
|
||||
#ifdef BLUR_V_PASS
|
||||
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-3.0));
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-2.0));
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-1.0));
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*1.0));
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*2.0));
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*3.0));
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-3.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-2.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-1.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*1.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*2.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*3.0)*pixel_scale);
|
||||
|
||||
color*=(1.0/7.0);
|
||||
color*=(1.0/7.0)*blur_magnitude;
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef BLUR_H_PASS
|
||||
|
||||
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*-3.0,0.0));
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*-2.0,0.0));
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*-1.0,0.0));
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*1.0,0.0));
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*2.0,0.0));
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*3.0,0.0));
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*-3.0,0.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*-2.0,0.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*-1.0,0.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*1.0,0.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*2.0,0.0)*pixel_scale);
|
||||
color+=texture2D(source,uv_interp+vec2(pixel_size.x*3.0,0.0)*pixel_scale);
|
||||
|
||||
color*=(1.0/7.0);
|
||||
color*=(1.0/7.0)*blur_magnitude;
|
||||
|
||||
#endif
|
||||
|
||||
|
|
@ -249,12 +255,25 @@ void main() {
|
|||
|
||||
vec4 glow = texture2D( glow_source, uv2_interp );
|
||||
|
||||
#if 1
|
||||
//ifdef USE_GLOW_SCREEN
|
||||
#ifdef USE_GLOW_SCREEN
|
||||
|
||||
color.rgb = clamp((color.rgb + glow.rgb) - (color.rgb * glow.rgb), 0.0, 1.0);
|
||||
|
||||
#else
|
||||
#endif
|
||||
|
||||
#ifdef USE_GLOW_SOFTLIGHT
|
||||
|
||||
{
|
||||
|
||||
glow.rgb = (glow.rgb * 0.5) + 0.5;
|
||||
color.r = (glow.r <= 0.5) ? (color.r - (1.0 - 2.0 * glow.r) * color.r * (1.0 - color.r)) : (((glow.r > 0.5) && (color.r <= 0.25)) ? (color.r + (2.0 * glow.r - 1.0) * (4.0 * color.r * (4.0 * color.r + 1.0) * (color.r - 1.0) + 7.0 * color.r)) : (color.r + (2.0 * glow.r - 1.0) * (sqrt(color.r) - color.r)));
|
||||
color.g = (glow.g <= 0.5) ? (color.g - (1.0 - 2.0 * glow.g) * color.g * (1.0 - color.g)) : (((glow.g > 0.5) && (color.g <= 0.25)) ? (color.g + (2.0 * glow.g - 1.0) * (4.0 * color.g * (4.0 * color.g + 1.0) * (color.g - 1.0) + 7.0 * color.g)) : (color.g + (2.0 * glow.g - 1.0) * (sqrt(color.g) - color.g)));
|
||||
color.b = (glow.b <= 0.5) ? (color.b - (1.0 - 2.0 * glow.b) * color.b * (1.0 - color.b)) : (((glow.b > 0.5) && (color.b <= 0.25)) ? (color.b + (2.0 * glow.b - 1.0) * (4.0 * color.b * (4.0 * color.b + 1.0) * (color.b - 1.0) + 7.0 * color.b)) : (color.b + (2.0 * glow.b - 1.0) * (sqrt(color.b) - color.b)));
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if !defined(USE_GLOW_SCREEN) && !defined(USE_GLOW_SOFTLIGHT)
|
||||
color.rgb+=glow.rgb;
|
||||
#endif
|
||||
|
||||
|
|
@ -316,6 +335,9 @@ void main() {
|
|||
color.a=1.0;
|
||||
#endif
|
||||
|
||||
#ifdef USE_CUSTOM_ALPHA
|
||||
color.a=custom_alpha;
|
||||
#endif
|
||||
gl_FragColor = color;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -386,6 +386,7 @@ VERTEX_SHADER_CODE
|
|||
specular_interp=vec3(0.0);
|
||||
}
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
#ifdef SHADELESS
|
||||
|
|
@ -722,21 +723,28 @@ void main() {
|
|||
|
||||
|
||||
|
||||
#ifdef FRAGMENT_SHADER_CODE_USE_DISCARD
|
||||
float discard_=0.0;
|
||||
#if defined(ENABLE_DISCARD)
|
||||
bool discard_=false;
|
||||
#endif
|
||||
|
||||
|
||||
FRAGMENT_SHADER_CODE
|
||||
|
||||
|
||||
#ifdef FRAGMENT_SHADER_CODE_USE_DISCARD
|
||||
if (discard_>0.0) {
|
||||
#if defined(ENABLE_DISCARD)
|
||||
if (discard_) {
|
||||
//easy to eliminate dead code
|
||||
discard;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifdef ENABLE_CLIP_ALPHA
|
||||
if (diffuse.a<0.99) {
|
||||
//used for doublepass and shadowmapping
|
||||
discard;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
float shadow_attenuation = 1.0;
|
||||
|
||||
|
|
@ -902,7 +910,10 @@ FRAGMENT_SHADER_CODE
|
|||
|
||||
# if !defined(LIGHT_TYPE_DIRECTIONAL) && !defined(LIGHT_TYPE_OMNI) && !defined (LIGHT_TYPE_SPOT)
|
||||
//none
|
||||
#ifndef SHADELESS
|
||||
diffuse.rgb=vec3(0.0,0.0,0.0);
|
||||
#endif
|
||||
|
||||
# endif
|
||||
|
||||
diffuse.rgb+=const_light_mult*emission;
|
||||
|
|
@ -959,6 +970,7 @@ FRAGMENT_SHADER_CODE
|
|||
#ifdef USE_HDR
|
||||
diffuse.rgb*=0.25;
|
||||
#endif
|
||||
|
||||
gl_FragColor = diffuse;
|
||||
#endif
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue