Merge pull request #167 from potree/develop

update page template

PotreeConverter/resources/page_template/build/shaders/shaders.js

@@ -260,16 +260,9 @@ Potree.Shaders["pointcloud.vs"] = [
  "	#elif defined color_type_classification",
  "		float c = mod(classification, 16.0);",
  "		vec2 uv = vec2(c / 255.0, 0.5);",
- "		vColor = texture2D(classificationLUT, uv).rgb;",
- "		",
- "		// TODO only for testing - removing points with class 7",
- "		if(classification == 7.0){",
- "			gl_Position = vec4(100.0, 100.0, 100.0, 0.0);",
- "		}",
+ "		vec4 classColor = texture2D(classificationLUT, uv);",
+ "		vColor = classColor.rgb;",
  "	#elif defined color_type_return_number",
- "		//float w = (returnNumber - 1.0) / 4.0 + 0.1;",
- "		//vColor = texture2D(gradient, vec2(w, 1.0 - w)).rgb;",
- "		",
  "		if(numberOfReturns == 1.0){",
  "			vColor = vec3(1.0, 1.0, 0.0);",
  "		}else{",
@@ -281,7 +274,6 @@ Potree.Shaders["pointcloud.vs"] = [
  "				vColor = vec3(0.0, 1.0, 0.0);",
  "			}",
  "		}",
- "		",
  "	#elif defined color_type_source",
  "		float w = mod(pointSourceID, 10.0) / 10.0;",
  "		vColor = texture2D(gradient, vec2(w,1.0 - w)).rgb;",
@@ -291,6 +283,16 @@ Potree.Shaders["pointcloud.vs"] = [
  "		vColor = color;",
  "	#endif",
  "	",
+ "	{",
+ "		// TODO might want to combine with the define block above to avoid reading same LUT two times",
+ "		float c = mod(classification, 16.0);",
+ "		vec2 uv = vec2(c / 255.0, 0.5);",
+ "		",
+ "		if(texture2D(classificationLUT, uv).a == 0.0){",
+ "			gl_Position = vec4(100.0, 100.0, 100.0, 0.0);",
+ "		}",
+ "	}",
+ "	",
  "	//if(vNormal.z < 0.0){",
  "	//	gl_Position = vec4(1000.0, 1000.0, 1000.0, 1.0);",
  "	//}",
@@ -694,7 +696,9 @@ Potree.Shaders["edl.fs"] = [
  "uniform vec2 neighbours[NEIGHBOUR_COUNT];",
  "uniform vec3 lightDir;",
  "uniform float expScale;",
+ "uniform float edlScale;",
  "uniform float radius;",
+ "uniform float opacity;",
  "",
  "//uniform sampler2D depthMap;",
  "uniform sampler2D colorMap;",
@@ -753,14 +757,14 @@ Potree.Shaders["edl.fs"] = [
  "	float linearDepth = logToLinear(texture2D(colorMap, vUv).a);",
  "	",
  "	float f = computeObscurance(linearDepth);",
- "	f = exp(-expScale * f);",
+ "	f = exp(-expScale * edlScale * f);",
  "	",
  "	vec4 color = texture2D(colorMap, vUv);",
  "	if(color.a == 0.0 && f >= 1.0){",
  "		discard;",
  "	}",
  "	",
- "	gl_FragColor = vec4(color.rgb * f, 1.0);",
+ "	gl_FragColor = vec4(color.rgb * f, opacity);",
  "}",
  "",
 ].join("\n");