Water?

Author: Daxode

Blobtory/Scripts/Main.py

@@ -21,6 +21,8 @@ def __init__(self):
         self.winCreator = WindowCreator(self, enableRP=False, isFullscreen=False)
         self.scene: SceneBuilder = SceneBuilder(self.winCreator)
 
+        # self.loader.loadModel("assets/models/icosphere").reparentTo(self.render)
+
 
 loadPrcFileData('', 'framebuffer-srgb #t')
 loadPrcFileData('', 'framebuffer-multisample 0')

Blobtory/Scripts/game/SceneBuilder.py

@@ -39,6 +39,7 @@ def SetupPlanets(self):
 
     def IncreaseSize(self, planetGen: PlanetGenerator, a):
         planetGen.cubeformer.mouseTime.setData(PTAFloat([10, 0, 0, planetGen.cubeformer.mouseTime.getElement(3)+a]))
+        planetGen.cubeformerNav.mouseTime.setData(PTAFloat([10, 0, 0, planetGen.cubeformer.mouseTime.getElement(3) + a]))
         planetGen.RegenPlanet()
 
     def SetupLighting(self):

Blobtory/Scripts/planet_former/CubeFormer.py

@@ -1,4 +1,5 @@
 import math
+from copy import copy, deepcopy
 
 from panda3d.core import Texture, NodePath, Shader, LVecBase3i, ShaderAttrib, PTAFloat, LVecBase3f
 from Blobtory.Scripts.Pipeline.WindowCreator import WindowCreator
@@ -10,6 +11,7 @@ class CubeFormer:
     __cubeBufferCreatorComputeNode: NodePath = None
     offset = PTAFloat([0])
     radius = PTAFloat([0])
+    isWater = False
 
     def __init__(self, winCreator: WindowCreator, width: int, length: int, height: int, spacing: float):
         self.winCreator = winCreator
