spdis/voxy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

complete and utter fukin idiot

Browse Source
This commit is contained in:
mcrcortex
2025-12-17 23:56:42 +10:00
parent ef1a296998
commit 4ffb7583a7
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/me/cortex/voxy/client/core/rendering/building/RenderDataFactory.java
View File

@@ -764,12 +764,12 @@ public class RenderDataFactory {
//Check and test if can cull W.R.T neighbor //Check and test if can cull W.R.T neighbor
if (Mapper.getBlockId(neighborId) != 0) {//Not air if (Mapper.getBlockId(neighborId) != 0) {//Not air
int modelId = this.modelMan.getModelId(Mapper.getBlockId(neighborId)); int modelId = this.modelMan.getModelId(Mapper.getBlockId(neighborId));
/*
if (modelId == ((A>>26)&0xFFFF)) {//TODO: FIXME, this technically isnt correct as need to check self occulsion, thinks?
if (ModelQueries.cullsSame(B) && modelId == ((A>>26)&0xFFFF)) {//TODO: FIXME, this technically isnt correct as need to check self occulsion, thinks?
//TODO: check self occlsuion in the if statment //TODO: check self occlsuion in the if statment
fail = true; fail = true;
} else */ } else {
{
long meta = this.modelMan.getModelMetadataFromClientId(modelId); long meta = this.modelMan.getModelMetadataFromClientId(modelId);
if (ModelQueries.faceOccludes(meta, (axis << 1) | (1 - side))) { if (ModelQueries.faceOccludes(meta, (axis << 1) | (1 - side))) {
@@ -783,14 +783,10 @@ public class RenderDataFactory {
boolean failB = false; boolean failB = false;
//TODO: check self occlusion //TODO: check self occlusion
/* if (ModelQueries.cullsSame(nB) && (nA&(0xFFFFL<<26)) == (A&(0xFFFFL<<26))) {//TODO: FIXME, this technically isnt correct as need to check self occulsion, thinks?
if ((nA&(0xFFFFL<<26)) == (A&(0xFFFFL<<26))) {//TODO: FIXME, this technically isnt correct as need to check self occulsion, thinks?
//TODO: check self occlsuion in the if statment //TODO: check self occlsuion in the if statment
failB = true; failB = true;
} else } else {
*/
{
if (ModelQueries.faceOccludes(nB, (axis << 1) | (side))) { if (ModelQueries.faceOccludes(nB, (axis << 1) | (side))) {
failB = true; failB = true;
} }
@@ -1494,8 +1490,8 @@ public class RenderDataFactory {
int skipB = 0; int skipB = 0;
for (int z = 0; z < 32; z++) { for (int z = 0; z < 32; z++) {
int i = y*32+z; int i = y*32+z;
int msk = this.opaqueMasks[i]; int msk = this.nonOpaqueMasks[i];
if ((msk & 1)== 0) {//-x if ((msk & 1) != 0) {//-x
long neighborId = this.neighboringFaces[i]; long neighborId = this.neighboringFaces[i];
//TODO also check self occlusion //TODO also check self occlusion
@@ -1516,7 +1512,7 @@ public class RenderDataFactory {
dualMeshNonOpaqueOuterX(0, A, Am, modelId, Mapper.getLightId(neighborId), nM, this.sectionData[sidx+2], this.sectionData[sidx+3], nnx, npx); dualMeshNonOpaqueOuterX(0, A, Am, modelId, Mapper.getLightId(neighborId), nM, this.sectionData[sidx+2], this.sectionData[sidx+3], nnx, npx);
} else {skipA++;} } else {skipA++;}
if ((msk & (1<<31)) == 0) {//+x if ((msk & (1<<31)) != 0) {//+x
long neighborId = this.neighboringFaces[i+32*32]; long neighborId = this.neighboringFaces[i+32*32];
//TODO also check self occlusion //TODO also check self occlusion