Skip to content

Commit 096db99

Browse files
committed
Fixed south face JSON model lighting
1 parent 15e71e3 commit 096db99

1 file changed

Lines changed: 18 additions & 14 deletions

File tree

  • station-renderer-arsenic/src/main/java/net/modificationstation/stationapi/impl/client/arsenic/renderer/aocalc

station-renderer-arsenic/src/main/java/net/modificationstation/stationapi/impl/client/arsenic/renderer/aocalc/LightingCalculatorImpl.java

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -200,31 +200,35 @@ private void quadSmooth(
200200
case POSITIVE -> {
201201
light[0] = MathHelper.interpolate3D(
202202
v00dx, v00dy, v00dz,
203-
light(v00x0, v00y0, v00z0), light(v00x1, v00y0, v00z0), light(v00x0, v00y1, v00z0), light(v00x1, v00y1, v00z0),
204-
light(v00x0, BLOCKS_ALLOW_VISION[id(v00x0, v00y0, v00z0)] || BLOCKS_ALLOW_VISION[id(v00x0, v00y1, v00z1)] ? v00y0 : v00y1, v00z1),
205-
light(v00x1, BLOCKS_ALLOW_VISION[id(v00x1, v00y0, v00z0)] || BLOCKS_ALLOW_VISION[id(v00x1, v00y1, v00z1)] ? v00y0 : v00y1, v00z1),
206-
light(v00x0, v00y1, v00z1), light(v00x1, v00y1, v00z1)
203+
light(v00x0, v00y0, v00z0), light(v00x1, v00y0, v00z0),
204+
light(v00x0, v00y1, v00z0), light(v00x1, v00y1, v00z0),
205+
light(v00x0, v00y0, v00z1), light(v00x1, v00y0, v00z1),
206+
light(v00x0, BLOCKS_ALLOW_VISION[id(v00x0, v00y1, v00z0)] || BLOCKS_ALLOW_VISION[id(v00x0, v00y0, v00z1)] ? v00y1 : v00y0, v00z1),
207+
light(v00x1, BLOCKS_ALLOW_VISION[id(v00x1, v00y1, v00z0)] || BLOCKS_ALLOW_VISION[id(v00x1, v00y0, v00z1)] ? v00y1 : v00y0, v00z1)
207208
);
208209
light[1] = MathHelper.interpolate3D(
209210
v01dx, v01dy, v01dz,
210-
light(v01x0, BLOCKS_ALLOW_VISION[id(v01x0, v01y0, v01z1)] || BLOCKS_ALLOW_VISION[id(v01x0, v01y1, v01z0)] ? v01y0 : v01y1, v01z0),
211-
light(v01x1, BLOCKS_ALLOW_VISION[id(v01x1, v01y0, v01z1)] || BLOCKS_ALLOW_VISION[id(v01x1, v01y1, v01z0)] ? v01y0 : v01y1, v01z0),
212-
light(v01x0, v01y1, v01z0), light(v01x1, v01y1, v01z0), light(v01x0, v01y0, v01z1), light(v01x1, v01y0, v01z1),
211+
light(v01x0, v01y0, v01z0), light(v01x1, v01y0, v01z0),
212+
light(v01x0, v01y1, v01z0), light(v01x1, v01y1, v01z0),
213+
light(v01x0, BLOCKS_ALLOW_VISION[id(v01x0, v01y0, v01z0)] || BLOCKS_ALLOW_VISION[id(v01x0, v01y1, v01z1)] ? v01y0 : v01y1, v01z1),
214+
light(v01x1, BLOCKS_ALLOW_VISION[id(v01x1, v01y0, v01z0)] || BLOCKS_ALLOW_VISION[id(v01x1, v01y1, v01z1)] ? v01y0 : v01y1, v01z1),
213215
light(v01x0, v01y1, v01z1), light(v01x1, v01y1, v01z1)
214216
);
215217
light[2] = MathHelper.interpolate3D(
216218
v11dx, v11dy, v11dz,
217-
light(v11x0, v11y0, v11z0), light(v11x1, v11y0, v11z0),
218-
light(v11x0, BLOCKS_ALLOW_VISION[id(v11x0, v11y1, v11z1)] || BLOCKS_ALLOW_VISION[id(v11x0, v11y0, v11z0)] ? v11y1 : v11y0, v11z0),
219-
light(v11x1, BLOCKS_ALLOW_VISION[id(v11x1, v11y1, v11z1)] || BLOCKS_ALLOW_VISION[id(v11x1, v11y0, v11z0)] ? v11y1 : v11y0, v11z0),
220-
light(v11x0, v11y0, v11z1), light(v11x1, v11y0, v11z1), light(v11x0, v11y1, v11z1), light(v11x1, v11y1, v11z1)
219+
light(v11x0, BLOCKS_ALLOW_VISION[id(v11x0, v11y0, v11z1)] || BLOCKS_ALLOW_VISION[id(v11x0, v11y1, v11z0)] ? v11y0 : v01y1, v11z0),
220+
light(v11x1, BLOCKS_ALLOW_VISION[id(v11x1, v11y0, v11z1)] || BLOCKS_ALLOW_VISION[id(v11x1, v11y1, v11z0)] ? v11y0 : v11y1, v11z0),
221+
light(v11x0, v11y1, v11z0), light(v11x1, v11y1, v11z0),
222+
light(v11x0, v11y0, v11z1), light(v11x1, v11y0, v11z1),
223+
light(v11x0, v11y1, v11z1), light(v11x1, v11y1, v11z1)
221224
);
222225
light[3] = MathHelper.interpolate3D(
223226
v10dx, v10dy, v10dz,
224227
light(v10x0, v10y0, v10z0), light(v10x1, v10y0, v10z0),
225-
light(v10x0, v10y1, v10z0), light(v10x1, v10y1, v10z0), light(v10x0, v10y0, v10z1), light(v10x1, v10y0, v10z1),
226-
light(v10x0, BLOCKS_ALLOW_VISION[id(v10x0, v10y1, v10z0)] || BLOCKS_ALLOW_VISION[id(v10x0, v10y0, v10z1)] ? v10y1 : v10y0, v10z1),
227-
light(v10x1, BLOCKS_ALLOW_VISION[id(v10x1, v10y1, v10z0)] || BLOCKS_ALLOW_VISION[id(v10x1, v10y0, v10z1)] ? v10y1 : v10y0, v10z1)
228+
light(v10x0, BLOCKS_ALLOW_VISION[id(v10x0, v10y1, v10z1)] || BLOCKS_ALLOW_VISION[id(v10x0, v10y0, v10z0)] ? v10y1 : v10y0, v10z0),
229+
light(v10x1, BLOCKS_ALLOW_VISION[id(v10x1, v10y1, v10z1)] || BLOCKS_ALLOW_VISION[id(v10x1, v10y0, v10z0)] ? v10y1 : v10y0, v10z0),
230+
light(v10x0, v10y0, v10z1), light(v10x1, v10y0, v10z1),
231+
light(v10x0, v10y1, v10z1), light(v10x1, v10y1, v10z1)
228232
);
229233
}
230234
case NEGATIVE -> {

0 commit comments

Comments
 (0)