@@ -21,7 +23,7 @@ def __init__(self, winCreator: WindowCreator, width: int, length: int, height: i
 
     def GenerateCube(self) -> Texture:
         if self.vertexBuffer is None:
-            self.vertexBuffer = Texture("vertex buffer")
+            self.vertexBuffer = deepcopy(Texture("vertex buffer"))
             self.vertexBuffer.setup_3d_texture(self.size[0], self.size[1], self.size[2], Texture.T_float, Texture.F_rgba32)
 
         if self.__cubeBufferCreatorComputeNode is None:

Blobtory/Scripts/planet_former/MarchingCubes.py

@@ -1,4 +1,5 @@
 import math
+from copy import copy, deepcopy
 
 from panda3d.core import Texture, Shader, NodePath, LVecBase3i, ShaderAttrib, GeomEnums, GeomNode, \
     GeomVertexFormat, GeomVertexData, GeomTriangles, Geom, OmniBoundingVolume, Material, LColor, SamplerState, \
@@ -29,7 +30,7 @@ def __init__(self, cubeformer: CubeFormer):
 
     def EdgeGenerator(self) -> Texture:
         if self.edgeVertexBuffer is None:
-            self.edgeVertexBuffer = Texture("edge vertex buffer")
+            self.edgeVertexBuffer = deepcopy(Texture("edge vertex buffer"))
             self.edgeVertexBuffer.setup_3d_texture(self.size[0]*3, self.size[1], self.size[2],
                                                    Texture.T_float, Texture.F_rgba32)
         else:
@@ -53,21 +54,21 @@ def EdgeGenerator(self) -> Texture:
 
     def MarchCube(self):
         if self.atomic is None:
-            self.atomic = Texture("atomic int")
+            self.atomic = copy(Texture("atomic int"))
             self.atomic.setupBufferTexture(1, Texture.T_int, Texture.F_r32i, GeomEnums.UH_dynamic)
 
         if self.triangleBuffer is None:
-            self.triangleBuffer = Texture("Cube march triangle Buffer")
+            self.triangleBuffer = deepcopy(Texture("Cube march triangle Buffer"))
             self.triangleBuffer.setupBufferTexture((self.size[0]-1)*(self.size[1]-1)*(self.size[2]-1)*4*3,
                                                    Texture.T_int, Texture.F_rgba32, GeomEnums.UH_dynamic)
-            self.normalBuffer = Texture("Cube march normal Buffer")
+            self.normalBuffer = deepcopy(Texture("Cube march normal Buffer"))
             self.normalBuffer.setupBufferTexture((self.size[0] - 1) * (self.size[1] - 1) * (self.size[2] - 1) * 4,
                                                    Texture.T_float, Texture.F_rgba32, GeomEnums.UH_dynamic)
         else:
             self.triangleBuffer.setClearColor(-1)
 
         if self.triangulationBuffer is None:
-            self.triangulationBuffer = Texture("Triangulation buffer")
+            self.triangulationBuffer = deepcopy(Texture("Triangulation buffer"))
             self.triangulationBuffer.setup_2d_texture(16, 256, Texture.T_int, Texture.F_r32i)
             self.triangulationBuffer.set_ram_image(MarchTable.TRIANGULATION.tobytes())
         else:
@@ -77,6 +78,7 @@ def MarchCube(self):
             shader = Shader.load_compute(Shader.SL_GLSL, "assets/shaders/compute/cubemarcher.glsl")
             self.cubeMarchBufferGeneratorNode = NodePath("Cube march triangle Generator")
             self.cubeMarchBufferGeneratorNode.set_shader(shader)
+            self.cubeMarchBufferGeneratorNode.set_shader_input("isWater", self.cubeformer.isWater)
             self.cubeMarchBufferGeneratorNode.set_shader_input("isoLevel", 0.5)
             self.cubeMarchBufferGeneratorNode.set_shader_input("size", self.size)
             self.cubeMarchBufferGeneratorNode.set_shader_input("triagIndexBuffer", self.atomic)

Blobtory/Scripts/planet_former/PlanetGenerator.py

@@ -3,22 +3,60 @@
 from Blobtory.Scripts.Pipeline.WindowCreator import WindowCreator
 from Blobtory.Scripts.planet_former.CubeFormer import CubeFormer
 from Blobtory.Scripts.planet_former.MarchingCubes import MarchingCubes
-
+from Blobtory.Scripts.Pipeline.PipelineInstancing import PipelineInstancing
 
 class PlanetGenerator:
     def __init__(self, winCreator: WindowCreator, gridSize: int, radius: float):
         self.radius = radius
         self.winCreator = winCreator
+
+        # Setup Mesh
         self.cubeformer: CubeFormer = CubeFormer(self.winCreator, gridSize, gridSize, gridSize, winCreator.cubeSpacing)
         self.cubeformer.GenerateCube()
         self.cubeformer.GenerateNoiseSphere(self.radius)
+
         self.marchingCubes: MarchingCubes = MarchingCubes(self.cubeformer)
         self.marchingCubes.EdgeGenerator()
         self.marchingCubes.MarchCube()
         self.marchingCubes.GenerateMesh()
 
+        # Setup Navigation Mesh
+        self.cubeformerNav: CubeFormer = CubeFormer(self.winCreator, gridSize//4, gridSize//4, gridSize//4, winCreator.cubeSpacing*4)
+        self.cubeformerNav.GenerateCube()
+        self.cubeformerNav.GenerateNoiseSphere(self.radius)
+
+        self.marchingCubesNav: MarchingCubes = MarchingCubes(self.cubeformerNav)
+        self.marchingCubesNav.EdgeGenerator()
+        self.marchingCubesNav.MarchCube()
+
+        # Setup Water Mesh
+        self.cubeformerWater: CubeFormer = CubeFormer(self.winCreator, gridSize//4, gridSize//4, gridSize//4, winCreator.cubeSpacing*4)
+        self.cubeformerWater.GenerateCube()
+        self.cubeformerWater.mouseTime.setData(PTAFloat([10, 0, 0, 10.1]))
+        self.cubeformerWater.GenerateNoiseSphere(self.radius * 0.98)
+        self.cubeformerWater.isWater = True
+
+        self.marchingCubesWater: MarchingCubes = MarchingCubes(self.cubeformerWater)
+        self.marchingCubesWater.EdgeGenerator()
+        self.marchingCubesWater.MarchCube()
+        self.marchingCubesWater.GenerateMesh()
+
+        # sphere = self.winCreator.base.loader.loadModel("assets/models/icosphere")
+        # PipelineInstancing.RenderThisModelAtVertexesFrom3DBuffer(sphere, self.cubeformer.vertexBuffer,
+        #                                                        self.cubeformer.size, self.winCreator)
+
+        # box = self.winCreator.base.loader.loadModel("box")
+        # PipelineInstancing.RenderThisModelAtVertexesFrom3DBuffer(box, self.cubeformerNav.vertexBuffer,
+        #                                                          self.cubeformerNav.size, self.winCreator)
+
     def RegenPlanet(self):
         self.winCreator.baseData.debuggerPlanetFormer.Inform("Regenerating planet")
+
+        self.cubeformerNav.GenerateNoiseSphere(self.radius)
+        self.marchingCubesNav.EdgeGenerator()
+        self.marchingCubesNav.MarchCube()
+        self.marchingCubesNav.GenerateMesh()
+
         self.cubeformer.GenerateNoiseSphere(self.radius)
         self.marchingCubes.EdgeGenerator()
         self.marchingCubes.MarchCube()

assets/shaders/compute/cubemarcher.glsl

@@ -12,6 +12,7 @@ layout(rgba32f) uniform readonly image3D vertexBufferEdge;
 uniform writeonly iimageBuffer triangleBuffer;
 uniform writeonly imageBuffer normalBuffer;
 uniform float isoLevel;
+uniform bool isWater;
 uniform ivec3 size;
 
 
@@ -70,8 +71,9 @@ void main() {
 
         vec3 normal = normalize(cross(v2-v0, v1-v0));
         //vec3 normal = normalize(v2+v0+v1);
-        int type = int(distance(vec3(512), v1)/45);
-        //if(type > 6) if(dot(normalize(vec3(512)-v1), normal)<0.8) type = 5;
+        int type = int(distance(vec3(512), v1)/51);
+        if (isWater) type = 13;
+        // if(type > 7) if(dot(normalize(vec3(512)-v1), normal)<0.5) type = 6;
         imageStore(normalBuffer, int(triangleIDIndex/3), vec4(normal, type));
 
         i+=3;