Working terrain colloring based on hardness and type.. However, types and hardness is yet to be implemented

Author: Daxode

Blobtory/Scripts/Main.py

@@ -1,5 +1,5 @@
 from panda3d.core import loadPrcFile, loadPrcFileData
-from direct.showbase.ShowBase import ShowBase, PTAFloat, AmbientLight
+from direct.showbase.ShowBase import ShowBase, PTAFloat, AmbientLight, DirectionalLight
 
 from Blobtory.Scripts.Pipeline.WindowCreator import WindowCreator
 
@@ -25,13 +25,23 @@ def __init__(self):
         self.accept("a", self.planetGen.RegenPlanet)
 
         alight = AmbientLight('alight')
-        alight.setColor((0.5, 0.5, 0.5, 1))
+        alight.setColor((0.1, 0.1, 0.1, 1))
         alnp = self.render.attachNewNode(alight)
         self.render.setLight(alnp)
 
+        dlight = DirectionalLight('my dlight')
+        dlnp = self.render.attachNewNode(dlight)
+        self.render.setLight(dlnp)
+
+        dlight = DirectionalLight('my dlight')
+        dlight.setColor((0.05, 0.05, 0.05, 1))
+        dlnp = self.render.attachNewNode(dlight)
+        dlnp.setHpr(0, 180, 0)
+        self.render.setLight(dlnp)
+
 
 loadPrcFileData('', 'framebuffer-multisample 1')
-loadPrcFileData('', 'multisamples 1')
+loadPrcFileData('', 'multisamples 0')
 loadPrcFileData('', 'sync-video false')
 loadPrcFile("config/Config.prc")
 blobtoryBase = Main()

Blobtory/Scripts/Pipeline/WindowCreator.py

@@ -1,5 +1,6 @@
 from direct.filter.CommonFilters import CommonFilters
 from direct.showbase.ShowBase import ShowBase, DirectionalLight, AntialiasAttrib
+from direct.task import Task
 from panda3d.core import WindowProperties
 from Blobtory.Scripts.Pipeline.BaseData import ShowBaseData
 from multipledispatch import dispatch
@@ -79,19 +80,7 @@ def UpdateWindow(self, isFullscreen: bool, enableRP: bool):
             filters = CommonFilters(self.base.win, self.base.cam)
             # filters.setHighDynamicRange()
             # filters.setBloom()
-
-            dlight = DirectionalLight('my dlight')
-            # dlight.setColor((0.8, 0.5, 0.5, 1))
-            dlnp = self.base.render.attachNewNode(dlight)
-            self.base.render.setLight(dlnp)
-
-            dlight = DirectionalLight('my dlight')
-            dlight.setColor((0.05, 0.05, 0.05, 1))
-            dlnp = self.base.render.attachNewNode(dlight)
-            dlnp.setHpr(0, 180, 0)
-            self.base.render.setLight(dlnp)
-
-            #filters.setAmbientOcclusion()
+            # filters.setAmbientOcclusion()
             # filters.setVolumetricLighting(dlnp)
             self.base.render.setAntialias(AntialiasAttrib.MAuto)
             self.base.setBackgroundColor(0, 0.01, 0.1)

Blobtory/Scripts/planet_former/MarchingCubes.py

@@ -1,7 +1,8 @@
 import math
 
 from panda3d.core import Texture, Shader, NodePath, LVecBase3i, ShaderAttrib, GeomEnums, GeomNode, \
-    GeomVertexFormat, GeomVertexData, GeomTriangles, Geom, OmniBoundingVolume, Material, LColor
+    GeomVertexFormat, GeomVertexData, GeomTriangles, Geom, OmniBoundingVolume, Material, LColor, SamplerState, \
+    TextureStage
 
 from assets.shaders.compute.includes import MarchTable
 from Blobtory.Scripts.planet_former.CubeFormer import CubeFormer
@@ -131,8 +132,18 @@ def GenerateMesh(self):
 
         myMaterial = Material()
         myMaterial.setShininess(0.8)  # Make this material shiny
-        myMaterial.setDiffuse(LColor(0.95, 0.24, 0.06, 1)*0.1)
+        myMaterial.setDiffuse(LColor(0.99, 0.16, 0.06, 1)*0.1)
         myMaterial.setSpecular((1.1, 1.1, 1.1, 1))
-        myMaterial.setAmbient((0.04, 0.01, 0.006, 1))  # Make this material blue
         self.geomPath.setMaterial(myMaterial)
 
+        myDiffTex = self.winCreator.base.loader.loadTexture(
+            "assets/textures/ramps/rampTerrainDiffuse.png",
+            "assets/textures/ramps/rampTerrainSpecular.png")
+        #myDiffTex.setMagfilter(SamplerState.FT_linear)
+        #myDiffTex.setMinfilter(SamplerState.FT_linear)
+
+        stageDiff = TextureStage("Diffuse")
+        stageDiff.setSort(1)
+        self.geomPath.setTexture(stageDiff, myDiffTex)
+
+

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 = 0;
 
 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*90;
     float planetRadius = radius+noiseOuter;
     point.w = smoothstep(0, 1, (planetRadius - lengthFromCenter)/10);
 

