Backups/Bliss-Shader
1
0
Fork 0
mirror of https://github.com/X0nk/Bliss-Shader.git synced 2025-06-22 08:42:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

make emissives work again

Browse Source
This commit is contained in:
Xonk
2023-06-13 14:36:07 -04:00
parent 4cc83166db
commit 33a2c1d0f3
10 changed files with 107 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
shaders/gbuffers_all_solid.vsh
View File

@ -46,13 +46,13 @@ attribute vec4 mc_Entity;
uniform int blockEntityId;
uniform int entityId;
flat varying int EMISSIVE;
flat varying float blockID;
flat varying int LIGHTNING;
flat varying float SSSAMOUNT;
flat varying float EMISSIVE;
flat varying int NameTags;
@ -161,26 +161,20 @@ void main() {
gl_Position = ftransform();
SSSAMOUNT = 0.0;
vec3 position = mat3(gl_ModelViewMatrix) * vec3(gl_Vertex) + gl_ModelViewMatrix[3].xyz;
EMISSIVE = 0;
/////// ----- COLOR STUFF ----- ///////
color = gl_Color;
#ifdef ENTITIES
LIGHTNING = 0;
if(entityId == 12345){
LIGHTNING = 1;
}
#endif
VanillaAO = 1.0 - clamp(color.a,0,1);
if (color.a < 0.3) color.a = 1.0; // fix vanilla ao on some custom block models.
blockID = mc_Entity.x;
velocity = at_velocity;
// emission and shit...
// #ifndef LabPBR_Emissives
// if(mc_Entity.x == 10005) EMISSIVE = 1;
// #endif
/////// ----- RANDOM STUFF ----- ///////
lmtexcoord.xy = (gl_MultiTexCoord0).xy;
@ -197,21 +191,18 @@ void main() {
vec3 position = mat3(gl_ModelViewMatrix) * vec3(gl_Vertex) + gl_ModelViewMatrix[3].xyz;
color = gl_Color;
VanillaAO = 1.0 - clamp(color.a,0,1);
if (color.a < 0.3) color.a = 1.0; // fix vanilla ao on some custom block models.
#ifdef MC_NORMAL_MAP
tangent = vec4(normalize(gl_NormalMatrix *at_tangent.rgb),at_tangent.w);
#endif
normalMat = vec4(normalize(gl_NormalMatrix *gl_Normal), 1.0);
FlatNormals = normalMat.xyz;
blockID = mc_Entity.x;
velocity = at_velocity;
// #ifdef ENTITIES
// NameTags = 0;
@ -221,6 +212,21 @@ void main() {
// #endif
/////// ----- EMISSIVE STUFF ----- ///////
EMISSIVE = 0.0;
// normal block lightsources
if(mc_Entity.x == 10005) EMISSIVE = 0.5;
// special cases light lightning and beacon beams...
#ifdef ENTITIES
if(entityId == 12345) EMISSIVE = 0.9;
#endif
/////// ----- SSS STUFF ----- ///////
SSSAMOUNT = 0.0;
#ifdef WORLD
/////// ----- SSS ON BLOCKS ----- ///////
@ -306,5 +312,4 @@ void main() {
gl_Position.xy += offsets[framemod8] * gl_Position.w * texelSize;
#endif
}