studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

basic visuals work
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-03-17 18:54:33 -04:00
parent 97edfacd41
commit 7ab0debc45
5 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/Shaders/fluid2/fluid2.fs
View File

@ -77,7 +77,7 @@ void main(){
float lightIntensity = calcLightIntensityTotal(norm); float lightIntensity = calcLightIntensityTotal(norm);
//get color of base texture //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 //shadow
float shadow = ShadowCalculation(FragPosLightSpace, normalize(-dLDirection), norm); float shadow = ShadowCalculation(FragPosLightSpace, normalize(-dLDirection), norm);
@ -90,7 +90,7 @@ void main(){
// } // }
//this final calculation is for transparency //this final calculation is for transparency
FragColor = vec4(finalColor, 1); FragColor = vec4(finalColor, 0.2);
} }

1
src/main/java/electrosphere/entity/types/fluid/FluidChunk.java
View File

@ -29,6 +29,7 @@ public class FluidChunk {
// } // }
rVal.putData(EntityDataStrings.FLUID_IS_FLUID, true); rVal.putData(EntityDataStrings.FLUID_IS_FLUID, true);
rVal.putData(EntityDataStrings.DRAW_TRANSPARENT_PASS, true);
return rVal; return rVal;
} }

2
src/main/java/electrosphere/logger/LoggerInterface.java
View File

@ -22,7 +22,7 @@ public class LoggerInterface {
public static void initLoggers(){ public static void initLoggers(){
loggerStartup = new Logger(LogLevel.WARNING); loggerStartup = new Logger(LogLevel.WARNING);
loggerNetworking = new Logger(LogLevel.DEBUG); loggerNetworking = new Logger(LogLevel.WARNING);
loggerFileIO = new Logger(LogLevel.WARNING); loggerFileIO = new Logger(LogLevel.WARNING);
loggerGameLogic = new Logger(LogLevel.WARNING); loggerGameLogic = new Logger(LogLevel.WARNING);
loggerRenderer = new Logger(LogLevel.WARNING); loggerRenderer = new Logger(LogLevel.WARNING);

7
src/main/java/electrosphere/renderer/meshgen/FluidChunkModelGeneration.java
View File

@ -594,9 +594,6 @@ public class FluidChunkModelGeneration {
for(int x = 0; x < weightGrid.length - 1; x++){ for(int x = 0; x < weightGrid.length - 1; x++){
for(int y = 0; y < weightGrid[0].length - 1; y++){ for(int y = 0; y < weightGrid[0].length - 1; y++){
for(int z = 0; z < weightGrid[0][0].length - 1; z++){ 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 //push the current cell's values into the gridcell
currentCell.setValues( 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), 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]); UVs.add(temp[1]);
} }
System.out.println("weight at 3 3 3 " + weightGrid[3][3][3]);
System.out.println("Fluid verts: " + vertsFlat.size());
//List<Float> vertices, List<Float> normals, List<Integer> faceElements, List<Float> uvs //List<Float> vertices, List<Float> normals, List<Integer> faceElements, List<Float> uvs
FluidChunkModelData rVal = new FluidChunkModelData(vertsFlat, normalsFlat, elementsFlat, UVs); FluidChunkModelData rVal = new FluidChunkModelData(vertsFlat, normalsFlat, elementsFlat, UVs);
return rVal; return rVal;

3
src/main/java/electrosphere/renderer/meshgen/TerrainChunkModelGeneration.java
View File

@ -599,9 +599,6 @@ public class TerrainChunkModelGeneration {
for(int x = 0; x < terrainGrid.length - 1; x++){ for(int x = 0; x < terrainGrid.length - 1; x++){
for(int y = 0; y < terrainGrid[0].length - 1; y++){ for(int y = 0; y < terrainGrid[0].length - 1; y++){
for(int z = 0; z < terrainGrid[0][0].length - 1; z++){ 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 //push the current cell's values into the gridcell
currentCell.setValues( 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), 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),