assets/shaders/compute/cubemarcher.glsl

@@ -68,9 +68,11 @@ void main() {
         imageStore(triangleBuffer, triangleIDIndex+2, vertexID);
         vec3 v2 = imageLoad(vertexBufferEdge, vertexID.xyz).xyz;
 
-        vec3 normal = cross(v2-v0, v1-v0);
+        vec3 normal = normalize(cross(v2-v0, v1-v0));
         //vec3 normal = normalize(v2+v0+v1);
-        imageStore(normalBuffer, int(triangleIDIndex/3), vec4(normal, wComb));
+        int type = int(distance(vec3(512), v1)/60);
+        if(type > 6) if(dot(normalize(vec3(512)-v1), normal)<0.5) type = 5;
+        imageStore(normalBuffer, int(triangleIDIndex/3), vec4(normal, type));
 
         i+=3;
     } while (triangleEdgeIndex != -1);

assets/shaders/planets/planet.frag

@@ -10,6 +10,9 @@ in vec3 vertexNormal;
 in vec3 primNormal;
 in float num;
 
+in vec3 diffuseColor;
+in float specStrength;
+
 in vec3 cam_pos;
 in vec3 cam_dir;
 
@@ -26,11 +29,12 @@ float remap(float iMin, float iMax, float oMin, float oMax, float v) {
 }
 
 void main() {
-  int mode = 1;
-  //vec3 viewDir = normalize(viewspacePos.xyz-cam_pos);
   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++) {
     vec3 lightDir = p3d_LightSource[i].position.xyz;
     if (p3d_LightSource[i].position.w != 0) lightDir -= viewspacePos;
@@ -49,26 +53,14 @@ void main() {
       vec3 halfDir = normalize(lightDir + viewDir);
       float specAngle = max(dot(halfDir, normal), 0.0);
       specular = pow(specAngle, p3d_Material.shininess);
-
-      // this is phong (for comparison)
-      if (mode == 2) {
-        vec3 reflectDir = reflect(-lightDir, normal);
-        specAngle = max(dot(reflectDir, viewDir), 0.0);
-        // note that the exponent is different here
-        specular = pow(specAngle, p3d_Material.shininess/4.0);
-      }
     }
-    vec3 illumDiffuse = (p3d_Material.diffuse.xyz) * lambertian * p3d_LightSource[i].color.xyz * 1 / distance;
-    vec3 illumSpecular = p3d_Material.diffuse.xyz*p3d_Material.specular * specular * p3d_LightSource[i].color.xyz * 1 / distance;
+    vec3 illumDiffuse = diffuseColor * lambertian * p3d_LightSource[i].color.xyz * 1 / distance;
+    vec3 illumSpecular = diffuseColor * specStrength * specular * p3d_LightSource[i].color.xyz * 1 / distance;
 
     illumLightSum += illumDiffuse+illumSpecular;
   }
 
-  //vec3 reflectDir = reflect(-lightDir, normalize(primNormal));
-  //float spec = pow(max(dot(viewDir, reflectDir), 0.0), 64);
-  //vec3 specular = specularStrength * spec * specColor;
-
-  vec3 colorGammaCorrected = pow(p3d_LightModel.ambient.xyz*p3d_Material.ambient.xyz+illumLightSum, vec3(0.49504950495));
+  vec3 colorGammaCorrected = pow(p3d_LightModel.ambient.xyz*diffuseColor+illumLightSum, vec3(0.49504950495));
   // use the gamma corrected color in the fragment0
   outputColor = vec4(colorGammaCorrected, 1.0);
 }

assets/shaders/planets/planet.vert

@@ -7,6 +7,9 @@ uniform mat4 p3d_ModelMatrix;
 uniform mat4 p3d_ModelViewMatrix;
 uniform mat3 p3d_NormalMatrix;
 
+uniform sampler2D p3d_Texture0;
+uniform sampler2D p3d_Texture1;
+
 layout(rgba32f) uniform readonly image3D vertexBufferEdge;
 layout(rgba32i) uniform readonly iimageBuffer triangleBuffer;
 layout(rgba32f) uniform readonly imageBuffer normalBuffer;
@@ -22,6 +25,9 @@ out float num;
 out vec4 fragPos;
 out vec3 viewspacePos;
 
+out vec3 diffuseColor;
+out float specStrength;
+
 out vec3 cam_pos;
 out vec3 cam_dir;
 
@@ -43,6 +49,11 @@ 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;
+
   cam_pos = p3d_ViewMatrixInverse[3].xyz;
   cam_dir = -p3d_ViewMatrixInverse[2].xyz;
 }

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[8];
+} p3d_LightSource[4];
 
 // The sum of all active ambient light colors.
 uniform struct {