diff --git a/assets/Shaders/fluid2/fluid2.fs b/assets/Shaders/fluid2/fluid2.fs index 1e59f1a4..db6cbe98 100644 --- a/assets/Shaders/fluid2/fluid2.fs +++ b/assets/Shaders/fluid2/fluid2.fs @@ -77,7 +77,7 @@ void main(){ float lightIntensity = calcLightIntensityTotal(norm); //get color of base texture - vec3 textureColor = getColor(texPlane1, texPlane2, texPlane3, norm, material); + vec3 textureColor = vec3(0.6, 0.92, 0.92);//getColor(texPlane1, texPlane2, texPlane3, norm, material); //shadow float shadow = ShadowCalculation(FragPosLightSpace, normalize(-dLDirection), norm); @@ -90,7 +90,7 @@ void main(){ // } //this final calculation is for transparency - FragColor = vec4(finalColor, 1); + FragColor = vec4(finalColor, 0.2); } diff --git a/src/main/java/electrosphere/entity/types/fluid/FluidChunk.java b/src/main/java/electrosphere/entity/types/fluid/FluidChunk.java index 714bd6c3..7f63bccb 100644 --- a/src/main/java/electrosphere/entity/types/fluid/FluidChunk.java +++ b/src/main/java/electrosphere/entity/types/fluid/FluidChunk.java @@ -29,6 +29,7 @@ public class FluidChunk { // } rVal.putData(EntityDataStrings.FLUID_IS_FLUID, true); + rVal.putData(EntityDataStrings.DRAW_TRANSPARENT_PASS, true); return rVal; } diff --git a/src/main/java/electrosphere/logger/LoggerInterface.java b/src/main/java/electrosphere/logger/LoggerInterface.java index bd343cda..ffe3f69d 100644 --- a/src/main/java/electrosphere/logger/LoggerInterface.java +++ b/src/main/java/electrosphere/logger/LoggerInterface.java @@ -22,7 +22,7 @@ public class LoggerInterface { public static void initLoggers(){ loggerStartup = new Logger(LogLevel.WARNING); - loggerNetworking = new Logger(LogLevel.DEBUG); + loggerNetworking = new Logger(LogLevel.WARNING); loggerFileIO = new Logger(LogLevel.WARNING); loggerGameLogic = new Logger(LogLevel.WARNING); loggerRenderer = new Logger(LogLevel.WARNING); diff --git a/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java b/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java index dc952ce4..dd19e7ea 100644 --- a/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java +++ b/src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java @@ -594,9 +594,6 @@ public class FluidChunkModelGeneration { for(int x = 0; x < weightGrid.length - 1; x++){ for(int y = 0; y < weightGrid[0].length - 1; y++){ for(int z = 0; z < weightGrid[0][0].length - 1; z++){ - if(x == 3 && y == 3 && z == 3){ - System.out.println("erihjy at 3,3,3 " + weightGrid[x][y][z]); - } //push the current cell's values into the gridcell currentCell.setValues( new Vector3f(x+0,y+0,z+0), new Vector3f(x+0,y+0,z+1), new Vector3f(x+1,y+0,z+1), new Vector3f(x+1,y+0,z+0), @@ -669,10 +666,6 @@ public class FluidChunkModelGeneration { UVs.add(temp[1]); } - System.out.println("weight at 3 3 3 " + weightGrid[3][3][3]); - - System.out.println("Fluid verts: " + vertsFlat.size()); - //List vertices, List normals, List faceElements, List uvs FluidChunkModelData rVal = new FluidChunkModelData(vertsFlat, normalsFlat, elementsFlat, UVs); return rVal; diff --git a/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java b/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java index e2a2e3ca..f3d87a4c 100644 --- a/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java +++ b/src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java @@ -599,9 +599,6 @@ public class TerrainChunkModelGeneration { for(int x = 0; x < terrainGrid.length - 1; x++){ for(int y = 0; y < terrainGrid[0].length - 1; y++){ for(int z = 0; z < terrainGrid[0][0].length - 1; z++){ - if(x == 0 && y == 0 && z == 0){ - System.out.println("asdf"); - } //push the current cell's values into the gridcell currentCell.setValues( new Vector3f(x+0,y+0,z+0), new Vector3f(x+0,y+0,z+1), new Vector3f(x+1,y+0,z+1), new Vector3f(x+1,y+0,z+0),