Did a tiny bit of cleaning, still not done tho

Author: Daxode

Blobtory/Scripts/Main.py

@@ -1,9 +1,8 @@
-from direct.interval.LerpInterval import LerpPosInterval
-from panda3d.core import loadPrcFile, loadPrcFileData, LPoint3f, PointLight, Spotlight, PerspectiveLens
-from direct.showbase.ShowBase import ShowBase, PTAFloat, AmbientLight, DirectionalLight, Shader, Texture, TextureStage, \
-    SamplerState, FrameBufferProperties, WindowProperties, GraphicsPipe, GraphicsOutput, NodePath
+from panda3d.core import loadPrcFile, loadPrcFileData
+from direct.showbase.ShowBase import ShowBase
 
 from Blobtory.Scripts.Pipeline.WindowCreator import WindowCreator
+from Blobtory.Scripts.game.SceneBuilder import SceneBuilder
 
 # Description:
 # This is the main program, and should thus be kept clean,
@@ -14,87 +13,13 @@
 #
 # Copyright (c) 2020 Daniel Kierkegaard Andersen. All rights reserved.
 # https://github.com/Daxode/ComplexSoftwareProject
-from Blobtory.Scripts.planet_former.PlanetGenerator import PlanetGenerator
 
 
 class Main(ShowBase):
     def __init__(self):
         super().__init__()
         self.winCreator = WindowCreator(self, enableRP=False, isFullscreen=False)
-
-        self.planetGen: PlanetGenerator = PlanetGenerator(self.winCreator, 128, 500)
-        self.planetGen.cubeformer.mouseTime.setData(PTAFloat([10, 0, 0, 1]))
-        self.accept("a", self.planetGen.RegenPlanet)
-
-        sphere = self.loader.loadModel("assets/models/icosphere")
-        sphere.reparentTo(self.render)
-        myShader: Shader = Shader.load(Shader.SL_GLSL,
-                                       vertex="assets/shaders/defaults/default.vert",
-                                       fragment="assets/shaders/defaults/default.frag")
-        #sphere.setShader(myShader, 1)
-        sphere.setScale(100)
-        sphere.setPos((0,50,600))
-
-        myToonLightTex = self.winCreator.base.loader.loadTexture(
-            "assets/textures/ramps/rampToonLight.png")
-        myToonLightTex.setWrapU(Texture.WM_clamp)
-        myToonLightTex.setWrapV(Texture.WM_clamp)
-        myToonLightTex.setMagfilter(SamplerState.FT_nearest)
-        myToonLightTex.setMinfilter(SamplerState.FT_nearest)
-
-        stageToonLight = TextureStage("ToonLight")
-        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)
-
-        self.accept("v", self.bufferViewer.toggleEnable)
-
-        alight = AmbientLight('alight')
-        alight.setColor((0.1, 0.1, 0.1, 1))
-        alnp = self.render.attachNewNode(alight)
-        self.render.setLight(alnp)
-
-        sun = DirectionalLight('TheSun')
-        sun.setShadowCaster(True, 2048, 2048)
-
-        #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)
-
-        size=512
-        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()
-
-        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)
+        self.scene: SceneBuilder = SceneBuilder(self.winCreator)
 
 
 loadPrcFileData('', 'framebuffer-multisample 0')

Blobtory/Scripts/game/SceneBuilder.py

@@ -0,0 +1,58 @@
+from direct.interval.LerpInterval import LerpPosInterval
+from direct.interval.MetaInterval import Sequence
+from panda3d.core import AmbientLight, DirectionalLight, PTAFloat
+
+from Blobtory.Scripts.Pipeline.WindowCreator import WindowCreator
+from Blobtory.Scripts.planet_former.PlanetGenerator import PlanetGenerator
+
+
+class SceneBuilder:
+    def __init__(self, winCreator: WindowCreator):
+        self.winCreator = winCreator
+        self.base = winCreator.base
+        self.SetupScene()
+
+    def SetupScene(self):
+        self.SetupLighting()
+        self.SetupPlanets()
+
+        # Moving sphere for shadow testing
+        sphere = self.base.loader.loadModel("assets/models/icosphere")
+        sphere.reparentTo(self.base.render)
+        sphere.setScale(100)
+        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()
+
+    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)
+
+    def SetupLighting(self):
+        # Add ambient lighting
+        alight = AmbientLight('alight')
+        alight.setColor((0.1, 0.1, 0.1, 1))
+        alnp = self.base.render.attachNewNode(alight)
+        self.base.render.setLight(alnp)
+
+        # Make the sun and place it
+        sun = DirectionalLight('TheSun')
+        sunNodePath = self.base.render.attachNewNode(sun)
+        sunNodePath.setPos(0, 1000, 1000)
+        sunNodePath.lookAt(0, 0, 0)
+        self.base.render.setLight(sunNodePath)
+
+        # Enable shadow mapping on sun
+        lens = sun.get_lens(0)
+        lens.set_film_size((1024, 1024))
+        lens.set_near_far(0, 10000)
+        sun.setShadowCaster(True, 2048, 2048)
+
+        # Setup back lighting - faking GI
+        dlight2 = DirectionalLight('my dlight2')
+        dlight2.setColor((0.05, 0.05, 0.05, 1))
+        dlnp2 = self.base.render.attachNewNode(dlight2)
+        dlnp2.setPos(0, -1000, -1000)
+        dlnp2.lookAt(0, 0, 0)
+        self.base.render.setLight(dlnp2)

assets/shaders/compute/alphaNoiseSphere.glsl

@@ -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*60;
+    float noiseOuter = 1-abs(fractalNoise(normalize(movedPoint)*1)+1)*mouseTime.w*100;
     float planetRadius = radius+noiseOuter;
     point.w = smoothstep(0, 1, (planetRadius - lengthFromCenter)/10);
 

assets/shaders/planets/planet.frag

@@ -93,7 +93,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;
 
     float specular = 0.0;
 
@@ -104,15 +104,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;
     }
     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;
 
   // use the gamma corrected color in the fragment0
   outputColor = vec4(colorGammaCorrected, 1);