Improved crosshair slightly and added more debug statements.
This commit is contained in:
parent
91ef650457
commit
3c49b42b23
|
|
@ -8,7 +8,6 @@ import nl.andrewl.aos_core.model.World;
|
||||||
import org.joml.Matrix4f;
|
import org.joml.Matrix4f;
|
||||||
import org.lwjgl.glfw.*;
|
import org.lwjgl.glfw.*;
|
||||||
import org.lwjgl.opengl.GL;
|
import org.lwjgl.opengl.GL;
|
||||||
import org.lwjgl.opengl.GLUtil;
|
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
|
||||||
|
|
@ -89,6 +88,7 @@ public class GameRenderer {
|
||||||
log.debug("Initialized OpenGL context.");
|
log.debug("Initialized OpenGL context.");
|
||||||
|
|
||||||
chunkRenderer.setupShaderProgram();
|
chunkRenderer.setupShaderProgram();
|
||||||
|
log.debug("Initialized chunk renderer.");
|
||||||
guiRenderer.setup();
|
guiRenderer.setup();
|
||||||
// TODO: More organized way to load textures for GUI.
|
// TODO: More organized way to load textures for GUI.
|
||||||
try {
|
try {
|
||||||
|
|
@ -99,6 +99,7 @@ public class GameRenderer {
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
log.debug("Initialized GUI renderer.");
|
||||||
updatePerspective();
|
updatePerspective();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,77 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
||||||
|
<svg
|
||||||
|
xmlns:dc="http://purl.org/dc/elements/1.1/"
|
||||||
|
xmlns:cc="http://creativecommons.org/ns#"
|
||||||
|
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
|
||||||
|
xmlns:svg="http://www.w3.org/2000/svg"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
|
width="32"
|
||||||
|
height="32"
|
||||||
|
viewBox="0 0 8.4666665 8.4666669"
|
||||||
|
version="1.1"
|
||||||
|
id="svg8"
|
||||||
|
inkscape:export-filename="/home/andrew/Programming/github-andrewlalis/ace-of-shades-2/client/src/main/resources/gui/crosshair.png"
|
||||||
|
inkscape:export-xdpi="96.000008"
|
||||||
|
inkscape:export-ydpi="96.000008"
|
||||||
|
inkscape:version="0.92.5 (2060ec1f9f, 2020-04-08)"
|
||||||
|
sodipodi:docname="crosshair.svg">
|
||||||
|
<defs
|
||||||
|
id="defs2" />
|
||||||
|
<sodipodi:namedview
|
||||||
|
id="base"
|
||||||
|
pagecolor="#ffffff"
|
||||||
|
bordercolor="#666666"
|
||||||
|
borderopacity="1.0"
|
||||||
|
inkscape:pageopacity="0.0"
|
||||||
|
inkscape:pageshadow="2"
|
||||||
|
inkscape:zoom="22.4"
|
||||||
|
inkscape:cx="5.8671803"
|
||||||
|
inkscape:cy="15.402866"
|
||||||
|
inkscape:document-units="mm"
|
||||||
|
inkscape:current-layer="layer1"
|
||||||
|
showgrid="false"
|
||||||
|
units="px"
|
||||||
|
inkscape:window-width="1920"
|
||||||
|
inkscape:window-height="1009"
|
||||||
|
inkscape:window-x="0"
|
||||||
|
inkscape:window-y="0"
|
||||||
|
inkscape:window-maximized="1" />
|
||||||
|
<metadata
|
||||||
|
id="metadata5">
|
||||||
|
<rdf:RDF>
|
||||||
|
<cc:Work
|
||||||
|
rdf:about="">
|
||||||
|
<dc:format>image/svg+xml</dc:format>
|
||||||
|
<dc:type
|
||||||
|
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
|
||||||
|
<dc:title />
|
||||||
|
</cc:Work>
|
||||||
|
</rdf:RDF>
|
||||||
|
</metadata>
|
||||||
|
<g
|
||||||
|
inkscape:label="Layer 1"
|
||||||
|
inkscape:groupmode="layer"
|
||||||
|
id="layer1"
|
||||||
|
transform="translate(0,-288.53332)">
|
||||||
|
<g
|
||||||
|
id="g821"
|
||||||
|
style="fill:none;fill-opacity:1;stroke:#f6f6f6;stroke-opacity:0.25263157">
|
||||||
|
<path
|
||||||
|
sodipodi:nodetypes="cc"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
id="path815"
|
||||||
|
d="m 4.2333333,288.53332 v 8.46667"
|
||||||
|
style="fill:none;stroke:#f6f6f6;stroke-width:1.05833333;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25263157;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1" />
|
||||||
|
<path
|
||||||
|
style="fill:none;stroke:#f6f6f6;stroke-width:1.05833333;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.25263157;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
|
||||||
|
d="M 8.4666683,292.76666 H -1.7e-6"
|
||||||
|
id="path817"
|
||||||
|
inkscape:connector-curvature="0"
|
||||||
|
sodipodi:nodetypes="cc" />
|
||||||
|
</g>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
After Width: | Height: | Size: 2.6 KiB |
Loading…
Reference in New Issue