Planet shader performance boost, plus new CubeMarch Material system meaning COOL planets ;)

Author: Daxode

Blobtory/Scripts/Main.py

@@ -46,20 +46,20 @@ def __init__(self):
         stageToonLight.setSort(1)
         sphere.setTexture(stageToonLight, myToonLightTex)
 
-        winprops = WindowProperties(size=(512, 512))
-        props = FrameBufferProperties()
-        props.setRgbColor(1)
-        props.setAlphaBits(1)
-        props.setDepthBits(1)
-        LBuffer = self.graphicsEngine.makeOutput(
-            self.pipe, "offscreen buffer", -2,
-            props, winprops,
-            GraphicsPipe.BFRefuseWindow,
-            self.win.getGsg(), self.win)
-
-        Ldepthmap = Texture()
-        LBuffer.addRenderTexture(Ldepthmap, GraphicsOutput.RTMBindOrCopy,
-                                 GraphicsOutput.RTPDepthStencil)
+        # winprops = WindowProperties(size=(512, 512))
+        # props = FrameBufferProperties()
+        # props.setRgbColor(1)
+        # props.setAlphaBits(1)
+        # props.setDepthBits(1)
+        # LBuffer = self.graphicsEngine.makeOutput(
+        #     self.pipe, "offscreen buffer", -2,
+        #     props, winprops,
+        #     GraphicsPipe.BFRefuseWindow,
+        #     self.win.getGsg(), self.win)
+        #
+        # Ldepthmap = Texture()
+        # LBuffer.addRenderTexture(Ldepthmap, GraphicsOutput.RTMBindOrCopy,
+        #                          GraphicsOutput.RTPDepthStencil)
 
         self.accept("v", self.bufferViewer.toggleEnable)
 
@@ -69,43 +69,36 @@ def __init__(self):
         self.render.setLight(alnp)
 
         sun = DirectionalLight('TheSun')
-        sun.setShadowCaster(True, 1024, 1024)
-        #lens = PerspectiveLens()
-        #lens.setFov(40)
-        #sun.setLens(lens)
-        #sun.attenuation = (0.0000000000000000001, 0., 0.)
+        sun.setShadowCaster(True, 2048, 2048)
 
-        sun.show_frustum()
+        #sun.show_frustum()
         sun.set_color((1, 1, 1, 1))
         sunNodePath = self.render.attachNewNode(sun)
         sunNodePath.setPos(0, 200, 600)
         sunNodePath.lookAt(0,0,0)
         self.render.setLight(sunNodePath)
 
-        bmin, bmax = self.render.get_tight_bounds(sunNodePath)
         size=512
-        bmin, bmax = LPoint3f(-size,0, -size), LPoint3f(size, size,size)
+        bmin, bmax = LPoint3f(-size,0, -size), LPoint3f(size, 10*size,size)
         print(bmin,bmax)
         lens = sun.get_lens(0)
         lens.set_film_offset((bmin.xz + bmax.xz) * 0.5)
         lens.set_film_size(bmax.xz - bmin.xz)
         lens.set_near_far(bmin.y, bmax.y)
 
-        i = LerpPosInterval(sphere,
-                            2,
-                            (0,-100,600),(0,100,600))
-        i.loop()
+        # i = LerpPosInterval(sphere, 2, (0,-100,600),(0,100,600))
+        # i.loop()
 
-        # dlight2 = DirectionalLight('my dlight2')
-        # dlight2.setColor((0.05, 0.05, 0.05, 1))
-        # dlight2.setShadowCaster(True, 512, 512)
-        # dlnp2 = self.render.attachNewNode(dlight2)
-        # dlnp2.setHpr(0, 180, 0)
-        # self.render.setLight(dlnp2)
+        dlight2 = DirectionalLight('my dlight2')
+        dlight2.setColor((0.05, 0.05, 0.05, 1))
+        dlnp2 = self.render.attachNewNode(dlight2)
+        dlnp2.setPos(0, -200, -600)
+        dlnp2.lookAt(0, 0, 0)
+        self.render.setLight(dlnp2)
 
 
-loadPrcFileData('', 'framebuffer-multisample 1')
-loadPrcFileData('', 'multisamples 0')
+loadPrcFileData('', 'framebuffer-multisample 0')
+loadPrcFileData('', 'multisamples 1')
 loadPrcFileData('', 'sync-video false')
 loadPrcFile("config/Config.prc")
 blobtoryBase = Main()

