mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-08-15 09:34:18 +02:00
Code Issues Releases Wiki Activity

fix inventory items fade out

Browse Source
This commit is contained in:
XProger
2018-11-14 04:20:26 +03:00
parent 710bf99290
commit c14096ebc1
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/inventory.h
View File

@@ -509,10 +509,9 @@ struct Inventory {
Core::setBasis(joints, m.mCount); Core::setBasis(joints, m.mCount);
Core::setBlendMode(bmNone); Core::setBlendMode(bmPremult);
mesh->transparent = 0; mesh->transparent = 0;
mesh->renderModel(desc.model); mesh->renderModel(desc.model);
Core::setBlendMode(bmPremult);
mesh->transparent = 1; mesh->transparent = 1;
mesh->renderModel(desc.model); mesh->renderModel(desc.model);
Core::setBlendMode(bmAdd); Core::setBlendMode(bmAdd);

2
src/shaders/shader.glsl
View File

@@ -164,7 +164,7 @@ uniform vec4 uFogParams;
void _diffuse() { void _diffuse() {
#ifndef PASS_SHADOW #ifndef PASS_SHADOW
vDiffuse = vec4(aColor.xyz * (uMaterial.x * 1.8), uMaterial.w); vDiffuse = vec4(aColor.xyz * (uMaterial.x * 1.8), 1.0) * uMaterial.w;
#ifdef UNDERWATER #ifdef UNDERWATER
vDiffuse.xyz *= UNDERWATER_COLOR; vDiffuse.xyz *= UNDERWATER_COLOR;