Skip to content

Commit 8309567

Browse files
GleaseGlease
authored
fix cube faces rendering order (#22)
* fix cube faces rendering order Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * spotless Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> * address review Signed-off-by: Glease <4586901+Glease@users.noreply.github.com> --------- Signed-off-by: Glease <4586901+Glease@users.noreply.github.com>
1 parent 2331219 commit 8309567

3 files changed

Lines changed: 196 additions & 25 deletions

File tree

‎LICENSE.txt‎

Lines changed: 165 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,165 @@
1+
GNU LESSER GENERAL PUBLIC LICENSE
2+
Version 3, 29 June 2007
3+
4+
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
5+
Everyone is permitted to copy and distribute verbatim copies
6+
of this license document, but changing it is not allowed.
7+
8+
9+
This version of the GNU Lesser General Public License incorporates
10+
the terms and conditions of version 3 of the GNU General Public
11+
License, supplemented by the additional permissions listed below.
12+
13+
0. Additional Definitions.
14+
15+
As used herein, "this License" refers to version 3 of the GNU Lesser
16+
General Public License, and the "GNU GPL" refers to version 3 of the GNU
17+
General Public License.
18+
19+
"The Library" refers to a covered work governed by this License,
20+
other than an Application or a Combined Work as defined below.
21+
22+
An "Application" is any work that makes use of an interface provided
23+
by the Library, but which is not otherwise based on the Library.
24+
Defining a subclass of a class defined by the Library is deemed a mode
25+
of using an interface provided by the Library.
26+
27+
A "Combined Work" is a work produced by combining or linking an
28+
Application with the Library. The particular version of the Library
29+
with which the Combined Work was made is also called the "Linked
30+
Version".
31+
32+
The "Minimal Corresponding Source" for a Combined Work means the
33+
Corresponding Source for the Combined Work, excluding any source code
34+
for portions of the Combined Work that, considered in isolation, are
35+
based on the Application, and not on the Linked Version.
36+
37+
The "Corresponding Application Code" for a Combined Work means the
38+
object code and/or source code for the Application, including any data
39+
and utility programs needed for reproducing the Combined Work from the
40+
Application, but excluding the System Libraries of the Combined Work.
41+
42+
1. Exception to Section 3 of the GNU GPL.
43+
44+
You may convey a covered work under sections 3 and 4 of this License
45+
without being bound by section 3 of the GNU GPL.
46+
47+
2. Conveying Modified Versions.
48+
49+
If you modify a copy of the Library, and, in your modifications, a
50+
facility refers to a function or data to be supplied by an Application
51+
that uses the facility (other than as an argument passed when the
52+
facility is invoked), then you may convey a copy of the modified
53+
version:
54+
55+
a) under this License, provided that you make a good faith effort to
56+
ensure that, in the event an Application does not supply the
57+
function or data, the facility still operates, and performs
58+
whatever part of its purpose remains meaningful, or
59+
60+
b) under the GNU GPL, with none of the additional permissions of
61+
this License applicable to that copy.
62+
63+
3. Object Code Incorporating Material from Library Header Files.
64+
65+
The object code form of an Application may incorporate material from
66+
a header file that is part of the Library. You may convey such object
67+
code under terms of your choice, provided that, if the incorporated
68+
material is not limited to numerical parameters, data structure
69+
layouts and accessors, or small macros, inline functions and templates
70+
(ten or fewer lines in length), you do both of the following:
71+
72+
a) Give prominent notice with each copy of the object code that the
73+
Library is used in it and that the Library and its use are
74+
covered by this License.
75+
76+
b) Accompany the object code with a copy of the GNU GPL and this license
77+
document.
78+
79+
4. Combined Works.
80+
81+
You may convey a Combined Work under terms of your choice that,
82+
taken together, effectively do not restrict modification of the
83+
portions of the Library contained in the Combined Work and reverse
84+
engineering for debugging such modifications, if you also do each of
85+
the following:
86+
87+
a) Give prominent notice with each copy of the Combined Work that
88+
the Library is used in it and that the Library and its use are
89+
covered by this License.
90+
91+
b) Accompany the Combined Work with a copy of the GNU GPL and this license
92+
document.
93+
94+
c) For a Combined Work that displays copyright notices during
95+
execution, include the copyright notice for the Library among
96+
these notices, as well as a reference directing the user to the
97+
copies of the GNU GPL and this license document.
98+
99+
d) Do one of the following:
100+
101+
0) Convey the Minimal Corresponding Source under the terms of this
102+
License, and the Corresponding Application Code in a form
103+
suitable for, and under terms that permit, the user to
104+
recombine or relink the Application with a modified version of
105+
the Linked Version to produce a modified Combined Work, in the
106+
manner specified by section 6 of the GNU GPL for conveying
107+
Corresponding Source.
108+
109+
1) Use a suitable shared library mechanism for linking with the
110+
Library. A suitable mechanism is one that (a) uses at run time
111+
a copy of the Library already present on the user's computer
112+
system, and (b) will operate properly with a modified version
113+
of the Library that is interface-compatible with the Linked
114+
Version.
115+
116+
e) Provide Installation Information, but only if you would otherwise
117+
be required to provide such information under section 6 of the
118+
GNU GPL, and only to the extent that such information is
119+
necessary to install and execute a modified version of the
120+
Combined Work produced by recombining or relinking the
121+
Application with a modified version of the Linked Version. (If
122+
you use option 4d0, the Installation Information must accompany
123+
the Minimal Corresponding Source and Corresponding Application
124+
Code. If you use option 4d1, you must provide the Installation
125+
Information in the manner specified by section 6 of the GNU GPL
126+
for conveying Corresponding Source.)
127+
128+
5. Combined Libraries.
129+
130+
You may place library facilities that are a work based on the
131+
Library side by side in a single library together with other library
132+
facilities that are not Applications and are not covered by this
133+
License, and convey such a combined library under terms of your
134+
choice, if you do both of the following:
135+
136+
a) Accompany the combined library with a copy of the same work based
137+
on the Library, uncombined with any other library facilities,
138+
conveyed under the terms of this License.
139+
140+
b) Give prominent notice with the combined library that part of it
141+
is a work based on the Library, and explaining where to find the
142+
accompanying uncombined form of the same work.
143+
144+
6. Revised Versions of the GNU Lesser General Public License.
145+
146+
The Free Software Foundation may publish revised and/or new versions
147+
of the GNU Lesser General Public License from time to time. Such new
148+
versions will be similar in spirit to the present version, but may
149+
differ in detail to address new problems or concerns.
150+
151+
Each version is given a distinguishing version number. If the
152+
Library as you received it specifies that a certain numbered version
153+
of the GNU Lesser General Public License "or any later version"
154+
applies to it, you have the option of following the terms and
155+
conditions either of that published version or of any later version
156+
published by the Free Software Foundation. If the Library as you
157+
received it does not specify a version number of the GNU Lesser
158+
General Public License, you may choose any version of the GNU Lesser
159+
General Public License ever published by the Free Software Foundation.
160+
161+
If the Library as you received it specifies that a proxy can decide
162+
whether future versions of the GNU Lesser General Public License shall
163+
apply, that proxy's public statement of acceptance of any version is
164+
permanent authorization for you to choose that version for the
165+
Library.

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ The project is developed using IDEA. Please manually configure the build to not
3232
Due to me adding in ItemStackMap, which was derived from code from CodeChicken's LGPL mod NEI. This mod is effectively considered
3333
licensed under LGPL in its entirety since commit ebef584b8c518f8202cfe0984fb28a6d23e52b3d or any squash commit containing it, e.g.
3434
609e50428ee4e293f65f67f554a70b9fcfae97c4.
35+
36+
Note while the LICENSE.txt is added by a much later commit, all code on previous commits are covered by this as well.