Blobtory/Scripts/planet_former/MarchingCubes.py

@@ -132,19 +132,16 @@ def GenerateMesh(self):
 
         myMaterial = Material()
         myMaterial.setShininess(0.8)  # Make this material shiny
-        myMaterial.setDiffuse(LColor(0.99, 0.16, 0.06, 1)*0.1)
-        myMaterial.setSpecular((1.1, 1.1, 1.1, 1))
         self.geomPath.setMaterial(myMaterial)
 
-        myDiffTex = self.winCreator.base.loader.loadTexture(
-            "assets/textures/ramps/rampTerrainDiffuse.png",
-            "assets/textures/ramps/rampTerrainSpecular.png")
-        myDiffTex.setWrapU(Texture.WM_clamp)
-        myDiffTex.setWrapV(Texture.WM_clamp)
+        myMarchCubeMatsTex = self.winCreator.base.loader.loadTexture(
+            "assets/textures/ramps/rampMarchCubeMat.png")
+        myMarchCubeMatsTex.setWrapU(Texture.WM_clamp)
+        myMarchCubeMatsTex.setWrapV(Texture.WM_clamp)
 
-        stageDiff = TextureStage("Diffuse")
+        stageDiff = TextureStage("March Cube Mat")
         stageDiff.setSort(1)
