three-gpu-pathtracer 0.0.14 → 0.0.16

package/src/shader/structs/fogMaterialBvh.glsl.js

@@ -1,62 +1,62 @@
-export const fogMaterialBvhGLSL = /* glsl */`
-
-#ifndef FOG_CHECK_ITERATIONS
-#define FOG_CHECK_ITERATIONS 30
-#endif
-
-// returns whether the given material is a fog material or not
-bool isMaterialFogVolume( sampler2D materials, uint materialIndex ) {
-
-	uint i = materialIndex * 45u;
-	vec4 s14 = texelFetch1D( materials, i + 14u );
-	return bool( int( s14.b ) & 4 );
-
-}
-
-// returns true if we're within the first fog volume we hit
-bool bvhIntersectFogVolumeHit(
-	BVH bvh, vec3 rayOrigin, vec3 rayDirection,
-	usampler2D materialIndexAttribute, sampler2D materials,
-	out Material material
-) {
-
-	material.fogVolume = false;
-
-	for ( int i = 0; i < FOG_CHECK_ITERATIONS; i ++ ) {
-
-		// find nearest hit
-		uvec4 faceIndices = uvec4( 0u );
-		vec3 faceNormal = vec3( 0.0, 0.0, 1.0 );
-		vec3 barycoord = vec3( 0.0 );
-		float side = 1.0;
-		float dist = 0.0;
-		bool hit = bvhIntersectFirstHit( bvh, rayOrigin, rayDirection, faceIndices, faceNormal, barycoord, side, dist );
-		if ( hit ) {
-
-			// if it's a fog volume return whether we hit the front or back face
-			uint materialIndex = uTexelFetch1D( materialIndexAttribute, faceIndices.x ).r;
-			if ( isMaterialFogVolume( materials, materialIndex ) ) {
-
-				material = readMaterialInfo( materials, materialIndex );
-				return side == - 1.0;
-
-			} else {
-
-				// move the ray forward
-				rayOrigin = stepRayOrigin( rayOrigin, rayDirection, - faceNormal, dist );
-
-			}
-
-		} else {
-
-			return false;
-
-		}
-
-	}
-
-	return false;
-
-}
-
-`;
+export const fogMaterialBvhGLSL = /* glsl */`
+
+#ifndef FOG_CHECK_ITERATIONS
+#define FOG_CHECK_ITERATIONS 30
+#endif
+
+// returns whether the given material is a fog material or not
+bool isMaterialFogVolume( sampler2D materials, uint materialIndex ) {
+
+	uint i = materialIndex * 45u;
+	vec4 s14 = texelFetch1D( materials, i + 14u );
+	return bool( int( s14.b ) & 4 );
+
+}
+
+// returns true if we're within the first fog volume we hit
+bool bvhIntersectFogVolumeHit(
+	BVH bvh, vec3 rayOrigin, vec3 rayDirection,
+	usampler2D materialIndexAttribute, sampler2D materials,
+	out Material material
+) {
+
+	material.fogVolume = false;
+
+	for ( int i = 0; i < FOG_CHECK_ITERATIONS; i ++ ) {
+
+		// find nearest hit
+		uvec4 faceIndices = uvec4( 0u );
+		vec3 faceNormal = vec3( 0.0, 0.0, 1.0 );
+		vec3 barycoord = vec3( 0.0 );
+		float side = 1.0;
+		float dist = 0.0;
+		bool hit = bvhIntersectFirstHit( bvh, rayOrigin, rayDirection, faceIndices, faceNormal, barycoord, side, dist );
+		if ( hit ) {
+
+			// if it's a fog volume return whether we hit the front or back face
+			uint materialIndex = uTexelFetch1D( materialIndexAttribute, faceIndices.x ).r;
+			if ( isMaterialFogVolume( materials, materialIndex ) ) {
+
+				material = readMaterialInfo( materials, materialIndex );
+				return side == - 1.0;
+
+			} else {
+
+				// move the ray forward
+				rayOrigin = stepRayOrigin( rayOrigin, rayDirection, - faceNormal, dist );
+
+			}
+
+		} else {
+
+			return false;
+
+		}
+
+	}
+
+	return false;
+
+}
+
+`;

package/src/shader/structs/lightsStruct.glsl.js