‎src/main/java/com/gtnewhorizon/structurelib/ClientProxy.java‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ public class ClientProxy extends CommonProxy {
4646
*/
4747
private static final List<HintGroup> allGroups = new ArrayList<>();
4848

49-
public static int HOLOGRAM_LIFETIME = 200;
5049
/**
5150
* Current batch of hints. Belongs to the same logical multiblock.
5251
*/
@@ -335,26 +334,32 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye
335334
double X = (x - eyeXint) + 0.25;
336335
double Y = (y - eyeYint) + 0.25;
337336
double Z = (z - eyeZint) + 0.25;
338-
339-
for (int i = 0; i < 6; i++) {
340-
if (icons[i] == null) continue;
341-
342-
markTextureUsed(icons[i]);
343-
344-
double u = icons[i].getMinU();
345-
double U = icons[i].getMaxU();
346-
double v = icons[i].getMinV();
347-
double V = icons[i].getMaxV();
348-
349-
// cube is a very special model. its facings can be rendered correctly by viewer distance without using
350-
// surface normals and view vector
351-
// here we do a 2 pass render.
352-
// first pass we draw obstructed faces (i.e. faces that are further away from player)
353-
// second pass we draw unobstructed faces
354-
for (int j = 0; j < 2; j++) {
337+
double worldX = x + 0.25;
338+
double worldY = y + 0.25;
339+
double worldZ = z + 0.25;
340+
341+
// this rendering code is independently written by glee8e on July 10th, 2023
342+
// and is released as part of StructureLib under LGPL terms, just like everything else in this project
343+
// cube is a very special model. its facings can be rendered correctly by viewer distance without using
344+
// surface normals and view vector
345+
// here we do a 2 pass render.
346+
// first pass we draw obstructed faces (i.e. faces that are further away from player)
347+
// second pass we draw unobstructed faces
348+
for (int j = 0; j < 2; j++) {
349+
boolean unobstructedPass = j == 1;
350+
for (int i = 0; i < 6; i++) {
351+
if (icons[i] == null) continue;
352+
353+
markTextureUsed(icons[i]);
354+
355+
double u = icons[i].getMinU();
356+
double U = icons[i].getMaxU();
357+
double v = icons[i].getMinV();
358+
double V = icons[i].getMaxV();
355359
switch (i) { // {DOWN, UP, NORTH, SOUTH, WEST, EAST}
356360
case 0:
357-
if ((Y >= eyeY) != (j == 1)) continue;
361+
// all these ifs is in form if ((is face unobstructed) != (is in unobstructred pass))
362+
if ((worldY >= eyeY) != unobstructedPass) continue;
358363
tes.setNormal(0, -1, 0);
359364
tes.addVertexWithUV(X, Y, Z + size, u, V);
360365
tes.addVertexWithUV(X, Y, Z, u, v);
@@ -364,7 +369,7 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye
364369
tes.addVertexWithUV(X, Y, Z + size, u, V);
365370
break;
366371
case 1:
367-
if ((Y + size <= eyeY) != (j == 1)) continue;
372+
if ((worldY + size <= eyeY) != unobstructedPass) continue;
368373
tes.setNormal(0, 1, 0);
369374
tes.addVertexWithUV(X, Y + size, Z, u, v);
370375
tes.addVertexWithUV(X, Y + size, Z + size, u, V);
@@ -374,7 +379,7 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye
374379
tes.addVertexWithUV(X, Y + size, Z, u, v);
375380
break;
376381
case 2:
377-
if ((Z >= eyeZ) != (j == 1)) continue;
382+
if ((worldZ >= eyeZ) != unobstructedPass) continue;
378383
tes.setNormal(0, 0, -1);
379384
tes.addVertexWithUV(X, Y, Z, U, V);
380385
tes.addVertexWithUV(X, Y + size, Z, U, v);
@@ -384,7 +389,7 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye
384389
tes.addVertexWithUV(X, Y, Z, U, V);
385390
break;
386391
case 3:
387-
if ((Z <= eyeZ) != (j == 1)) continue;
392+
if ((worldZ + size <= eyeZ) != unobstructedPass) continue;
388393
tes.setNormal(0, 0, 1);
389394
tes.addVertexWithUV(X + size, Y, Z + size, U, V);
390395
tes.addVertexWithUV(X + size, Y + size, Z + size, U, v);
@@ -394,7 +399,7 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye
394399
tes.addVertexWithUV(X + size, Y, Z + size, U, V);
395400
break;
396401
case 4:
397-
if ((X >= eyeX) != (j == 1)) continue;
402+
if ((worldX >= eyeX) != unobstructedPass) continue;
398403
tes.setNormal(-1, 0, 0);
399404
tes.addVertexWithUV(X, Y, Z + size, U, V);
400405
tes.addVertexWithUV(X, Y + size, Z + size, U, v);
@@ -404,7 +409,7 @@ public void draw(Tessellator tes, double eyeX, double eyeY, double eyeZ, int eye
404409
tes.addVertexWithUV(X, Y, Z + size, U, V);
405410
break;
406411
case 5:
407-
if ((X + size <= eyeX) != (j == 1)) continue;
412+
if ((worldX + size <= eyeX) != unobstructedPass) continue;
408413
tes.setNormal(1, 0, 0);
409414
tes.addVertexWithUV(X + size, Y, Z, U, V);
410415
tes.addVertexWithUV(X + size, Y + size, Z, U, v);
@@ -550,7 +555,6 @@ public void onRenderWorldLast(RenderWorldLastEvent e) {
550555
tes.draw();
551556
tes.startDrawing(GL11.GL_TRIANGLES);
552557
}
553-
// TODO verify if we need to add eyeHeight
554558
hint.draw(tes, d0, d1, d2, i0, i1, i2);
555559
}
556560
p.endStartSection("Draw");

0 commit comments

Comments
 (0)