build errors

This commit is contained in:
SamGondelman 2019-03-15 13:42:33 -07:00
parent 8748a7561b
commit 79dda7a6c7
5 changed files with 2 additions and 7 deletions

View file

@ -43,7 +43,6 @@
using namespace std; using namespace std;
const int NUM_BODY_CONE_SIDES = 9;
const float CHAT_MESSAGE_SCALE = 0.0015f; const float CHAT_MESSAGE_SCALE = 0.0015f;
const float CHAT_MESSAGE_HEIGHT = 0.1f; const float CHAT_MESSAGE_HEIGHT = 0.1f;
const float DISPLAYNAME_FADE_TIME = 0.5f; const float DISPLAYNAME_FADE_TIME = 0.5f;

View file

@ -19,8 +19,6 @@
#include "RenderPipelines.h" #include "RenderPipelines.h"
#include <DisableDeferred.h>
//#define SHAPE_ENTITY_USE_FADE_EFFECT //#define SHAPE_ENTITY_USE_FADE_EFFECT
#ifdef SHAPE_ENTITY_USE_FADE_EFFECT #ifdef SHAPE_ENTITY_USE_FADE_EFFECT
#include <FadeEffect.h> #include <FadeEffect.h>

View file

@ -19,8 +19,6 @@
#include "GLMHelpers.h" #include "GLMHelpers.h"
#include <DisableDeferred.h>
#include "DeferredLightingEffect.h" #include "DeferredLightingEffect.h"
using namespace render; using namespace render;

View file

@ -235,7 +235,7 @@ vec3 fetchLightmapMap(vec2 uv) {
<@endfunc@> <@endfunc@>
<@func discardInvisible(opacity)@> <@func discardInvisible(opacity)@>
{ {
if (<$opacity$> < 1.e-6) { if (<$opacity$> <= 0.0) {
discard; discard;
} }
} }

View file

@ -64,7 +64,7 @@ void packDeferredFragmentUnlit(vec3 normal, float alpha, vec3 color) {
} }
void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 albedo, float roughness) { void packDeferredFragmentTranslucent(vec3 normal, float alpha, vec3 albedo, float roughness) {
if (alpha < 1.e-6) { if (alpha <= 0.0) {
discard; discard;
} }
_fragColor0 = vec4(albedo.rgb, alpha); _fragColor0 = vec4(albedo.rgb, alpha);