basilisk-engine 0.1.35__py3-none-any.whl → 0.1.37__py3-none-any.whl

basilisk/shaders/geometry.vert

@@ -1,42 +1,42 @@
-#version 330 core
-
-layout (location = 0) in vec3 in_position;
-
-layout (location = 5) in vec3  obj_position;
-layout (location = 6) in vec4  obj_rotation;
-layout (location = 7) in vec3  obj_scale;
-
-// Uniforms
-uniform mat4 projectionMatrix;
-uniform mat4 viewMatrix;
-
-// Function to get the model matrix from node position, rotation, and scale
-mat4 getModelMatrix(vec3 pos, vec4 rot, vec3 scl) {
-    mat4 translation = mat4(
-        1    , 0    , 0    , 0,
-        0    , 1    , 0    , 0,
-        0    , 0    , 1    , 0,
-        pos.x, pos.y, pos.z, 1
-    );
-    mat4 rotation = mat4(
-        1 - 2 * (rot.z * rot.z + rot.w * rot.w), 2 * (rot.y * rot.z - rot.w * rot.x), 2 * (rot.y * rot.w + rot.z * rot.x), 0,
-        2 * (rot.y * rot.z + rot.w * rot.x), 1 - 2 * (rot.y * rot.y + rot.w * rot.w), 2 * (rot.z * rot.w - rot.y * rot.x), 0,
-        2 * (rot.y * rot.w - rot.z * rot.x), 2 * (rot.z * rot.w + rot.y * rot.x), 1 - 2 * (rot.y * rot.y + rot.z * rot.z), 0,
-        0, 0, 0, 1
-    );
-    mat4 scale = mat4(
-        scl.x, 0    , 0    , 0,
-        0    , scl.y, 0    , 0,
-        0    , 0    , scl.z, 0,
-        0    , 0    , 0    , 1
-    );
-    return translation * rotation * scale;
-}
-
-
-void main() {
-    // Set the model matrix
-    mat4 modelMatrix = getModelMatrix(obj_position, obj_rotation, obj_scale);
-    // Set the fragment position
-    gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(in_position, 1.0);
+#version 330 core
+
+layout (location = 0) in vec3 in_position;
+
+layout (location = 5) in vec3  obj_position;
+layout (location = 6) in vec4  obj_rotation;
+layout (location = 7) in vec3  obj_scale;
+
+// Uniforms
+uniform mat4 projectionMatrix;
+uniform mat4 viewMatrix;
+
+// Function to get the model matrix from node position, rotation, and scale
+mat4 getModelMatrix(vec3 pos, vec4 rot, vec3 scl) {
+    mat4 translation = mat4(
+        1    , 0    , 0    , 0,
+        0    , 1    , 0    , 0,
+        0    , 0    , 1    , 0,
+        pos.x, pos.y, pos.z, 1
+    );
+    mat4 rotation = mat4(
+        1 - 2 * (rot.z * rot.z + rot.w * rot.w), 2 * (rot.y * rot.z - rot.w * rot.x), 2 * (rot.y * rot.w + rot.z * rot.x), 0,
+        2 * (rot.y * rot.z + rot.w * rot.x), 1 - 2 * (rot.y * rot.y + rot.w * rot.w), 2 * (rot.z * rot.w - rot.y * rot.x), 0,
+        2 * (rot.y * rot.w - rot.z * rot.x), 2 * (rot.z * rot.w + rot.y * rot.x), 1 - 2 * (rot.y * rot.y + rot.z * rot.z), 0,
+        0, 0, 0, 1
+    );
+    mat4 scale = mat4(
+        scl.x, 0    , 0    , 0,
+        0    , scl.y, 0    , 0,
+        0    , 0    , scl.z, 0,
+        0    , 0    , 0    , 1
+    );
+    return translation * rotation * scale;
+}
+
+
+void main() {
+    // Set the model matrix
+    mat4 modelMatrix = getModelMatrix(obj_position, obj_rotation, obj_scale);
+    // Set the fragment position
+    gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(in_position, 1.0);
 }

basilisk/shaders/normal.frag

@@ -1,60 +1,63 @@
-#version 330 core
-
-layout (location = 0) out vec4 fragColor;
-
-// Structs needed for the shader
-struct textArray {
-    sampler2DArray array;
-};
-
-struct Material {
-    vec3  color;
-    float roughness;
-    float subsurface;
-    float sheen;
-    float sheenTint;
-    float anisotropic;
-    float specular;
-    float metallicness;
-    float specularTint;
-    float clearcoat;
-    float clearcoatGloss;
-    
-    int   hasAlbedoMap;
-    vec2  albedoMap;
-    int   hasNormalMap;
-    vec2  normalMap;
-    int   hasRoughnessMap;
-    vec2  roughnessMap;
-    int   hasAoMap;
-    vec2  aoMap;
-};
-in vec2 uv;
-in mat3 TBN;
-
-// Material attributes
-flat in Material mtl;
-
-// Uniforms
-uniform textArray textureArrays[5];
-
-
-vec3 getNormal(Material mtl, mat3 TBN){
-    // Isolate the normal vector from the TBN basis
-    vec3 normal = TBN[2];
-    // Apply normal map if the material has one
-    if (bool(mtl.hasNormalMap)) {
-        normal = texture(textureArrays[int(round(mtl.normalMap.x))].array, vec3(uv, round(mtl.normalMap.y))).rgb * 2.0 - 1.0;
-        normal = normalize(TBN * normal); 
-    }
-    // Return vector
-    return normal;
-}
-
-void main() {
-    // Get lighting vectors
-    vec3 normal    = getNormal(mtl, TBN);
-
-    // Output fragment color
-    fragColor = vec4(normal, 1.0);
+#version 330 core
+
+layout (location = 0) out vec4 fragColor;
+layout (location = 1) out vec4 bloomColor;
+
+// Structs needed for the shader
+struct textArray {
+    sampler2DArray array;
+};
+
+struct Material {
+    vec3  color;
+    float roughness;
+    float subsurface;
+    float sheen;
+    float sheenTint;
+    float anisotropic;
+    float specular;
+    float metallicness;
+    float specularTint;
+    float clearcoat;
+    float clearcoatGloss;
+    
+    int   hasAlbedoMap;
+    vec2  albedoMap;
+    int   hasNormalMap;
+    vec2  normalMap;
+    int   hasRoughnessMap;
+    vec2  roughnessMap;
+    int   hasAoMap;
+    vec2  aoMap;
+};
+in vec2 uv;
+in mat3 TBN;
+
+// Material attributes
+flat in Material mtl;
+
+// Uniforms
+uniform textArray textureArrays[5];
+
+
+vec3 getNormal(Material mtl, mat3 TBN){
+    // Isolate the normal vector from the TBN basis
+    vec3 normal = TBN[2];
+    // Apply normal map if the material has one
+    if (bool(mtl.hasNormalMap)) {
+        normal = texture(textureArrays[int(round(mtl.normalMap.x))].array, vec3(uv, round(mtl.normalMap.y))).rgb * 2.0 - 1.0;
+        normal = normalize(TBN * normal); 
+    }
+    // Return vector
+    return normal;
+}
+
+void main() {
+    // Get lighting vectors
+    vec3 normal    = getNormal(mtl, TBN);
+
+    // Output fragment color
+    fragColor = vec4(normal, 1.0);
+
+    bloomColor = vec4(0.0);
 }

basilisk/shaders/normal.vert

@@ -1,97 +1,97 @@
-#version 330 core
-
-layout (location = 0) in vec3 in_position;
-layout (location = 1) in vec2 in_uv;
-layout (location = 2) in vec3 in_normal;
-layout (location = 3) in vec3 in_tangent;
-layout (location = 4) in vec3 in_bitangent;
-
-layout (location = 5) in vec3  obj_position;
-layout (location = 6) in vec4  obj_rotation;
-layout (location = 7) in vec3  obj_scale;
-layout (location = 8) in float obj_material;
-
-// Variables passed on to the fragment shader
-out vec2 uv;
-out mat3 TBN;
-
-// Material struct sent to fragment shader
-struct Material {
-    vec3  color;
-    float roughness;
-    float subsurface;
-    float sheen;
-    float sheenTint;
-    float anisotropic;
-    float specular;
-    float metallicness;
-    float specularTint;
-    float clearcoat;
-    float clearcoatGloss;
-    
-    int   hasAlbedoMap;
-    vec2  albedoMap;
-    int   hasNormalMap;
-    vec2  normalMap;
-    int   hasRoughnessMap;
-    vec2  roughnessMap;
-    int   hasAoMap;
-    vec2  aoMap;
-};
-flat out Material mtl;
-
-// Uniforms
-uniform mat4 projectionMatrix;
-uniform mat4 viewMatrix;
-uniform sampler2D materialsTexture;
-
-// Function to get the model matrix from node position, rotation, and scale
-mat4 getModelMatrix(vec3 pos, vec4 rot, vec3 scl) {
-    mat4 translation = mat4(
-        1    , 0    , 0    , 0,
-        0    , 1    , 0    , 0,
-        0    , 0    , 1    , 0,
-        pos.x, pos.y, pos.z, 1
-    );
-    mat4 rotation = mat4(
-        1 - 2 * (rot.z * rot.z + rot.w * rot.w), 2 * (rot.y * rot.z - rot.w * rot.x), 2 * (rot.y * rot.w + rot.z * rot.x), 0,
-        2 * (rot.y * rot.z + rot.w * rot.x), 1 - 2 * (rot.y * rot.y + rot.w * rot.w), 2 * (rot.z * rot.w - rot.y * rot.x), 0,
-        2 * (rot.y * rot.w - rot.z * rot.x), 2 * (rot.z * rot.w + rot.y * rot.x), 1 - 2 * (rot.y * rot.y + rot.z * rot.z), 0,
-        0, 0, 0, 1
-    );
-    mat4 scale = mat4(
-        scl.x, 0    , 0    , 0,
-        0    , scl.y, 0    , 0,
-        0    , 0    , scl.z, 0,
-        0    , 0    , 0    , 1
-    );
-    return translation * rotation * scale;
-}
-
-// Function to get the TBN matrix for normal mapping
-mat3 getTBN(mat4 modelMatrix, vec3 normal, vec3 tangent, vec3 bitangent){
-    vec3 T = normalize(vec3(modelMatrix * vec4(tangent,   0.0)));
-    vec3 B = normalize(vec3(modelMatrix * vec4(bitangent, 0.0)));
-    vec3 N = normalize(vec3(modelMatrix * vec4(normal,    0.0)));
-    return mat3(T, B, N);
-}
-
-void main() {
-    // Set the model matrix
-    mat4 modelMatrix = getModelMatrix(obj_position, obj_rotation, obj_scale);
-
-    // Set out variables
-    TBN      = getTBN(modelMatrix, in_normal, in_tangent, in_bitangent);
-    uv       = in_uv;
-    
-    // Get the material
-    int mtl_size = 25;
-    mtl = Material(vec3(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, vec2(0), 0, vec2(0), 0, vec2(0), 0, vec2(0));
-    int materialID     = int(obj_material);
-    
-    mtl.hasNormalMap = int(texelFetch(materialsTexture,  ivec2(0, 16  + materialID * mtl_size), 0).r);
-    mtl.normalMap    = vec2(texelFetch(materialsTexture, ivec2(0, 17  + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 18 + materialID * mtl_size), 0).r);    
-
-    // Set the fragment position
-    gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(in_position, 1.0);
+#version 330 core
+
+layout (location = 0) in vec3 in_position;
+layout (location = 1) in vec2 in_uv;
+layout (location = 2) in vec3 in_normal;
+layout (location = 3) in vec3 in_tangent;
+layout (location = 4) in vec3 in_bitangent;
+
+layout (location = 5) in vec3  obj_position;
+layout (location = 6) in vec4  obj_rotation;
+layout (location = 7) in vec3  obj_scale;
+layout (location = 8) in float obj_material;
+
+// Variables passed on to the fragment shader
+out vec2 uv;
+out mat3 TBN;
+
+// Material struct sent to fragment shader
+struct Material {
+    vec3  color;
+    float roughness;
+    float subsurface;
+    float sheen;
+    float sheenTint;
+    float anisotropic;
+    float specular;
+    float metallicness;
+    float specularTint;
+    float clearcoat;
+    float clearcoatGloss;
+    
+    int   hasAlbedoMap;
+    vec2  albedoMap;
+    int   hasNormalMap;
+    vec2  normalMap;
+    int   hasRoughnessMap;
+    vec2  roughnessMap;
+    int   hasAoMap;
+    vec2  aoMap;
+};
+flat out Material mtl;
+
+// Uniforms
+uniform mat4 projectionMatrix;
+uniform mat4 viewMatrix;
+uniform sampler2D materialsTexture;
+
+// Function to get the model matrix from node position, rotation, and scale
+mat4 getModelMatrix(vec3 pos, vec4 rot, vec3 scl) {
+    mat4 translation = mat4(
+        1    , 0    , 0    , 0,
+        0    , 1    , 0    , 0,
+        0    , 0    , 1    , 0,
+        pos.x, pos.y, pos.z, 1
+    );
+    mat4 rotation = mat4(
+        1 - 2 * (rot.z * rot.z + rot.w * rot.w), 2 * (rot.y * rot.z - rot.w * rot.x), 2 * (rot.y * rot.w + rot.z * rot.x), 0,
+        2 * (rot.y * rot.z + rot.w * rot.x), 1 - 2 * (rot.y * rot.y + rot.w * rot.w), 2 * (rot.z * rot.w - rot.y * rot.x), 0,
+        2 * (rot.y * rot.w - rot.z * rot.x), 2 * (rot.z * rot.w + rot.y * rot.x), 1 - 2 * (rot.y * rot.y + rot.z * rot.z), 0,
+        0, 0, 0, 1
+    );
+    mat4 scale = mat4(
+        scl.x, 0    , 0    , 0,
+        0    , scl.y, 0    , 0,
+        0    , 0    , scl.z, 0,
+        0    , 0    , 0    , 1
+    );
+    return translation * rotation * scale;
+}
+
+// Function to get the TBN matrix for normal mapping
+mat3 getTBN(mat4 modelMatrix, vec3 normal, vec3 tangent, vec3 bitangent){
+    vec3 T = normalize(vec3(modelMatrix * vec4(tangent,   0.0)));
+    vec3 B = normalize(vec3(modelMatrix * vec4(bitangent, 0.0)));
+    vec3 N = normalize(vec3(modelMatrix * vec4(normal,    0.0)));
+    return mat3(T, B, N);
+}
+
+void main() {
+    // Set the model matrix
+    mat4 modelMatrix = getModelMatrix(obj_position, obj_rotation, obj_scale);
+
+    // Set out variables
+    TBN      = getTBN(modelMatrix, in_normal, in_tangent, in_bitangent);
+    uv       = in_uv;
+    
+    // Get the material
+    int mtl_size = 25;
+    mtl = Material(vec3(0), 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, vec2(0), 0, vec2(0), 0, vec2(0), 0, vec2(0));
+    int materialID     = int(obj_material);
+    
+    mtl.hasNormalMap = int(texelFetch(materialsTexture,  ivec2(0, 16  + materialID * mtl_size), 0).r);
+    mtl.normalMap    = vec2(texelFetch(materialsTexture, ivec2(0, 17  + materialID * mtl_size), 0).r, texelFetch(materialsTexture, ivec2(0, 18 + materialID * mtl_size), 0).r);    
+
+    // Set the fragment position
+    gl_Position = projectionMatrix * viewMatrix * modelMatrix * vec4(in_position, 1.0);
 }

basilisk/shaders/particle.frag

@@ -1,72 +1,77 @@
-#version 330 core
-out vec4 fragColor;
-
-in vec2 uv;
-in vec3 position;
-in mat3 TBN;
-
-struct textArray {
-    sampler2DArray array;
-};
-uniform textArray textureArrays[5];
-
-struct Material {
-    vec3  color;
-    float roughness;
-    float subsurface;
-    float sheen;
-    float sheenTint;
-    float anisotropic;
-    float specular;
-    float metallicness;
-    float specularTint;
-    float clearcoat;
-    float clearcoatGloss;
-    
-    int   hasAlbedoMap;
-    vec2  albedoMap;
-    int   hasNormalMap;
-    vec2  normalMap;
-    int   hasRoughnessMap;
-    vec2  roughnessMap;
-    int   hasAoMap;
-    vec2  aoMap;
-};
-flat in Material mtl;
-
-
-vec3 getColor(Material mtl, vec2 uv, float gamma) {
-    vec3 albedo = mtl.color;
-    if (bool(mtl.hasAlbedoMap)){
-        albedo *= pow(texture(textureArrays[int(round(mtl.albedoMap.x))].array, vec3(uv, round(mtl.albedoMap.y))).rgb, vec3(gamma));
-    }
-    return albedo;
-}
-
-vec3 getNormal(Material mtl, mat3 TBN){
-    // Isolate the normal vector from the TBN basis
-    vec3 normal = TBN[2];
-    // Apply normal map if the material has one
-    if (bool(mtl.hasNormalMap)) {
-        normal = texture(textureArrays[int(round(mtl.normalMap.x))].array, vec3(uv, round(mtl.normalMap.y))).rgb * 2.0 - 1.0;
-        normal = normalize(TBN * normal); 
-    }
-    // Return vector
-    return normal;
-}
-
-void main()
-{   
-    // Texture and normal data
-    float gamma = 2.2;
-    vec3 color  = getColor(mtl, uv, gamma);
-    vec3 normal = getNormal(mtl, TBN);
-
-    // Simple light calculations
-    vec3 light = normalize(vec3(1.5, 2, 1));
-    float diff = abs(dot(normal, light));
-
-    // Get color and gamma correction
-    fragColor = vec4(color * (.2 + diff), 1.0);
-    fragColor.rgb = pow(fragColor.rgb, vec3(1.0/gamma));
+#version 330 core
+
+layout (location = 0) out vec4 fragColor;
+layout (location = 1) out vec4 bloomColor;
+
+in vec2 uv;
+in vec3 position;
+in mat3 TBN;
+
+struct textArray {
+    sampler2DArray array;
+};
+uniform textArray textureArrays[5];
+
+struct Material {
+    vec3  color;
+    vec3  emissiveColor;
+    float roughness;
+    float subsurface;
+    float sheen;
+    float sheenTint;
+    float anisotropic;
+    float specular;
+    float metallicness;
+    float specularTint;
+    float clearcoat;
+    float clearcoatGloss;
+    
+    int   hasAlbedoMap;
+    vec2  albedoMap;
+    int   hasNormalMap;
+    vec2  normalMap;
+    int   hasRoughnessMap;
+    vec2  roughnessMap;
+    int   hasAoMap;
+    vec2  aoMap;
+};
+flat in Material mtl;
+
+
+vec3 getColor(Material mtl, vec2 uv, float gamma) {
+    vec3 albedo = mtl.color;
+    if (bool(mtl.hasAlbedoMap)){
+        albedo *= pow(texture(textureArrays[int(round(mtl.albedoMap.x))].array, vec3(uv, round(mtl.albedoMap.y))).rgb, vec3(gamma));
+    }
+    return albedo;
+}
+
+vec3 getNormal(Material mtl, mat3 TBN){
+    // Isolate the normal vector from the TBN basis
+    vec3 normal = TBN[2];
+    // Apply normal map if the material has one
+    if (bool(mtl.hasNormalMap)) {
+        normal = texture(textureArrays[int(round(mtl.normalMap.x))].array, vec3(uv, round(mtl.normalMap.y))).rgb * 2.0 - 1.0;
+        normal = normalize(TBN * normal); 
+    }
+    // Return vector
+    return normal;
+}
+
+void main()
+{   
+    // Texture and normal data
+    float gamma = 2.2;
+    vec3 color  = getColor(mtl, uv, gamma);
+    vec3 normal = getNormal(mtl, TBN);
+
+    // Simple light calculations
+    vec3 light = normalize(vec3(1.5, 2, 1));
+    float diff = abs(dot(normal, light));
+
+    // Get color and gamma correction
+    fragColor = vec4(color * (.2 + diff), 1.0);
+    fragColor.rgb = pow(fragColor.rgb, vec3(1.0/gamma));
+
+    bloomColor = vec4(mtl.emissiveColor, 1.0);
 }