Small planet change, and ability to change planet size with 'a' and 'd'

Author: Daxode

Blobtory/Scripts/Main.py

@@ -9,7 +9,7 @@
 # so stuff doesn't get out of control
 #
 # Author:  Daniel Kierkegaard Andersen (dax@daxode.dk)
-# Version: 2020-09-22
+# Version: 2020-10-24
 #
 # Copyright (c) 2020 Daniel Kierkegaard Andersen. All rights reserved.
 # https://github.com/Daxode/ComplexSoftwareProject

Blobtory/Scripts/game/SceneBuilder.py

@@ -31,9 +31,15 @@ def SetupScene(self):
         Sequence(startInterval, endInterval).loop()
 
     def SetupPlanets(self):
-        planetGen: PlanetGenerator = PlanetGenerator(self.winCreator, 128, 500)
-        planetGen.cubeformer.mouseTime.setData(PTAFloat([10, 0, 0, 1]))
-        self.base.accept("a", planetGen.RegenPlanet)
+        planetGen: PlanetGenerator = PlanetGenerator(self.winCreator, 128, 450)
+        self.base.accept("d", self.IncreaseSize, [planetGen, 1.5])
+        self.base.accept("d-repeat", self.IncreaseSize, [planetGen, 1.5])
+        self.base.accept("a", self.IncreaseSize, [planetGen, -1.5])
+        self.base.accept("a-repeat", self.IncreaseSize, [planetGen, -1.5])
+
+    def IncreaseSize(self, planetGen: PlanetGenerator, a):
+        planetGen.cubeformer.mouseTime.setData(PTAFloat([10, 0, 0, planetGen.cubeformer.mouseTime.getElement(3)+a]))
+        planetGen.RegenPlanet()
 
     def SetupLighting(self):
         # Add ambient lighting

Blobtory/Scripts/planet_former/CubeFormer.py

@@ -16,7 +16,7 @@ def __init__(self, winCreator: WindowCreator, width: int, length: int, height: i
         self.size = LVecBase3i(width, length, height)
         self.spacing = spacing
         self.vertexCount = width*length*height
-        self.mouseTime = PTAFloat([0, 0, 0, 0])
+        self.mouseTime: PTAFloat = PTAFloat([0, 0, 0, 0])
 
     def GenerateCube(self) -> Texture:
         if self.vertexBuffer is None:

assets/shaders/compute/alphaNoiseSphere.glsl

@@ -8,7 +8,7 @@ uniform float radius;
 uniform float offset;
 uniform vec3 midPoint;
 uniform vec4 mouseTime;
-const int craterCount = 30;
+const int craterCount = 300;
 
 layout(rgba32f, binding = 0) uniform image3D vertexBufferWAlpha;
 
@@ -38,34 +38,30 @@ void main() {
     if (mouseTime.x == 0)  mouseX = 0.1;
 
     float lengthFromCenter = length(movedPoint);
-//    float phi = atan(movedPoint.y/movedPoint.x);
-//    float theta = acos(movedPoint.z/r)+mouseTime.y;
-//    vec3 polarCoord = vec3(r, phi, theta);
 
-
-//    point.w = (snoise(polarCoord.yz/(mouseX*10))*radius - r);
-
-    float noiseOuter = 1-abs(fractalNoise(normalize(movedPoint)*1)+1)*mouseTime.w*100;
+    float noiseOuter = (1-abs(fractalNoise(normalize(movedPoint)*1)+1))*mouseTime.w;
     float planetRadius = radius+noiseOuter;
-    point.w = smoothstep(0, 1, (planetRadius - lengthFromCenter)/10);
+    point.w = smoothstep(0, 1, (planetRadius - lengthFromCenter)/100);
 
 
-    float cometOffset = 0.9;
-    float cometDiff = 0.01;
-    float sizeMatters = 0.4;
+    float cometOffset = 0.8;
+    float cometDiff = 50.5;
+    float sizeMatters = 0.1;
     for (int i = 0; i < craterCount; i++) {
         float theta = rand((offset+i))*2*PI;
         float phi = rand((offset+i+200))*2*PI;
 
-        float cometSize = rand((offset+i))*200+50;
+        float cometSize = rand((offset+i))*50+100;
 
         vec3 cartCraterNormal = vec3(sin(theta)*cos(phi), sin(theta)*sin(phi), cos(theta));
         vec3 cartCraterPosCenter = (planetRadius*cometOffset-cometDiff+cometSize*sizeMatters)*cartCraterNormal;
         vec3 cartCraterPosOffset = (planetRadius*cometOffset+cometSize*sizeMatters)*cartCraterNormal;
 
-        point.w += smoothstep(0,1, max(0, cometSize-distance(movedPoint, cartCraterPosCenter)));
-        point.w -= smoothstep(0,1, max(0, cometSize-cometDiff-distance(movedPoint, cartCraterPosOffset)))*5;
+        point.w += smoothstep(0,1, max(0, (cometSize-distance(movedPoint, cartCraterPosCenter))/100));
+        point.w -= smoothstep(0,1, max(0, (cometSize-cometDiff-distance(movedPoint, cartCraterPosOffset))/100))*5;
     }
 
+    //point.w = dot(sin(movedPoint.xyz*0.05)*0.3, vec3(1));
+
     imageStore(vertexBufferWAlpha, ivec3(gl_GlobalInvocationID.xyz), point);
 }

assets/shaders/compute/cubemarcher.glsl

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