Bit o' cleaning plus added a deffault toon shader

Author: Daxode

Blobtory/Scripts/game/SceneBuilder.py

@@ -1,4 +1,4 @@
-from direct.interval.LerpInterval import LerpPosInterval
+from direct.interval.LerpInterval import LerpPosInterval, Shader
 from direct.interval.MetaInterval import Sequence
 from panda3d.core import AmbientLight, DirectionalLight, PTAFloat
 
@@ -20,6 +20,12 @@ def SetupScene(self):
         sphere = self.base.loader.loadModel("assets/models/icosphere")
         sphere.reparentTo(self.base.render)
         sphere.setScale(100)
+
+        sphere.setShader(Shader.load(Shader.SL_GLSL,
+                       vertex="assets/shaders/defaults/default.vert",
+                       fragment="assets/shaders/defaults/default.frag"))
+        sphere.setTexture(self.base.loader.loadTexture("assets/textures/ramps/rampToonLight.png"))
+
         startInterval = LerpPosInterval(sphere, 1, (0, -200, 600), (0, 200, 600), blendType='easeInOut')
         endInterval = LerpPosInterval(sphere, 1, (0, 200, 600), (0, -200, 600), blendType='easeInOut')
         Sequence(startInterval, endInterval).loop()

assets/shaders/defaults/default.frag

@@ -21,8 +21,8 @@ void main() {
   if (p3d_LightSource[0].position.w != 0) lightDir -= viewspacePos;
   lightDir = normalize(-lightDir);
 
-  float lambertian = max(dot(lightDir, normal), 0.0);
+  float lambertian = (dot(lightDir, normal)+1)*0.5;
   lambertian = texture(p3d_Texture0, vec2(lambertian, 0.5)).x;
 
-  outputColor = vec4(lambertian)*vec4(1, 0.5, 0.5, 1);
+  outputColor = vec4(lambertian)*vec4(1, 0.5, 0.5, 1)+vec4(0.1,0.05,0.05,1);
 }

assets/shaders/planets/planet.frag

@@ -49,39 +49,15 @@ float textureProjSoft(sampler2DShadow tex, vec4 uv, float bias, float blur) {
   return result/13.0;
 }
 
-//float shadowCoef(vec4 vPos, sampler2DShadow shadowMap, mat4 shadowViewMatrix) {
-//  int index = 3;
-//  // find the appropriate depth map to look up in
-//  // based on the depth of this fragment
-//  if(gl_FragCoord.z < far_d.x) index = 0;
-//  else if(gl_FragCoord.z < far_d.y) index = 1;
-//  else if(gl_FragCoord.z < far_d.z) index = 2;
-//
-//  // transform this fragment's position from view space to
-//  // scaled light clip space such that the xy coordinates
-//  // lie in [0;1]. Note that there is no need to divide by w
-//  // for othogonal light sources
-//  vec4 shadow_coord = shadowViewMatrix*vPos;
-//  // set the current depth to compare with
-//  shadow_coord.w = shadow_coord.z;
-//
-//  // tell glsl in which layer to do the look up
-//  shadow_coord.z = float(index);
-//
-//  // let the hardware do the comparison for us
-//  return shadow2DArray(shadowMap, shadow_coord).x;
-//}
+
 
 void main() {
   vec3 illumLightSum = vec3(0);
   vec3 normal = normalize(primNormal);
 
-  //diffuseColor = p3d_Material.diffuse.xyz;
-  //specStrength = p3d_Material.specular.x;
-
   for (int i = 0; i < p3d_LightSource.length(); i++) {
     float shadowScale = 1;
-    //shadowScale = textureProj(p3d_LightSource[i].shadowMap, shadow_uv[i]);
+    shadowScale = textureProj(p3d_LightSource[i].shadowMap, shadow_uv[i]);
     //shadowScale = textureProjSoft(p3d_LightSource[i].shadowMap, shadow_uv[i], 0.0001, 0.001);
     vec3 lightDir = p3d_LightSource[i].position.xyz;
     if (p3d_LightSource[i].position.w != 0) {
@@ -93,7 +69,7 @@ void main() {
     lightDir = normalize(-lightDir);
 
     float lambertian = max(dot(lightDir, normal), 0.0);
-    //lambertian = texture(p3d_Texture1, vec2(lambertian, 0.5)).x;
+    //lambertian = texture(p3d_Texture1, vec2(lambertian, 0.5)).x; // --Adds diffuse toon shading
 
     float specular = 0.0;
 
@@ -104,15 +80,15 @@ void main() {
       vec3 halfDir = normalize(lightDir + viewDir);
       float specAngle = max(dot(halfDir, normal), 0.0);
       specular = pow(specAngle, p3d_Material.shininess);
-      //specular = texture(p3d_Texture1, vec2(specular, 0.5)).x;
+      //specular = texture(p3d_Texture1, vec2(specular, 0.5)).x; // --Adds specular toon shading
     }
     vec3 illumDiffuse = diffuseColor *                 lambertian * p3d_LightSource[i].color.xyz / (distance);
     vec3 illumSpecular = diffuseColor * specStrength * specular   * p3d_LightSource[i].color.xyz / (distance);
     illumLightSum += (illumDiffuse+illumSpecular)*shadowScale;
   }
 
   vec3 colorGammaCorrected = pow(p3d_LightModel.ambient.xyz*diffuseColor+illumLightSum, vec3(0.49504950495));
-  //colorGammaCorrected = texture(p3d_Texture1, vec2(length(colorGammaCorrected.xyz), 0.5), 0).x*colorGammaCorrected;
+  //colorGammaCorrected = texture(p3d_Texture1, vec2(length(colorGammaCorrected.xyz), 0.5), 0).x*colorGammaCorrected; // - Adds brightness toon shading
 
   // use the gamma corrected color in the fragment0
   outputColor = vec4(colorGammaCorrected, 1);