Merge branch 'Navigation' of https://github.com/SHADE-DP/SHADE_Y3 into Navigation

This commit is contained in:
maverickdgg 2023-03-30 15:37:46 +08:00
commit 3fef57f88a
2 changed files with 3 additions and 0 deletions

View File

@ -8,6 +8,7 @@ struct MatPropData
int textureIndex; int textureIndex;
float alpha; float alpha;
float sliderThreshold; float sliderThreshold;
float borderThickness;
vec4 sliderStartColor; vec4 sliderStartColor;
vec4 sliderEndColor; vec4 sliderEndColor;
vec4 sliderBarColor; vec4 sliderBarColor;
@ -43,6 +44,8 @@ void main()
{ {
//fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv); //fragColor = texture(textures[nonuniformEXT(MatProp.data[In2.materialIndex].textureIndex)], In.uv);
if (In.uv.x > MatProp.data[In2.materialIndex].sliderThreshold) if (In.uv.x > MatProp.data[In2.materialIndex].sliderThreshold)
fragColor = MatProp.data[In2.materialIndex].sliderBarColor; fragColor = MatProp.data[In2.materialIndex].sliderBarColor;
else else