@@ -1,78 +1,78 @@
-export const lightsStructGLSL = /* glsl */`
-
-	#define RECT_AREA_LIGHT_TYPE 0
-	#define CIRC_AREA_LIGHT_TYPE 1
-	#define SPOT_LIGHT_TYPE 2
-	#define DIR_LIGHT_TYPE 3
-	#define POINT_LIGHT_TYPE 4
-
-	struct LightsInfo {
-
-		sampler2D tex;
-		uint count;
-
-	};
-
-	struct Light {
-
-		vec3 position;
-		int type;
-
-		vec3 color;
-		float intensity;
-
-		vec3 u;
-		vec3 v;
-		float area;
-
-		// spot light fields
-		float radius;
-		float near;
-		float decay;
-		float distance;
-		float coneCos;
-		float penumbraCos;
-		int iesProfile;
-
-	};
-
-	Light readLightInfo( sampler2D tex, uint index ) {
-
-		uint i = index * 6u;
-
-		vec4 s0 = texelFetch1D( tex, i + 0u );
-		vec4 s1 = texelFetch1D( tex, i + 1u );
-		vec4 s2 = texelFetch1D( tex, i + 2u );
-		vec4 s3 = texelFetch1D( tex, i + 3u );
-
-		Light l;
-		l.position = s0.rgb;
-		l.type = int( round( s0.a ) );
-
-		l.color = s1.rgb;
-		l.intensity = s1.a;
-
-		l.u = s2.rgb;
-		l.v = s3.rgb;
-		l.area = s3.a;
-
-		if ( l.type == SPOT_LIGHT_TYPE || l.type == POINT_LIGHT_TYPE ) {
-
-			vec4 s4 = texelFetch1D( tex, i + 4u );
-			vec4 s5 = texelFetch1D( tex, i + 5u );
-			l.radius = s4.r;
-			l.near = s4.g;
-			l.decay = s4.b;
-			l.distance = s4.a;
-
-			l.coneCos = s5.r;
-			l.penumbraCos = s5.g;
-			l.iesProfile = int( round ( s5.b ) );
-
-		}
-
-		return l;
-
-	}
-
-`;
+export const lightsStructGLSL = /* glsl */`
+
+	#define RECT_AREA_LIGHT_TYPE 0
+	#define CIRC_AREA_LIGHT_TYPE 1
+	#define SPOT_LIGHT_TYPE 2
+	#define DIR_LIGHT_TYPE 3
+	#define POINT_LIGHT_TYPE 4
+
+	struct LightsInfo {
+
+		sampler2D tex;
+		uint count;
+
+	};
+
+	struct Light {
+
+		vec3 position;
+		int type;
+
+		vec3 color;
+		float intensity;
+
+		vec3 u;
+		vec3 v;
+		float area;
+
+		// spot light fields
+		float radius;
+		float near;
+		float decay;
+		float distance;
+		float coneCos;
+		float penumbraCos;
+		int iesProfile;
+
+	};
+
+	Light readLightInfo( sampler2D tex, uint index ) {
+
+		uint i = index * 6u;
+
+		vec4 s0 = texelFetch1D( tex, i + 0u );
+		vec4 s1 = texelFetch1D( tex, i + 1u );
+		vec4 s2 = texelFetch1D( tex, i + 2u );
+		vec4 s3 = texelFetch1D( tex, i + 3u );
+
+		Light l;
+		l.position = s0.rgb;
+		l.type = int( round( s0.a ) );
+
+		l.color = s1.rgb;
+		l.intensity = s1.a;
+
+		l.u = s2.rgb;
+		l.v = s3.rgb;
+		l.area = s3.a;
+
+		if ( l.type == SPOT_LIGHT_TYPE || l.type == POINT_LIGHT_TYPE ) {
+
+			vec4 s4 = texelFetch1D( tex, i + 4u );
+			vec4 s5 = texelFetch1D( tex, i + 5u );
+			l.radius = s4.r;
+			l.near = s4.g;
+			l.decay = s4.b;
+			l.distance = s4.a;
+
+			l.coneCos = s5.r;
+			l.penumbraCos = s5.g;
+			l.iesProfile = int( round ( s5.b ) );
+
+		}
+
+		return l;
+
+	}
+
+`;