-        self.geomPath.setTexture(stageDiff, myDiffTex)
+        self.geomPath.setTexture(stageDiff, myMarchCubeMatsTex)
         #self.geomPath.setTransparency(TransparencyAttrib.MAlpha)
 
         myToonLightTex = self.winCreator.base.loader.loadTexture(

assets/shaders/compute/alphaNoiseSphere.glsl

@@ -8,7 +8,7 @@ uniform float radius;
 uniform float offset;
 uniform vec3 midPoint;
 uniform vec4 mouseTime;
-const int craterCount = 20;
+const int craterCount = 30;
 
 layout(rgba32f, binding = 0) uniform image3D vertexBufferWAlpha;
 
@@ -45,7 +45,7 @@ void main() {
 
 //    point.w = (snoise(polarCoord.yz/(mouseX*10))*radius - r);
 
-    float noiseOuter = 1-abs(fractalNoise(normalize(movedPoint)*1)+1)*mouseTime.w*50;
+    float noiseOuter = 1-abs(fractalNoise(normalize(movedPoint)*1)+1)*mouseTime.w*60;
     float planetRadius = radius+noiseOuter;
     point.w = smoothstep(0, 1, (planetRadius - lengthFromCenter)/10);
 
@@ -57,7 +57,7 @@ void main() {
         float theta = rand((offset+i))*2*PI;
         float phi = rand((offset+i+200))*2*PI;
 
-        float cometSize = rand((offset+i))*150+50;
+        float cometSize = rand((offset+i))*200+50;
 
         vec3 cartCraterNormal = vec3(sin(theta)*cos(phi), sin(theta)*sin(phi), cos(theta));
         vec3 cartCraterPosCenter = (planetRadius*cometOffset-cometDiff+cometSize*sizeMatters)*cartCraterNormal;

assets/shaders/compute/cubemarcher.glsl

@@ -70,8 +70,8 @@ void main() {
 
         vec3 normal = normalize(cross(v2-v0, v1-v0));
         //vec3 normal = normalize(v2+v0+v1);
-        int type = int(distance(vec3(512), v1)/60);
-        if(type > 6) if(dot(normalize(vec3(512)-v1), normal)<0.8) type = 5;
+        int type = int(distance(vec3(512), v1)/55);
+        //if(type > 6) if(dot(normalize(vec3(512)-v1), normal)<0.8) type = 5;
         imageStore(normalBuffer, int(triangleIDIndex/3), vec4(normal, type));
 
         i+=3;

assets/shaders/planets/planet.frag

@@ -7,7 +7,6 @@ uniform sampler2D p3d_Texture1;
 
 // Input from vertex shader
 in vec3 viewspacePos;
-in vec4 fragPos;
 in vec3 vertexNormal;
 in vec3 primNormal;
 in float num;
@@ -16,7 +15,7 @@ in vec3 diffuseColor;
 in float specStrength;
 
 in vec3 cam_pos;
-in vec3 cam_dir;
+//in vec3 cam_dir;
 
 in vec4[4] shadow_uv;
 
@@ -81,8 +80,13 @@ void main() {
   //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 = 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) lightDir -= viewspacePos;
+    if (p3d_LightSource[i].position.w != 0) {
+      lightDir -= viewspacePos;
+    }
 
     float distance = length(lightDir);
     distance = distance * distance;
@@ -104,12 +108,11 @@ void main() {
     }
     vec3 illumDiffuse = diffuseColor *                 lambertian * p3d_LightSource[i].color.xyz / (distance);
     vec3 illumSpecular = diffuseColor * specStrength * specular   * p3d_LightSource[i].color.xyz / (distance);
-    illumLightSum += (illumDiffuse+illumSpecular)*textureProjSoft(p3d_LightSource[i].shadowMap, shadow_uv[i], 0.0001, 0.01);
-    //illumLightSum += (illumDiffuse+illumSpecular)*textureProj(p3d_LightSource[i].shadowMap, shadow_uv[i]);
+    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), 0).x*colorGammaCorrected;
+  colorGammaCorrected = texture(p3d_Texture1, vec2(length(colorGammaCorrected.xyz), 0.5), 0).x*colorGammaCorrected;
 
   // use the gamma corrected color in the fragment0
   outputColor = vec4(colorGammaCorrected, 1);

assets/shaders/planets/planet.vert

@@ -23,7 +23,6 @@ out vec2 texcoord;
 out vec3 vertexNormal;
 out vec3 primNormal;
 out float num;
-out vec4 fragPos;
 out vec3 viewspacePos;
 
 out vec3 diffuseColor;
@@ -36,8 +35,8 @@ out vec4[4] shadow_uv;
 void main() {
   ivec3 vertexIndex = imageLoad(triangleBuffer, gl_VertexID).xyz;
   vec4 vertex = vec4(imageLoad(vertexBufferEdge, vertexIndex).xyz, 1);
+
   gl_Position = p3d_ModelViewProjectionMatrix*vertex;
-  fragPos = gl_Position;
 
   vec4 viewspacePos4 = p3d_ModelViewMatrix * vertex;
   viewspacePos = vec3(viewspacePos4) / viewspacePos4.w;
@@ -51,13 +50,12 @@ void main() {
   texcoord = p3d_MultiTexCoord0;
   num = primNormalWVal.w;
 
-  vec4 getColor = texelFetch(p3d_Texture0, ivec2(8-num, 8-num), 0);
-  diffuseColor = getColor.xyz;
-  diffuseColor = diffuseColor*diffuseColor;
-  specStrength = getColor.w;
+  diffuseColor = texelFetch(p3d_Texture0, ivec2(num, 3), 0).xyz;
+  diffuseColor = pow(diffuseColor, vec3(5));
+  specStrength = texelFetch(p3d_Texture0, ivec2(num, 2), 0).x;
 
   cam_pos = p3d_ViewMatrixInverse[3].xyz;
-  cam_dir = -p3d_ViewMatrixInverse[2].xyz;
+  //cam_dir = -p3d_ViewMatrixInverse[2].xyz;
 
   for (int i = 0; i < p3d_LightSource.length(); i++) {
     shadow_uv[i] = p3d_LightSource[i].shadowViewMatrix * (p3d_ModelViewMatrix * vertex);

assets/shaders/utils/p3d_light_sources.glsl

@@ -25,7 +25,7 @@ uniform struct p3d_LightSourceParameters {
 
   // Transforms view-space coordinates to shadow map coordinates
   mat4 shadowViewMatrix;
-} p3d_LightSource[4];
+} p3d_LightSource[3];
 
 // The sum of all active ambient light colors.
 uniform struct {